From b1b9efdbe1eadd771e08aa0b4aa05e679115db3c Mon Sep 17 00:00:00 2001 From: Andrey Arapov Date: Mon, 19 Jan 2015 10:46:45 +0100 Subject: [PATCH 001/947] nginx service improvements Adding Restart, RestartSec, StartLimitInterval to ensure that the service is started in case if it can't assign (bind) the address as often it takes longer for the network (e.g. dhcpcd) to get the IP assigned. --- nixos/modules/services/web-servers/nginx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0af1b58b7ca..0f21ef01263 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,9 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; }; }; From 611a21a91956b050932797ed232315c61f73e2a9 Mon Sep 17 00:00:00 2001 From: j-keck Date: Sat, 24 Jan 2015 20:37:55 +0100 Subject: [PATCH 002/947] nixos-container: add missing 'nixos-container update' in usage * in nixos-container.pl the mode 'update' is missing in the usage --- nixos/modules/virtualisation/nixos-container.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 9ae5331786c..a94501ea342 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -22,6 +22,7 @@ Usage: nixos-container list nixos-container start nixos-container stop nixos-container status + nixos-container update [--config ] nixos-container login nixos-container root-login nixos-container run -- args... From 0d91df8129a608c89171033913b693e62a465752 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 24 Jan 2015 23:13:19 +0100 Subject: [PATCH 003/947] phpPackages: add redis and composer --- pkgs/top-level/php-packages.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 600768536ca..6f99cd76cfa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -95,4 +95,36 @@ let self = with self; { buildInputs = [ pkgs.geoip ]; }; + redis = buildPecl { + name = "redis-2.2.5"; + + sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + }; + + composer = pkgs.stdenv.mkDerivation rec { + name = "composer-${version}"; + version = "1.0.0-alpha9"; + + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar"; + sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${php}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" + ''; + + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = https://getcomposer.org/; + maintainers = with maintainers; [offline]; + }; + }; }; in self From 0738edc1fd8c0ed48ca67c5a69f545b5570d1206 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 00:49:31 +0300 Subject: [PATCH 004/947] added ddccontrol package --- .../tools/misc/automake/automake-1.10.x.nix | 46 +++++++++++++++++++ pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 17 +++++++ pkgs/tools/misc/ddccontrol/default.nix | 31 +++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 4 files changed, 100 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix create mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix create mode 100644 pkgs/tools/misc/ddccontrol/default.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 00000000000..a06426e9cf4 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: + +stdenv.mkDerivation rec { + name = "automake-1.10.3"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.gz"; + sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + # Run the test suite in parallel. + enableParallelBuilding = true; + + meta = { + branch = "1.10"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix new file mode 100644 index 00000000000..0835e97c5a7 --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ]; + meta= with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix new file mode 100644 index 00000000000..417a118a47a --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +let version = "0.4.2"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + + prePatch = '' + npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + mv configure.ac configure.ac.old + opath="\$" + opath+="{datadir}\/ddccontrol-db" + sed "s/$opath/$npath/" configure.ac + rm configure.ac.old + ''; + preConfigure = '' + autoreconf --install + ''; + + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} + \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a6ba9e5f8..ba83f98ca0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1007,6 +1007,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -4528,6 +4532,8 @@ let automake = automake112x; + automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; + automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; From 4e926e50da81c990ef4635b6ef5ee9b0ba5df88c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:26:29 +0300 Subject: [PATCH 005/947] Stylistical changes for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 44 +++++++++---- pkgs/tools/misc/ddccontrol/default.nix | 68 ++++++++++++++------ 2 files changed, 78 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 0835e97c5a7..66a9a5024c0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + let version = "20061014"; in let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; - }; - buildInputs = - [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ]; - meta= with stdenv.lib; { - description = "Monitor database for DDCcontrol"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + stdenv + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 417a118a47a..80d925cf0f9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,31 +1,57 @@ -{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +{ stdenv +, fetchurl +, intltool +, libtool +, autoconf +, automake110x +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +, ddccontrol-db +}: + let version = "0.4.2"; in let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; - }; - buildInputs = - [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv + intltool + libtool + autoconf + automake110x + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ddccontrol-db + ]; - prePatch = '' - npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + prePatch = '' + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") mv configure.ac configure.ac.old - opath="\$" - opath+="{datadir}\/ddccontrol-db" - sed "s/$opath/$npath/" configure.ac + oldPath="\$" + oldPath+="{datadir}\/ddccontrol-db" + sed "s/$oldPath/$newPath/" configure.ac rm configure.ac.old - ''; - preConfigure = '' + ''; + preConfigure = '' autoreconf --install - ''; + ''; - meta = with stdenv.lib; { - description = "A program used to control monitor parameters by software"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file From 0baa4eba330a12172eab602d3d20c2ffc367d693 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:53:16 +0300 Subject: [PATCH 006/947] Changes in meta for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 2 ++ pkgs/tools/misc/ddccontrol/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 66a9a5024c0..199ed5b7eb0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; + homepage = "http://http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 80d925cf0f9..3da2a14f4c7 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; + homepage = "http://http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } \ No newline at end of file From b85beb6984618c6c04099cc0fe32a4196422645c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:57:10 +0300 Subject: [PATCH 007/947] Added a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4621e719cfd..591349a6118 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -130,6 +130,7 @@ orbitz = "Malcolm Matalka "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; + pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; From 4147050550367c9aa64a04e94f9d2b8b4a67f492 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 22 Feb 2015 13:31:35 +0000 Subject: [PATCH 008/947] add a (slightly naive) packaging of osrm-backend and its missing dependencies --- .../libraries/libosmpbf/default.nix | 22 +++++++ .../luabind/0.9.1_boost_1.57_fix.patch | 23 ++++++++ .../luabind/0.9.1_modern_boost_fix.patch | 59 +++++++++++++++++++ .../development/libraries/luabind/default.nix | 28 +++++++++ pkgs/development/libraries/stxxl/default.nix | 24 ++++++++ pkgs/servers/osrm-backend/4.5.0-openmp.patch | 18 ++++++ pkgs/servers/osrm-backend/default.nix | 20 +++++++ pkgs/top-level/all-packages.nix | 8 +++ 8 files changed, 202 insertions(+) create mode 100644 pkgs/development/libraries/libosmpbf/default.nix create mode 100644 pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch create mode 100644 pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch create mode 100644 pkgs/development/libraries/luabind/default.nix create mode 100644 pkgs/development/libraries/stxxl/default.nix create mode 100644 pkgs/servers/osrm-backend/4.5.0-openmp.patch create mode 100644 pkgs/servers/osrm-backend/default.nix diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix new file mode 100644 index 00000000000..6ff5d816776 --- /dev/null +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, protobuf}: + +stdenv.mkDerivation rec { + name = "libosmpbf-1.3.3"; + + src = fetchurl { + url = "https://github.com/scrosby/OSM-binary/archive/v1.3.3.tar.gz"; + sha256 = "a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798"; + }; + + buildInputs = [ protobuf ]; + + sourceRoot = "OSM-binary-1.3.3/src"; + + installFlags = "PREFIX=$(out)"; + + meta = { + homepage = https://github.com/scrosby/OSM-binary; + description = "C library to read and write OpenStreetMap PBF files."; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch b/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch new file mode 100644 index 00000000000..7ac495777b5 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch @@ -0,0 +1,23 @@ +diff --git a/luabind/object.hpp b/luabind/object.hpp +index f7b7ca5..1c18e04 100644 +--- a/luabind/object.hpp ++++ b/luabind/object.hpp +@@ -536,6 +536,8 @@ namespace detail + handle m_key; + }; + ++#if BOOST_VERSION < 105700 ++ + // Needed because of some strange ADL issues. + + #define LUABIND_OPERATOR_ADL_WKND(op) \ +@@ -557,7 +559,8 @@ namespace detail + LUABIND_OPERATOR_ADL_WKND(!=) + + #undef LUABIND_OPERATOR_ADL_WKND +- ++ ++#endif // BOOST_VERSION < 105700 + } // namespace detail + + namespace adl diff --git a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch b/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch new file mode 100644 index 00000000000..92e32828a03 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch @@ -0,0 +1,59 @@ +diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp +index 1b45ec1..8f5afff 100644 +--- luabind-0.9.1/luabind/detail/call_function.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp +@@ -323,7 +323,8 @@ namespace luabind + + #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -440,4 +441,5 @@ namespace luabind + + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp +index de8d563..e63555b 100644 +--- luabind-0.9.1/luabind/detail/call_member.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp +@@ -316,7 +316,8 @@ namespace luabind + + #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -360,4 +361,5 @@ namespace luabind + #undef LUABIND_TUPLE_PARAMS + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp +index d54c668..0f88cc5 100755 +--- luabind-0.9.1/luabind/wrapper_base.hpp ++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp +@@ -89,7 +89,8 @@ namespace luabind + + #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -188,3 +189,4 @@ namespace luabind + #undef N + + #endif ++#endif diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix new file mode 100644 index 00000000000..d89229541cd --- /dev/null +++ b/pkgs/development/libraries/luabind/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, boost-build, lua, boost}: + +stdenv.mkDerivation rec { + name = "luabind-0.9.1"; + + src = fetchurl { + url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz"; + sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; + }; + + patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ]; + + buildInputs = [ boost-build lua boost ]; + + buildPhase = "LUA_PATH=${lua} bjam release"; + + installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install"; + + passthru = { + inherit lua; + }; + + meta = { + homepage = https://github.com/luabind/luabind; + description = "Luabind is a library that helps you create bindings between C++ and Lua."; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix new file mode 100644 index 00000000000..b387c59efa1 --- /dev/null +++ b/pkgs/development/libraries/stxxl/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, cmake, parallel ? true }: + +stdenv.mkDerivation rec { + name = "stxxl-1.4.1"; + + src = fetchurl { + url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz"; + sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; + }; + + buildInputs = [ cmake ]; + + cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}"; + + passthru = { + inherit parallel; + }; + + meta = { + homepage = https://github.com/stxxl/stxxl; + description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations."; + license = stdenv.lib.licenses.boost; + }; +} diff --git a/pkgs/servers/osrm-backend/4.5.0-openmp.patch b/pkgs/servers/osrm-backend/4.5.0-openmp.patch new file mode 100644 index 00000000000..f4010131f60 --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-openmp.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6a40f9..87ca301 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,9 +261,10 @@ target_link_libraries(OSRM ${STXXL_LIBRARY}) + target_link_libraries(osrm-extract ${STXXL_LIBRARY}) + target_link_libraries(osrm-prepare ${STXXL_LIBRARY}) + +-if(MINGW) +- # STXXL needs OpenMP library +- target_link_libraries(osrm-extract gomp) ++find_package(OpenMP) ++if (OPENMP_FOUND) ++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + + find_package( OSMPBF REQUIRED ) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix new file mode 100644 index 00000000000..035ba9658a6 --- /dev/null +++ b/pkgs/servers/osrm-backend/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib}: + +stdenv.mkDerivation rec { + name = "osrm-backend-4.5.0"; + + src = fetchurl { + url = "https://github.com/Project-OSRM/osrm-backend/archive/v4.5.0.tar.gz"; + sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c"; + }; + + patches = [ ./4.5.0-openmp.patch ]; + + buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + + meta = { + homepage = https://github.com/Project-OSRM/osrm-backend/wiki; + description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project."; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd8284bbc9..ca389139311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6466,6 +6466,8 @@ let libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmpbf = callPackage ../development/libraries/libosmpbf {}; + libotr = callPackage ../development/libraries/libotr { libgcrypt = libgcrypt_1_6; }; @@ -6727,6 +6729,8 @@ let loudmouth = callPackage ../development/libraries/loudmouth { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; + lzo = callPackage ../development/libraries/lzo { }; matio = callPackage ../development/libraries/matio { }; @@ -7312,6 +7316,8 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; + stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); @@ -8104,6 +8110,8 @@ let opensmtpd = callPackage ../servers/mail/opensmtpd { }; + osrm-backend = callPackage ../servers/osrm-backend { }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; From a112709b02b93f9690a4a5b422119f1a1dd6d8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Feb 2015 00:02:26 +0100 Subject: [PATCH 009/947] automake: use 1.14.* as the default I see 1.15 has been released recently, but that's probably too new to be the default. --- .../gnome-3/3.12/core/gnome-contacts/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 4 ++-- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +++-------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix index 5b4ca5c3418..49bd7ac70f4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret , bash, makeWrapper, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: +, libsoup, vala, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { name = "gnome-contacts-3.12.0"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.gnome_icon_theme librsvg hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; + vala automake autoconf db ]; preFixup = '' for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index 0d5cc4d1427..13ea6bb391c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf +, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler, libtool , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool + automake autoconf libtool gnome3.gsettings_desktop_schemas makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index a7e42a07a63..35468d1351f 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoconf -, automake114x +, automake , findutils # for xargs , gettext_0_19 , libtool @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; }; - buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ]; + buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd8284bbc9..8faa7a548a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1294,9 +1294,7 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - automake = automake114x; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; @@ -4353,7 +4351,6 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; - automake = automake114x; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; pythonProtobuf = pythonPackages.protobuf; }; @@ -4656,7 +4653,7 @@ let autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake112x; + automake = automake114x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -5203,9 +5200,7 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib { - automake = automake114x; - }; + afflib = callPackage ../development/libraries/afflib { }; agg = callPackage ../development/libraries/agg { }; From e8288a7e2e52ee3726388c3a536922f57a3e5624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Feb 2015 22:06:05 +0100 Subject: [PATCH 010/947] grep: update The 2.21 update fixes NixOS/nix#464. --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0380d2d2467..e0dcd4eadf9 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv }: -let version = "2.20"; in +let version = "2.21"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; + sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"; }; buildInputs = [ pcre libiconv ]; From ff1a5a25282c11ea6debfb0ac03ce81632b43c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Feb 2015 23:39:27 +0100 Subject: [PATCH 011/947] libtool: update I see nothing dangerous in NEWS. Also refactored the expression. --- .../tools/misc/libtool/libtool2.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index d0cc086a9a6..443915d71e9 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, m4, perl, lzma }: +{ stdenv, fetchurl, m4, perl, help2man }: -stdenv.mkDerivation (rec { - name = "libtool-2.4.2"; +stdenv.mkDerivation rec { + name = "libtool-2.4.5"; src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; - sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; + sha256 = "11v9gl8ancavx7179n6zk4k8hwa0zl4wz4w9z3mffk71gnfb972h"; }; - nativeBuildInputs = [ lzma m4 perl ]; + propagatedNativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ perl help2man ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! @@ -18,6 +19,10 @@ stdenv.mkDerivation (rec { # leads to the failure of a number of tests. doCheck = false; + # Don't run the native `strip' when cross-compiling. This breaks at least + # with `.a' files for MinGW. + dontStrip = stdenv ? cross; + meta = { description = "GNU Libtool, a generic library support script"; @@ -39,10 +44,3 @@ stdenv.mkDerivation (rec { }; } -// - -# Don't run the native `strip' when cross-compiling. This breaks at least -# with `.a' files for MinGW. -(if (stdenv ? cross) - then { dontStrip = true; } - else { })) From 2fd5f06acee84d44cc6966e794e621eeae8c0b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Feb 2015 10:58:35 +0100 Subject: [PATCH 012/947] recode: fix build, needing texinfo now Also make the build inputs native (no references are retained). --- pkgs/tools/text/recode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 21b35682e4e..bf95125b208 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,6 +1,6 @@ # XXX: this may need -liconv on non-glibc systems.. -{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }: +{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, texinfo }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - buildInputs = [ python perl autoconf automake libtool intltool flex ]; + nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo ]; preConfigure = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 From a00f77155173f28edd05b8531f0afa3a1e5d9a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Feb 2015 15:03:34 +0100 Subject: [PATCH 013/947] gnugrep: fix CVE-2015-1345 by upstream patch --- pkgs/tools/text/gnugrep/cve-2015-1345.patch | 60 +++++++++++++++++++++ pkgs/tools/text/gnugrep/default.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/text/gnugrep/cve-2015-1345.patch diff --git a/pkgs/tools/text/gnugrep/cve-2015-1345.patch b/pkgs/tools/text/gnugrep/cve-2015-1345.patch new file mode 100644 index 00000000000..7156f475e7e --- /dev/null +++ b/pkgs/tools/text/gnugrep/cve-2015-1345.patch @@ -0,0 +1,60 @@ +From 83a95bd8c8561875b948cadd417c653dbe7ef2e2 Mon Sep 17 00:00:00 2001 +From: Yuliy Pisetsky +Date: Thu, 01 Jan 2015 23:36:55 +0000 +Subject: grep -F: fix a heap buffer (read) overrun + +grep's read buffer is often filled to its full size, except when +reading the final buffer of a file. In that case, the number of +bytes read may be far less than the size of the buffer. However, for +certain unusual pattern/text combinations, grep -F would mistakenly +examine bytes in that uninitialized region of memory when searching +for a match. With carefully chosen inputs, one can cause grep -F to +read beyond the end of that buffer altogether. This problem arose via +commit v2.18-90-g73893ff with the introduction of a more efficient +heuristic using what is now the memchr_kwset function. The use of +that function in bmexec_trans could leave TP much larger than EP, +and the subsequent call to bm_delta2_search would mistakenly access +beyond end of the main input read buffer. + +* src/kwset.c (bmexec_trans): When TP reaches or exceeds EP, +do not call bm_delta2_search. +* tests/kwset-abuse: New file. +* tests/Makefile.am (TESTS): Add it. +* THANKS.in: Update. +* NEWS (Bug fixes): Mention it. + +Prior to this patch, this command would trigger a UMR: + + printf %0360db 0 | valgrind src/grep -F $(printf %019dXb 0) + + Use of uninitialised value of size 8 + at 0x4142BE: bmexec_trans (kwset.c:657) + by 0x4143CA: bmexec (kwset.c:678) + by 0x414973: kwsexec (kwset.c:848) + by 0x414DC4: Fexecute (kwsearch.c:128) + by 0x404E2E: grepbuf (grep.c:1238) + by 0x4054BF: grep (grep.c:1417) + by 0x405CEB: grepdesc (grep.c:1645) + by 0x405EC1: grep_command_line_arg (grep.c:1692) + by 0x4077D4: main (grep.c:2570) + +See the accompanying test for how to trigger the heap buffer overrun. + +Thanks to Nima Aghdaii for testing and finding numerous +ways to break early iterations of this patch. + +Nix: @vcunat restricted this to the runtime code only to avoid needing autoreconfiguration. +--- +diff --git a/src/kwset.c b/src/kwset.c +index 4003c8d..376f7c3 100644 +--- a/src/kwset.c ++++ b/src/kwset.c +@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + if (! tp) + return -1; + tp++; ++ if (ep <= tp) ++ break; + } + } + } diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e0dcd4eadf9..e73458d0aba 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"; }; + patches = [ ./cve-2015-1345.patch ]; + buildInputs = [ pcre libiconv ]; doCheck = !stdenv.isDarwin; From 3d9e9f65715e30edc63c5395193c4bd18cc4e4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 11:49:17 +0100 Subject: [PATCH 014/947] glibc: fix -lgcc_s linking https://github.com/NixOS/nixpkgs/commit/65221567c12eb20d12#commitcomment-9515597 --- pkgs/development/libraries/glibc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index b0a28406473..f60df4a30d6 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -36,6 +36,7 @@ in if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + ln -s libgcc_s.so.1 $out/lib/libgcc_s.so fi ''; From fe76b8e60803b8a82f1c760311b304be9139d4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 15:57:04 +0100 Subject: [PATCH 015/947] libdrm: update --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 12e25b03a7b..ecc92fce40c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.58"; + name = "libdrm-2.4.59"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd"; + sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; }; nativeBuildInputs = [ pkgconfig ]; From bb587dd5cc86b08433b3901ef38009b73a91f360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:19:32 +0100 Subject: [PATCH 016/947] dbus: security bump to fix CVE-2015-0245 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f6c42f2136c..8fc75721c23 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.8.14"; - sha256 = "06hzrvlpm91c4a4a19bk5pzxvs00fwd7fjd3njd3pjd4lr854hl3"; + version = "1.8.16"; + sha256 = "01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz"; inherit (stdenv) lib; From bb2be45e086f53cede9164855b4d9c0ebd5de35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:22:13 +0100 Subject: [PATCH 017/947] xorg: update various modules --- pkgs/servers/x11/xorg/default.nix | 46 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 14 ++++---- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index da537c5c453..2ffa65debb9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -25,11 +25,11 @@ let }) // {inherit ;}; bdftopcf = (mkDerivation "bdftopcf" { - name = "bdftopcf-1.0.4"; + name = "bdftopcf-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2; - sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga"; + url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; + sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; buildInputs = [pkgconfig libXfont ]; }) // {inherit libXfont ;}; @@ -515,11 +515,11 @@ let }) // {inherit ;}; iceauth = (mkDerivation "iceauth" { - name = "iceauth-1.0.6"; + name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2; - sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx"; + url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; + sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; buildInputs = [pkgconfig libICE xproto ]; }) // {inherit libICE xproto ;}; @@ -895,11 +895,11 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.2"; + name = "libpciaccess-0.13.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2; - sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2; + sha256 = "1qy2i776jb7912dxqylv59p41sa0hw8lmn7asd3ywvp0wk56rmvc"; }; buildInputs = [pkgconfig zlib ]; }) // {inherit zlib ;}; @@ -935,11 +935,11 @@ let }) // {inherit kbproto libX11 ;}; libxshmfence = (mkDerivation "libxshmfence" { - name = "libxshmfence-1.1"; + name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; - sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; + sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -985,11 +985,11 @@ let }) // {inherit ;}; mkfontscale = (mkDerivation "mkfontscale" { - name = "mkfontscale-1.1.1"; + name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2; - sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14"; + url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; + sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1065,11 +1065,11 @@ let }) // {inherit ;}; sessreg = (mkDerivation "sessreg" { - name = "sessreg-1.0.8"; + name = "sessreg-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2; - sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf"; + url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2; + sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -2025,11 +2025,11 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.26"; + name = "xproto-7.0.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2; - sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3"; + url = mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2; + sha256 = "030ix881p0crnd4bc01nz6cs0afmfv6ivsyyhf0h1j1mnak26vr4"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index bb1c5b9291f..0ca8d6b5fc7 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 @@ -47,16 +47,16 @@ mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 -mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2 @@ -88,13 +88,13 @@ mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2 mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 From 99a740aa2178bb5ca4a96d4c2c70ee20b139d3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:22:44 +0100 Subject: [PATCH 018/947] xf86-video-vmware: update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2ffa65debb9..55bc13f2273 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1765,11 +1765,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.0.2"; + name = "xf86-video-vmware-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2; - sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; + sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 0ca8d6b5fc7..e199672942d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -154,7 +154,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From c0def4a169755c17db2203bae3c8d46f08cb6d99 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Fri, 20 Feb 2015 16:29:52 +0100 Subject: [PATCH 019/947] llvm-3.5: enable RTTI to support mesa Extracted from #6367. --- pkgs/development/compilers/llvm/3.5/llvm.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index bacd0b26643..7e11caa66f0 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_REQUIRES_RTTI=1" ] ++ stdenv.lib.optionals (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8faa7a548a9..25b34d79160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3714,6 +3714,7 @@ let llvm = llvmPackages.llvm; + llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; From 0e9a0c9913a810af38cc644d4847b4b6bf3e5198 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Sun, 22 Feb 2015 19:11:38 +0100 Subject: [PATCH 020/947] mesa: big update, and related improvements (close #6367) * Remove upstreamed patch * EGL driver dirs are no longer a thing, see mesa commit 407450eb84f5a1b466a2eff19b85cdee7ac15dfb Patching runtime search dir in sources instead (by vcunat). * static-gallium patch dropped as it causes visibility issues with nouveau * rtti patch dropped as it the relevant configuration has been removed upstream; properly fixed by an LLVM flag now * Checks disabled. This is known and solved upstream. Checks will be re-enabled in a future commit when updating to a version containing the fixes * Use llvm-3.5 now (by vcunat). --- pkgs/development/libraries/mesa/default.nix | 32 +++------ pkgs/development/libraries/mesa/rtti.patch | 72 ------------------- .../libraries/mesa/static-gallium.patch | 64 ----------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 11 insertions(+), 159 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/rtti.patch delete mode 100644 pkgs/development/libraries/mesa/static-gallium.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d562b2364d4..875dabc3734 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -15,16 +15,15 @@ else - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - - DRI and EGL drivers are compiled into $drivers output, - which is much bigger and depends on LLVM. - These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*" - and so are kind-of impure (given by NixOS). + - DRI drivers are compiled into $drivers output, which is much bigger and + depends on LLVM. These should be searched at runtime in + "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) - libOSMesa is in $osmesa (~4 MB) */ let - version = "10.2.9"; + version = "10.4.5"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -38,46 +37,35 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/MesaLib-${version}.tar.bz2" "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2" ]; - sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d"; + sha256 = "bf60000700a9d58e3aca2bfeee7e781053b0d839e61a95b1883e05a2dee247a0"; }; prePatch = "patchShebangs ."; patches = [ - ./static-gallium.patch ./glx_ro_text_segm.patch # fix for grsecurity/PaX # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog - (fetchpatch { - name = "fix-lp_test_arit.diff"; - url = "http://cgit.freedesktop.org/mesa/mesa/patch/" - + "?id=8148a06b8fdb734f7f9a11ce787ee6505939fdaa"; - sha256 = "0k2bnl7d28nx2y88jchw6jj4f3xfdjjvz4vpvhc40060c2iz8fla"; - }) ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; inherit udev; }); - # Change the search path for EGL drivers from $drivers/* to driverLink postPatch = '' - sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \ - -i src/egl/main/Makefile.am - '' + /* work around RTTI LLVM problems */ '' - patch -R -p1 < ${./rtti.patch} + substituteInPlace src/egl/main/egldriver.c \ + --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"' ''; outputs = ["out" "drivers" "osmesa"]; configureFlags = [ "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-egl-driver-dir=$(drivers)/lib/egl" "--with-dri-searchpath=${driverLink}/lib/dri" "--enable-dri" "--enable-glx-tls" - "--enable-shared-glapi" "--enable-shared-gallium" + "--enable-shared-glapi" "--enable-driglx-direct" # seems enabled anyway "--enable-gallium-llvm" "--enable-llvm-shared-libs" "--enable-xa" # used in vmware driver @@ -112,7 +100,7 @@ stdenv.mkDerivation { ; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big @@ -178,6 +166,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = "bsd"; platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ simons vcunat ]; + maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/rtti.patch b/pkgs/development/libraries/mesa/rtti.patch deleted file mode 100644 index 6b123139013..00000000000 --- a/pkgs/development/libraries/mesa/rtti.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://lists.freedesktop.org/archives/mesa-dev/2013-October/046311.html - -* As discussed on the mailing list, - forced no-rtti breaks C++ public - API's such as the Haiku C++ libGL.so -* -fno-rtti *can* be still set however - instead of blindly forcing -fno-rtti, - we can rely on the llvm-config - --cppflags output. - If the system llvm is built without - rtti (default), the no-rtti flag will be - present in llvm-config --cppflags - (which we pick up on) - If llvm is built with rtti - (REQUIRES_RTTI=1), then -fno-rtti is - removed from llvm-config --cppflags. -* We could selectively add / remove rtti - from various components, however mixing - rtti and non-rtti code is tricky and - could introduce bugs. -* This needs impact tested. ---- - configure.ac | 1 - - scons/llvm.py | 3 --- - src/gallium/auxiliary/Makefile.am | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0d082d2..3335575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1943,7 +1943,6 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) - AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) - AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) - AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1) --AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302) - - AC_SUBST([ELF_LIB]) - -diff --git a/scons/llvm.py b/scons/llvm.py -index 7cd609c..c1c3736 100644 ---- a/scons/llvm.py -+++ b/scons/llvm.py -@@ -195,9 +195,6 @@ def generate(env): - if llvm_version >= distutils.version.LooseVersion('3.1'): - components.append('mcjit') - -- if llvm_version >= distutils.version.LooseVersion('3.2'): -- env.Append(CXXFLAGS = ('-fno-rtti',)) -- - env.ParseConfig('llvm-config --libs ' + ' '.join(components)) - env.ParseConfig('llvm-config --ldflags') - except OSError: -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index 670e124..2d2d8d4 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -25,12 +25,6 @@ AM_CXXFLAGS += \ - $(GALLIUM_CFLAGS) \ - $(LLVM_CXXFLAGS) - --if LLVM_NEEDS_FNORTTI -- --AM_CXXFLAGS += -fno-rtti -- --endif -- - libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) --- -1.8.4 diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch deleted file mode 100644 index bb3f60eaf88..00000000000 --- a/pkgs/development/libraries/mesa/static-gallium.patch +++ /dev/null @@ -1,64 +0,0 @@ -117-static-gallium.patch from Ubuntu Trusty - -diff --git a/configure.ac b/configure.ac -index b9fcb0b..be89843 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -747,6 +747,19 @@ if test "x$enable_shared_glapi" = xyes; then - fi - AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) - -+AC_ARG_ENABLE([shared-gallium], -+ [AS_HELP_STRING([--enable-shared-gallium], -+ [Enable shared gallium core @<:@default=yes@:>@])], -+ [enable_shared_gallium="$enableval"], -+ [enable_shared_gallium=yes]) -+ -+SHARED_GALLIUM="0" -+if test "x$enable_shared_gallium" = xyes; then -+ SHARED_GALLIUM="1" -+fi -+AC_SUBST([SHARED_GALLIUM]) -+AM_CONDITIONAL(HAVE_SHARED_GALLIUM, test $SHARED_GALLIUM = 1) -+ - dnl - dnl Driver specific build directories - dnl -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index f14279b..3cdec83 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -3,14 +3,19 @@ AUTOMAKE_OPTIONS = subdir-objects - include Makefile.sources - include $(top_srcdir)/src/gallium/Automake.inc - --noinst_LTLIBRARIES = libgallium.la -- - AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/auxiliary/util \ -- $(GALLIUM_CFLAGS) \ -- $(VISIBILITY_CFLAGS) -+ $(GALLIUM_CFLAGS) - --AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -+AM_CXXFLAGS = -+ -+if HAVE_SHARED_GALLIUM -+lib_LTLIBRARIES = libgallium.la -+else -+noinst_LTLIBRARIES = libgallium.la -+AM_CFLAGS += $(VISIBILITY_CFLAGS) -+AM_CXXFLAGS += $(VISIBILITY_CXXFLAGS) -+endif - - libgallium_la_SOURCES = \ - $(C_SOURCES) \ -@@ -29,6 +34,8 @@ if LLVM_NEEDS_FNORTTI - - AM_CXXFLAGS += -fno-rtti - -+libgallium_la_LIBADD = $(LLVM_LIBS) -+ - endif - - libgallium_la_SOURCES += \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25b34d79160..8bff0cc1497 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6744,7 +6744,7 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - llvm = llvm_34; + llvm = llvm_35; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( From b8bf8e502c21f24d7a52fe83171d65d8272f4fd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Feb 2015 21:55:27 +0100 Subject: [PATCH 021/947] ghc: re-instate code that configures statically linked builds by default The compiler should not expect to have dynamic versions of all libraries available, because that configuration doesn't play along nicely with statically linked libraries. Fixes https://github.com/NixOS/nixpkgs/issues/6399. --- pkgs/development/compilers/ghc/7.8.4.nix | 1 + pkgs/development/compilers/ghc/head.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index e9e1e1eafd0..c4000fc86c2 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0363855977f..4cde21dbcc2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,6 +7,7 @@ let libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" From d3dd218bc2d6bfea1c9365f49b0e78802a249b8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Feb 2015 11:45:49 +0100 Subject: [PATCH 022/947] haskell-generic-builder: consistently use $TMPDIR to refer to the designated place for temporary files Resolves https://github.com/NixOS/nixpkgs/issues/6525. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 8e730fd37f0..03535f90b79 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation ({ export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - packageConfDir="$TMP/package.conf.d" + packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" From 4bf66ba89caacc99605aea46fe937a2acb31c446 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 18 Feb 2015 23:44:29 -0500 Subject: [PATCH 023/947] ddclient module: fix module * rewrite to systemd.services * disable forking to give systemd better control * verifiably run as ddclient user * expose ssl option * unset default value for dyndns server * rename option "web" to "use" to be consistent with ddclient docs * add descriptions * add types to options * clean up formatting --- .../modules/services/networking/ddclient.nix | 99 +++++++++++-------- 1 file changed, 58 insertions(+), 41 deletions(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index bb94a8dacfa..f01deb6ee7c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -3,24 +3,22 @@ let inherit (lib) mkOption mkIf singleton; - inherit (pkgs) ddclient; stateDir = "/var/spool/ddclient"; - ddclientUser = "ddclient"; - - ddclientFlags = "-foreground -file ${ddclientCfg}"; - + ddclientFlags = "-foreground -verbose -noquiet -file ${ddclientCfg}"; + ddclientPIDFile = "${stateDir}/ddclient.pid"; ddclientCfg = pkgs.writeText "ddclient.conf" '' daemon=600 cache=${stateDir}/ddclient.cache - pid=${stateDir}/ddclient.pid - use=${config.services.ddclient.web} + pid=${ddclientPIDFile} + use=${config.services.ddclient.use} login=${config.services.ddclient.username} password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} server=${config.services.ddclient.server} + ssl=${if config.services.ddclient.ssl then "yes" else "yes"} wildcard=YES ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} @@ -34,10 +32,11 @@ in options = { - services.ddclient = { + services.ddclient = with lib.types; { enable = mkOption { default = false; + type = bool; description = '' Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org). ''; @@ -45,6 +44,7 @@ in domain = mkOption { default = ""; + type = str; description = '' Domain name to synchronize. ''; @@ -52,76 +52,93 @@ in username = mkOption { default = ""; + type = str; description = '' Username. ''; }; password = mkOption { - default = "" ; + default = ""; + type = str; description = '' Password. ''; }; protocol = mkOption { - default = "dyndns2" ; + default = "dyndns2"; + type = str; description = '' - Protocol to use with dynamic DNS provider. (see also, http://sourceforge.net/apps/trac/ddclient/wiki/Protocols) + Protocol to use with dynamic DNS provider (see http://sourceforge.net/apps/trac/ddclient/wiki/Protocols). ''; }; server = mkOption { - default = "members.dyndns.org" ; + default = ""; + type = str; description = '' - Server + Server address. + ''; + }; + + ssl = mkOption { + default = true; + type = bool; + description = '' + Whether to use to use SSL/TLS to connect to dynamic DNS provider. ''; }; extraConfig = mkOption { - default = "" ; + default = ""; + type = str; description = '' Extra configuration. Contents will be added verbatim to the configuration file. ''; }; - web = mkOption { - default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ; - description = ""; + use = mkOption { + default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; + type = str; + description = '' + Method to determine the IP address to send to the dymanic DNS provider. + ''; }; - }; - }; ###### implementation config = mkIf config.services.ddclient.enable { - + environment.systemPackages = [ ddclient ]; - users.extraUsers = singleton - { name = ddclientUser; - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - home = stateDir; + users.extraUsers = singleton { + name = ddclientUser; + uid = config.ids.uids.ddclient; + description = "ddclient daemon user"; + home = stateDir; + }; + + systemd.services.ddclient = { + description = "Dynamic DNS Client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + # This may change back to forking if too many problems occur: + type = "simple"; + User = ddclientUser; + Group = "nogroup"; #TODO get this to work + PermissionsStartOnly = "true"; + PIDFile = ddclientPIDFile; + ExecStartPre = '' + ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}" + ''; + ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}"; + #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this? }; - - jobs.ddclient = - { name = "ddclient"; - - startOn = "startup"; - - preStart = - '' - mkdir -m 0755 -p ${stateDir} - chown ${ddclientUser} ${stateDir} - ''; - - exec = "${ddclient}/bin/ddclient ${ddclientFlags}"; - }; - + }; }; - } From 7b531e28454412a68b68f821b3dd394e5ec4f141 Mon Sep 17 00:00:00 2001 From: mancha Date: Mon, 23 Feb 2015 23:13:00 +0000 Subject: [PATCH 024/947] unzip: fix CVE-2014-9636 patch Close #6544, fixes #6543. vcunat: no security impact; just fixes false rejections of some rarer inputs - a problem introduced by the CVE patch. --- pkgs/tools/archivers/unzip/CVE-2014-9636.diff | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff index aeaf3e70de6..d4c7f752975 100644 --- a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff +++ b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff @@ -1,6 +1,6 @@ -From a9bfab5b52d08879bbc5e0991684b700127ddcff Mon Sep 17 00:00:00 2001 +From 190040ebfcf5395a6ccedede2cc9343d34f0a108 Mon Sep 17 00:00:00 2001 From: mancha -Date: Mon, 3 Nov 2014 +Date: Wed, 11 Feb 2015 Subject: Info-ZIP UnZip buffer overflow By carefully crafting a corrupt ZIP archive with "extra fields" that @@ -26,12 +26,13 @@ This patch ensures that when extra fields use STORED mode, the if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ -@@ -2226,6 +2227,12 @@ static int test_compr_eb(__G__ eb, eb_si +@@ -2226,6 +2227,13 @@ static int test_compr_eb(__G__ eb, eb_si eb_size <= (compr_offset + EB_CMPRHEADLEN))) return IZ_EF_TRUNC; /* no compressed data! */ + method = makeword(eb + (EB_HEADSIZE + compr_offset)); -+ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ if ((method == STORED) && ++ (eb_size - compr_offset - EB_CMPRHEADLEN != eb_ucsize)) + return PK_ERR; /* compressed & uncompressed + * should match in STORED + * method */ From bf521d7b55fb4913c895946f9d0af2e89fc36033 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 24 Feb 2015 10:51:46 +0100 Subject: [PATCH 025/947] Add setup-hook to hicolor_icon_theme --- .../graphics/shotwell/default.nix | 1 - .../data/icons/hicolor-icon-theme/default.nix | 2 ++ .../icons/hicolor-icon-theme/setup-hook.sh | 20 +++++++++++++++++++ .../gnome-3/3.12/apps/bijiben/default.nix | 1 - .../gnome-3/3.12/apps/file-roller/default.nix | 1 - .../gnome-3/3.12/apps/glade/default.nix | 1 - .../gnome-3/3.12/apps/gnome-boxes/default.nix | 1 - .../3.12/apps/gnome-clocks/default.nix | 1 - .../3.12/apps/gnome-documents/default.nix | 1 - .../gnome-3/3.12/apps/gnome-music/default.nix | 2 -- .../3.12/apps/gnome-photos/default.nix | 1 - .../gnome-3/3.12/apps/seahorse/default.nix | 1 - .../gnome-3/3.12/core/baobab/default.nix | 2 -- .../gnome-3/3.12/core/empathy/default.nix | 1 - .../gnome-3/3.12/core/eog/default.nix | 2 -- .../gnome-3/3.12/core/evince/default.nix | 2 -- .../core/gnome-control-center/default.nix | 2 -- .../3.12/core/gnome-disk-utility/default.nix | 1 - .../gnome-icon-theme-symbolic/default.nix | 4 +++- .../3.12/core/gnome-icon-theme/default.nix | 6 +++--- .../3.12/core/gnome-icon-theme/setup-hook.sh | 10 ---------- .../3.12/core/gnome-system-log/default.nix | 1 - .../3.12/core/gnome-user-share/default.nix | 1 - .../gnome-3/3.12/core/totem/default.nix | 2 -- .../gnome-3/3.12/misc/gitg/default.nix | 1 - pkgs/desktops/xfce/applications/ristretto.nix | 2 -- .../development/tools/misc/d-feet/default.nix | 2 -- 27 files changed, 28 insertions(+), 44 deletions(-) create mode 100644 pkgs/data/icons/hicolor-icon-theme/setup-hook.sh delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 223f632f937..629126503c9 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -44,7 +44,6 @@ in stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 1cf29db9dbc..f8eb7bc032e 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; }; + setupHook = ./setup-hook.sh; + meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh new file mode 100644 index 00000000000..05ab9b3d65d --- /dev/null +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -0,0 +1,20 @@ +# Populate XDG_ICON_DIRS +hicolorIconThemeHook() { + + # where to find icon themes + if [ -d "$1/share/icons" ]; then + addToSearchPath XDG_ICON_DIRS $1/share + fi + +} + +envHooks+=(hicolorIconThemeHook) + +# Remove icon cache +hicolorPreFixupPhase() { + rm -f $out/share/icons/hicolor/icon-theme.cache + rm -f $out/share/icons/HighContrast/icon-theme.cache +} + +preFixupPhases="$preFixupPhases hicolorPreFixupPhase" + diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix index c4d609790fa..c4f6741c070 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/bijiben" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix index a761c13e959..deff8494866 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/file-roller" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix index 5979d10fa70..4783804f200 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/glade" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix index cbb53eedd4c..7d33933656a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" done - rm "$out/share/icons/hicolor/icon-theme.cache" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix index 2226f314eed..47bcbf692ad 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-clocks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index 5c2206641e5..642e0044a75 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index 028ab4832ef..ebcd4c0d01e 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix PYTHONPATH : "$PYTHONPATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index cc92cdd3014..4d080039a88 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix index fb7339dd05f..02365d6b3d5 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/seahorse" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix index e4da596ae21..4d6c91787a3 100644 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache wrapProgram "$out/bin/baobab" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix index c6ac93b1074..a10450d9332 100644 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix index 8c8a49cb7ed..de30f0dbbe1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index aaef1d59ed9..d1ad071d426 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/evince" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; doCheck = false; # would need pythonPackages.dogTail, which is missing diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 0aed2e7a410..bcb49b6cafe 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; patches = [ ./search_providers_dir.patch ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix index 56bde211105..a68624ba0e1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-disks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix index 6a30362f593..7b9e2097bef 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { make -C src install ''; - buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; + buildInputs = [ pkgconfig iconnamingutils gtk ]; + + propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix index aa0c9d24dfe..34a3b67af7e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "gnome-icon-theme-3.12.0"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; }; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + propagatedBuildInputs = [ hicolor_icon_theme ]; + meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh deleted file mode 100644 index d7156f3d463..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -make_gtk_applications_find_icon_themes() { - - # where to find icon themes - if [ -d "$1/share/icons" ]; then - addToSearchPath XDG_ICON_DIRS $1/share - fi - -} - -envHooks+=(make_gtk_applications_find_icon_themes) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix index cdc4b732b97..9abeda53744 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-system-log" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix index 976b0eaca45..fde47a66340 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-user-share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix index 49094751983..9c2db40f89d 100644 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix index 401d5cf2f36..37e1975fd57 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/gitg/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index de7fe597594..b38b97b9043 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df5fdbfab5a..5afe5525d0e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { From 5ea3b3e36ff69925ffd07e5c885d45c606a5f17e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 19:42:02 +0100 Subject: [PATCH 026/947] haskell-generic-builder.nix: don't add lib64 directories to the search path Packages that provide 32 and 64-bit libraries in the same store path are rare and usually require manual overrides anyway. It seems pointless to try and guess proper settings for them. The effect is that we'll end up with bogus settings that take more effort to correct that it takes to configure proper settings in the first place. Point in case: haskell-cuda and it's configuration for "cudatools". Fixes https://github.com/NixOS/nixpkgs/issues/6564. --- pkgs/development/haskell-modules/generic-builder.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 03535f90b79..509cc058648 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -147,11 +147,9 @@ stdenv.mkDerivation ({ if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi - for d in lib{,64}; do - if [ -d "$p/$d" ]; then - configureFlags+=" --extra-lib-dirs=$p/$d" - fi - done + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi done ghc-pkg --${packageDbFlag}="$packageConfDir" recache From d732039ecc95aaaf4126a33e76b58e592ebb67d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 19:49:39 +0100 Subject: [PATCH 027/947] haskell-generic-builder: set LOCALE_ARCHIVE only on Linux --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 509cc058648..da07af21c77 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation ({ propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment @@ -296,4 +295,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) From 3021f2f529c914fe2ac8212e4388b16f57663e1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 20:15:26 +0100 Subject: [PATCH 028/947] haskell-generic-builder: update and jailbreak cabal files before patchPhase is run The updated and jailbroken Cabal file must be in place before the 'patchPhase' hook is run, otherwise we cannot use that hook to patch the Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922. As an added bonus, this change makes the "jailbreakPhase" obsolete. --- .../haskell-modules/generic-builder.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index da07af21c77..f22d2d7e507 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; prePhases = ["setupCompilerEnvironmentPhase"]; - preConfigurePhases = ["jailbreakPhase" "compileBuildDriverPhase"]; + preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; inherit src; @@ -121,6 +121,14 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. + prePatch = optionalString (editedCabalFile != null) '' + echo "Replacing Cabal file with edited version ${newCabalFile}." + cp ${newCabalFile} ${pname}.cabal + '' + optionalString jailbreak '' + echo "Running jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + '' + prePatch; + setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment @@ -155,20 +163,6 @@ stdenv.mkDerivation ({ runHook postSetupCompilerEnvironment ''; - jailbreakPhase = '' - runHook preJailbreak - - ${optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." - cp ${newCabalFile} ${pname}.cabal - ''}${optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal - ''} - - runHook postJailbreak - ''; - compileBuildDriverPhase = '' runHook preCompileBuildDriver @@ -281,7 +275,6 @@ stdenv.mkDerivation ({ // optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } From fffcb14e0636ed2713066177005e788e8d82a1f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 20:40:11 +0100 Subject: [PATCH 029/947] haskell-highlighting-kate: make build work without patching --- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 201826b1e89..78cdf27dce9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -59947,7 +59947,7 @@ self: { "highlighting-kate" = callPackage ({ mkDerivation, base, blaze-html, containers, Diff, directory - , filepath, mtl, parsec, process, regex-pcre, utf8-string + , filepath, mtl, parsec, pcre-light, process, utf8-string }: mkDerivation { pname = "highlighting-kate"; @@ -59956,14 +59956,14 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ - base blaze-html containers filepath mtl parsec regex-pcre + base blaze-html containers filepath mtl parsec pcre-light utf8-string ]; testDepends = [ base blaze-html containers Diff directory filepath process ]; + configureFlags = [ "-fpcre-light" ]; jailbreak = true; - prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal"; homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; license = "GPL"; From c01dd4ab57c82dacee742c0d49bf676df4d97eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Feb 2015 20:48:26 +0100 Subject: [PATCH 030/947] gtk2: small maintenance update --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index b95de7105be..c4dec6c2e1e 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.25"; + name = "gtk+-2.24.26"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3"; + sha256 = "d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133"; }; enableParallelBuilding = true; From 90979e6aa4a7663c414640355797a478d614f405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:06:06 +0100 Subject: [PATCH 031/947] xf86-video-vmware: drop patch included in update --- pkgs/servers/x11/xorg/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3701bdc461f..bb3be6e8b51 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -221,11 +221,6 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker - patches = [( args.fetchpatch { - url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" - + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; - sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; - })]; }; xf86videoqxl = attrs: attrs // { From be18346534184a21e5835cb38449528435896f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:14:45 +0100 Subject: [PATCH 032/947] glib: maintenance update --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1dff672b348..4749e2394b5 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.42"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "16pqvikrps1fvwwqvk0qi4a13mfg7gw6w5qfhk7bhi8f51jhhgwg"; + sha256 = "1nz7vb549gzkxcpmb7yj9dvg3k8kwwz2kr1aykysj46k5fyixk53"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; From fefe6d69832861546a73fca9e9b011918601d76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:24:09 +0100 Subject: [PATCH 033/947] trustedGrub: fix build by using older automake (again) --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70173068432..4d847b56b3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1467,6 +1467,7 @@ let trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; grub2 = grub2_full; From d3bfead0d4178c22bea9584f4ad8cc7b43160ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:26:26 +0100 Subject: [PATCH 034/947] dbus-glib: maintenance update --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 16a20ec94a4..00b302bde8d 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.102"; + name = "dbus-glib-0.104"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "177j5p2vrvpmzk2xrrj6akn73kvpbvnmsjvlmca9l55qbdcfsr39"; + sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; }; nativeBuildInputs = [ pkgconfig gettext ]; From a24ef4f33804c8e6a2574315639d0cef9f468b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:31:41 +0100 Subject: [PATCH 035/947] harfbuzz: small update --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 0b75797b366..a7ec3a75878 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.37"; + name = "harfbuzz-0.9.38"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "01q22an29ni6b7yaial7l2zq0yyr8dk2230x7n31dbfy88w3npr5"; + sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; }; configureFlags = [ From 7476de722b30e917e40aec3abfa9aa2fa2cea5d7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 Feb 2015 22:37:16 +0000 Subject: [PATCH 036/947] luabind: add patch to allow us to discover a provided luajit --- .../luabind/0.9.1_discover_luajit.patch | 22 +++++++++++++++++++ .../development/libraries/luabind/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch diff --git a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch new file mode 100644 index 00000000000..6e5fe6aa6f8 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch @@ -0,0 +1,22 @@ +diff --git a/Jamroot b/Jamroot +index 94494bf..83dfcbb 100755 +--- a/Jamroot ++++ b/Jamroot +@@ -64,7 +64,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ; + + local possible-suffixes = +- include/lua5.1 include/lua51 include/lua include ; ++ include/lua5.1 include/lua51 include/lua include include/luajit-2.0 ; + + local includes = [ GLOB $(possible-prefixes)/$(possible-suffixes) : lua.h ] ; + +@@ -83,7 +83,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + + local lib = $(prefix)/lib ; + +- local names = liblua5.1 liblua51 liblua ; ++ local names = liblua5.1 liblua51 liblua libluajit-5.1 ; + local extensions = .a .so ; + + library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) : diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index d89229541cd..5afbb71ab65 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; }; - patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ]; + patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ]; buildInputs = [ boost-build lua boost ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca389139311..6faddd8c8a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6731,6 +6731,8 @@ let luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; + luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + lzo = callPackage ../development/libraries/lzo { }; matio = callPackage ../development/libraries/matio { }; From 7ce77b57527ce3d7ce5bddcaede76547401c8421 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 28 Feb 2015 20:11:13 +0300 Subject: [PATCH 037/947] slurm: add pkg --- nixos/modules/module-list.nix | 1 + pkgs/servers/computing/slurm/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/servers/computing/slurm/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c41ae69c1ac..c94c07e4130 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -108,6 +108,7 @@ ./services/cluster/panamax.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix + ./services/computing/slurm/slurm.nix ./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix new file mode 100644 index 00000000000..74701dc6dbe --- /dev/null +++ b/pkgs/servers/computing/slurm/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python, munge, perl, pam, openssl, mysql }: + +#TODO: add sview support based on gtk2 + +stdenv.mkDerivation rec { + name = "slurm-llnl-${version}"; + version = "14.11.4"; + + src = fetchurl { + url = "http://www.schedmd.com/download/latest/slurm-${version}.tar.bz2"; + sha256 = "1w454j92j2fnh7xmg63275qcszq8ywiq51sm2rpyf175jrxv6ina"; + }; + + buildInputs = [ python munge perl pam openssl mysql ]; + + configureFlags = '' + --with-munge=${munge} + --with-ssl=${openssl} + ''; + + preConfigure = '' + substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" + substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" + ''; + + meta = with stdenv.lib; { + homepage = http://www.schedmd.com/; + description = "Simple Linux Utility for Resource Management"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d813cb2618..02e965b7033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8340,6 +8340,8 @@ let thttpd = callPackage ../servers/http/thttpd { }; storm = callPackage ../servers/computing/storm { }; + + slurm-llnl = callPackage ../servers/computing/slurm { }; tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; From 54fc2db1b86918f9204107d623294740c64b4c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 2 Mar 2015 21:24:55 +0100 Subject: [PATCH 038/947] glibc: update 2.20 -> 2.21, including security fixes Fixes #6578. https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html - I had to disable one warning-error type. - One of our patches needed modification - it seemed that just the context changed without affecting the purpose of the patch. --- pkgs/development/libraries/glibc/common.nix | 7 ++++--- .../libraries/glibc/dont-use-system-ld-so-cache.patch | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 81abd4f19d4..01b60361e8e 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -13,7 +13,7 @@ cross: let - version = "2.20"; + version = "2.21"; in @@ -127,7 +127,8 @@ stdenv.mkDerivation ({ # I.e. when gcc is compiled with --with-arch=i686, then the # preprocessor symbol `__i686' will be defined to `1'. This causes # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686" + + " -Wno-error=strict-prototypes"; } # Remove the `gccCross' attribute so that the *native* glibc store path @@ -150,7 +151,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; - sha256 = "1g6ysvk15arpi7c1f1fpx5slgfr2k3dqd5xr0yvijajp1m0xxq9p"; + sha256 = "0f4prv4c0fcpi85wv4028wqxn075197gwxhgf0vp571fiw2pi3wd"; }; # Remove absolute paths from `configure' & co.; build out-of-tree. diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index 95f53773320..fc14553c3ee 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -15,13 +15,14 @@ diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 @@ -415,12 +415,12 @@ - $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) + $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) -SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +PREFIX-FLAGS := -D'PREFIX="$(prefix)"' +CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 + -D'SLIBDIR="$(slibdir)"' + libof-ldconfig = ldconfig -CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) -CFLAGS-cache.c = $(SYSCONF-FLAGS) -CFLAGS-rtld.c = $(SYSCONF-FLAGS) @@ -29,8 +30,8 @@ diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +CFLAGS-cache.c = $(PREFIX-FLAGS) +CFLAGS-rtld.c = $(PREFIX-FLAGS) - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) + cpp-srcs-left := $(all-rtld-routines:=.os) + lib := rtld diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h --- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 +++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 From 4dd253c30602a273dfc58ee5c45fc7e1ea0633a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 2 Mar 2015 23:45:00 +0100 Subject: [PATCH 039/947] valgrind: fix build with glibc-2.21 by Arch patch --- pkgs/development/tools/analysis/valgrind/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 28456d931e0..a58ad0f39b2 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb }: +{ stdenv, fetchurl, fetchpatch, perl, gdb }: stdenv.mkDerivation rec { name = "valgrind-3.10.1"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; }; + patches = [(fetchpatch { + name = "glibc-2.21.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; + sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; + })]; + # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; From bd87d32efc2e6a7b178bbe5ed0f372477c1a9949 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 24 Feb 2015 21:47:04 +0200 Subject: [PATCH 040/947] util-linux: update to 2.26 (close #6553) Patch unshare-fix-map-root-user.patch appiled upstream, and removed. Trigger mass-rebuild, so PR will be to staging --- pkgs/os-specific/linux/util-linux/default.nix | 7 +- .../unshare-fix-map-root-user.patch | 66 ------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 81eeee68fba..ae13b7b267c 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.25.2"; + name = "util-linux-2.26"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz"; - sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6"; + url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz"; + sha256 = "a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489"; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ./unshare-fix-map-root-user.patch ]; #FIXME: make it also work on non-nixos? diff --git a/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch b/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch deleted file mode 100644 index 1d1531e110c..00000000000 --- a/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch +++ /dev/null @@ -1,66 +0,0 @@ -In rare cases droping groups with setgroups(0, NULL) is an operation -that can grant a user additional privileges. User namespaces were -allwoing that operation to unprivileged users and that had to be -fixed. - -Update unshare --map-root-user to disable the setgroups operation -before setting the gid_map. - -This is needed as after the security fix gid_map is restricted to -privileged users unless setgroups has been disabled. - -Signed-off-by: "Eric W. Biederman" ---- - include/pathnames.h | 1 + - sys-utils/unshare.c | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/include/pathnames.h b/include/pathnames.h -index 1cc4e15e6e4f..1c53e4554268 100644 ---- a/include/pathnames.h -+++ b/include/pathnames.h -@@ -92,6 +92,7 @@ - - #define _PATH_PROC_UIDMAP "/proc/self/uid_map" - #define _PATH_PROC_GIDMAP "/proc/self/gid_map" -+#define _PATH_PROC_SETGROUPS "/proc/self/setgroups" - - #define _PATH_PROC_ATTR_CURRENT "/proc/self/attr/current" - #define _PATH_PROC_ATTR_EXEC "/proc/self/attr/exec" -diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c -index 95e4afbd055e..d409a7c936b6 100644 ---- a/sys-utils/unshare.c -+++ b/sys-utils/unshare.c -@@ -39,6 +39,24 @@ - #include "pathnames.h" - #include "all-io.h" - -+static void disable_setgroups(void) -+{ -+ const char *file = _PATH_PROC_SETGROUPS; -+ const char *deny = "deny"; -+ int fd; -+ -+ fd = open(file, O_WRONLY); -+ if (fd < 0) { -+ if (errno == ENOENT) -+ return; -+ err(EXIT_FAILURE, _("cannot open %s"), file); -+ } -+ -+ if (write_all(fd, deny, strlen(deny))) -+ err(EXIT_FAILURE, _("write failed %s"), file); -+ close(fd); -+} -+ - static void map_id(const char *file, uint32_t from, uint32_t to) - { - char *buf; -@@ -178,6 +196,7 @@ int main(int argc, char *argv[]) - } - - if (maproot) { -+ disable_setgroups(); - map_id(_PATH_PROC_UIDMAP, 0, real_euid); - map_id(_PATH_PROC_GIDMAP, 0, real_egid); - } From 91fa9b27d57c58d9a7be9b5d49dcb4e767e4c109 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 2 Mar 2015 00:02:47 -0800 Subject: [PATCH 041/947] graphviz: Patch to fix CVE-2014-9157 (close #6640) --- .../graphics/graphviz/cve-2014-9157.patch | 24 +++++++++++++++++++ pkgs/tools/graphics/graphviz/default.nix | 11 +++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/graphics/graphviz/cve-2014-9157.patch diff --git a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch new file mode 100644 index 00000000000..66ce496ca74 --- /dev/null +++ b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch @@ -0,0 +1,24 @@ +From https://lists.debian.org/debian-qa-packages/2014/12/msg00048.html , which +seems to come from Ubuntu. + +Subject: Fix format string vulnerability (CVE-2014-9157) in yyerror() routine +Origin: https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081 +Author: Emden R. Gansner + +--- + lib/cgraph/scan.l | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/lib/cgraph/scan.l +=================================================================== +--- a/lib/cgraph/scan.l ++++ b/lib/cgraph/scan.l +@@ -225,7 +225,7 @@ + agxbput (&xb, buf); + agxbput (&xb, yytext); + agxbput (&xb,"'\n"); +- agerr(AGERR,agxbuse(&xb)); ++ agerr(AGERR, "%s", agxbuse(&xb)); + agxbfree(&xb); + } + /* must be here to see flex's macro defns */ diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 31945c9f232..2fcea02519a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo +, flex }: stdenv.mkDerivation rec { @@ -11,10 +12,16 @@ stdenv.mkDerivation rec { sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"; }; - patches = [ ./0001-vimdot-lookup-vim-in-PATH.patch ]; + patches = + [ ./0001-vimdot-lookup-vim-in-PATH.patch + + # NOTE: Once this patch is removed, flex can probably be removed from + # buildInputs. + ./cve-2014-9157.patch + ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; From eb935ffb733bd8acf53a897f43a03e5330ba9625 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Tue, 3 Mar 2015 18:53:47 +0100 Subject: [PATCH 042/947] eclipse: update to 4.4.2 --- pkgs/applications/editors/eclipse/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e04e438b8ba..3ddffbb8738 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -271,4 +271,19 @@ in { }; }; + eclipse_sdk_442 = buildEclipse { + name = "eclipse-sdk-4.4.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; + + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; + sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d"; + }; + }; + }; } From 856d1ff27f0ca573d9fc26cab6e64a6c659985ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Mar 2015 22:01:11 +0100 Subject: [PATCH 043/947] more build fixups concerning automake defaults --- pkgs/tools/security/gnupg/21.nix | 4 ++-- pkgs/top-level/all-packages.nix | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b9f212de26b..c79414a6456 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, texinfo, gettext }: with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 - autoreconfHook gettext + autoreconfHook texinfo gettext ]; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f20f2d2389..7c4a3e30387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1469,6 +1469,7 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { @@ -2212,7 +2213,9 @@ let panomatic = callPackage ../tools/graphics/panomatic { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { + automake = automake112x; # fails with 14 + }; parallel = callPackage ../tools/misc/parallel { }; @@ -2333,7 +2336,9 @@ let ponysay = callPackage ../tools/misc/ponysay { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + automake = automake113x; # fails with 14 + }; ppl = callPackage ../development/libraries/ppl { }; @@ -6037,7 +6042,9 @@ let libassuan = callPackage ../development/libraries/libassuan { }; - libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; + libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { + automake = automake112x; # fails with 13 and 14 + }; libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; @@ -6632,7 +6639,9 @@ let libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; - libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { }); + libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { + automake = automake113x; # fails with 14 + }); libv4l = lowPrio (v4l_utils.override { withQt4 = false; From 7e042659b7821a38ef2c63d92badc581937e4c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Mar 2015 22:02:09 +0100 Subject: [PATCH 044/947] plymouth: hacky fix build (automake-related) --- pkgs/os-specific/linux/plymouth/default.nix | 41 ++++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index a04407ba5c2..00d330ca955 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, cairo, docbook_xsl, gtk -, libdrm, libpng , libtool, libxslt, makeWrapper, pango, pkgconfig -, udev +{ stdenv, fetchurl, autoreconfHook, cairo, docbook_xsl, gtk +, libdrm, libpng, libxslt, makeWrapper, pango, pkgconfig, udev }: stdenv.mkDerivation rec { @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake cairo docbook_xsl gtk libdrm libpng libtool + autoreconfHook cairo docbook_xsl gtk libdrm libpng libxslt makeWrapper pango pkgconfig udev ]; @@ -22,23 +21,23 @@ stdenv.mkDerivation rec { -i configure.ac ''; - configurePhase = '' - ./configure \ - --prefix=$out \ - -bindir=$out/bin \ - -sbindir=$out/sbin \ - --exec-prefix=$out \ - --libdir=$out/lib \ - --libexecdir=$out/lib \ - --sysconfdir=$out/etc \ - --localstatedir=/var \ - --with-log-viewer \ - --without-system-root-install \ - --without-rhgb-compat-link \ - --enable-tracing \ - --enable-systemd-integration \ - --enable-pango \ - --enable-gtk + postPatch = '' + configureFlags=" + --prefix=$out + --bindir=$out/bin + --sbindir=$out/sbin + --exec-prefix=$out + --libdir=$out/lib + --libexecdir=$out/lib + --sysconfdir=$out/etc + --localstatedir=/var + --with-log-viewer + --without-system-root-install + --without-rhgb-compat-link + --enable-tracing + --enable-systemd-integration + --enable-pango + --enable-gtk" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c4a3e30387..d30cd98cb87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9129,9 +9129,7 @@ let config = config.pcmciaUtils.config or null; }; - plymouth = callPackage ../os-specific/linux/plymouth { - automake = automake113x; - }; + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { }; From 2485055a963395f80be238ba7663027fd703e3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Mar 2015 22:02:45 +0100 Subject: [PATCH 045/947] gtk2: maintenance update Perhaps a bugfix important for us: 745052 Icon theme code assumes directories with mtime 0 don't exist --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c4dec6c2e1e..774193cc06c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.26"; + name = "gtk+-2.24.27"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133"; + sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"; }; enableParallelBuilding = true; From f1b7e4d12717630ec9f46a71c5a72ee35d0d7f18 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 5 Mar 2015 06:43:33 +0100 Subject: [PATCH 046/947] LLVM, clang, and lldb 3.6 --- .../compilers/llvm/3.6/clang-exports.patch | 29 ++++++++ .../compilers/llvm/3.6/clang-purity.patch | 22 ++++++ pkgs/development/compilers/llvm/3.6/clang.nix | 46 ++++++++++++ .../compilers/llvm/3.6/default.nix | 31 ++++++++ .../compilers/llvm/3.6/libc++/darwin.patch | 30 ++++++++ .../compilers/llvm/3.6/libc++/default.nix | 41 +++++++++++ .../compilers/llvm/3.6/libc++/setup-hook.sh | 4 + .../compilers/llvm/3.6/libc++abi/default.nix | 47 ++++++++++++ pkgs/development/compilers/llvm/3.6/lldb.nix | 44 +++++++++++ pkgs/development/compilers/llvm/3.6/llvm.nix | 73 +++++++++++++++++++ 10 files changed, 367 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.6/clang-exports.patch create mode 100644 pkgs/development/compilers/llvm/3.6/clang-purity.patch create mode 100644 pkgs/development/compilers/llvm/3.6/clang.nix create mode 100644 pkgs/development/compilers/llvm/3.6/default.nix create mode 100644 pkgs/development/compilers/llvm/3.6/libc++/darwin.patch create mode 100644 pkgs/development/compilers/llvm/3.6/libc++/default.nix create mode 100644 pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh create mode 100644 pkgs/development/compilers/llvm/3.6/libc++abi/default.nix create mode 100644 pkgs/development/compilers/llvm/3.6/lldb.nix create mode 100644 pkgs/development/compilers/llvm/3.6/llvm.nix diff --git a/pkgs/development/compilers/llvm/3.6/clang-exports.patch b/pkgs/development/compilers/llvm/3.6/clang-exports.patch new file mode 100644 index 00000000000..fbe9489d8e2 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang-exports.patch @@ -0,0 +1,29 @@ +diff -Naur clang-3.6.0.src-orig/CMakeLists.txt clang-3.6.0.src/CMakeLists.txt +--- clang-3.6.0.src-orig/CMakeLists.txt 2015-03-05 05:56:20.788520896 +0100 ++++ clang-3.6.0.src/CMakeLists.txt 2015-03-05 06:02:15.589365469 +0100 +@@ -362,6 +362,7 @@ + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libclang") + install(TARGETS ${name} ++ EXPORT ClangTargets + LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} + ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} + RUNTIME DESTINATION bin) +@@ -516,15 +517,15 @@ + set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake) + set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") + get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) +- export(TARGETS ${CLANG_EXPORTS} FILE ${clang_cmake_builddir}/ClangTargets.cmake) + + # Install a /share/clang/cmake/ClangConfig.cmake file so that + # find_package(Clang) works. Install the target list with it. + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake +- ${CLANG_BINARY_DIR}/share/clang/cmake/ClangTargets.cmake + DESTINATION share/clang/cmake) + ++ install(EXPORT ClangTargets DESTINATION share/clang/cmake) ++ + # Also copy ClangConfig.cmake to the build directory so that dependent projects + # can build against a build directory of Clang more easily. + configure_file( diff --git a/pkgs/development/compilers/llvm/3.6/clang-purity.patch b/pkgs/development/compilers/llvm/3.6/clang-purity.patch new file mode 100644 index 00000000000..dc3b54e304f --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang-purity.patch @@ -0,0 +1,22 @@ +diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp +index 198e82e..810d006 100644 +--- a/lib/Driver/Tools.cpp ++++ b/lib/Driver/Tools.cpp +@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, + CmdArgs.push_back("-shared"); + } + +- if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::armeb || +- ToolChain.getArch() == llvm::Triple::thumb || +- ToolChain.getArch() == llvm::Triple::thumbeb || +- (!Args.hasArg(options::OPT_static) && +- !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString( +- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); +- } +- + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); + diff --git a/pkgs/development/compilers/llvm/3.6/clang.nix b/pkgs/development/compilers/llvm/3.6/clang.nix new file mode 100644 index 00000000000..49b75d7fe0d --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang.nix @@ -0,0 +1,46 @@ +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: + +stdenv.mkDerivation { + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"} + mv cfe-${version}.src clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + buildInputs = [ cmake libedit libxml2 llvm ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ + (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); + + patches = [ ./clang-purity.patch ./clang-exports.patch ]; + + postPatch = '' + sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + ''; + + # Clang expects to find LLVMgold in its own prefix + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ + ln -sv $out/bin/clang $out/bin/cpp + ''; + + enableParallelBuilding = true; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix new file mode 100644 index 00000000000..a6f5d10d05d --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -0,0 +1,31 @@ +{ pkgs, newScope, stdenv, isl, fetchurl }: +let + callPackage = newScope (self // { inherit stdenv isl version fetch; }); + + version = "3.6.0"; + + fetch = fetch_v version; + fetch_v = ver: name: sha256: fetchurl { + url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz"; + clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s"; + + self = { + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src; + }; + + clang = callPackage ./clang.nix { + inherit clang-tools-extra_src; + }; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; + + libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; + }; +in self diff --git a/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch new file mode 100644 index 00000000000..bf83f169cfc --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch @@ -0,0 +1,30 @@ +diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt +--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 ++++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 +@@ -56,7 +56,7 @@ + "-compatibility_version 1" + "-current_version ${LIBCXX_VERSION}" + "-install_name /usr/lib/libc++.1.dylib" +- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" ++ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" + "/usr/lib/libSystem.B.dylib") + else() +@@ -64,14 +64,14 @@ + list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) + if (OSX_HAS_ARMV7) + set(OSX_RE_EXPORT_LINE +- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" ++ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") + else() + set(OSX_RE_EXPORT_LINE +- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") ++ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") + endif() + else() +- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") ++ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") + endif() + + list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix new file mode 100644 index 00000000000..a01d15e186b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719"; + + # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, + # force it to link with our copy + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace lib/CMakeLists.txt \ + --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \ + 'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \ + --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \ + '"${libcxxabi}/lib/libc++abi.dylib"' + ''; + + patches = [ ./darwin.patch ]; + + buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + enableParallelBuilding = true; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh new file mode 100644 index 00000000000..8a45be7e85a --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh @@ -0,0 +1,4 @@ +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++" diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix new file mode 100644 index 00000000000..ddc9c267edd --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix @@ -0,0 +1,47 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp"; + + buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export NIX_CFLAGS_COMPILE+=" -I$PWD/include" + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/cxxabi.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix new file mode 100644 index 00000000000..efb592e493e --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, llvm +, clang +, python +, version +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib"; + + patchPhase = '' + sed -i 's|/usr/bin/env||' \ + scripts/Python/finish-swig-Python-LLDB.sh \ + scripts/Python/build-swig-Python.sh + ''; + + buildInputs = [ cmake python which swig ncurses zlib libedit ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" + "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + ]; + + enableParallelBuilding = true; + + meta = { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix new file mode 100644 index 00000000000..a679ab3babd --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetch +, perl +, groff +, cmake +, python +, libffi +, binutils +, libxml2 +, valgrind +, ncurses +, version +, zlib +, compiler-rt_src +}: + +let + src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk"; +in stdenv.mkDerivation rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}.src llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + + propagatedBuildInputs = [ ncurses zlib ]; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + ] ++ stdenv.lib.optionals (!isDarwin) [ + "-DBUILD_SHARED_LIBS=ON" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + ] ++ stdenv.lib.optionals ( isDarwin) [ + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCAN_TARGET_i386=false" + ]; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + + paxmark m unittests/ExecutionEngine/JIT/JITTests + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/Support/SupportTests + ''; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ]; + platforms = stdenv.lib.platforms.all; + }; +} From de89820f69c0d8ed076d9fbd2b79dda90a41e71e Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Wed, 4 Mar 2015 22:45:04 -0800 Subject: [PATCH 047/947] Add LLVM 3.6 to all-packages --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9f9247b07..cefe8cbb26c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3197,6 +3197,7 @@ let clang = wrapCC llvmPackages.clang; + clang_36 = wrapCC llvmPackages_36.clang; clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); @@ -3727,12 +3728,14 @@ let llvm = llvmPackages.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; llvm_v = path: callPackage path { }; - llvmPackages = llvmPackages_35; + llvmPackages = llvmPackages_36; llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; @@ -3744,6 +3747,10 @@ let inherit pkgs stdenv newScope fetchurl isl; }; + llvmPackages_36 = import ../development/compilers/llvm/3.6 { + inherit pkgs stdenv newScope fetchurl isl; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( From 36c1a8a6c7b9fd137f4428dc802978cbc765bdd9 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 5 Mar 2015 01:50:19 +0100 Subject: [PATCH 048/947] git: 2.3.0 -> 2.3.1 --- .../version-management/git-and-tools/git/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 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 d31edb04bbe..310fcbc92e6 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,11 +9,8 @@ }: let - - version = "2.3.0"; - + version = "2.3.1"; svn = subversionClient.override { perlBindings = true; }; - in stdenv.mkDerivation { @@ -21,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1jhagfsmn9as6bss0c6zppw0iydcalgmadyywz7kdxbdsqa3mcll"; + sha256 = "1dwqqi3hynf4q8fnlkpvqp3qi5b2fra6gxc03ns3w53n2l2lpk0s"; }; patches = [ From 0ce3dcd91a7b7823f0582668ae66e1c6957d3c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Mar 2015 10:27:31 +0100 Subject: [PATCH 049/947] libxmi: fix build after libtool bump The file copied by libxmi builder seems moved. --- pkgs/development/libraries/libxmi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 71c641770e4..46d38b16ccf 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; # For the x86_64 GNU/Linux arch to be recognized by 'configure' - preConfigure = "cp ${libtool}/share/libtool/config/config.sub ."; + preConfigure = "cp ${libtool}/share/libtool/build-aux/config.sub ."; meta = { description = "Library for rasterizing 2-D vector graphics"; From 33153a216679f903478ad6a3a9a0b5aea489db91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Mar 2015 12:09:01 +0100 Subject: [PATCH 050/947] paraview, vtk: fix build after mesa update --- pkgs/applications/graphics/paraview/default.nix | 3 +++ pkgs/development/libraries/vtk/default.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 40f8d441d7e..0973893bbec 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" ]; + # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 62fce3c1d2d..59063645232 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt +{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt , qtLib ? null }: with stdenv.lib; @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; }; + # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 + postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h"; + buildInputs = [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib; From 0ea7d9b6f9437cc2db761967a782786453bc61ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Mar 2015 14:44:01 +0100 Subject: [PATCH 051/947] opencascade*: fix build after mesa update --- pkgs/development/libraries/opencascade/6.5.nix | 4 +++- pkgs/development/libraries/opencascade/default.nix | 3 +++ pkgs/development/libraries/opencascade/oce.nix | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 7cc47a30eb7..a150f53bb86 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { # -fpermissive helps building opencascade, although gcc detects a flaw in the code # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; + NIX_CFLAGS_COMPILE = "-fpermissive" + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + + " -DGLX_GLXEXT_LEGACY"; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 1ce38ab7b3c..ec15d9d631e 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix index 480664a0d4d..4988ee6ef24 100644 --- a/pkgs/development/libraries/opencascade/oce.nix +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; meta = { From 33fbec14b643b47a611e13c4d9bf3858c28568c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Mar 2015 14:44:21 +0100 Subject: [PATCH 052/947] opencascade-6.5: maintenance update They claim it's ABI-compatible. --- pkgs/development/libraries/opencascade/6.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index a150f53bb86..b0ef9e83242 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -2,10 +2,10 @@ ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.5.5"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.5.5_release/OpenCASCADE655.tgz; + sha256 = "1dnik00adfh6dxvn9kgf35yjda8chbi05f71i9119idmmrcapipm"; }; buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; From 55cf0151424be6a2dba0eda5459ece0840472f1a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Mar 2015 13:49:49 +0000 Subject: [PATCH 053/947] clang-3.6: provide path to gcc on Linux gcc contains core runtime bits that aren't available elsewhere for Linux. Refs #6449 --- pkgs/development/compilers/llvm/3.6/clang.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.6/clang.nix b/pkgs/development/compilers/llvm/3.6/clang.nix index 49b75d7fe0d..45ad7445712 100644 --- a/pkgs/development/compilers/llvm/3.6/clang.nix +++ b/pkgs/development/compilers/llvm/3.6/clang.nix @@ -1,6 +1,8 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: -stdenv.mkDerivation { +let + gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' @@ -17,6 +19,8 @@ stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ + # Maybe with compiler-rt this won't be needed? + (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); patches = [ ./clang-purity.patch ./clang-exports.patch ]; @@ -36,6 +40,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; From f91dea4c0be410c52d8131d6a1237f04b1b8da71 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Mar 2015 19:04:43 +0000 Subject: [PATCH 054/947] cc-wrapper: Set default system include flags for non-gcc c++ on Linux Without this, clang can't find libstdc++. This needs to happen in the wrapper so that the libc++ setup hook can still override it --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 ++-- pkgs/build-support/cc-wrapper/default.nix | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 548b1910645..e374e1656a4 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -80,8 +80,8 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then fi if [[ "@prog@" = *++ ]]; then - if echo "$@" | grep -qvw -- -nostdlib; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE" + if echo "$@" | grep -qv -- -nostdlib; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" fi fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ac33a0b083c..df43da58e3e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -169,6 +169,12 @@ stdenv.mkDerivation { export real_cc=cc export real_cxx=c++ + export default_cxx_stdlib_compile="${ + if stdenv.isLinux && !(cc.isGNU or false) + then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + else "" + }" + if [ -e $ccPath/gcc ]; then wrap gcc ${./cc-wrapper.sh} $ccPath/gcc ln -s gcc $out/bin/cc From 69e59e99629c3ddf6d0b1070e80662e95e663cf9 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 1 Mar 2015 00:23:07 +0300 Subject: [PATCH 055/947] munge: add service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/security/munge.nix | 61 +++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/services/security/munge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c94c07e4130..87dd91971e4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -326,6 +326,7 @@ ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix + ./services/security/munge.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix new file mode 100644 index 00000000000..919c2c2b0e1 --- /dev/null +++ b/nixos/modules/services/security/munge.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.munge; + +in + +{ + + ###### interface + + options = { + + services.munge = { + enable = mkEnableOption "munge service"; + + password = mkOption { + default = "/etc/munge/munge.key"; + type = types.string; + description = '' + The path to a daemon's secret key. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.munge ]; + + systemd.services.munged = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ pkgs.munge pkgs.coreutils ]; + + preStart = '' + chmod 0700 ${cfg.password} + mkdir -p /var/lib/munge -m 0711 + mkdir -p /var/log/munge -m 0700 + mkdir -p /run/munge -m 0755 + ''; + + serviceConfig = { + ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}"; + PIDFile = "/run/munge/munged.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + + }; + + }; + +} From 0b1cc3cd5198afd07a918d206e3b73ad4ac42930 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 1 Mar 2015 04:12:13 +0300 Subject: [PATCH 056/947] slurm: impl simple service --- .../services/computing/slurm/slurm.nix | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 nixos/modules/services/computing/slurm/slurm.nix diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix new file mode 100644 index 00000000000..9c8261c6df1 --- /dev/null +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -0,0 +1,99 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.slurm; + # configuration file can be generated by http://slurm.schedmd.com/configurator.html + configFile = pkgs.writeText "slurm.conf" + '' + ${cfg.extraConfig} + ''; +in + +{ + + ###### interface + + options = { + + services.slurm = { + + server = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable slurm control daemon. + ''; + }; + + }; + + client = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable slurm client daemon. + ''; + }; + + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra configuration options that will be added verbatim at + the end of the slurm configuration file. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf (cfg.client.enable || cfg.server.enable) { + + environment.systemPackages = [ pkgs.slurm-llnl ]; + + systemd.services.slurmd = mkIf (cfg.client.enable) { + path = with pkgs; [ slurm-llnl coreutils ]; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-tmpfiles-clean.service" ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.slurm-llnl}/bin/slurmd -f ${configFile}"; + PIDFile = "/run/slurmd.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill $MAINPID"; + }; + }; + + systemd.services.slurmctld = mkIf (cfg.server.enable) { + path = with pkgs; [ slurm-llnl munge coreutils ]; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "auditd.service" "munged.service" "slurmdbd.service" ]; + requires = [ "munged.service" ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.slurm-llnl}/bin/slurmctld"; + PIDFile = "/run/slurmctld.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill $MAINPID"; + }; + environment = { SLURM_CONF = "${configFile}"; }; + }; + + }; + +} From 30e6f1b4eaed19848e0e76b550be04320e7ae8b3 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 2 Mar 2015 00:48:20 +0300 Subject: [PATCH 057/947] slurm: impl basic configuration --- .../services/computing/slurm/slurm.nix | 69 ++++++++++++++----- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 9c8261c6df1..019d7fbb16c 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -8,7 +8,11 @@ let # configuration file can be generated by http://slurm.schedmd.com/configurator.html configFile = pkgs.writeText "slurm.conf" '' - ${cfg.extraConfig} + ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} + ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} + ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} + ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + ${cfg.extraConfig} ''; in @@ -21,27 +25,57 @@ in services.slurm = { server = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable slurm control daemon. - ''; - }; + enable = mkEnableOption "slurm control daemon"; }; client = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable slurm client daemon. - ''; - }; + enable = mkEnableOption "slurm rlient daemon"; }; + controlMachine = mkOption { + type = types.nullOr types.str; + default = null; + example = null; + description = '' + The short hostname of the machine where SLURM control functions are + executed (i.e. the name returned by the command "hostname -s", use "tux001" + rather than "tux001.my.com"). + ''; + }; + + controlAddr = mkOption { + type = types.nullOr types.str; + default = cfg.controlMachine; + example = null; + description = '' + Name that ControlMachine should be referred to in establishing a + communications path. + ''; + }; + + nodeName = mkOption { + type = types.nullOr types.str; + default = null; + example = "linux[1-32] CPUs=1 State=UNKNOWN"; + description = '' + Name that SLURM uses to refer to a node (or base partition for BlueGene + systems). Typically this would be the string that "/bin/hostname -s" + returns. Note that now you have to write node's parameters after the name. + ''; + }; + + partitionName = mkOption { + type = types.nullOr types.str; + default = null; + example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP"; + description = '' + Name by which the partition may be referenced. Note that now you have + to write patrition's parameters after the name. + ''; + }; + extraConfig = mkOption { default = ""; type = types.lines; @@ -50,7 +84,6 @@ in the end of the slurm configuration file. ''; }; - }; }; @@ -64,7 +97,7 @@ in systemd.services.slurmd = mkIf (cfg.client.enable) { path = with pkgs; [ slurm-llnl coreutils ]; - + wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; @@ -73,7 +106,6 @@ in ExecStart = "${pkgs.slurm-llnl}/bin/slurmd -f ${configFile}"; PIDFile = "/run/slurmd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill $MAINPID"; }; }; @@ -89,7 +121,6 @@ in ExecStart = "${pkgs.slurm-llnl}/bin/slurmctld"; PIDFile = "/run/slurmctld.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill $MAINPID"; }; environment = { SLURM_CONF = "${configFile}"; }; }; From eb8105ad019670be5ae05f3872d3ce1bbdf9c722 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Sat, 7 Mar 2015 01:10:46 +0300 Subject: [PATCH 058/947] Separated DDCcontrol-DB declaration from DDCcontrol declaration --- pkgs/data/misc/ddccontrol-db/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/misc/ddccontrol-db/default.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix new file mode 100644 index 00000000000..199ed5b7eb0 --- /dev/null +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + stdenv + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + homepage = "http://http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba83f98ca0b..cfbef1ac006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1009,7 +1009,7 @@ let ddccontrol = callPackage ../tools/misc/ddccontrol { }; - ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; ddclient = callPackage ../tools/networking/ddclient { }; From 211f1b826fe9ba9ec8c091c7f0ebfe7ddd48df73 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Mar 2015 11:26:46 +0000 Subject: [PATCH 059/947] osrm-backend: add a luajit variant --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6faddd8c8a0..d73f5e94c85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8114,6 +8114,8 @@ let osrm-backend = callPackage ../servers/osrm-backend { }; + osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; From b37fd11351ed60eb8c2c83170d04bfe5364a3107 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 7 Mar 2015 12:51:06 +0000 Subject: [PATCH 060/947] llvm-3.6 packages: Rearrange directory structure --- .../3.6/{clang-exports.patch => clang/cmake-exports.patch} | 0 .../compilers/llvm/3.6/{clang.nix => clang/default.nix} | 2 +- .../llvm/3.6/{clang-purity.patch => clang/purity.patch} | 0 pkgs/development/compilers/llvm/3.6/default.nix | 4 ++-- .../llvm/3.6/{libc++abi/default.nix => libc++abi.nix} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/compilers/llvm/3.6/{clang-exports.patch => clang/cmake-exports.patch} (100%) rename pkgs/development/compilers/llvm/3.6/{clang.nix => clang/default.nix} (96%) rename pkgs/development/compilers/llvm/3.6/{clang-purity.patch => clang/purity.patch} (100%) rename pkgs/development/compilers/llvm/3.6/{libc++abi/default.nix => libc++abi.nix} (100%) diff --git a/pkgs/development/compilers/llvm/3.6/clang-exports.patch b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch similarity index 100% rename from pkgs/development/compilers/llvm/3.6/clang-exports.patch rename to pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch diff --git a/pkgs/development/compilers/llvm/3.6/clang.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix similarity index 96% rename from pkgs/development/compilers/llvm/3.6/clang.nix rename to pkgs/development/compilers/llvm/3.6/clang/default.nix index 45ad7445712..2216dad3ef8 100644 --- a/pkgs/development/compilers/llvm/3.6/clang.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - patches = [ ./clang-purity.patch ./clang-exports.patch ]; + patches = [ ./purity.patch ./cmake-exports.patch ]; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp diff --git a/pkgs/development/compilers/llvm/3.6/clang-purity.patch b/pkgs/development/compilers/llvm/3.6/clang/purity.patch similarity index 100% rename from pkgs/development/compilers/llvm/3.6/clang-purity.patch rename to pkgs/development/compilers/llvm/3.6/clang/purity.patch diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index a6f5d10d05d..dddd09c44ed 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -18,7 +18,7 @@ let inherit compiler-rt_src; }; - clang = callPackage ./clang.nix { + clang = callPackage ./clang { inherit clang-tools-extra_src; }; @@ -26,6 +26,6 @@ let libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; - libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; }; }; in self diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix similarity index 100% rename from pkgs/development/compilers/llvm/3.6/libc++abi/default.nix rename to pkgs/development/compilers/llvm/3.6/libc++abi.nix From e57e44f867b7d308d2296907f400b87f5393ce83 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 7 Mar 2015 13:08:34 +0000 Subject: [PATCH 061/947] llvm-3.6 packages: Build everything (except clang and llvm) with clang --- .../development/compilers/llvm/3.6/default.nix | 18 +++++++++++------- pkgs/development/compilers/llvm/3.6/lldb.nix | 4 ++-- pkgs/top-level/all-packages.nix | 15 ++++++++------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index dddd09c44ed..624fc68c21a 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -1,6 +1,6 @@ -{ pkgs, newScope, stdenv, isl, fetchurl }: +{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); + callPackage = newScope (self // { inherit isl version fetch; }); version = "3.6.0"; @@ -15,17 +15,21 @@ let self = { llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; + inherit compiler-rt_src stdenv; }; - clang = callPackage ./clang { - inherit clang-tools-extra_src; + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; }; + clang = wrapCC self.clang-unwrapped; + + stdenv = overrideCC stdenv self.clang; + lldb = callPackage ./lldb.nix {}; - libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; + libcxx = callPackage ./libc++ {}; - libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ./libc++abi.nix {}; }; in self diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index efb592e493e..d4f496a1749 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -7,7 +7,7 @@ , which , libedit , llvm -, clang +, clang-unwrapped , python , version }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e808674eee2..395fae18ada 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3203,9 +3203,9 @@ let ccl = callPackage ../development/compilers/ccl { }; - clang = wrapCC llvmPackages.clang; + clang = llvmPackages.clang; - clang_36 = wrapCC llvmPackages_36.clang; + clang_36 = llvmPackages.clang; clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); @@ -3233,8 +3233,8 @@ let }; #Use this instead of stdenv to build with clang - clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideCC stdenv clang); - libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang); + clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped); clean = callPackage ../development/compilers/clean { }; @@ -3756,7 +3756,8 @@ let }; llvmPackages_36 = import ../development/compilers/llvm/3.6 { - inherit pkgs stdenv newScope fetchurl isl; + inherit pkgs stdenv newScope fetchurl isl wrapCC; + inherit (stdenvAdapters) overrideCC; }; manticore = callPackage ../development/compilers/manticore { }; @@ -4837,8 +4838,8 @@ let csslint = callPackage ../development/web/csslint { }; - libcxx = llvmPackages_35.libcxx; - libcxxabi = llvmPackages_35.libcxxabi; + libcxx = llvmPackages.libcxx; + libcxxabi = llvmPackages.libcxxabi; libsigrok = callPackage ../development/tools/libsigrok { }; From 5113a065d7340f8c2650566bf1400e1863c539e2 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 20:45:02 -0800 Subject: [PATCH 062/947] boto: Apply patch needed to fix docker-registry This makes docker-registry work when backed by S3. It's the same patch applied in the docker upstream container image. Backported from boto/boto#2932 --- .../python-modules/boto/content-length-str.patch | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/boto/content-length-str.patch diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch new file mode 100644 index 00000000000..7895e223c6b --- /dev/null +++ b/pkgs/development/python-modules/boto/content-length-str.patch @@ -0,0 +1,16 @@ +Cherry-picked from https://github.com/boto/boto/pull/2932 + +This fix is required for things like docker-registry to interact with S3. Will +be obsolete after the next boto release (> 2.36.0) + +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -381,7 +381,7 @@ class HTTPRequest(object): + if 'Content-Length' not in self.headers: + if 'Transfer-Encoding' not in self.headers or \ + self.headers['Transfer-Encoding'] != 'chunked': +- self.headers['Content-Length'] = len(self.body) ++ self.headers['Content-Length'] = str(len(self.body)) + + + class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b41732005bf..200c086ed80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1110,6 +1110,8 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; + patches = [ ../development/python-modules/boto/content-length-str.patch ]; + meta = { homepage = https://github.com/boto/boto; From 02712cc3f1443e0b1d6ff6a9d18daab59f98b005 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 20:48:25 -0800 Subject: [PATCH 063/947] Drop obsolete boto-1.9 patch This has been unreferenced since commit d52d71a04bd99794401178acaf164fec94b8e387 from August 2014. --- .../python-modules/boto-1.9-python-2.7.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 pkgs/development/python-modules/boto-1.9-python-2.7.patch diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch deleted file mode 100644 index 79ff9a7e4af..00000000000 --- a/pkgs/development/python-modules/boto-1.9-python-2.7.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix Boto 1.9 on Python 2.7. - -https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 - -diff --git a/boto/connection.py b/boto/connection.py -index c5779e2..71942f1 100644 ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -252,8 +252,9 @@ class AWSAuthConnection(object): - # versions, it would append ":443" to the hostname sent - # in the Host header and so we needed to make sure we - # did the same when calculating the V2 signature. In 2.6 -+ # (and higher!) - # it no longer does that. Hence, this kludge. -- if sys.version[:3] == "2.6" and port == 443: -+ if sys.version[:3] in ('2.6', '2.7') and port == 443: - signature_host = self.host - else: - signature_host = '%s:%d' % (self.host, port) From 65d6eb0f20584e9e0654860ee304907744897188 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 23:20:18 -0800 Subject: [PATCH 064/947] docker-registry: update to 0.9.1 --- 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 200c086ed80..f3272fa5700 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2407,12 +2407,12 @@ let }; docker_registry = buildPythonPackage rec { - name = "docker-registry-0.9.0"; + name = "docker-registry-0.9.1"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; - md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + sha256 = "1svm1h59sg4bwj5cy10m016gj0xpiin15nrz5z66h47sbkndvlw3"; }; DEPS = "loose"; @@ -2420,7 +2420,7 @@ let doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + requests2 rsa sqlalchemy9 setuptools backports_lzma pyasn1 m2crypto ]; patchPhase = "> requirements/main.txt"; From ed6ce446d03ce89cffe533aaec02b0325f091d44 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 7 Mar 2015 00:58:23 -0800 Subject: [PATCH 065/947] euca2ools: bump to 2.1.4, use python27 Change-Id: I8be644bcf2892e1146c3b3eedea36c5f5e749c16 --- pkgs/tools/virtualization/euca2ools/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 84dc7c3c071..a87dd568322 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.1.3"; + name = "euca2ools-2.1.4"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "8ae2ecc"; - sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; + rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; + sha256 = "0f52jqw3s79w391lbzlh83lp55j73clvwmn2np4fy6kxc4j49da1"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; - doCheck = false; - meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90b5cbbbf7..30bc8f664f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1187,7 +1187,7 @@ let ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + euca2ools = callPackage ../tools/virtualization/euca2ools { }; evtest = callPackage ../applications/misc/evtest { }; From de892761cf10a161663fbf97c80f17281ed5e65f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Mar 2015 23:01:59 +0000 Subject: [PATCH 066/947] dragonegg: Pull from llvm 3.5 If someone uses it, we can add the 3.6 version of course --- 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 395fae18ada..6b41f1d51d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5468,7 +5468,7 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = llvmPackages.dragonegg; + dragonegg = llvmPackages_35.dragonegg; dxflib = callPackage ../development/libraries/dxflib {}; From 50933385c53ae640bfe9188d4111a540feeb648f Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 10 Mar 2015 10:32:56 +0000 Subject: [PATCH 067/947] git: 2.3.1 -> 2.3.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 310fcbc92e6..1a0ea9e02da 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.3.1"; + version = "2.3.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 = "1dwqqi3hynf4q8fnlkpvqp3qi5b2fra6gxc03ns3w53n2l2lpk0s"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; patches = [ From fe6b0b15e6f4a346a204f72310e0914ba7edc941 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 11 Mar 2015 16:44:31 +0000 Subject: [PATCH 068/947] nixos-install: support -j, --cores and --option. Closes #6755 --- nixos/doc/manual/man-nixos-install.xml | 47 +++++++++++++++++++ .../modules/installer/tools/nixos-install.sh | 11 +++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 06e7b4a9847..7ad1be1ec10 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -25,6 +25,22 @@ root + + + + + + number + + + + number + + + + name + value + @@ -96,6 +112,37 @@ it. + + + + Sets the maximum number of build jobs that Nix will + perform in parallel to the specified number. The default is 1. + A higher value is useful on SMP systems or to exploit I/O latency. + + + + + + + Sets the value of the NIX_BUILD_CORES + environment variable in the invocation of builders. Builders can + use this variable at their discretion to control the maximum amount + of parallelism. For instance, in Nixpkgs, if the derivation + attribute enableParallelBuilding is set to + true, the builder passes the + flag to GNU Make. + The value 0 means that the builder should use all + available CPU cores in the system. + + + + name value + + Set the Nix configuration option + name to value. + + + diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index bfb42d40b06..14ae3daace0 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -28,9 +28,14 @@ chrootCommand=(/run/current-system/sw/bin/bash) while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - -I) - given_path="$1"; shift 1 - extraBuildFlags+=("$i" "$given_path") + --max-jobs|-j|--cores|-I) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + ;; + --option) + j="$1"; shift 1 + k="$1"; shift 1 + extraBuildFlags+=("$i" "$j" "$k") ;; --root) mountPoint="$1"; shift 1 From e3b1b09779b7575f73224695602dfe5de348651c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 10:10:47 +0100 Subject: [PATCH 069/947] Add AppArmor 2.9 The 2.9 series brings features such as support for dbus, unix abstract sockets, ptrace mediation, and replaces Perl tools with equivalents implemented in Python. See [1] for details. The package expression has been changed to build each component (library, parser) separately. Additionally, Perl is now only used to build man pages and locale support has been removed. The user-land tools are currently broken (fail to import the Python module), but this isn't really a regression, as only two or three of the tools installed by the previous version were functional. The most important tool, aa-status, works, however. Lastly, dbus support is compiled in, but is untested and probably requires patching of dbus. [1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_9_0 --- .../linux/apparmor/2.9/default.nix | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 pkgs/os-specific/linux/apparmor/2.9/default.nix diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix new file mode 100644 index 00000000000..a8d8b2a9e1c --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -0,0 +1,196 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, perl, which +, glibc, flex, bison, python27, swig, dbus, pam +}: + +let + apparmor-series = "2.9"; + apparmor-patchver = "1"; + apparmor-version = "${apparmor-series}.${apparmor-patchver}"; + + apparmor-meta = component: with stdenv.lib; { + homepage = http://apparmor.net/; + description = "Linux application security system - ${component}"; + license = licenses.gpl2; + maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; + platforms = platforms.linux; + }; + + apparmor-sources = fetchurl { + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; + sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + }; + + libapparmor = stdenv.mkDerivation { + name = "libapparmor-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + autoconf + automake + bison + flex + dbus # requires patch to dbus ... + glibc + libtool + perl + pkgconfig + python27 + swig + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### libapparmor + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + ''; + + buildPhase = '' + ### libapparmor + cd ./libraries/libapparmor + ./autogen.sh + ./configure --prefix="$out" --with-python + make + ''; + + installPhase = '' + make install + ''; + + meta = apparmor-meta "library"; + }; + + apparmor-utils = stdenv.mkDerivation { + name = "apparmor-utils-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + python27 + libapparmor + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ''; + + buildPhase = '' + cd ./utils + make LANGS="" + ''; + + installPhase = '' + make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" + ''; + + meta = apparmor-meta "user-land utilities"; + }; + + apparmor-parser = stdenv.mkDerivation { + name = "apparmor-parser-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + bison + flex + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### apparmor-parser + substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" + substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ## techdoc.pdf still doesn't build ... + substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + ''; + + buildPhase = '' + cd ./parser + make LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include + ''; + + installPhase = '' + make install LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include DESTDIR="$out" DISTRO="unknown" + ''; + + meta = apparmor-meta "rule parser"; + }; + + apparmor-pam = stdenv.mkDerivation { + name = "apparmor-pam-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + pam + pkgconfig + which + ]; + + buildPhase = '' + cd ./changehat/pam_apparmor + make USE_SYSTEM=1 + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "PAM service"; + }; + + apparmor-profiles = stdenv.mkDerivation { + name = "apparmor-profiles-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + which + ]; + + buildPhase = '' + cd ./profiles + make + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "profiles"; + }; + + apparmor-kernel-patches = stdenv.mkDerivation { + name = "apparmor-kernel-patches-${apparmor-version}"; + src = apparmor-sources; + + phases = ''unpackPhase installPhase''; + + installPhase = '' + mkdir "$out" + cp -R ./kernel-patches "$out" + ''; + + meta = apparmor-meta "kernel patches"; + }; + +in + +{ + inherit libapparmor apparmor-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; +} From 65e41b4f08f11ba153763daf263afd968ea3cc1d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 11:24:37 +0100 Subject: [PATCH 070/947] Add AppArmor 2.9 to packages toplevel - Each component has its own name (libapparmor, apparmor-parser, etc) - The name apparmor still refers to the old version, for compatiblity; most users of this name probably want libapparmor. --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad..54df6449a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8446,6 +8446,13 @@ let perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; + libapparmor = apparmor_2_9.libapparmor; + apparmor-pam = apparmor_2_9.apparmor-pam; + apparmor-parser = apparmor_2_9.apparmor-parser; + apparmor-profiles = apparmor_2_9.apparmor-profiles; + apparmor-utils = apparmor_2_9.apparmor-utils; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; From 7a9a24a95e70f10ebd90eda94f08508f03942963 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 10:11:25 +0100 Subject: [PATCH 071/947] Update AppArmor service module - Use AppArmor 2.9 - Enable PAM support --- nixos/modules/security/apparmor.nix | 84 +++++++++++++++++------------ 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index f29e7a5ad81..92f020edce5 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,43 +1,61 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types concatMapStrings; cfg = config.security.apparmor; in + { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; + #### interface + options = { - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - }; - }; + security.apparmor = { - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor ]; - systemd.services.apparmor = { - wantedBy = [ "local-fs.target" ]; - path = [ pkgs.apparmor ]; + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the AppArmor Mandatory Access Control system."; + }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - ExecStop = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - }; - }; - }; + profiles = mkOption { + type = types.listOf types.path; + default = []; + description = "List of files containing AppArmor profiles."; + }; + + }; + + }; + + #### implementation + config = mkIf cfg.enable { + + environment.systemPackages = [ + pkgs.apparmor-utils + ]; + + systemd.services.apparmor = { + wantedBy = [ "local-fs.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ) cfg.profiles; + ExecStop = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ) cfg.profiles; + }; + }; + + security.pam.services.apparmor.text = '' + ## The AppArmor service changes hats according to order: first try + ## user, then group, and finally fall back to a hat called "DEFAULT" + ## + ## For now, enable debugging as this is an experimental feature. + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + ''; + + }; } From 92eaff008e90c982b095275cb5250ec0c1a60c24 Mon Sep 17 00:00:00 2001 From: "Luis G. Torres" Date: Thu, 12 Mar 2015 15:48:58 -0400 Subject: [PATCH 072/947] Added derivation for google ceres-solver optimization library for C++ --- lib/maintainers.nix | 1 + .../libraries/ceres-solver/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/ceres-solver/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cee9f0023e2..f46d9b80990 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -81,6 +81,7 @@ garrison = "Jim Garrison "; gavin = "Gavin Rogers "; gebner = "Gabriel Ebner "; + giogadi = "Luis G. Torres "; globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix new file mode 100644 index 00000000000..4dce56a8f1a --- /dev/null +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, eigen +, fetchurl +, cmake +, google-gflags ? null +, glog ? null +, runTests ? false +}: + +# google-gflags is required to run tests +assert runTests -> google-gflags != null; + +let + version = "1.10.0"; + + # glog currently doesn't build on darwin + # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 + useGlog = glog != null && !stdenv.isDarwin; + +in +stdenv.mkDerivation { + name = "ceres-solver-${version}"; + + src = fetchurl { + url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; + sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + }; + + buildInputs = [ cmake ] + ++ stdenv.lib.optional useGlog glog + ++ stdenv.lib.optional (google-gflags != null) google-gflags; + + inherit eigen; + + doCheck = runTests; + + checkTarget = "test"; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + ${if !useGlog then "-DMINIGLOG=ON" else ""} + "; + + meta = with stdenv.lib; { + description = "C++ library for modeling and solving large, complicated optimization problems"; + license = licenses.bsd3; + homepage = "http://ceres-solver.org"; + maintainers = with stdenv.lib.maintainers; [ giogadi ]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88634e3146b..75425a036d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,6 +697,10 @@ let cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { + google-gflags = null; # only required for examples/tests + }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; From f11cf895d19bb5158c21624976ed3e739f4cbded Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 12 Mar 2015 14:00:27 +0100 Subject: [PATCH 073/947] Fix frei0r url --- pkgs/development/libraries/frei0r/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index ca2895f3c89..f3c9b95d6b4 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4"; src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/frei0r-plugins-1.4.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; }; From c96aff8eb9c878e2f6f33c78d8924760b09eb3ea Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 12 Mar 2015 14:00:14 +0100 Subject: [PATCH 074/947] Add sqldeveloper derivation --- .../tools/database/sqldeveloper/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/tools/database/sqldeveloper/default.nix diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix new file mode 100644 index 00000000000..031c004ef52 --- /dev/null +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -0,0 +1,48 @@ +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7}: + +stdenv.mkDerivation rec { + version = "4.0.3.16.84"; + name = "sqldeveloper-${version}"; + + src = requireFile { + name = "${name}-no-jre.zip"; + url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; + sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + }; + + buildInputs = [ makeWrapper unzip ]; + + buildCommand = '' + mkdir -p $out/bin + # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed + echo -e '#!/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && bash sqldeveloper $*' >> $out/bin/sqldeveloper + + cd $out + unzip ${src} + cp -r sqldeveloper/* $out/ + # Activate the needed shell script + rm $out/sqldeveloper.sh + chmod +x $out/bin/sqldeveloper + chmod +x $out/sqldeveloper/bin/sqldeveloper + + wrapProgram $out/bin/sqldeveloper \ + --set JAVA_HOME "${oraclejdk7}" + ''; + + meta = with stdenv.lib; { + description = "Oracle's Oracle DB GUI client."; + longDescription = '' + Oracle SQL Developer is a free integrated development environment that + simplifies the development and management of Oracle Database in both + traditional and Cloud deployments. SQL Developer offers complete + end-to-end development of your PL/SQL applications, a worksheet for + running queries and scripts, a DBA console for managing the database, + a reports interface, a complete data modeling solution, and a migration + platform for moving your 3rd party databases to Oracle. + ''; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html; + license = licenses.unfree; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f48b9f15a45..32cf949f494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4217,6 +4217,8 @@ let smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; From e07ea5cf77601325b16f51fb457b90d5aadfab6f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 17:34:22 -0700 Subject: [PATCH 075/947] samba4: Fix linking and absolute paths --- pkgs/servers/samba/4.x.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 362885417b7..2cc3cc69d3f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -56,6 +56,11 @@ stdenv.mkDerivation rec { zlib ncurses libcap ]; + postPatch = '' + # Removes absolute paths in scripts + sed -i 's,/sbin/,,g' ctdb/config/functions + ''; + enableParallelBuilding = true; configureFlags = [ @@ -111,6 +116,19 @@ stdenv.mkDerivation rec { stripAllList = [ "bin" "sbin" ]; + postFixup = '' + export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" + read -r -d "" SCRIPT << EOF + [ -z "\$SAMBA_LIBS" ] && exit 1; + BIN='{}'; + OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; + ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; + patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; + patchelf --shrink-rpath "\$BIN"; + EOF + find $out -type f -exec $SHELL -c "$SCRIPT" \; + ''; + meta = with stdenv.lib; { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; From 8b2f21a667f20daccb0b1c7c3279a000448ceeb3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Mar 2015 09:23:25 +0100 Subject: [PATCH 076/947] syncthing 0.10.25 -> 0.10.26 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc29aeafef9..b7f4c8abde3 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.10.25"; + version = "0.10.26"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "fcb6fbcd37bdcf07d2960d143209b7697ee705286754ead4cc5e6bd95cd0acb8"; + sha256 = "023vnns8ns2pgvqjisw466mw7323rv61cbl1indpfai412y7xjbk"; }; subPackages = [ "cmd/syncthing" ]; From 14e5333e3c39282324113d327b385ee68ac02e70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 11:16:01 +0100 Subject: [PATCH 077/947] hackage-packages: re-generate from Hackage 2015-03-12T12:28:02+0100 Resolves https://github.com/peti/jailbreak-cabal/issues/5. --- .../configuration-ghc-7.10.x.nix | 3 - .../haskell-modules/hackage-packages.nix | 566 +++++++++++------- 2 files changed, 358 insertions(+), 211 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 219fe85b176..a70597e6ee5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,9 +89,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # https://github.com/peti/jailbreak-cabal/issues/5 - ReadArgs = dontCheck super.ReadArgs; - # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68ea13ab775..5c5ef83b10b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1748,6 +1748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "CLI" = callPackage + ({ mkDerivation, base, directory, doctest, split, time }: + mkDerivation { + pname = "CLI"; + version = "0.1.0.0"; + sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall"; + buildDepends = [ base directory split time ]; + testDepends = [ base doctest ]; + description = "CLI tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "CMCompare" = callPackage ({ mkDerivation, array, base, BiobaseInfernal, BiobaseXNA, cmdargs , containers, lens @@ -4866,12 +4878,12 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw }: + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "1.4.0.2"; - sha256 = "10sy0zag1wfrrq137azv3xazcgs21zb6bp84xzh518qbhiiycjhg"; - buildDepends = [ base OpenGLRaw ]; + version = "1.5.0.0"; + sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j"; + buildDepends = [ base OpenGLRaw transformers ]; extraLibraries = [ freeglut mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -4902,11 +4914,11 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.4"; - sha256 = "1bjc33cnlcb29hfyq2141cj2g2pklg5296hg1jpg246j0bcy9fcf"; + version = "0.8.5"; + sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; buildDepends = [ - array base bytestring containers cpphs directory filepath - JuicyPixels linear OpenGL OpenGLRaw transformers vector + array base bytestring containers directory filepath JuicyPixels + linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; @@ -7782,6 +7794,7 @@ self: { version = "5.2.0.16"; sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s"; buildDepends = [ array base containers StateVar transformers ]; + jailbreak = true; homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; @@ -10778,12 +10791,12 @@ self: { winmm = null; winspool = null;}; "ObjectName" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "ObjectName"; - version = "1.0.1.1"; - sha256 = "18bqaqxzafhmnf1r4qc0qnxdiv00i4zis89yinvpwjqbiwlwakda"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg"; + buildDepends = [ base transformers ]; homepage = "https://github.com/svenpanne/ObjectName"; description = "Explicitly handled object names"; license = stdenv.lib.licenses.bsd3; @@ -10981,12 +10994,12 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, mesa }: + ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.3.0.0"; - sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln"; - buildDepends = [ base ]; + version = "2.4.0.0"; + sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -11490,18 +11503,18 @@ self: { "Plot-ho-matic" = callPackage ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers - , data-default-class, generic-accessors, glib, gtk, lens, linear - , spatial-math, stm, text, time + , data-default-class, generic-accessors, glib, gtk, lens, text + , time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.0"; - sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg"; + version = "0.5.0.2"; + sha256 = "0i55milm63y0djnni3sg40pydxw5ls4gjsj18g8f5rbbdjx6y95q"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo Chart Chart-cairo containers data-default-class - generic-accessors glib gtk lens linear spatial-math stm text time + generic-accessors glib gtk lens text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -12302,8 +12315,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.1"; - sha256 = "0ifs2gca5sgmaqrby3fc410n5k357102c8jh3fh77rhdc3m8l8bd"; + version = "0.0.2"; + sha256 = "06w5q8xb4n5428ja1834z18rn6zl5cqdizcvj7519a2xy9m5qda5"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -13504,12 +13517,12 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.0.1.1"; - sha256 = "0h2cykrbnq4aq8dmi59mmnagvzz00lfagqx3476y2ygqc7v1iisl"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1"; + buildDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; @@ -18468,6 +18481,7 @@ self: { base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; + jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -18945,8 +18959,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.0"; - sha256 = "1z0wky3xhkgayxf6fzrj7dnll6r948vgqsvfhhjh32ybadmi97bm"; + version = "1.4.2"; + sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19672,12 +19686,11 @@ self: { pname = "arithmoi"; version = "0.4.1.1"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "d12980bee5be68b204594ee91c026599ec930613be6c05106ea27d93d96c0433"; + editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - jailbreak = true; homepage = "https://bitbucket.org/dafis/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; @@ -19899,8 +19912,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.0"; - sha256 = "0r3an905by72w7r9pd00rf7fn061v668bh4x6apllmpxid7a7pm7"; + version = "0.2.1.1"; + sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25449,6 +25462,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "broccoli" = callPackage + ({ mkDerivation, base, stm, unamb }: + mkDerivation { + pname = "broccoli"; + version = "0.2.0.1"; + sha256 = "0kish92mch22jlpg86iq6y73jmmsjg1yl7s2f15y6vwfdvbhv8zz"; + buildDepends = [ base stm unamb ]; + description = "Small library for interactive functional programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bsd-sysctl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25661,10 +25685,9 @@ self: { ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { pname = "buildable"; - version = "0.1.0.2"; - sha256 = "1p9xi5ms7rxgzn5jxv5nv8bynyfb9ll952k0j7di5s7zbga8v1pg"; + version = "0.1.0.3"; + sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; buildDepends = [ base bytestring containers dlist text ]; - jailbreak = true; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -26536,8 +26559,8 @@ self: { }: mkDerivation { pname = "cabal-db"; - version = "0.1.11"; - sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7"; + version = "0.1.12"; + sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26671,6 +26694,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, data-default, directory + , filepath, mtl, process, template-haskell, temporary, transformers + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.1.0.1"; + sha256 = "1a7yavkja9ghrr7pf9j8hkg4fg1xl6g4fn82hwc56snmvlpc0ms5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring Cabal data-default directory filepath mtl process + template-haskell temporary transformers + ]; + description = "Simple interface to Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -30403,18 +30444,22 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, containers, hierarchical-clustering - , mwc-random, tasty, tasty-hunit, vector + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, primitive, split, tasty, tasty-hunit + , tasty-quickcheck, vector }: mkDerivation { pname = "clustering"; - version = "0.1.0"; - sha256 = "04x6q7da64b2v326mbralkc13zb3b5x1fwdc3by703hf7mv28kd4"; - buildDepends = [ base containers vector ]; - testDepends = [ - base hierarchical-clustering mwc-random tasty tasty-hunit vector + version = "0.1.1"; + sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + buildDepends = [ + base binary containers matrices mwc-random primitive vector ]; - description = "fast clustering algorithms"; + testDepends = [ + base binary hierarchical-clustering mwc-random split tasty + tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; }) {}; @@ -30911,6 +30956,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "collection-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "collection-json"; + version = "0.1.0.0"; + sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; + buildDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/danchoi/collection-json.hs"; + description = "Collection+JSON hypermedia type tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "collections" = callPackage ({ mkDerivation, array, base, bytestring, containers, QuickCheck }: mkDerivation { @@ -31216,8 +31273,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.3"; - sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj"; + version = "4.2.4"; + sha256 = "0wycd7ir3bjrf9k1fh81jl09lk9s99fg8z25lwhb8bc70q50sab8"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -32582,15 +32639,15 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, foreign-var, semigroups, transformers + ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: mkDerivation { pname = "contravariant"; - version = "1.2.2.1"; - sha256 = "0w1kgx85wbf96f1hr50b6nh9pqjbqbn4axfd419b38xy09j61j75"; + version = "1.3"; + sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; buildDepends = [ - base foreign-var semigroups transformers transformers-compat void + base semigroups StateVar transformers transformers-compat void ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -34785,9 +34842,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, pretty }: mkDerivation { pname = "cuda"; - version = "0.6.5.1"; - sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; - editedCabalFile = "4a72db38c131b220e445e389755d48338769d9a08e826244dcfb7b1182c21c00"; + version = "0.6.6.0"; + sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring pretty ]; @@ -34824,7 +34880,6 @@ self: { sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg"; buildDepends = [ base cuda ]; buildTools = [ c2hs ]; - jailbreak = true; homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; @@ -38411,6 +38466,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rubiks-cube" = callPackage + ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: + mkDerivation { + pname = "diagrams-rubiks-cube"; + version = "0.1.0.0"; + sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv"; + buildDepends = [ base data-default-class diagrams-lib lens ]; + homepage = "https://github.com/timjb/rubiks-cube"; + description = "Library for drawing the Rubik's Cube"; + license = stdenv.lib.licenses.mit; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg , bytestring, colour, containers, diagrams-core, diagrams-lib @@ -44273,8 +44340,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck }: mkDerivation { pname = "farmhash"; - version = "0.1.0.1"; - sha256 = "1dm3msrlrfhm20qc1d5a42w4sspmdwgmdkm75xprmyvpyivh2alb"; + version = "0.1.0.2"; + sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec QuickCheck ]; homepage = "https://github.com/abhinav/haskell-farmhash"; @@ -44892,6 +44959,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "feldspar-signal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "feldspar-signal"; + version = "0.0.0.1"; + sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; + buildDepends = [ base ]; + homepage = "https://github.com/markus-git/feldspar-signal"; + description = "Signal Processing extension for Feldspar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48097,12 +48176,13 @@ self: { ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { pname = "gearbox"; - version = "1.0.0.2"; - sha256 = "15ip1vb1b82ympfylm1m1hxw2nkcmhnqhj2bl4v8mw61zcvznky7"; + version = "1.0.0.3"; + sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGLRaw Vec ]; jailbreak = true; + homepage = "http://code.mathr.co.uk/gearbox"; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -48243,8 +48323,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.1.0.0"; - sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5"; + version = "0.1.0.1"; + sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; buildDepends = [ base linear spatial-math ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -48782,8 +48862,8 @@ self: { }: mkDerivation { pname = "ghc-core-html"; - version = "0.1.1"; - sha256 = "0l0474kpzvzzwkbz9mcjl4fnasznb1crynjcsk3hmnjq8syhmm97"; + version = "0.1.2"; + sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -48879,16 +48959,19 @@ self: { "ghc-exactprint" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb + , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.0.1"; - sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx"; - buildDepends = [ base containers ghc ghc-paths syb ]; + version = "0.1.1.0"; + sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + buildDepends = [ + base containers directory filepath ghc ghc-paths ghc-syb-utils mtl + syb + ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils - HUnit mtl random syb + HUnit mtl random stm syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -49316,8 +49399,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.3.5"; - sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx"; + version = "0.3.6"; + sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -50171,8 +50254,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.3"; - sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; + version = "0.7.2.4"; + sha256 = "0kv8yyxixhhiqbicyd1w1fmpv7szf5h5wxs8b57sf76hww7gq0fn"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -52472,13 +52555,12 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.1"; - sha256 = "0r368b4gw32yxi7xx85ljaw72plbw1i659kwjqiigmd2s54ids5h"; + version = "0.2.0.3"; + sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; buildDepends = [ base cairo containers filepath gtk ]; - jailbreak = true; - homepage = "http://gitorious.org/maximus/gulcii"; + homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -53269,8 +53351,8 @@ self: { }: mkDerivation { pname = "hack2-handler-snap-server"; - version = "2014.11.17"; - sha256 = "0cfc2d6px0n33a3wl7s7k0l7nq9rfi1lxchlwjjb6wyp4f6mg4bb"; + version = "2015.3.9"; + sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7"; buildDepends = [ air base blaze-builder bytestring case-insensitive containers data-default directory enumerator hack2 mtl network snap-core @@ -54025,8 +54107,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.6.0"; - sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb"; + version = "4.6.7.0"; + sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54045,7 +54127,6 @@ self: { system-filepath tagsoup test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; @@ -54406,16 +54487,16 @@ self: { "handsy" = callPackage ({ mkDerivation, base, bytestring, data-default-class, operational - , process, process-extras, retry, shell-escape, split, tasty - , tasty-hunit, tasty-th, transformers + , process-extras, retry, shell-escape, split, tasty, tasty-hunit + , tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.12"; - sha256 = "0awiffsgwa2vmib9yq9zamkr4zm1vw9xxj3g47d1ljq3jg93nn3f"; + version = "0.0.13"; + sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5"; buildDepends = [ - base bytestring data-default-class operational process - process-extras retry shell-escape split transformers + base bytestring data-default-class operational process-extras retry + shell-escape split transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-th ]; homepage = "https://github.com/utdemir/handsy"; @@ -56220,8 +56301,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.10"; - sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2"; + version = "0.3.0.12"; + sha256 = "1kh1xglqcz8yg1660ham0k4y0mxs63x75hv9xxjk2ms5386jpj6c"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet @@ -59293,8 +59374,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.6"; - sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; + version = "1.2.7"; + sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6"; buildDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -61253,8 +61334,8 @@ self: { }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.4"; - sha256 = "0xs56kszgwm2hz1fl2cajzbygm8n3883bz3j7qqckw14iw81c25b"; + version = "0.1.0.6"; + sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw"; buildDepends = [ base bindings-DSL bytestring ]; testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; @@ -66707,8 +66788,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.3"; - sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n"; + version = "0.2.4"; + sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -66762,8 +66843,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.8"; - sha256 = "10vflra58ndyq861zswshpcnqdx9acglb2m8f2yzha0slihwda77"; + version = "0.4.8.1"; + sha256 = "08dd730ix5j0y7jrzrb8d0i153g2jmvklj97npdizmqhwxjfwiis"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -68344,6 +68425,7 @@ self: { base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; @@ -68360,6 +68442,7 @@ self: { buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli-args/"; description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; @@ -68372,6 +68455,7 @@ self: { version = "0.14"; sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; buildDepends = [ base hydrogen-parsing hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; @@ -68396,6 +68480,7 @@ self: { version = "0.14"; sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; buildDepends = [ base containers hydrogen-prelude parsec ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; @@ -68409,8 +68494,8 @@ self: { }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.14"; - sha256 = "05xpxgvpllay8rqs5hbkr5pf8i1aanr72651xkz02qp864g0i822"; + version = "0.15"; + sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; buildDepends = [ array base cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network nicify process random @@ -68434,6 +68519,7 @@ self: { base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-syntax/"; description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; @@ -68613,8 +68699,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.4.2"; - sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28"; + version = "0.4.2.1"; + sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi"; buildDepends = [ base containers unordered-containers ]; testDepends = [ base containers directory doctest filepath unordered-containers @@ -71711,8 +71797,8 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.2"; - sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr"; + version = "1.3"; + sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -73141,8 +73227,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.3.8"; - sha256 = "1128ik8ad4s5nd2c4vjs7nm9db44hyd6w0z19642klyrxlhmr67w"; + version = "1.3.9.1"; + sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73781,6 +73867,7 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -74849,14 +74936,14 @@ self: { , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv , lens, lens-aeson, luautils, mtl, operational , optparse-applicative, parallel-io, parsec, parsers, pcre-utils - , process, regex-pcre-builtin, scientific, split, stateWriter, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml + , process, regex-pcre-builtin, scientific, split, stm + , strict-base-types, temporary, text, time, transformers-compat + , unix, unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.0.1"; - sha256 = "1bhhbr50xzb095nikfhc99sd5qmhzd81rg0z922x807r38kkdgnx"; + version = "1.1.0"; + sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74865,14 +74952,13 @@ self: { Glob hashable hruby hslogger hslua hspec http-conduit http-types iconv lens lens-aeson luautils mtl operational optparse-applicative parallel-io parsec parsers pcre-utils process regex-pcre-builtin - scientific split stateWriter stm strict-base-types text time - transformers unix unordered-containers vector yaml + scientific split stm strict-base-types text time + transformers-compat unix unordered-containers vector yaml ]; testDepends = [ ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -75554,7 +75640,7 @@ self: { pname = "lens"; version = "4.7"; sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "a991d37b9cd348226fcdd0b99b079bede892c172b1ddf8a88142b01f80cd5775"; + editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -75589,6 +75675,7 @@ self: { pname = "lens"; version = "4.8"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; + editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -76919,8 +77006,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.4.0.0"; - sha256 = "0kq4xcpgzrpadibh5ahli5pvb5rd9h1gnd1dzxddjz3plgxil803"; + version = "0.4.0.1"; + sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -78123,8 +78210,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.0.1"; - sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag"; + version = "0.13.1"; + sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -78746,8 +78833,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.3"; - sha256 = "0fr8f641rkazi4ff5s0gr72v5chd2f7dl600v8rj4fp2vmxwwhjc"; + version = "0.4.0.4"; + sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12"; buildDepends = [ base blaze-builder lucid text transformers ]; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; @@ -79046,6 +79133,7 @@ self: { pname = "machines"; version = "0.4.1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; + editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -81022,6 +81110,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mgeneric" = callPackage + ({ mkDerivation, base, containers, lens, mtl, template-haskell }: + mkDerivation { + pname = "mgeneric"; + version = "0.0.0.0"; + sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + buildDepends = [ base containers lens mtl template-haskell ]; + homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; + description = "Generics with multiple parameters"; + license = stdenv.lib.licenses.mit; + }) {}; + "mi" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, split , template-haskell @@ -84418,6 +84518,7 @@ self: { async base contravariant managed mmorph pipes pipes-concurrency transformers ]; + jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84573,7 +84674,7 @@ self: { homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mysql; inherit (pkgs) zlib;}; + }) { mysql = null; inherit (pkgs) zlib;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -85583,6 +85684,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-i2p" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec + , hspec-attoparsec, hspec-expectations, mtl, network + , network-attoparsec, network-simple, text, transformers, uuid + }: + mkDerivation { + pname = "network-anonymous-i2p"; + version = "0.9.2"; + sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + buildDepends = [ + attoparsec base bytestring exceptions mtl network + network-attoparsec network-simple text transformers uuid + ]; + testDepends = [ + attoparsec base bytestring exceptions hspec hspec-attoparsec + hspec-expectations mtl network network-simple transformers uuid + ]; + homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; + description = "Haskell API for I2P anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -85689,8 +85812,8 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.0.2"; - sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; + version = "1.1.1"; + sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons system-fileio @@ -86744,15 +86867,15 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw - , spatial-math, time + ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT + , OpenGLRaw, spatial-math, time }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.2"; - sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y"; + version = "0.7.1.1"; + sha256 = "0mkjzw3n4a5zi9ygpys1w2xdvdycvgylflz8fj6sxdc3r9m1icy9"; buildDepends = [ - base binary cereal GLUT OpenGLRaw spatial-math time + base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; @@ -87621,6 +87744,7 @@ self: { version = "0.5"; sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; buildDepends = [ base contravariant ghc-prim transformers ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -87696,7 +87820,7 @@ self: { pname = "opaleye"; version = "0.3.1"; sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "aad8d4a8bcd52a4668a5f04362af0a1443924b44369f753a184ae170a9a5ca9d"; + editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; buildDepends = [ attoparsec base case-insensitive contravariant old-locale postgresql-simple pretty product-profunctors profunctors semigroups @@ -89950,8 +90074,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.0.1"; - sha256 = "00w6r2zpw5h2db7h8k3y6l1kryi8jvn1rf5wamx0a634ga606czc"; + version = "0.1.1.0"; + sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -90921,17 +91045,19 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, bytestring, Cabal, configurator, directory - , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui + ({ mkDerivation, array, base, bytestring, Cabal, configurator + , directory, filepath, HTTP, network-uri, process, tagsoup, text + , vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.6"; - sha256 = "1vgvf7xbzkmb5nbxgaf552i18p22pkj9wgyz3mhbg1m0j2jr1dnj"; + version = "7.77"; + sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; + editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal configurator directory filepath HTTP + array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; @@ -93367,8 +93493,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.30.0.0"; - sha256 = "0srmjh4hzsg341bjgixz4kvhlc15bbzyx2spcd8hi25m0l0ji0m9"; + version = "0.32.0.0"; + sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -93591,13 +93717,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_2_1" = callPackage + "pretty_1_1_3_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.2.1"; - sha256 = "128bgw9qgm256f28ffb49dvqs9js01m9q6mj6dhg4nlcbpz5fhav"; - editedCabalFile = "ebd25419c2eacdf4212ba30592975908255c84b928a228fe5b045bc4f32c102a"; + version = "1.1.3.1"; + sha256 = "0v1g7gr8nki1bka5dxagayx9azj2gyyd5y23202pnk53synj2lzh"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -94184,7 +94309,7 @@ self: { pname = "product-profunctors"; version = "0.6"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "d0b625cde02d967598b57bca429c61e9496b164b36db238b8f896d649230f4d1"; + editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -94473,8 +94598,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.1.0"; - sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; + version = "2.2.0"; + sha256 = "15y4affp5bipjg33ybkm8wwms54cx8a0dh8c9c328dz9x7cf9bgp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97008,6 +97133,7 @@ self: { version = "1.0.1.0"; sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; buildDepends = [ base readline StateVar ]; + jailbreak = true; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -97083,10 +97209,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.2.1"; - sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "0kyhvdpk6xr111yyd828f6sdfc4f7ayhdmwsyml6j4c7npxb1g6i"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -99098,9 +99222,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.0"; - sha256 = "1z0227d43dj3c1yh74lh71qihggj21pl7i6mwarb6kam2ziwp7mk"; - editedCabalFile = "4940711977084fce3b86efa958906ba38df63ac450eaf7093ef36268a4c25fe7"; + version = "0.17.0.1"; + sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -99111,7 +99234,6 @@ self: { base fclabels haskell-src-exts HUnit rest-core test-framework test-framework-hunit ]; - jailbreak = true; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102209,8 +102331,8 @@ self: { }: mkDerivation { pname = "search"; - version = "0.1"; - sha256 = "1d996dkirvv22kkli5vpaxy2ismyiwd4jyzfvbxyqc79lqanf2gh"; + version = "0.1.0.1"; + sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw"; buildDepends = [ base ghc-prim profunctors semigroupoids tagged transformers ]; @@ -102601,8 +102723,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.1"; - sha256 = "0vakqqdhjn7a049k1sx86ah5x85c005hrxri2xl9qcd690bvrs6f"; + version = "0.3.2"; + sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -104513,14 +104635,13 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.3.0"; - sha256 = "0blr8j52q8q1mdmb66byll3pnhzqmrlwc8jjz40km86bj73n1c7h"; + version = "0.3.1"; + sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; buildDepends = [ base containers deepseq directory filepath MonadCatchIO-transformers mtl old-locale SafeSemaphore text time transformers ]; - jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -105653,9 +105774,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.13.3.2"; - sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; - editedCabalFile = "2ffeb6e3e6d6d54819bc8c7d58c4bdabf1911599c4e83ededbda4f5719c0298f"; + version = "0.14.0"; + sha256 = "11vf7v1aqbm1lzb5jjjna6j8gj7757xkc8zk820z9d73ak8bq7m8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -105791,6 +105911,7 @@ self: { attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -105825,6 +105946,7 @@ self: { async base containers monad-loops MonadCatchIO-transformers snap stm time transformers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; @@ -106000,6 +106122,7 @@ self: { sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106099,6 +106222,7 @@ self: { base bytestring css-text directory filepath lens snap text utf8-string ]; + jailbreak = true; homepage = "https://github.com/zmthy/snaplet-css-min"; description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; @@ -106128,8 +106252,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.10"; - sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; + version = "0.3.3.11"; + sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -106394,6 +106518,7 @@ self: { MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106445,6 +106570,7 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text ]; + jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -106461,6 +106587,7 @@ self: { buildDepends = [ base configurator hedis lens mtl network snap text transformers ]; + jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106602,6 +106729,7 @@ 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; @@ -114312,18 +114440,20 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty , tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.0.2.0"; - sha256 = "1k8p8l8fvvc9qrw0qgbbfy9r6h3i1mfkmfzy1g2rsq9kcsc0821r"; - buildDepends = [ base stm time unordered-containers ]; + version = "1.0.3.0"; + sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base retry stm time unordered-containers ]; testDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck - time transformers + base bytestring QuickCheck retry stm tasty tasty-hunit + tasty-quickcheck time transformers ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; @@ -114562,14 +114692,14 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.29"; - sha256 = "05p6iga6lzshk6vzywpxd6g53r7hqyvs1rq90v00lpxkiwyqxs6i"; + version = "0.4.30"; + sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers websockets ]; - homepage = "http://yaxu.org/tidal/"; + homepage = "http://tidal.lurk.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117961,8 +118091,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2.1"; - sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + version = "0.1"; + sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q"; buildDepends = [ base containers contravariant mtl transformers transformers-compat ]; @@ -119926,16 +120056,17 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, mtl, pcre-heavy - , stringable, text + ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy + , QuickCheck, stringable, text }: mkDerivation { pname = "validate-input"; - version = "0.1.0.0"; - sha256 = "1xbpgc2zkaszjydy15ir11vlrwg4pgclm6ldnjxmv3p2v1cswxq6"; + version = "0.2.0.0"; + sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls"; buildDepends = [ base bytestring either mtl pcre-heavy stringable text ]; + testDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; @@ -120120,8 +120251,8 @@ self: { }: mkDerivation { pname = "vcache-trie"; - version = "0.1"; - sha256 = "0aln3vin1jah4c7hnhdbm4w5vsiqf3kgf48z6xdyzc0zwhv7mf1k"; + version = "0.1.1"; + sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk"; buildDepends = [ array base bytestring bytestring-builder vcache ]; homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; @@ -121759,23 +121890,22 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, haddock, hlint, hspec - , http-types, HUnit, network, process, regex-compat, stm, text - , token-bucket, transformers, unordered-containers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, haddock, hlint + , hspec, http-types, HUnit, network, process, regex-compat, stm + , token-bucket, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.1.0.1"; - sha256 = "1404i9f8pcvhpa2kjz5rc7r18f5dk7889v576i5k41faxb749ig0"; + version = "0.2.0.0"; + sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; buildDepends = [ - base bytestring http-types network stm text token-bucket - transformers unordered-containers wai + base containers http-types network stm token-bucket transformers + wai ]; testDepends = [ base bytestring haddock hlint hspec http-types HUnit process - regex-compat stm transformers unordered-containers wai wai-extra + regex-compat stm transformers wai wai-extra ]; - jailbreak = true; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122067,6 +122197,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "waitra" = callPackage + ({ mkDerivation, aeson, base, http-types, regex-applicative, tasty + , tasty-hunit, text, wai, wai-extra + }: + mkDerivation { + pname = "waitra"; + version = "0.0.2.0"; + sha256 = "1hzwxwaw5w38bmsyh15mggrawjbfn1bnkjjjv4aigynv19kdjf03"; + buildDepends = [ + aeson base http-types regex-applicative text wai + ]; + testDepends = [ + aeson base http-types regex-applicative tasty tasty-hunit wai + wai-extra + ]; + homepage = "https://github.com/futurice/waitra"; + description = "A very simple Wai router"; + license = stdenv.lib.licenses.mit; + }) {}; + "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec @@ -122137,8 +122287,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.2"; - sha256 = "1jhra0iq7iph4cn5lq98892rapzws2nsf1pyb70gpww4l3bgjfzd"; + version = "3.0.3"; + sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -123184,13 +123334,13 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.1.1"; - sha256 = "1i0jvxc1llcq5aayzgqhkz51mqh96pdadml6gi94h2z3yj20nicg"; + version = "0.1.2.1"; + sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of catMaybes"; + description = "Generalization of filter and catMaybes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124144,8 +124294,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.0"; - sha256 = "1388nw6ikk8myqq9h9if3fkdlxhzj7fs9l3hyfiv77k499j3iln9"; + version = "0.2.1"; + sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126326,8 +126476,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.4"; - sha256 = "0xd5rx9gpaj8m5v1ln3lgi6xhk2lw43c8ykdiqhp3583aybjkvnm"; + version = "1.4.5"; + sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -126401,8 +126551,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.1"; - sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb"; + version = "1.4.8.2"; + sha256 = "0syfgwyj5cgs2rl26g8mz2sz3vr39g813ljz441asrqv80mz4xww"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -126579,8 +126729,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.4"; - sha256 = "1vy4gscw3rgglbiq0v4l0zjmvan2sk6sgd93402hw64xwxwzc35c"; + version = "1.4.4.1"; + sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -127881,7 +128031,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base @@ -127923,7 +128073,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq4-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions @@ -127944,7 +128094,7 @@ self: { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath From fdd821f1ef78f65c5f3725cd37e2e0f3649d581d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Mar 2015 13:19:49 +0100 Subject: [PATCH 078/947] configuration-ghc-7.8.x.nix: remove amazonka-related overrides These overrides allow us to build amazonka packages, but we have no way to actually use those build results within Nix, because the replaced GHC core libraries collide with the real ones when we try to compose a ghc-with-packages environment. Closes https://github.com/NixOS/nixpkgs/issues/6584. --- .../configuration-ghc-7.8.x.nix | 41 ------------------- 1 file changed, 41 deletions(-) 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 568a4d46c54..bd308b7f420 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -98,44 +98,3 @@ self: super: { incremental-computing = dontCheck super.incremental-computing; } - -// # packages relating to amazonka - -(let - Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; - amazonkaEnv = self: super: { - mkDerivation = drv: super.mkDerivation (drv // { - doCheck = false; - hyperlinkSource = false; - buildTools = (drv.buildTools or []) ++ [ ( - if pkgs.stdenv.lib.elem drv.pname [ - "Cabal" - "time" - "unix" - "directory" - "process" - "jailbreak-cabal" - ] then null else Cabal - ) ]; - }); - mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_3_0; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - hscolour = super.hscolour; - time = self.time_1_5_0_1; - unix = self.unix_2_7_1_0; - directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); - inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch amazonka-glacier amazonka-ecs; - }; - amazonka = super.amazonka.overrideScope amazonkaEnv; - amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv; - amazonka-core = super.amazonka-core.overrideScope amazonkaEnv; - amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv; - amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv; - amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv; - amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv; -in { - inherit amazonkaEnv; - inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm; -}) From db42c89325f0f4106b540ec6fed9f243234e6b24 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Mar 2015 11:03:33 +0100 Subject: [PATCH 079/947] Add syncthing-gtk --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 685d12c885c..2e1b93277aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10894,6 +10894,35 @@ let }; }; + syncthing-gtk = buildPythonPackage rec { + version = "0.6.2"; + name = "syncthing-gtk-${version}"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "0dfs5kzdj9ld20i23w6ldj7z761rwnnbqkr0l12wkgcxi58jcqds"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.syncthing pygobject3 dateutil pkgs.gtk3 pyinotify pkgs.libnotify pkgs.psmisc ]; + + patchPhase = '' + substituteInPlace "scripts/syncthing-gtk" \ + --replace "/usr/share" "$out/share" \ + ''; + + + meta = with stdenv.lib; { + description = " GTK3 & python based GUI for Syncthing "; + maintainers = [ maintainers.DamienCassou ]; + platforms = pkgs.syncthing.meta.platforms; + homepage = "https://github.com/syncthing/syncthing-gtk"; + license = stdenv.lib.licenses.gpl2; + }; + }; + tarsnapper = buildPythonPackage rec { name = "tarsnapper-0.2.1"; disabled = isPy3k; From 53663772f30719433b8e1ba14e25d57b3bfdd896 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 13 Mar 2015 07:06:20 -0400 Subject: [PATCH 080/947] haskell: aeson-schema missing test suite For some reason the .tar.gz on hackage is missing most of the files for the test suite. I've opened an issue on it (https://github.com/timjb/aeson-schema/issues/9), but it's not yet been acted on. In the meantime, simply disabling the test suite seems most sensible. @peti, could you merge this? --- 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 cd77d8ef2df..f9a6f2bd203 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -276,6 +276,7 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw + aeson-schema = dontCheck super.aeson-schema; # http://hydra.cryp.to/build/576244/nixlog/2/raw apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials From 75ba60aded9f29a8f614d64ca3e4219fb7a12c5b Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 13 Mar 2015 12:23:05 +0100 Subject: [PATCH 081/947] pythonPackages: MySQL_python: added openssl as buildInput --- 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 685d12c885c..ac175c448ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6529,7 +6529,7 @@ let sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pkgs.openssl ]; propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; From 86062d7a952c9e8cdb0b370cedf1b010e0864bb4 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Fri, 13 Mar 2015 12:00:10 +0100 Subject: [PATCH 082/947] Adapt code according to @lethalman's review - Use ${bash}/bin/bash - We cannot use oraclejre7 because sqldeveloper wants a jdk. --- pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 031c004ef52..9a0afdc8e1d 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7}: +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: stdenv.mkDerivation rec { version = "4.0.3.16.84"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed - echo -e '#!/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && bash sqldeveloper $*' >> $out/bin/sqldeveloper + echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper cd $out unzip ${src} From 328651bfacec1d487a839dce31bda13756eea90b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 13 Mar 2015 14:55:08 +0100 Subject: [PATCH 083/947] pycharm: Update to 4.0.5 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 429de65b568..3bb0100c5fc 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -254,25 +254,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; + sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; + sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg"; }; }; From 8eb7034766e1f99c536c7397d0cf4bb3d44e8ce8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 13 Mar 2015 16:12:12 +0100 Subject: [PATCH 084/947] calibre: update from 2.20.0 to 2.21.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 ee064865d34..9f5c9e3c107 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.20.0"; + name = "calibre-2.21.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13246f4vxz4ps3c549hrnwdkwic5jsf7g1faham38z1ixd094lkd"; + sha256 = "1adig2jxwbmsxcs36jaybhc8zdb8mnkc23kabw0c72izrsg4c5gb"; }; inherit python; From e729dfbd3f63f1a840e0f6bc02cb6dde804b2091 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Mar 2015 12:47:11 -0400 Subject: [PATCH 085/947] gcc-4.9: Set isGNU Fixes #6787 --- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 02747d90567..7de8a140c0a 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -475,7 +475,7 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; + { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; isGNU = true; }; inherit enableParallelBuilding; From 75d3a321d643d14bcf2f2ac4e398252d62479d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= Date: Fri, 13 Mar 2015 18:53:00 +0100 Subject: [PATCH 086/947] IDEA-PhpStorm version bump to 8.0.3 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 3bb0100c5fc..ba4a4173da7 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -278,13 +278,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.2"; - build = "PS-139.732"; + version = "8.0.3"; + build = "PS-139.1348"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; + sha256 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; }; }; From fe8072ee7f8e47ff8a7644bc522f1eec2c65989a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Mar 2015 13:17:38 -0500 Subject: [PATCH 087/947] kf57: add meta.branch to fix monitor --- .../libraries/kde-frameworks-5.7/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index c53ae595e5e..c87161a725e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,6 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: + let inherit (parseDrvName drv.version) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -40,6 +41,8 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); } // (drv.meta or {}); }); @@ -108,12 +111,16 @@ let [ ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; + meta = + let inherit (parseDrvName super.extra-cmake-modules.name) version; in + { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + }; }; frameworkintegration = super.frameworkintegration // { From 628594fd7911093a26f0a6b9a3c61ffae5af9fdf Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 13 Mar 2015 19:27:30 +0100 Subject: [PATCH 088/947] Fix URL for emacs evil package --- pkgs/top-level/emacs-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 57d5410a3bf..331cde10f35 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -320,9 +320,9 @@ let self = _self // overrides; pname = "evil"; version = "20141020"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; packageRequires = [ goto-chg undo-tree ]; meta = { @@ -504,9 +504,9 @@ let self = _self // overrides; pname = "goto-chg"; version = "1.6"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; files = [ "lib/goto-chg.el" ]; meta = { license = gpl3Plus; }; From 7f07b33e4dcdfbb27153384a55587d11bfe3fdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 13 Mar 2015 15:30:31 -0300 Subject: [PATCH 089/947] Add ocaml-xml-light --- .../ocaml-modules/xml-light/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/xml-light/default.nix diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix new file mode 100644 index 00000000000..5eb4fbfd6b1 --- /dev/null +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "xml-light"; + version = "2.4"; +in +stdenv.mkDerivation { + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/ncannasse/${pname}/archive/${version}.tar.gz"; + sha256 = "10b55qf6mvdp11ny3h0jv6k6wrs78jr9lhsiswl0xya7z8r8j0a2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + buildPhase = '' + make all + make opt + ''; + + installPhase = '' + make install_ocamlfind + mkdir -p $out/share + cp -vai doc $out/share/ + ''; + + meta = { + description = "Minimal Xml parser and printer for OCaml"; + longDescription = '' + Xml-Light provides functions to parse an XML document into an OCaml + data structure, work with it, and print it back to an XML + document. It support also DTD parsing and checking, and is + entirely written in OCaml, hence it does not require additional C + library. + ''; + homepage = "http://tech.motion-twin.com/xmllight.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90dbe36e100..1ee447f806b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4095,6 +4095,8 @@ let xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; From 9be119bb0ec7dc4b93180eb2f24bc9f6754c4a55 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 13 Mar 2015 21:07:46 +0000 Subject: [PATCH 090/947] disnix: bump to version 0.3 --- .../package-management/disnix/DisnixWebService/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 16f90ec5ca2..4e143bed519 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213076/download/4/DisnixWebService-0.3.tar.bz2; - sha256 = "0m3hk8nfgfnmd503pkpb6n2z944haq2n22d44q6n6zzqnfkjm175"; + url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index ee1e70a8582..98213d9cf34 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7"; + name = "disnix-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213001/download/4/disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7.tar.gz; - sha256 = "08f16gi8dg39ll5ph6rs4wdw9dg4sdgnikpg1x40slzcrckvnkhm"; + url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz; + sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 4e8f7cc17ec..52312ca7191 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add"; + name = "disnixos-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/20213021/download/3/disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add.tar.gz; - sha256 = "1dc9q8i9vhw0851w9b7giv570rly172mmqfr6khr2r88npc642xc"; + url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz; + sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index e6d224c36f6..6fa95f060d7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd"; + name = "dysnomia-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20404955/download/1/dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd.tar.gz; - sha256 = "0dighcn7lihfnkyahw9da0fck8xh1jgbfpfhwndxg0x4bcp7v9f3"; + url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz; + sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 48c6daf49152afb69acc97a8ba311ab492eceea3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Mar 2015 15:07:29 +0100 Subject: [PATCH 091/947] jedit: update from 5.1.0 to 5.2.0 --- .../editors/jedit/build.xml.patch | 47 ++++++++++--------- pkgs/applications/editors/jedit/default.nix | 8 ++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch index 2dabaaaed0c..2f630f18ab7 100644 --- a/pkgs/applications/editors/jedit/build.xml.patch +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -1,6 +1,6 @@ ---- a/build.xml 2013-07-28 18:03:55.000000000 +0100 -+++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 -@@ -42,16 +42,6 @@ +--- a/build.xml 2015-02-04 08:47:37.000000000 +0100 ++++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 +@@ -43,16 +43,6 @@ @@ -17,7 +17,7 @@ -@@ -89,51 +79,8 @@ +@@ -90,51 +80,8 @@ value="true"/> @@ -39,7 +39,7 @@ - - +- unless="ivy.done"> - - +- unless="ivy.done"> - - -@@ -238,37 +185,6 @@ +@@ -239,37 +186,6 @@ @@ -108,13 +108,14 @@ - +- description="run unit tests" +- unless="skip.tests"> - - - + + +- -@@ -611,7 +503,7 @@ +@@ -622,7 +512,7 @@ -@@ -655,7 +547,7 @@ +@@ -668,7 +558,7 @@ -@@ -679,7 +571,7 @@ +@@ -692,7 +582,7 @@ -@@ -703,7 +595,7 @@ +@@ -716,7 +606,7 @@ -@@ -838,7 +730,7 @@ +@@ -851,7 +741,7 @@ -@@ -1143,7 +1035,7 @@ +@@ -1154,7 +1044,7 @@ -@@ -1271,7 +1163,7 @@ +@@ -1295,7 +1185,7 @@ -@@ -1567,7 +1459,7 @@ +@@ -1592,7 +1482,7 @@ Date: Wed, 11 Mar 2015 15:07:18 +0100 Subject: [PATCH 092/947] tagainijisho: update from 1.0.2 to 1.0.3 --- pkgs/applications/office/tagainijisho/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bee1b738d12..9283ee1274c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, qt4, cmake, sqlite}: +{ stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { - name = "tagainijisho-1.0.2"; + name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; - sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; buildInputs = [ qt4 cmake sqlite ]; From d38c414d94881127a9ad47708f94f14b23beea36 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Mar 2015 21:30:41 +0100 Subject: [PATCH 093/947] Adds Qarte Qarte allows you to browse into the archives of arte+7 & arteLiveWeb sites and to record your preferred videos. Homepage: https://launchpad.net/qarte --- pkgs/applications/video/qarte/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/video/qarte/default.nix diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix new file mode 100644 index 00000000000..a7e8cd8c1b9 --- /dev/null +++ b/pkgs/applications/video/qarte/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: + +stdenv.mkDerivation { + name = "qarte-2.2.0"; + src = fetchbzr { + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; + rev = "146"; + sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv qarte $out/bin/ + substituteInPlace $out/bin/qarte \ + --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/share' "$out/share" + wrapProgram $out/bin/qarte \ + --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PATH : "${rtmpdump}/bin" + + mkdir -p $out/share/man/man1/ + mv qarte.1 $out/share/man/man1/ + + mkdir -p $out/share/qarte + mv * $out/share/qarte/ + ''; + + meta = { + homepage = https://launchpad.net/qarte; + description = "A recorder for Arte TV Guide and Arte Concert"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f2f72e4082..b9d38854f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2440,6 +2440,10 @@ let openmpi = callPackage ../development/libraries/openmpi { }; + qarte = callPackage ../applications/video/qarte { + sip = pythonPackages.sip_4_16; + }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; From f4146b7f2db8c28628147841522d721159fbfe40 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Mar 2015 16:27:04 -0500 Subject: [PATCH 094/947] kf57: fix evaluation --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index c87161a725e..605ed4a0567 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,7 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: - let inherit (parseDrvName drv.version) version; in + let inherit (builtins.parseDrvName drv.version) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; From cbc648f4627c58412849a30e7de7fcc378f358da Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 13 Mar 2015 16:06:37 -0600 Subject: [PATCH 095/947] New package: AtomicParsley --- pkgs/tools/video/atomicparsley/casts.patch | 38 ++++++++++++++++++++++ pkgs/tools/video/atomicparsley/default.nix | 29 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 69 insertions(+) create mode 100644 pkgs/tools/video/atomicparsley/casts.patch create mode 100644 pkgs/tools/video/atomicparsley/default.nix diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch new file mode 100644 index 00000000000..b70a3cbcf85 --- /dev/null +++ b/pkgs/tools/video/atomicparsley/casts.patch @@ -0,0 +1,38 @@ +--- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600 ++++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600 +@@ -1447,7 +1447,7 @@ + uint32_t atom_offsets = 0; + char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path + if (output_path == NULL) { +- char* orig_suffix = strrchr(originating_file, '.'); ++ char* orig_suffix = strrchr((char*)originating_file, (int)'.'); + if (orig_suffix == NULL) { + fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n"); + path_len = strlen(originating_file); +@@ -4464,7 +4464,7 @@ + void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) { + char* suffix = NULL; + if (forced_suffix == NULL) { +- suffix = strrchr(filePath, '.'); ++ suffix = strrchr((char*)filePath, (int)'.'); + } else { + suffix = forced_suffix; + } +@@ -4480,7 +4480,7 @@ + memcpy(temp_path, filePath, base_len); + memcpy(temp_path + base_len, file_kind, strlen(file_kind)); + #else +- char* file_name = strrchr(filePath, '/'); ++ char* file_name = strrchr((char*)filePath, (int)'/'); + size_t file_name_len = strlen(file_name); + memcpy(temp_path, filePath, filepath_len-file_name_len+1); + memcpy(temp_path + strlen(temp_path), ".", 1); +@@ -5006,7 +5006,7 @@ + free_modified_name = true; + if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension + uint16_t filename_len = strlen(m4aFile); +- char* suffix = strrchr(m4aFile, '.'); ++ char* suffix = strrchr((char*)m4aFile, (int)'.'); + memcpy(originating_file, m4aFile, filename_len+1 ); + memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 ); + } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix new file mode 100644 index 00000000000..d4b662c88f1 --- /dev/null +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -0,0 +1,29 @@ +{ stdenv, pkgs, fetchurl }: + +stdenv.mkDerivation rec { + name = "AtomicParsley"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip"; + sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; + }; + + buildInputs = with pkgs; [ unzip ]; + patches = [ ./casts.patch ]; + setSourceRoot = "sourceRoot=${name}-source-${version}"; + buildPhase = "bash build"; + installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + + meta = with stdenv.lib; { + description = '' + A lightweight command line program for reading, parsing and + setting metadata into MPEG-4 files + ''; + + homepage = http://atomicparsley.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f2f72e4082..36a501cfe28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -536,6 +536,8 @@ let }; }; + atomicparsley = callPackage ../tools/video/atomicparsley { }; + attic = callPackage ../tools/backup/attic { }; avfs = callPackage ../tools/filesystems/avfs { }; From e30f14b791053a1d8634b0ba049a5e9d49f76452 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 13 Mar 2015 22:25:24 -0700 Subject: [PATCH 096/947] update doomseeker to v0.12.2b --- pkgs/applications/misc/doomseeker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 404fb955386..da3b364f3eb 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,10 +1,10 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-0.12.1b"; + name = "doomseeker-0.12.2b"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "110yg3w3y1x8p4gqpxb6djxw348caj50q5liq8ssb5mf78v8gk6b"; + sha256 = "1bcrxc3g9c6b4d8dbm2rx0ldxkqc5fc91jndkwiaykf8hajm0jnr"; }; cmakeFlags = '' From 9c4cbaa553cef4ebbfa375f455ced63d141b0ba6 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 14 Mar 2015 12:08:22 +0000 Subject: [PATCH 097/947] Fix mpd configuration (enclosing quotes needed). --- nixos/modules/services/audio/mpd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 9abfb41087b..5afe5f8f46f 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -17,10 +17,10 @@ let log_file "syslog" user "${cfg.user}" group "${cfg.group}" - ${if cfg.network.host != "any" then - "bind_to_address ${cfg.network.host}" else ""} - ${if cfg.network.port != 6600 then - "port ${toString cfg.network.port}" else ""} + + ${optionalString (cfg.network.host != "any") ''bind_to_address "${cfg.network.host}"''} + ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${cfg.extraConfig} ''; From 5078d49248e29bacd442fac889123c2c0a68e13e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 14 Mar 2015 11:47:11 +0100 Subject: [PATCH 098/947] Add package: mpdscribble --- pkgs/tools/misc/mpdscribble/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/mpdscribble/default.nix diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix new file mode 100644 index 00000000000..3b276a7117f --- /dev/null +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "mpdscribble-${version}"; + version = "0.22"; + + src = fetchurl { + url = + "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + }; + + buildInputs = [ mpd_clientlib curl glib pkgconfig ]; + + preConfigure = '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = with stdenv.lib; { + description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 166e5365db7..9e87229f814 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8189,6 +8189,8 @@ let mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpdscribble = callPackage ../tools/misc/mpdscribble { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; From f1f3c2c77523b128c9ff5006be693b2eec53151e Mon Sep 17 00:00:00 2001 From: _1126 Date: Sat, 14 Mar 2015 14:36:25 +0100 Subject: [PATCH 099/947] torbrowser: bump version to 4.0.4 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 150cb49a9c4..750ab370872 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else - "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha"; + "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else + "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; }; patchPhase = '' From 9ba702765292698f6a0d37d99563b354a5245146 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:54:59 +0100 Subject: [PATCH 100/947] pkgs/development/libraries/kde-frameworks-5.7: fix evaluation --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 605ed4a0567..c7fdbc060ec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,7 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: - let inherit (builtins.parseDrvName drv.version) version; in + let inherit (builtins.parseDrvName drv.name) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -112,7 +112,7 @@ let ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; meta = - let inherit (parseDrvName super.extra-cmake-modules.name) version; in + let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in { license = with stdenv.lib.licenses; [ bsd2 ]; platforms = stdenv.lib.platforms.linux; From d54c94c189af96a40edc8cc845a0cc6988534a6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 15:05:34 +0100 Subject: [PATCH 101/947] pkgs/development/haskell-modules/configuration-common.nix: cosmetic --- 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 f9a6f2bd203..1594a6e9579 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -627,9 +627,6 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = markBroken super.xcffib; - # https://github.com/snapframework/snap/issues/141 - # snap = overrideCabal super.snap (drv: { preConfigure = "sed -i -e 's|lens .*<4.8|lens|' snap.cabal"; }); - } // { # Not on Hackage. From 4835813cb6718359e16e4ffcfeb538102b60823b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 14 Mar 2015 09:08:15 -0700 Subject: [PATCH 102/947] judy: clang doesnt know -fno-aggressive-loop-optimizations --- pkgs/development/libraries/judy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 4bca61d5b14..13b50286380 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # http://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = '' + preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; From d3f69cdf67a823285c6164f7596da5757169f99e Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 14 Mar 2015 09:09:09 -0700 Subject: [PATCH 103/947] mariadb: oqgraph fails to build on darwin --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fecf3709f69..23a09f1d54e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DWITH_PARTITION_STORAGE_ENGINE=1" "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 90f381ef4124b47f7668d5f5b68dddd411d1f9bf Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sat, 14 Mar 2015 14:39:00 -0300 Subject: [PATCH 104/947] Add Perl module App::Sqitch --- pkgs/top-level/perl-packages.nix | 195 +++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 625aea9046e..0470f7417d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -219,6 +219,30 @@ let self = _self // overrides; _self = with self; { }; }; + AppSqitch = buildPerlModule { + name = "App-Sqitch-0.999"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.999.tar.gz; + sha256 = "e7e02194a7b0c42fb4df046cd834d5eb99ff9a2c169f5c60a52c362e89351da6"; + }; + buildInputs = [ + CaptureTiny PathClass TestDeep TestDir TestException + TestFile TestFileContents TestMockModule TestNoWarnings + ]; + propagatedBuildInputs = [ + Clone ConfigGitLike DBI DateTime + DevelStackTrace EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 + IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter + StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI + URIdb libintlperl namespaceautoclean + ]; + meta = { + homepage = http://sqitch.org/; + description = "Sane database change management"; + license = stdenv.lib.licenses.mit; + }; + }; + ArrayCompare = buildPerlPackage { name = "Array-Compare-1.18"; src = fetchurl { @@ -1559,6 +1583,20 @@ let self = _self // overrides; _self = with self; { }; }; + ConfigGitLike = buildPerlPackage { + name = "Config-GitLike-1.16"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.16.tar.gz; + sha256 = "48c7f7e71405219582a96e5266cbec51c0ff3ec4bf0bb6db1fd12725ee23fe8f"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; + meta = { + description = "Git-compatible config file parsing"; + license = "perl"; + }; + }; + ConfigINI = buildPerlPackage { name = "Config-INI-0.020"; src = fetchurl { @@ -3444,6 +3482,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExporterTiny = buildPerlPackage { + name = "Exporter-Tiny-0.042"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-0.042.tar.gz; + sha256 = "8f1622c5ebbfbcd519ead81df7917e48cb16cc527b1c46737b0459c3908a023f"; + }; + meta = { + homepage = https://metacpan.org/release/Exporter-Tiny; + description = "An exporter with the features of Sub::Exporter but only core dependencies"; + license = "perl"; + }; + }; + ExtUtilsCBuilder = buildPerlPackage rec { name = "ExtUtils-CBuilder-0.280216"; src = fetchurl { @@ -3742,6 +3793,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/File-HomeDir-1.00.tar.gz; sha256 = "85b94f3513093ec0a25b91f9f2571918519ae6f2b7a1e8546f8f78d09a877143"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin [ MacSystemDirectory ]; propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; @@ -4773,6 +4825,18 @@ let self = _self // overrides; _self = with self; { }; }; + IPCSystemSimple = buildPerlPackage { + name = "IPC-System-Simple-1.25"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz; + sha256 = "f1b6aa1dfab886e8e4ea825f46a1cbb26038ef3e727fef5d84444aa8035a4d3b"; + }; + meta = { + description = "Run commands simply, with detailed diagnostics"; + license = "perl"; + }; + }; + ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-9.27"; @@ -5365,6 +5429,18 @@ let self = _self // overrides; _self = with self; { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MacSystemDirectory = buildPerlPackage { + name = "Mac-SystemDirectory-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/Mac-SystemDirectory-0.06.tar.gz; + sha256 = "d008e8c893f971bdb9e935e87e9f62e693d8532b01ed5b2dc89e915d9199b21f"; + }; + meta = { + description = "Locate Mac OS X Standard System Directories"; + license = "perl"; + }; + }; + MailDKIM = buildPerlPackage rec { name = "Mail-DKIM-0.40"; src = fetchurl { @@ -7334,6 +7410,19 @@ let self = _self // overrides; _self = with self; { }; }; + PerlIOutf8_strict = buildPerlModule { + name = "PerlIO-utf8_strict-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.005.tar.gz; + sha256 = "8956064ac2bf1f79bac868a9db93a44aade77df4d3e8b07ce31a40f987ef2e0e"; + }; + buildInputs = [ TestException ]; + meta = { + description = "Fast and correct UTF-8 IO"; + license = "perl"; + }; + }; + PerlIOviadynamic = buildPerlPackage { name = "PerlIO-via-dynamic-0.14"; src = fetchurl { @@ -8766,6 +8855,18 @@ let self = _self // overrides; _self = with self; { }; }; + TemplateTiny = buildPerlPackage { + name = "Template-Tiny-1.12"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz; + sha256 = "073e062c630b51dfb725cd6485a329155cb72d5c596e8cb698eb67c4566f0a4a"; + }; + meta = { + description = "Template Toolkit reimplemented in as little code as possible"; + license = "perl"; + }; + }; + TemplateToolkit = buildPerlPackage rec { name = "Template-Toolkit-2.25"; src = fetchurl { @@ -8999,6 +9100,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestDir = buildPerlPackage { + name = "Test-Dir-1.014"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.014.tar.gz; + sha256 = "b36efc286f8127b04fd7bb0dfdf4bd0a090b175872e35b5ce6d4d80c772c28bf"; + }; + meta = { + description = "Test directory attributes"; + license = "perl"; + }; + }; + TestDifferences = buildPerlPackage { name = "Test-Differences-0.4801"; src = fetchurl { @@ -9081,6 +9194,33 @@ let self = _self // overrides; _self = with self; { }; }; + TestFile = buildPerlPackage { + name = "Test-File-1.41"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.41.tar.gz; + sha256 = "45ec1b714f64d05e34205c40b08c49549f257910e4966fa28e2ac170d5516316"; + }; + buildInputs = [ Testutf8 ]; + meta = { + description = "Check file attributes"; + license = "perl"; + }; + }; + + TestFileContents = buildPerlModule { + name = "Test-File-Contents-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.21.tar.gz; + sha256 = "1b5a13f86f5df625ffd30361f628d34b0ceda80b9f39ca74bf0a4c1105828317"; + }; + propagatedBuildInputs = [ TextDiff ]; + meta = { + homepage = http://search.cpan.org/dist/Test-File-Contents/; + description = "Test routines for examining the contents of files"; + license = "perl"; + }; + }; + TestFileShareDir = buildPerlModule { name = "Test-File-ShareDir-0.3.3"; src = fetchurl { @@ -9863,6 +10003,19 @@ let self = _self // overrides; _self = with self; { }; }; + Testutf8 = buildPerlPackage { + name = "Test-utf8-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz; + sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; + }; + meta = { + homepage = https://github.com/2shortplanks/Test-utf8/tree; + description = "Handy utf8 tests"; + license = "perl"; + }; + }; + TextWikiFormat = buildPerlPackage { name = "Text-WikiFormat-0.81"; src = fetchurl { @@ -10042,6 +10195,20 @@ let self = _self // overrides; _self = with self; { }; }; + TypeTiny = buildPerlPackage { + name = "Type-Tiny-1.000005"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz; + sha256 = "42ed36c011825aa1e6995a4e8638621a1b2103a0970b15764ca3919368042365"; + }; + propagatedBuildInputs = [ ExporterTiny ]; + meta = { + homepage = https://metacpan.org/release/Type-Tiny; + description = "Tiny, yet Moo(se)-compatible type constraint"; + license = "perl"; + }; + }; + UNIVERSALcan = buildPerlPackage { name = "UNIVERSAL-can-1.20140328"; src = fetchurl { @@ -10151,6 +10318,20 @@ let self = _self // overrides; _self = with self; { }; }; + URIdb = buildPerlModule { + name = "URI-db-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.15.tar.gz; + sha256 = "ac3dc3eeb8ca58dc4f7e1dfed6bca5bb8ebbc5dfacee63161490b09a4bfac982"; + }; + propagatedBuildInputs = [ URI URINested ]; + meta = { + homepage = https://search.cpan.org/dist/URI-db/; + description = "Database URIs"; + license = "perl"; + }; + }; + URIFind = buildPerlModule { name = "URI-Find-20111103"; src = fetchurl { @@ -10189,6 +10370,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [URI TestMore]; }; + URINested = buildPerlModule { + name = "URI-Nested-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz; + sha256 = "e1971339a65fbac63ab87142d4b59d3d259d51417753c77cb58ea31a8233efaf"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + homepage = https://metacpan.org/release/URI-Nested/; + description = "Nested URIs"; + license = "perl"; + }; + }; + VariableMagic = buildPerlPackage rec { name = "Variable-Magic-0.53"; src = fetchurl { From 6ac1413b88ac72eb6292d738dc194149e0809d75 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sat, 14 Mar 2015 14:05:02 -0400 Subject: [PATCH 105/947] Disable tests for App::Sqitch module --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0470f7417d3..3d7b6f6df88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -236,6 +236,7 @@ let self = _self // overrides; _self = with self; { StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI URIdb libintlperl namespaceautoclean ]; + doCheck = false; # Can't find home directory. meta = { homepage = http://sqitch.org/; description = "Sane database change management"; From 5b947b82e61a57e8b5e3049625deb4419d501745 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 28 Feb 2015 12:25:33 +0000 Subject: [PATCH 106/947] lighttable: update to 0.7.2 --- pkgs/applications/editors/lighttable/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 852af584e90..d0ef3198a36 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -15,20 +15,20 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "LightTable-${version}"; - version = "0.6.7"; + version = "0.7.2"; src = if stdenv.system == "i686-linux" then fetchurl { name = "LightTableLinux.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux.tar.gz; - sha256 = "3b09f9665ed1b4abb7c1ca16286ac7222caf6dc124059be6db4cb9f5fd041e73"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz"; + sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i"; } else fetchurl { name = "LightTableLinux64.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux64.tar.gz; - sha256 = "710d670ccc30aadba521ccb723388679ee6404aac662297a005432c811d59e82"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz"; + sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c"; }; buildInputs = [ makeWrapper ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable From 79e9ca33c819e16b92db4887526ce725fcf24843 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 14 Mar 2015 18:33:05 +0000 Subject: [PATCH 107/947] lighttable: rename package LightTable to lighttable --- pkgs/applications/editors/lighttable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d0ef3198a36..d4fa56898c3 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -14,7 +14,7 @@ in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "LightTable-${version}"; + name = "lighttable-${version}"; version = "0.7.2"; src = From 01935e880b7b719c31f485d3e44d4a0e89e27821 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 Mar 2015 21:42:07 +0100 Subject: [PATCH 108/947] stunt-rally: fix hashes and add meta.platforms (closes #6712) --- pkgs/games/stuntrally/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index d9de1254915..2c41a11ab57 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; rev = "refs/tags/${version}"; - sha256 = "0zyzkac11dv9c1rxknydkisg2iw1rmi72psidl7jmq8v3rrqxk4r"; + sha256 = "1lsh7z7sjfwpdybg6vbwqx1zxsgbfp2n60n7xl33v225p32qh1qf"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; rev = "refs/tags/${version}"; - sha256 = "1j237dbhd1ik5mj8whbvlff5da9vzzgiskcj5nzfpw1vb1jpdjvd"; + sha256 = "1614j6q1d2f69l58kkqndndvf6svcghhw8pzc2s1plf6k87h67mg"; }; preConfigure = '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/vdrift-ogre/; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } From 90c04fcac337ea5e327016e1cc45c88be0334fa2 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sat, 14 Mar 2015 18:56:57 -0400 Subject: [PATCH 109/947] Remove Perl package Mac::SystemDirectory --- pkgs/top-level/perl-packages.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d7b6f6df88..6fe3cd2f72f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3794,7 +3794,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/File-HomeDir-1.00.tar.gz; sha256 = "85b94f3513093ec0a25b91f9f2571918519ae6f2b7a1e8546f8f78d09a877143"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ MacSystemDirectory ]; propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; @@ -5430,18 +5429,6 @@ let self = _self // overrides; _self = with self; { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; - MacSystemDirectory = buildPerlPackage { - name = "Mac-SystemDirectory-0.06"; - src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Mac-SystemDirectory-0.06.tar.gz; - sha256 = "d008e8c893f971bdb9e935e87e9f62e693d8532b01ed5b2dc89e915d9199b21f"; - }; - meta = { - description = "Locate Mac OS X Standard System Directories"; - license = "perl"; - }; - }; - MailDKIM = buildPerlPackage rec { name = "Mail-DKIM-0.40"; src = fetchurl { From c668b45c6cbfb1b922fa495517e91d20a594b184 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sat, 14 Mar 2015 20:02:30 -0300 Subject: [PATCH 110/947] Disable FileHomeDir on Darwin --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fe3cd2f72f..ab01e9b1f48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3800,6 +3800,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; preCheck = "export HOME=$TMPDIR"; + doCheck = !stdenv.isDarwin; }; FileKeePass = buildPerlPackage rec { From a8a350e679f20b782fad879d15939b332cdeb628 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 15 Mar 2015 00:04:55 +0100 Subject: [PATCH 111/947] Add Elanthec PS/2 Trackpoint (Thinkpad L430) --- nixos/modules/tasks/trackpoint.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 5d1bb631b54..778cdc5d30d 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -16,7 +16,7 @@ with lib; Enable sensitivity and speed configuration for trackpoints. ''; }; - + sensitivity = mkOption { default = 128; example = 255; @@ -44,7 +44,7 @@ with lib; Enable scrolling while holding the middle mouse button. ''; }; - + }; }; @@ -70,7 +70,7 @@ with lib; '' Section "InputClass" Identifier "Trackpoint Wheel Emulation" - MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" + MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" From 7c8247a8c50c1a4aa56fa5cfd3dae33f1aeae2ac Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:38:33 +0100 Subject: [PATCH 112/947] grsecurity: Update stable and test patches stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203 test: 3.1-3.18.9-201503071142 -> 3.1-3.19.1-201503122205 --- nixos/modules/security/grsecurity.nix | 4 ++-- pkgs/build-support/grsecurity/default.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.18.nix | 1 - pkgs/os-specific/linux/kernel/patches.nix | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 66eeab7503d..8cd40093348 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.18. + Enable the testing grsecurity patch, based on Linux 3.19. ''; }; @@ -245,7 +245,7 @@ in message = '' If grsecurity is enabled, you must select either the stable patch (with kernel 3.14), or the testing patch (with - kernel 3.18) to continue. + kernel 3.19) to continue. ''; } { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable); diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index b2bffc781b3..7bafd78d76a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_18 test-patch; + else mkKernel pkgs.linux_3_19 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 93ddecbf4a5..154c9633cdb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "3.18.9"; - # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c2d35ce4d2e..f239d459967 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.35"; - revision = "201503071140"; + revision = "201503092203"; branch = "stable"; - sha256 = "076kmzyrmg8g82xhaccysdgblfkdd21rfn8wvdpf6kxavg8xn855"; + sha256 = "0l8m0ixh0qcgwy8vcmfl8pal93wc03ahc3ci3sca79nx33a050v9"; }; grsecurity_unstable = grsecPatch - { kversion = "3.18.9"; - revision = "201503071142"; + { kversion = "3.19.1"; + revision = "201503122205"; branch = "test"; - sha256 = "0acrz6v827y8pdrl26wb652hmq0qglkwdgq0ffrw6k052f5lpfx2"; + sha256 = "0g22wfmlim163gmsl4cn4nq4zif8zni3cpkk7cr93z92r9kafp4y"; }; grsec_fix_path = From d54cac725fa2ebff3c5b120a0937ed9d96ba8e88 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 05:11:39 +0100 Subject: [PATCH 113/947] pythonPackages.coverage: Fix hash --- 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 7c629c9eba1..fa16501e892 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1797,7 +1797,7 @@ let src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; + md5 = "055d82e6849d882ec6cf2ae1faca8e56"; }; meta = { From c6c301640695e6776e77a9c65aa69f3e72fc4e84 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:37:03 +0100 Subject: [PATCH 114/947] flashplayer: Update from 11.2.202.442 -> 11.2.202.451 --- .../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 4ae7fca5398..26ba5c51480 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.442"; + version = "11.2.202.451"; 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 = "08ni1mllp98d7wawz35lx8ydymya8nspb90mq29ivbyrkx5aal28"; + sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z"; } 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 = "00728q8jp40llpsfw2n5q9w29isyy3a64xlisjizyh3chb6bkkdm"; + sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds"; } else throw "Flash Player is not supported on this platform"; From d848e346167d5a57038053458e392bbd7b6b3e98 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:37:12 +0100 Subject: [PATCH 115/947] pax-utils: Update from 1.0.1 -> 1.0.2 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 28bf24babdc..80e87d8aacc 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0v14dvkg19yabh0ijy8fbrvapxvc36dwhvp90py3baq7qb44wrc7"; + sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; }; makeFlags = [ From aa708af8d474cd0c5b7f061db79d184693a716db Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 14 Mar 2015 13:45:22 +0100 Subject: [PATCH 116/947] Change current version of uncrustify to 0.61 --- pkgs/development/tools/misc/uncrustify/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index cf1ec5edbcd..27e59af34fc 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify-0.60"; + name = "uncrustify"; + version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}.tar.gz"; - sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa"; + url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; meta = with stdenv.lib; { From 1207bc606e29ed51f9b24b3085837fb1613ec3d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:08:30 +0100 Subject: [PATCH 117/947] hackage-packages.nix: re-generate from Hackage 2015-03-14T13:08:30+0100 --- .../haskell-modules/hackage-packages.nix | 404 ++++++++++++------ 1 file changed, 284 insertions(+), 120 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5c5ef83b10b..38f1825bc86 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3986,8 +3986,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "EstProgress"; - version = "0.1.0.0"; - sha256 = "16krghh2x6m0bzwrzgalry5rl9gp7x19w5n00dhbg0q28mk668sv"; + version = "0.2.0.0"; + sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3"; buildDepends = [ base mtl ]; homepage = "http://alkalisoftware.net"; description = "Methods for estimating the progress of functions"; @@ -4746,6 +4746,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base bimap ]; + jailbreak = true; homepage = "https://github.com/xnil/GGg"; description = "GGg cipher"; license = stdenv.lib.licenses.mit; @@ -8828,6 +8829,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Kalman" = callPackage + ({ mkDerivation, base, hmatrix }: + mkDerivation { + pname = "Kalman"; + version = "0.1.0.0"; + sha256 = "0l4z7l90s14z24rlzdpl1rh7vjgpk7adbavza6k3144p1an5rfqp"; + buildDepends = [ base hmatrix ]; + homepage = "https://github.com/idontgetoutmuch/Kalman"; + description = "A slightly extended Kalman filter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -10186,6 +10199,7 @@ self: { version = "0.1.0.1"; sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; buildDepends = [ array base bimap containers Munkres ]; + jailbreak = true; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12315,8 +12329,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.2"; - sha256 = "06w5q8xb4n5428ja1834z18rn6zl5cqdizcvj7519a2xy9m5qda5"; + version = "0.0.3"; + sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -22866,10 +22880,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "bimap"; - version = "0.2.4"; - sha256 = "1ib54plfsxzmf9wbbdayfdsrcx4s5ffna3ca5ps928fy78wsx4fr"; + version = "0.3.0"; + sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1"; buildDepends = [ base containers ]; - homepage = "http://code.haskell.org/bimap"; + homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -25463,12 +25477,12 @@ self: { }) {}; "broccoli" = callPackage - ({ mkDerivation, base, stm, unamb }: + ({ mkDerivation, base, stm, time }: mkDerivation { pname = "broccoli"; - version = "0.2.0.1"; - sha256 = "0kish92mch22jlpg86iq6y73jmmsjg1yl7s2f15y6vwfdvbhv8zz"; - buildDepends = [ base stm unamb ]; + version = "0.3.0.0"; + sha256 = "0jdrly4xm2fdxr7vbqk4zhf3aya50m0gryrpnn0alc3kbrpbh8l6"; + buildDepends = [ base stm time ]; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26417,8 +26431,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.23.1"; - sha256 = "1vzng536z711hvv0ln40d863hwi103iywkhdsziy62nmxdq1afy5"; + version = "0.24.1"; + sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26700,8 +26714,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.1.0.1"; - sha256 = "1a7yavkja9ghrr7pf9j8hkg4fg1xl6g4fn82hwc56snmvlpc0ms5"; + version = "0.2.0.0"; + sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29058,8 +29072,8 @@ self: { ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { pname = "chesshs"; - version = "0.2.0"; - sha256 = "1v9qhnknqn8bsxzdcwskhssmmhbrr0d1rrxqm6ssf6j2jvv3diay"; + version = "0.2.1"; + sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv"; buildDepends = [ array attoparsec base bytestring containers ]; homepage = "http://arnovanlumig.com/chesshs.html"; description = "Simple library for validating chess moves and parsing PGN files"; @@ -29538,6 +29552,7 @@ self: { base containers optparse-applicative plailude pretty-tree safe split ]; + jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -29655,62 +29670,64 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, containers, directory, filepath, ghc, ghc-paths - , hashable, haskeline, lens, mtl, process, text, transformers - , unbound, unix, unordered-containers + , clash-prelude, clash-systemverilog, clash-vhdl, containers + , directory, filepath, ghc, hashable, haskeline, lens, mtl, process + , text, transformers, unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.4.1"; - sha256 = "0s6q7xld7v673r7bsr2sj64gdlfrzkf46ginqrcr2dmvbiwkkjrk"; + version = "0.5"; + sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj"; isLibrary = false; isExecutable = true; buildDepends = [ - array base bifunctors bytestring clash-lib clash-prelude containers - directory filepath ghc ghc-paths hashable haskeline lens mtl - process text transformers unbound unix unordered-containers + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-vhdl containers directory filepath ghc + hashable haskeline lens mtl process text transformers + unbound-generics unix unordered-containers ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , concurrent-supply, containers, contravariant, deepseq, directory - , errors, fgl, filepath, hashable, lens, ListLike, mtl, pretty - , process, template-haskell, text, time, transformers, unbound - , unordered-containers, uu-parsinglib, wl-pprint-text + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text }: mkDerivation { pname = "clash-lib"; - version = "0.4.1"; - sha256 = "001jldfwbfl3cvsqkd2q9qhpdv0najagzvzz94rx6jf4wal9dsx1"; + version = "0.5"; + sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng"; buildDepends = [ aeson attoparsec base bytestring concurrent-supply containers - contravariant deepseq directory errors fgl filepath hashable lens - ListLike mtl pretty process template-haskell text time transformers - unbound unordered-containers uu-parsinglib wl-pprint-text + deepseq directory errors fgl filepath hashable lens mtl pretty + process template-haskell text time transformers unbound-generics + unordered-containers uu-parsinglib wl-pprint-text ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude" = callPackage ({ mkDerivation, base, data-default, ghc-prim, integer-gmp - , template-haskell, th-lift + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.6.0.1"; - sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7"; + version = "0.7"; + sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; buildDepends = [ - base data-default ghc-prim integer-gmp template-haskell th-lift + base data-default ghc-prim integer-gmp singletons template-haskell + th-lift ]; homepage = "http://christiaanb.github.io/clash2/"; description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -29721,10 +29738,45 @@ self: { version = "0.1.0.0"; sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34"; buildDepends = [ base clash-prelude containers mtl QuickCheck ]; + jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; }) {}; + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5"; + sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr"; + 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 - As a Library"; + 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"; + sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5"; + 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 - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "classify" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -32698,15 +32750,15 @@ self: { }: mkDerivation { pname = "control-monad-exception"; - version = "0.11.1"; - sha256 = "1lzv5xggc7nyw62jq9plc3lzg06yx3sbd9jzji0pc6xcbqn2m4qn"; + version = "0.11.2"; + sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p"; buildDepends = [ base failure lifted-base monad-control monadloc transformers transformers-base ]; homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34939,12 +34991,12 @@ self: { }) {}; "current-locale" = callPackage - ({ mkDerivation, base, old-locale, process }: + ({ mkDerivation, base, old-locale, process, split }: mkDerivation { pname = "current-locale"; - version = "0.1.0.1"; - sha256 = "185fgzh8nvf2gl5hzg3xmab4xlp2wm2nw485g5nikzx99y3zr1b6"; - buildDepends = [ base old-locale process ]; + version = "0.2.0.1"; + sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; + buildDepends = [ base old-locale process split ]; homepage = "https://github.com/koterpillar/current-locale"; description = "Get the current system locale in System.Locale format"; license = stdenv.lib.licenses.mit; @@ -41169,31 +41221,33 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, base, bytestring, cairo, casadi-bindings - , casadi-bindings-core, cereal, Chart, Chart-cairo, Chart-gtk - , cmdargs, colour, containers, data-default, data-default-class - , distributive, glib, gtk, hmatrix, HUnit, jacobi-roots, lens - , linear, mtl, not-gloss, process, QuickCheck, reflection + ({ mkDerivation, base, binary, bytestring, casadi-bindings + , casadi-bindings-core, Chart, Chart-gtk, cmdargs, colour + , containers, data-default-class, distributive, generic-accessors + , hmatrix, hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl + , not-gloss, Plot-ho-matic, process, QuickCheck, reflection , semigroups, spatial-math, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , unordered-containers, vector, zeromq4-haskell + , test-framework-hunit, test-framework-quickcheck2 + , unordered-containers, vector, vector-binary-instances + , zeromq4-haskell }: mkDerivation { pname = "dynobud"; - version = "1.1.0.0"; - sha256 = "1bgzas5ywvvym0xgi1bajkx2z65wpzrc6p2r77dk0wlmdrpgb1rf"; + version = "1.3.0.0"; + sha256 = "1zxwx777n08flmwcd7c9w8rkkcpvkzagwhy0axaxl9n0anyf8q1i"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cairo casadi-bindings casadi-bindings-core cereal - Chart Chart-cairo Chart-gtk cmdargs colour containers data-default - data-default-class distributive glib gtk hmatrix jacobi-roots lens - linear mtl not-gloss process reflection semigroups spatial-math stm - text time unordered-containers vector zeromq4-haskell + base binary bytestring casadi-bindings casadi-bindings-core Chart + Chart-gtk cmdargs colour containers data-default-class distributive + generic-accessors hmatrix jacobi-roots lens linear mtl not-gloss + Plot-ho-matic process reflection semigroups spatial-math stm + unordered-containers vector vector-binary-instances zeromq4-haskell ]; testDepends = [ - base casadi-bindings hmatrix HUnit linear QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector + base binary casadi-bindings hmatrix hmatrix-gsl HUnit linear + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -43327,18 +43381,18 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, filepath, http-conduit, http-types, network, process - , regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, bytestring, conduit + , conduit-extra, directory, filepath, http-conduit, http-types + , network, process, regex-compat, transformers, utf8-string }: mkDerivation { pname = "eternal"; - version = "0.0.9"; - sha256 = "0kp25p26fsyqn4877wqjhbwfy7m0fnh7lfw0p5njmlx6kqbwi79n"; + version = "0.1.0"; + sha256 = "1ixxv6m9vj5ygry28c9zi3swhivl48r9cf4kj0r8yraqwv1givda"; buildDepends = [ - base bytestring conduit conduit-extra directory filepath - http-conduit http-types network process regex-compat transformers - utf8-string + base base-unicode-symbols bytestring conduit conduit-extra + directory filepath http-conduit http-types network process + regex-compat transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43436,15 +43490,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, happy, hlint, hspec, process, regex-posix - , xml + ({ mkDerivation, base, directory, happy, hlint, hspec, process + , regex-posix, xml }: mkDerivation { pname = "euler"; - version = "0.6.0"; - sha256 = "0dqm4cq9hb7l6xa84y53v6l226f8qfw5avpbsc0zikx50jlz0q2g"; + version = "0.7.0"; + sha256 = "0n3sngaa8zz7wlaqhk2lk7s0klcnq7p1vws9aic5mchrh24nm0sz"; buildDepends = [ base ]; - testDepends = [ base happy hlint hspec process regex-posix xml ]; + testDepends = [ + base directory happy hlint hspec process regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -44514,8 +44570,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.0"; - sha256 = "1xrsa9hj70792fv8lbd820n7k44q2xhjzplzc4j7np4l8nd9n6l5"; + version = "0.23.1.1"; + sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -46536,8 +46592,8 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.3.0.9"; - sha256 = "109n0rlwpbrpsa0j4vcab61zmc1j01ln141v19zjv4dm5al14bd5"; + version = "0.3.0.10"; + sha256 = "0s3q1az0fvx1kn79nsz3d7d4gampcz4yyp9nmqj9baip1lws6k36"; buildDepends = [ base containers data-default-class lens vector-space vector-space-points @@ -54583,18 +54639,24 @@ self: { }) { pfq = null;}; "hapistrano" = callPackage - ({ mkDerivation, base, either, filepath, lens, old-locale, process - , time, transformers + ({ mkDerivation, base, base-compat, directory, either, filepath + , hspec, mtl, old-locale, process, temporary, time, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.1.0.2"; - sha256 = "172hdvs8rnxwv3dy56024f4yc9f9hbs03wz3hfpdcqfj0a9lix65"; + version = "0.2.0.1"; + sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; isLibrary = true; isExecutable = true; buildDepends = [ - base either filepath lens old-locale process time transformers + base base-compat either filepath mtl old-locale process time + transformers ]; + testDepends = [ + base base-compat directory either filepath hspec mtl old-locale + process temporary time transformers + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -60475,8 +60537,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.0"; - sha256 = "0kdy3rdjh4kjlxqfdqxnnaa9cw4avpykqv6ryvw95nxqqraqpm65"; + version = "4.4.1"; + sha256 = "1hc71zzc8apl619449g9sp50wc6qprzd91c69rr3zf1pi77208qg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60487,6 +60549,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72386,8 +72449,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9"; - sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j"; + version = "0.9.1"; + sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; buildDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -75531,8 +75594,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.2"; - sha256 = "0inj841fdh6d8d2i5r2mnsw14fxzdcg92n91gfbaginds4mhjf7d"; + version = "0.3.1.3"; + sha256 = "16v7740xi825n3wmzb9p9svvs88mi5j7m94xqhbb2vhrvsn96phn"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -77816,8 +77879,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.4.3"; - sha256 = "0mxi58dihbwj4534swhy5zlga5w1q2h4jrfvi33kw0pf12hvxqjv"; + version = "3.4.4.4"; + sha256 = "1rx07pk6g46k4652mznga7v51pp6bi32h3wk0dnmihn8n4536m4x"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -86872,8 +86935,8 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.1.1"; - sha256 = "0mkjzw3n4a5zi9ygpys1w2xdvdycvgylflz8fj6sxdc3r9m1icy9"; + version = "0.7.2.1"; + sha256 = "0jkdfkkacb4qsf9f229z79ihrzm9xsgc7pnw96ainmnhjgvfmihj"; buildDepends = [ base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time ]; @@ -87424,17 +87487,17 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, free, hashable - , profunctors, stm, transformers, unordered-containers, void - , witherable + ({ mkDerivation, base, containers, either, exceptions, free + , hashable, monad-stm, profunctors, stm, transformers + , unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.0.1"; - sha256 = "1jycikj070mkrw43h44ynvh2f73n1p2ajxyxy7r0a57hl9l6rwba"; + version = "1.0.2"; + sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; buildDepends = [ - base containers either free hashable profunctors stm transformers - unordered-containers void witherable + base containers either exceptions free hashable monad-stm + profunctors stm transformers unordered-containers void witherable ]; homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; @@ -92004,8 +92067,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { pname = "plailude"; - version = "0.5.1"; - sha256 = "0c9q2pb7v1qv9v7xl8vcj3jncqsphz13accppxd7k6chmirrdnkh"; + version = "0.6.0"; + sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; buildDepends = [ base bytestring mtl time unix ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; @@ -93652,6 +93715,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocess-haskell" = callPackage + ({ mkDerivation, base, base-unicode-symbols, basic-prelude + , bytestring, Cabal, containers, cpphs, deepseq, directory + , file-embed, foldl, haskell-src-exts, here, system-filepath + , temporary, text, turtle, unix + }: + mkDerivation { + pname = "preprocess-haskell"; + version = "0.0.1.1"; + sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r"; + buildDepends = [ + base base-unicode-symbols basic-prelude bytestring Cabal containers + cpphs deepseq directory file-embed foldl haskell-src-exts here + system-filepath temporary text turtle unix + ]; + description = "Preprocess Haskell Repositories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "preprocessor-tools" = callPackage ({ mkDerivation, base, mtl, parsec, syb }: mkDerivation { @@ -94598,8 +94680,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.2.0"; - sha256 = "15y4affp5bipjg33ybkm8wwms54cx8a0dh8c9c328dz9x7cf9bgp"; + version = "2.2.1"; + sha256 = "0dc1km96k58m98ww7z2n8d167ihr5b7vws4y2va4nl30ghpfga56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97593,6 +97675,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , lens, mtl, primitive, semigroups, template-haskell, these + }: + mkDerivation { + pname = "reflex"; + version = "0.0.1"; + sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + buildDepends = [ + base containers dependent-map dependent-sum lens mtl primitive + semigroups template-haskell these + ]; + jailbreak = true; + description = "Higher-order Functional Reactive Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { @@ -101309,11 +101408,12 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.9.3"; - sha256 = "1vb8j6qm6n4v3621y3gz1hf8h1lygp624c4i3s5kzx6vxmm9d368"; + version = "2.9.6"; + sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; buildDepends = [ array base bytestring containers directory minisat mtl process ]; + testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; @@ -102131,6 +102231,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scroll" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, IfElse, monad-loops, mtl, ncurses + , optparse-applicative, random, text, vector + }: + mkDerivation { + pname = "scroll"; + version = "1.20150313"; + sha256 = "1q9zmdhqbz6w20fcf2gvv92ln7461b0ksr98a3kghqz3d7p5w0m3"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring case-insensitive containers data-default IfElse + monad-loops mtl ncurses optparse-applicative random text vector + ]; + homepage = "https://joeyh.name/code/scroll/"; + description = "scroll(6), a roguelike game"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "scrypt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -110875,6 +110995,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syncthing-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , derive, either, http-client, http-client-tls, lens, old-locale + , quickcheck-instances, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wreq + }: + mkDerivation { + pname = "syncthing-hs"; + version = "0.1.0.0"; + sha256 = "1yz37c01s2740idh5w8mvidjzd5fwy9sh2x2qdqivasg3c3kscic"; + buildDepends = [ + aeson base bytestring connection containers either http-client + http-client-tls lens old-locale regex-posix text time transformers + unordered-containers wreq + ]; + testDepends = [ + aeson base bytestring connection containers derive either + http-client http-client-tls lens old-locale quickcheck-instances + regex-posix tasty tasty-hunit tasty-quickcheck text time + transformers unordered-containers wreq + ]; + homepage = "https://github.com/jetho/syncthing-hs"; + description = "Haskell bindings for the Syncthing REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "synt" = callPackage ({ mkDerivation, argparser, base, haskell-src-exts, hpc, hspec , regexpr, split, Synt @@ -114018,8 +114165,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.3.0.5"; - sha256 = "1xirbzcnsb8lvadsz8m6jg8yxc3wrf40dnvs66kdmhwjbg6kv4rh"; + version = "0.3.0.6"; + sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j"; buildDepends = [ base containers syb template-haskell ]; testDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -115291,6 +115438,23 @@ self: { license = "unknown"; }) {}; + "titlecase" = callPackage + ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "titlecase"; + version = "0.1.0.0"; + sha256 = "09zq7z3icziad12ssn663l32k6c5z31azzlhg789q635ab3dckn0"; + buildDepends = [ base blaze-markup semigroups text ]; + testDepends = [ + base semigroups tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/nkaretnikov/titlecase"; + description = "Convert English words to title case"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tkhs" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit, utf8-string, vty @@ -127850,20 +128014,20 @@ self: { "yst" = callPackage ({ mkDerivation, aeson, base, containers, csv, directory, filepath - , HDBC, HDBC-sqlite3, HStringTemplate, old-locale, old-time, pandoc - , parsec, scientific, split, text, time, unordered-containers - , xhtml, yaml + , HDBC, HDBC-sqlite3, HStringTemplate, lucid, old-locale, old-time + , pandoc, parsec, scientific, split, text, time + , unordered-containers, yaml }: mkDerivation { pname = "yst"; - version = "0.4.1.1"; - sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; + version = "0.5.0.1"; + sha256 = "10fj095za1ga7hv76g9gjcc9narp3bnpfb71vs3j3ldfihxk6syv"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base containers csv directory filepath HDBC HDBC-sqlite3 - HStringTemplate old-locale old-time pandoc parsec scientific split - text time unordered-containers xhtml yaml + HStringTemplate lucid old-locale old-time pandoc parsec scientific + split text time unordered-containers yaml ]; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; From 09c9a987173b856c5d1e2ad6ddb5c36ec34c1c31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:09:51 +0100 Subject: [PATCH 118/947] aeson-schema: track the issue URL --- 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 1594a6e9579..6d6c8c89840 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -276,7 +276,7 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw - aeson-schema = dontCheck super.aeson-schema; # http://hydra.cryp.to/build/576244/nixlog/2/raw + aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials From 26223831dc0ba50eb1f190f5fa080dc2b138989e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:32:03 +0100 Subject: [PATCH 119/947] ghc-6.12.3: cosmetic clean up --- pkgs/development/compilers/ghc/6.12.3.nix | 47 +---------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 05eff1b5d90..2364fe1d5b9 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "${buildMK}" > mk/build.mk ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.cc}/bin/gcc" ]; @@ -36,50 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; - - # TODO: requires a comment as to what it does and why it is needed. - passthru = { - corePackages = [ - [ "Cabal" "1.8.0.2" ] - [ "array" "0.3.0.0" ] - [ "base" "3.0.3.2" ] - [ "base" "4.2.0.0" ] - [ "bin-package-db" "0.0.0.0" ] - [ "bytestring" "0.9.1.5" ] - [ "containers" "0.3.0.0" ] - [ "directory" "1.0.1.0" ] - [ "dph-base" "0.4.0" ] - [ "dph-par" "0.4.0" ] - [ "dph-prim-interface" "0.4.0" ] - [ "dph-prim-par" "0.4.0" ] - [ "dph-prim-seq" "0.4.0" ] - [ "dph-seq" "0.4.0" ] - [ "extensible-exceptions" "0.1.1.1" ] - [ "ffi" "1.0" ] - [ "filepath" "1.1.0.3" ] - [ "ghc" "6.12.1" ] - [ "ghc-binary" "0.5.0.2" ] - [ "ghc-prim" "0.2.0.0" ] - [ "haskell98" "1.0.1.1" ] - [ "hpc" "0.5.0.4" ] - [ "integer-gmp" "0.2.0.0" ] - [ "old-locale" "1.0.0.2" ] - [ "old-time" "1.0.0.3" ] - [ "pretty" "1.0.1.1" ] - [ "process" "1.0.1.2" ] - [ "random" "1.0.0.2" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.2" ] - [ "template-haskell" "2.4.0.0" ] - [ "time" "1.1.4" ] - [ "unix" "2.4.0.0" ] - [ "utf8-string" "0.3.4" ] - ]; - }; } From 3f712f84489b262763538d367233400b39112d31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:32:26 +0100 Subject: [PATCH 120/947] ghc-6.10.4: cosmetic clean up --- pkgs/development/compilers/ghc/6.10.4.nix | 38 ++--------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 3c5a52c0c40..ee7ca20ddf7 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -5,16 +5,14 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; buildInputs = [ghc libedit perl gmp]; - configureFlags=[ + configureFlags = [ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-gcc=${stdenv.cc}/bin/gcc" @@ -23,38 +21,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; inherit (ghc.meta) license platforms; }; - - passthru = { - corePackages = [ - [ "Cabal" "1.6.0.3" ] - [ "array" "0.2.0.0" ] - [ "base" "3.0.3.1" ] - [ "base" "4.1.0.0" ] - [ "bytestring" "0.9.1.4" ] - [ "containers" "0.2.0.1" ] - [ "directory" "1.0.0.3" ] - [ "extensible-exceptions" "0.1.1.0" ] - [ "filepath" "1.1.0.2" ] - [ "ghc" "6.10.4" ] - [ "ghc-prim" "0.1.0.0" ] - [ "haddock" "2.4.2" ] - [ "haskell98" "1.0.1.0" ] - [ "hpc" "0.5.0.3" ] - [ "integer" "0.1.0.1" ] - [ "old-locale" "1.0.0.1" ] - [ "old-time" "1.0.0.2" ] - [ "packedstring" "0.1.0.1" ] - [ "pretty" "1.0.1.0" ] - [ "process" "1.0.1.1" ] - [ "random" "1.0.0.1" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.1" ] - [ "template-haskell" "2.3.0.1" ] - [ "unix" "2.3.2.0" ] - ]; - }; } From adb3e894b2c1c06c4f42aead4081e6a450cab9c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:07:41 +0100 Subject: [PATCH 121/947] configuration-common.nix: update comments for GLFW packages --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d6c8c89840..58614672491 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -282,7 +282,7 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # http://hydra.cryp.to/build/497379/log/raw + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 @@ -316,7 +316,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; + GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; From 3b8a7f2f70285b9037e2f411f9e1ad0b5a55f112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:09:20 +0100 Subject: [PATCH 122/947] haskell-amazonka does not compile with ghc-7.8.x. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 1 + 1 file changed, 1 insertion(+) 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 bd308b7f420..dc43d296ba3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -79,6 +79,7 @@ self: super: { tidal-midi = dontDistribute super.tidal-midi; # These packages need mtl 2.2.x directly or indirectly via dependencies. + amazonka = markBroken super.amazonka; apiary-purescript = markBroken super.apiary-purescript; clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; From a33042af5b11072393618caa9b55ab6658a46bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:16:39 +0100 Subject: [PATCH 123/947] haskell-al: jailbreal to fix build with c2hs 0.24.1 --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58614672491..f08bea73483 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,7 +58,8 @@ self: super: { }); # The package doesn't know about the AL include hierarchy. - al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; + # https://github.com/phaazon/al/issues/1 + al = doJailbreak (appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"); # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices; From da1617cb2b549cc71427bd7fc849dd4e4b5980c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:34:35 +0100 Subject: [PATCH 124/947] haskell-exceptions: update test suite issue link --- 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 f08bea73483..a0ea10ae4f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -502,7 +502,7 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/40 + # https://github.com/ekmett/exceptions/issues/42 exceptions = dontCheck super.exceptions; # https://github.com/NixOS/nixpkgs/issues/6350 From 53b66200271fce1cc2adf78de3a72dead9d9f04a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:36:48 +0100 Subject: [PATCH 125/947] haskell-hindent: upstream has fixed the test suite --- 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 a0ea10ae4f0..07fe3d5e747 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -422,9 +422,6 @@ self: super: { # Needs llvm to compile. bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm; - # https://github.com/chrisdone/hindent/issues/83 - hindent = dontCheck super.hindent; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; From 519e1cefeece3336075716852d6b91fec2436716 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:44:35 +0100 Subject: [PATCH 126/947] haskell-xcffib: upstream fix the build issue (but the test suite still fails) --- 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 07fe3d5e747..4966ca6d115 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -623,7 +623,7 @@ self: super: { blip = markBroken super.blip; # https://github.com/tych0/xcffib/issues/37 - xcffib = markBroken super.xcffib; + xcffib = dontCheck super.xcffib; } // { From 9370137501654d9cabf764265b53a06cce609307 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:55:25 +0100 Subject: [PATCH 127/947] hackage-packages.nix: re-generate from Hackage 2015-03-14T14:55:25+0100 --- .../haskell-modules/hackage-packages.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38f1825bc86..6b39849d1f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17211,8 +17211,8 @@ self: { ({ mkDerivation, base, c2hs, openal }: mkDerivation { pname = "al"; - version = "0.1.1.2"; - sha256 = "0cb6vvjc23nb7qfdkyc7g197rgb7shjyxv6q5kd9jdxr3rl1apf4"; + version = "0.1.1.3"; + sha256 = "09ppkvzkka3c5hiawkz7lcrwp6sa8bhbg10m9hfp9rk4g9339czy"; buildDepends = [ base ]; buildTools = [ c2hs ]; extraLibraries = [ openal ]; @@ -25338,18 +25338,12 @@ self: { }) {}; "boundingboxes" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, random - , test-framework, test-framework-quickcheck2, test-framework-th - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "boundingboxes"; - version = "0.2.2"; - sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx"; + version = "0.2.3"; + sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; buildDepends = [ base lens ]; - testDepends = [ - base lens linear QuickCheck random test-framework - test-framework-quickcheck2 test-framework-th - ]; homepage = "https://github.com/fumieval/boundingboxes"; description = "A generic boundingbox for an arbitrary vector"; license = stdenv.lib.licenses.bsd3; @@ -41861,14 +41855,14 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.0.0"; - sha256 = "1957jq0fv3migj9807ifa0iws8x8ysxz0a6mhrvblvz0dl175vr6"; - buildDepends = [ base vector ]; + version = "1.1.2"; + sha256 = "1ingg4mdhd9h25as5i4w16g2v47msy4r1f9winijsnw1043f8ayr"; + buildDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; - description = "Haskel binding for Eigen library"; + description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; }) {}; From a996d94d6b295cf5eb71fd5db70076ac7e8c151b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:56:48 +0100 Subject: [PATCH 128/947] haskell-al: upstream has fixed the build --- 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 4966ca6d115..859e7ea8fb9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -59,7 +59,7 @@ self: super: { # The package doesn't know about the AL include hierarchy. # https://github.com/phaazon/al/issues/1 - al = doJailbreak (appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"); + al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices; From 46f2aab0a5951482e6edebaca1343668e8d511b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:57:41 +0100 Subject: [PATCH 129/947] haskell-boundingboxes: upstream has fixed the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 859e7ea8fb9..b1f5075bcb1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -286,7 +286,6 @@ self: super: { bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; - boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw From d8d4972544e7d3af275a337e125512f1ac0fed50 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 15 Mar 2015 14:42:40 +0100 Subject: [PATCH 130/947] xmlto: update from 0.0.25 to 0.0.26 --- pkgs/tools/typesetting/xmlto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index a1eee51b34d..49fe7dc681f 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -3,10 +3,10 @@ , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.25"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0dp5nxq491gymq806za0dk4hngfmq65ysrqbn0ypajqbbl6vf71n"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' From a2c488e6c05d3dfc9b3a83ba9b6adc1eb5470866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 14:42:22 +0100 Subject: [PATCH 131/947] digiKam: fix gphoto camera support --- pkgs/applications/graphics/digikam/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2551a985312..123453ee40b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, +lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, libusb1, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, shared_desktop_ontologies, marble, mysql, libpgf }: @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + enableParallelBuilding = true; meta = { From 849df05f6c6651140a18f7893b225ad37a84a447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 14:55:32 +0100 Subject: [PATCH 132/947] digiKam: tidy up, and add myself to the maintainers --- .../applications/graphics/digikam/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 123453ee40b..5ace07f827b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, libusb1, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, mysql, libpgf }: +{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake +, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff +, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 +, qimageblitz, qjson, qt4, soprano +}: stdenv.mkDerivation rec { name = "digikam-4.6.0"; @@ -13,22 +15,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ]; + buildInputs = [ + boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun + libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf + libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; # Make digikam find some FindXXXX.cmake 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"; enableParallelBuilding = true; meta = { description = "Photo Management Program"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; inherit (kdelibs.meta) platforms; }; } From d6e0169c6f2d7ea040e61c41cbaa8f5d074f6b2b Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sun, 15 Mar 2015 09:59:41 -0400 Subject: [PATCH 133/947] Add Sqitch database management tool --- .../development/tools/misc/sqitch/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ pkgs/top-level/perl-packages.nix | 5 +++++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/sqitch/default.nix diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix new file mode 100644 index 00000000000..dcf0710c5d3 --- /dev/null +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -0,0 +1,21 @@ +{ stdenv, writeScript, makeWrapper, sqitchModule }: +stdenv.mkDerivation rec { + name = "sqitch-0.999"; + buildInputs = [ makeWrapper ]; + propagatedNativeBuildInputs = [ sqitchModule ]; + builder = writeScript (name + "-builder.sh") '' + . ${stdenv}/setup + mkdir -p $out/bin + cp ${sqitchModule}/bin/sqitch $out/bin + fixupPhase + wrapProgram $out/bin/sqitch \ + --prefix PERL5LIB : \ + "$(for i in "$propagatedNativeBuildInputs" ; do + for j in $(cat $i/nix-support/propagated-native-build-inputs) ; do + echo -n "$j"/lib/perl5/site_perl: + done + done + echo "$propagatedNativeBuildInputs"/lib/perl5/site_perl + )" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01976f84cd..1c0c012ba93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7816,6 +7816,11 @@ let planetary_annihilation = callPackage ../games/planetaryannihilation { }; + sqitch = callPackage ../development/tools/misc/sqitch { + inherit stdenv writeScript makeWrapper ; + sqitchModule = perlPackages.AppSqitch; + }; + ### DEVELOPMENT / PYTHON MODULES # python function with default python interpreter diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ab01e9b1f48..23077aed55a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -235,6 +235,11 @@ let self = _self // overrides; _self = with self; { IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI URIdb libintlperl namespaceautoclean + strictures ModuleRuntime DevelGlobalDestruction SubExporterProgressive + ImportInto ExporterTiny DataOptList ParamsUtil SubInstall RoleTiny + MooXTypesMooseLike ClassLoad ModuleImplementation ClassLoadXS + BHooksEndOfScope namespaceclean PackageStash SubIdentify + ClassMethodModifiers ]; doCheck = false; # Can't find home directory. meta = { From d73e5d6fbceb8fb7cc055aacf421d955b417c754 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Sun, 15 Mar 2015 11:06:01 -0400 Subject: [PATCH 134/947] Handle Sqitch manual --- pkgs/development/tools/misc/sqitch/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index dcf0710c5d3..bef21abc0f0 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -6,7 +6,9 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder.sh") '' . ${stdenv}/setup mkdir -p $out/bin - cp ${sqitchModule}/bin/sqitch $out/bin + for d in bin/sqitch etc lib share ; do + ln -s ${sqitchModule}/$d $out/$d + done fixupPhase wrapProgram $out/bin/sqitch \ --prefix PERL5LIB : \ From 6fa7dcfe242ef8a12f0425e7610f1b978a6d1e15 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sun, 15 Mar 2015 18:04:06 +0000 Subject: [PATCH 135/947] ipv6calc: Update SHA Upstream seems to have overwritten the tarball therefore changing the SHA sum. --- pkgs/tools/networking/ipv6calc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 23c484e9479..6dcb6e7f317 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd"; + sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; buildInputs = [ geoip getopt openssl perl ]; From dec05e9b285da308beaae85d063ba5c789b25895 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 15 Mar 2015 14:00:54 -0700 Subject: [PATCH 136/947] mesos-dns: Update to newer commit Notable upstream changes: - Support for multiple ports per task - Records generated for mesos master nodes - SRV records resolve to hostnames rather than IPs - Query handling is now properly case-insensitive - Better AAAA record handling --- pkgs/servers/dns/mesos-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix index 5b7d96c14cf..bf672aa89d8 100644 --- a/pkgs/servers/dns/mesos-dns/default.nix +++ b/pkgs/servers/dns/mesos-dns/default.nix @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mesosphere"; repo = "mesos-dns"; - rev = "29940029d4b0c17142373c3280a8b452722b665b"; - sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n"; + rev = "f37051fc5a723eb021797e7d57d92755c011a28e"; + sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15"; }; # Avoid including the benchmarking test helper in the output: From eee31a2c979b59de6ac966f74ef2530a8f962e65 Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Sun, 15 Mar 2015 23:03:14 +0100 Subject: [PATCH 137/947] Update sqlite to 3.8.8.3 --- pkgs/development/libraries/sqlite/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 32118e182ac..98a71993253 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.7.4"; + name = "sqlite-3.8.8.3"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz"; - sha1 = "70ca0b8884a6b145b7f777724670566e2b4f3cde"; + url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz"; + sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco np ]; }; } From 511f95fee01a91acd9d6d5fde780eb48b9062900 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:26:19 +0100 Subject: [PATCH 138/947] Add deferred derivation --- pkgs/top-level/emacs-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 331cde10f35..fc423ffe5d9 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -263,6 +263,29 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + deferred = melpaBuild rec { + version = "0.3.2"; + pname = "deferred"; + + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-${pname}"; + rev = "896d4b53210289afe489e1ee7db4e12cb9248109"; + sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0"; + }; + + meta = { + description = "Simple asynchronous functions for emacs-lisp"; + longDescription = '' + deferred.el provides facilities to manage asynchronous tasks. + The API and implementations were translated from JSDeferred (by cho45) + and Mochikit.Async (by Bob Ippolito) in JavaScript. + ''; + homepage = https://github.com/kiwanami/emacs-deferred; + license = gpl3Plus; + }; + }; + diminish = melpaBuild rec { pname = "diminish"; version = "0.44"; From d7bda5c580a32c61669d81321454c15db0eead78 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:26:43 +0100 Subject: [PATCH 139/947] Add request derivation --- pkgs/top-level/emacs-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index fc423ffe5d9..ea390cfbfe3 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -719,6 +719,31 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + request = melpaBuild rec { + pname = "request"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-${pname}"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; From 79f368928908e8f6bd28ab1e94ae5fe45b762586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 23:35:33 +0100 Subject: [PATCH 140/947] Blender: enable blenderplayer --- pkgs/applications/misc/blender/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3a86c282193..27eced335dc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" + "-DWITH_PLAYER=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" From c3f489446de442fe7013901d707d8790e77d1330 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:56:36 +0100 Subject: [PATCH 141/947] Add request-deferred derivation --- pkgs/top-level/emacs-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ea390cfbfe3..25d682a7b61 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -744,6 +744,33 @@ let self = _self // overrides; }; }; + request-deferred = melpaBuild rec { + pname = "request-deferred"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-request"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + packageRequires = [ request deferred ]; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; From d8072196bd8af2b13b5e679c24d684f708d92d61 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:56:47 +0100 Subject: [PATCH 142/947] Add org-trello derivation --- pkgs/top-level/emacs-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 25d682a7b61..035ba621186 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -681,6 +681,28 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + org-trello = melpaBuild rec { + pname = "org-trello"; + version = "0.6.9.2"; + src = fetchFromGitHub { + owner = "org-trello"; + repo = pname; + rev = "5656f32d3624b3c82014658aef88ffa47c0fca7b"; + sha256 = "0781prmxbx3lmylma63vw80rix7dmhy8861jz4cbqmkfid6d3x73"; + }; + packageRequires = [ request-deferred deferred dash s ]; + files = [ "org-trello-*.el" ]; + meta = { + description = "Org minor mode - 2-way sync org & trello"; + longDescription = '' + Org-trello is an emacs minor mode that extends org-mode with + Trello abilities. + ''; + homepage = https://org-trello.github.io; + license = gpl3Plus; + }; + }; + pkg-info = melpaBuild rec { pname = "pkg-info"; version = "20140610"; From 7e94f7943300cd292d0ad1f45406807b208a0e10 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 15 Mar 2015 18:57:44 -0400 Subject: [PATCH 143/947] hs-mesos: fix build mesos was propagating the wrong protobuf version, and the cabal file referenced some impure paths. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cd77d8ef2df..41dc6ef911f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -199,6 +199,12 @@ self: super: { # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + # Upstream notified by e-mail. permutation = dontCheck super.permutation; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813179e7df..99134afdad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4449,7 +4449,7 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; }; mesos-dns = callPackage ../servers/dns/mesos-dns { }; From 77c40224d206842d0ccc9aff3113977fc2e73b96 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 16 Mar 2015 00:07:00 +0000 Subject: [PATCH 144/947] snort: 2.9.7.0 -> 2.9.7.2 This includes a slight refactor. 2014-11-24 - Snort 2.9.7.2 [*] New additions * Application Identification Preprocessor, when used in conjunction with open app ID detector content, that will identify application protocol, client, server, and web applications (including those using SSL) and include the info in Snort alert data. In addition, a new rule option keyword 'appid' that can be used to constrain Snort rules based on one or more applications that are identified for the connection. See README.appid for details. * A new protected_content rule option that is used to match against a content that is hashed. It can be used to obscure the full context of the rule from the administrator. * Protocol Aware Flushing (PAF) improvements for SMTP, POP, and IMAP to more accurately process different portions of email messages and file attachments. * Added ability to test normalization behavior without modifying network traffic. When configured using na_policy_mode:inline-test, statistics will be gathered on packet normalizations that would have occurred, allowing less disruptive testing of inline deployments. * The HTTP Inspection preprocessor now has the ability to decompress DEFLATE and LZMA compressed flash content and DEFLATE compressed PDF content from http responses when configured with the new decompress_swf and decompress_pdf options. This enhancement can be used with existing rule options that already match against decompressed equivalents. * Added improved XFF support to HttpInspect. It is now possible to specify custom HTTP headers to use in place of 'X-Fowarded-For'. In situations where traffic may contain multiple XFF-like headers, it is possible to specify which headers hold precedence. * Added control socket command to dump packets. * The Stream5 preprocessor functionality is now split between the new Session and Stream preprocessors. * Added decoding capaiblity for Cisco FabricPath [*] Improvements * Update active response to allow for responses of 1500+ bytes that span multiple TCP packets. * Check limits of multiple configurations to not exceed a maximum ID of 4095. * Updated the error output of byte_test, byte_jump, byte_extract to including details on offending options for a given rule. * Update build and install scripts to install preprocessor and engine libraries into user specified libdir. * Improved performance of IP Reputation preprocessor. * The control socket will now report success when reloading empty IP Reputation whitelists/blacklists. * All TCP normalizations can now be enabled individually. See README.normalize for details on using the new options. For consistency with other options, the "urp" tcp normalization keyword now enables the normalization instead of disabling it. * Lowered memory demand of Unicode -> ASCII mapping in HttpInspect. * Updated profiler output to remove duplicate results when using multiple configurations. * Improved performance of FTP reassembly. --- pkgs/applications/networking/ids/snort/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3f99094ffd4..257b676686b 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.7.0"; + version = "2.9.7.2"; + name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; + sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; From 6a8a739d689c1e8fd6699edda2cc7bd7d2cf3062 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 16 Mar 2015 00:32:16 +0000 Subject: [PATCH 145/947] gnupg21: Add texinfo as a dependency This adds texinfo as a dependency, without which the build will fail. --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index cebb61e62d5..db71408d12d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo , pcsclite }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 - autoreconfHook gettext + autoreconfHook gettext texinfo ]; configureFlags = From 6e45fb5a55d4e1623d12ee7aabc5232dc06de670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:14:50 +0100 Subject: [PATCH 146/947] planetaryannihilation: fix build --- pkgs/games/planetaryannihilation/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bbf12065cc7..a94f388b322 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -29,13 +29,12 @@ stdenv.mkDerivation { cp -R * $out/ mv $out/*.so $out/lib - rm $out/libstdc++.so.6 ln -s $out/PA $out/bin/PA ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" From bd35fa526b27a7a2abb943d0521477e3ee6be2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:42:12 +0100 Subject: [PATCH 147/947] add cbatticon --- pkgs/applications/misc/cbatticon/default.nix | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/cbatticon/default.nix diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix new file mode 100644 index 00000000000..78cd08e212c --- /dev/null +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "cbatticon-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/valr/cbatticon/archive/${version}.zip"; + sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ gtk libnotify unzip glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A lightweight and fast battery icon that sits in your system tray"; + homepage = https://github.com/valr/cbatticon; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} From c8016e5b31bbbda48c43ba558a1f55099a97352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:44:22 +0100 Subject: [PATCH 148/947] batti: mark as broken --- pkgs/applications/misc/batti/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 9bf481189e3..a2b3c15f044 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2170fe62c93..b5cfc40c000 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9837,6 +9837,8 @@ let batti = callPackage ../applications/misc/batti { }; + cbatticon = callPackage ../applications/misc/cbatticon { }; + bazaar = callPackage ../applications/version-management/bazaar { }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { From e9cd877921cc4164aa0ba57ae1fd7526ec6440c3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 8 Mar 2015 21:35:04 +0100 Subject: [PATCH 149/947] nixos: resolve uid/gid conflicts This patch resolves all uid/gid conflicts except for nobody/nogroup (seems to make sense that these are the same). All conflicts where determined mechanically, but resolutions were manual. This patch also marks uids/gids with no corresponding group/user as "unused" (aka. reserved). Briefly, - tss group conflicts with dhcpcd The tss group id conflicts with dhcpcd: assign a new number and add a corresponding tss user. - elasticsearch uid conflicts with haproxy gid - resolve firebird/munin conflict - fix fourstorehttp{,d} typo - fix ghostOne typo: the service module refers to gids.ghostone, so use that in ids - memcached uid conflicts with users gid - nagios uid conflicts with disks gid - nscd uid conflicts with wheel gid - ntp uid conflicts with tty gid - resolve postfix/postdrop id uid - redis uid conflicts with keys gid - sshd uid conflicts with kmem gid - tcryptd uid conflicts with openldap gid - unifi uid conflicts with docker gid - uptimed uid conflicts with utmp gid - zope2 uid conflicts with connman gid - tomcat uid/gid mismatch --- nixos/modules/misc/ids.nix | 113 ++++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 19 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 158609dcf79..eec2f1bb6f6 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -27,28 +27,38 @@ ids.uids = { root = 0; - nscd = 1; - sshd = 2; - ntp = 3; + #wheel = 1; # unused + #kmem = 2; # unused + #tty = 3; # unused messagebus = 4; # D-Bus haldaemon = 5; - nagios = 6; + #disk = 6; # unused vsftpd = 7; ftp = 8; bitlbee = 9; avahi = 10; + nagios = 11; atd = 12; - zabbix = 13; - postfix = 14; + postfix = 13; + #postdrop = 14; # unused dovecot = 15; tomcat = 16; + #audio = 17; # unused + #floppy = 18; # unused + #uucp = 19; # unused + #lp = 20; # unused pulseaudio = 22; # must match `pulseaudio' GID gpsd = 23; + #cdrom = 24; # unused + #tape = 25; # unused + #video = 26; # unused + #dialout = 27; # unused polkituser = 28; - uptimed = 29; + #utmp = 29; # unused ddclient = 30; davfs2 = 31; privoxy = 32; + #disnix = 33; # unused osgi = 34; tor = 35; cups = 36; @@ -70,18 +80,25 @@ fprot = 52; bind = 53; wwwrun = 54; + #adm = 55; # unused spamd = 56; + #networkmanager = 57; # unused nslcd = 58; + #scanner = 59; # unused nginx = 60; chrony = 61; + #systemd-journal = 62; # unused smtpd = 63; smtpq = 64; supybot = 65; iodined = 66; + #libvirtd = 67; # unused graphite = 68; statsd = 69; transmission = 70; postgres = 71; + #vboxusers = 72; # unused + #vboxsf = 73; # unused smbguest = 74; # unused varnish = 75; datadog = 76; @@ -102,13 +119,13 @@ minidlna = 91; elasticsearch = 92; tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. - zope2 = 94; + #connman = 94; # unused firebird = 95; - redis = 96; + #keys = 96; # unused haproxy = 97; mongodb = 98; openldap = 99; - memcached = 100; + #users = 100; # unused cgminer = 101; munin = 102; logcheck = 103; @@ -129,6 +146,7 @@ foundationdb = 118; newrelic = 119; starbound = 120; + #grsecurity = 121; # unused hydra = 122; spiped = 123; teamspeak = 124; @@ -138,7 +156,7 @@ znc = 128; polipo = 129; mopidy = 130; - unifi = 131; + #docker = 131; # unused gdm = 132; dhcpd = 133; siproxd = 134; @@ -180,7 +198,19 @@ panamax = 170; marathon = 171; exim = 172; + #fleet = 173; # unused + #input = 174; # unused sddm = 175; + tss = 176; + memcached = 177; + nscd = 178; + ntp = 179; + zabbix = 180; + redis = 181; + sshd = 182; + unifi = 183; + uptimed = 184; + zope2 = 185; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -200,15 +230,16 @@ ftp = 8; bitlbee = 9; avahi = 10; + #nagios = 11; # unused atd = 12; postfix = 13; postdrop = 14; dovecot = 15; + tomcat = 16; audio = 17; floppy = 18; uucp = 19; lp = 20; - tomcat = 21; pulseaudio = 22; # must match `pulseaudio' UID gpsd = 23; cdrom = 24; @@ -217,21 +248,30 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; + #ddclient = 30; # unused davfs2 = 31; privoxy = 32; disnix = 33; osgi = 34; tor = 35; - ghostOne = 40; + #cups = 36; # unused + #foldingathome = 37; # unused + #sabnzd = 38; # unused + #kdm = 39; # unused + ghostone = 40; git = 41; fourstore = 42; - fourstorehttpd = 43; + fourstorehttp = 43; virtuoso = 44; + #rtkit = 45; # unused dovecot2 = 46; + #dovenull = 47; # unused + #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; fprot = 52; + #bind = 53; # unused wwwrun = 54; adm = 55; spamd = 56; @@ -239,6 +279,7 @@ nslcd = 58; scanner = 59; nginx = 60; + #chrony = 61; # unused systemd-journal = 62; smtpd = 63; smtpq = 64; @@ -246,6 +287,7 @@ iodined = 66; libvirtd = 67; graphite = 68; + #statsd = 69; # unused transmission = 70; postgres = 71; vboxusers = 72; @@ -268,11 +310,17 @@ quassel = 89; amule = 90; minidlna = 91; - haproxy = 92; - openldap = 93; + #elasticsearch = 92; # unused + #tcpcryptd = 93; # unused connman = 94; - munin = 95; + firebird = 95; keys = 96; + haproxy = 97; + #mongodb = 98; # unused + openldap = 99; + munin = 102; + #logcheck = 103; # unused + #nix-ssh = 104; # unused dictd = 105; couchdb = 106; searx = 107; @@ -280,8 +328,12 @@ jenkins = 109; systemd-journal-gateway = 110; notbit = 111; + #ngircd = 112; # unused btsync = 113; + #minecraft = 114; # unused monetdb = 115; + #ripped = 116; # unused + #murmur = 117; # unused foundationdb = 118; newrelic = 119; starbound = 120; @@ -291,39 +343,62 @@ teamspeak = 124; influxdb = 125; nsd = 126; - firebird = 127; + #gitolite = 127; # unused znc = 128; polipo = 129; mopidy = 130; docker = 131; gdm = 132; - tss = 133; + #dhcpcd = 133; # unused siproxd = 134; mlmmj = 135; + #neo4j = 136; # unused riemann = 137; riemanndash = 138; + #radvd = 139; # unused + #zookeeper = 140; # unused + #dnsmasq = 141; # unused uhub = 142; + #yandexdisk = 143; # unused + #collectd = 144; # unused + #consul = 145; # unused mailpile = 146; redmine = 147; seeks = 148; prosody = 149; i2pd = 150; + #dnscrypt-proxy = 151; # unused systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; + #etcd = 156; # unused + #docker-registry = 157; # unused hbase = 158; opentsdb = 159; scollector = 160; bosun = 161; kubernetes = 162; + #peerflix = 163; # unused + #chronos = 164; # unused gitlab = 165; nylon = 168; panamax = 170; + #marathon = 171; # unused exim = 172; fleet = 173; input = 174; sddm = 175; + tss = 176; + #memcached = 177; # unused + #nscd = 178; # unused + #ntp = 179; # unused + #zabbix = 180; # unused + #redis = 181; # unused + #sshd = 182; # unused + #unifi = 183; # unused + #uptimed = 184; # unused + #zope2 = 185; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal From 3518b761ba2723970fa2744a31c9208e00e44bba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 8 Mar 2015 21:36:30 +0100 Subject: [PATCH 150/947] TCSD: use tss user/group instead of nginx For some reason TCSD is configured to use the nginx uid/gid. Use the newly created tss uid/gid instead. --- nixos/modules/services/hardware/tcsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d7f6c188feb..220b154bd97 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -128,12 +128,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; - uid = config.ids.uids.nginx; + uid = config.ids.uids.tss; }); users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; - gid = config.ids.gids.nginx; + gid = config.ids.gids.tss; }); }; } From 62d8b22931242ebd1ea88e0207f7b0f9bb3a4ba2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Mar 2015 11:02:07 +0100 Subject: [PATCH 151/947] hackage-packages.nix: re-generate from Hackage 2015-03-15T11:02:07+0100 --- .../haskell-modules/hackage-packages.nix | 242 +++++++++++++----- 1 file changed, 175 insertions(+), 67 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b39849d1f9..f93da206181 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -27507,18 +27507,15 @@ self: { }) {}; "calculator" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, parsec - , QuickCheck - }: + ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.2.2.0"; - sha256 = "18v58sgbx1g5bir0vwgbhfs347p95f36jw3fqj4nfzs5na0rrrvz"; + version = "0.3.0.1"; + sha256 = "067rnx1ixdnhqan2kwscqh6325ml523km7dg2apx1ksm51hl3gvc"; isLibrary = false; isExecutable = true; - buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; - testDepends = [ base containers mtl parsec QuickCheck ]; - jailbreak = true; + buildDepends = [ base containers haskeline parsec ]; + testDepends = [ base containers parsec QuickCheck ]; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; @@ -28039,8 +28036,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.1"; - sha256 = "1vza24ikj3ixryh2hf2xj28m1zjclqq9lsxp57pwzjx31djkb54s"; + version = "0.4.2.2"; + sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq ghc-prim text unordered-containers vector @@ -32107,8 +32104,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.0"; - sha256 = "1q4iq9wmiazv743gdypqc9797z1c0gdk1lzyzvlk4811ka263508"; + version = "1.1.7.1"; + sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -32603,6 +32600,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "context-free-grammar" = callPackage + ({ mkDerivation, array, base, containers, control-monad-omega + , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "context-free-grammar"; + version = "0.0.1"; + sha256 = "11xns7rfxb9s9adzkd2v1s46s8lay6yd32r83p63k96z570ccpj2"; + buildDepends = [ + array base containers control-monad-omega dlist mtl pretty + template-haskell + ]; + testDepends = [ + base containers HUnit pretty QuickCheck quickcheck-properties + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "http://github.com/nedervold/context-free-grammar"; + description = "Basic algorithms on context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -39756,6 +39778,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-zookeeper" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , distributed-process, distributed-process-monad-control + , enclosed-exceptions, hspec, hzk, lifted-base, monad-control, mtl + , network, network-transport, network-transport-tcp, transformers + }: + mkDerivation { + pname = "distributed-process-zookeeper"; + version = "0.2.0.0"; + sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers deepseq distributed-process hzk + mtl network network-transport network-transport-tcp transformers + ]; + testDepends = [ + base bytestring deepseq distributed-process + distributed-process-monad-control enclosed-exceptions hspec hzk + lifted-base monad-control network network-transport + network-transport-tcp transformers + ]; + jailbreak = true; + homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; + description = "A Zookeeper back-end for Cloud Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-static" = callPackage ({ mkDerivation, base, binary, bytestring, containers, rank1dynamic }: @@ -41858,9 +41908,10 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.1.2"; - sha256 = "1ingg4mdhd9h25as5i4w16g2v47msy4r1f9winijsnw1043f8ayr"; + version = "1.2.5"; + sha256 = "1xhi89zy0yf1p3xgjb07870mm9lrqpcrmikcs23kc3mhzwfjyd37"; buildDepends = [ base primitive vector ]; + testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -43736,12 +43787,12 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8.0.1"; - sha256 = "0qsbcmhr5ilmdw4wc3f316nsnrmhlqzrgdi15a6sv72nlk09kwsb"; + version = "0.8.0.2"; + sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"; buildDepends = [ base mtl stm transformers transformers-compat ]; testDepends = [ base mtl QuickCheck stm test-framework test-framework-quickcheck2 - transformers + transformers transformers-compat ]; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; @@ -46330,8 +46381,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.0.0"; - sha256 = "02sh7q9l874rbjdwj66grz0y0cbnd2wc5413x4mrvg095i8g9zww"; + version = "0.2.1.0"; + sha256 = "0lzn1wrqq7mnxlf8axb4nj90mq9c4w299dilp9k4s4s9lzag2gib"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -50304,8 +50355,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.4"; - sha256 = "0kv8yyxixhhiqbicyd1w1fmpv7szf5h5wxs8b57sf76hww7gq0fn"; + version = "0.7.3"; + sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -59892,19 +59943,19 @@ self: { }) {}; "hfoil" = callPackage - ({ mkDerivation, base, directory, gloss, haskeline, hmatrix, HTTP - , MissingH, transformers + ({ mkDerivation, base, directory, haskeline, hmatrix, HTTP, linear + , not-gloss, parsec, transformers }: mkDerivation { pname = "hfoil"; - version = "0.1.2"; - sha256 = "0q52xj7bajs8kn66cg7vfgbxp66nwnfl832csrz3bygi9vhv8kxw"; + version = "0.2.0"; + sha256 = "1749408l0abnh6d2dnh7dn30spp7798q862sfrr7kp8c1kcpx0wc"; isLibrary = true; isExecutable = true; buildDepends = [ - base directory gloss haskeline hmatrix HTTP MissingH transformers + base directory haskeline hmatrix HTTP linear not-gloss parsec + transformers ]; - jailbreak = true; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65117,6 +65168,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsilop" = callPackage + ({ mkDerivation, base, haskeline }: + mkDerivation { + pname = "hsilop"; + version = "0.1.0.0"; + sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base haskeline ]; + homepage = "https://github.com/Rnhmjoj/hsilop"; + description = "RPN calculator"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsimport" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre , filepath, haskell-src-exts, lens, mtl, split, tasty, tasty-golden @@ -73737,8 +73802,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.6"; - sha256 = "14r28h3pywv87ksnw65jid90v2d3s4lzxm0m7i6wvww5080z804a"; + version = "2.16.8"; + sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -75588,8 +75653,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.3"; - sha256 = "16v7740xi825n3wmzb9p9svvs88mi5j7m94xqhbb2vhrvsn96phn"; + version = "0.3.2.0"; + sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -77409,6 +77474,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lipsum-gen" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "lipsum-gen"; + version = "0.1.0.2"; + sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; + buildDepends = [ base QuickCheck ]; + description = "Generators for random sequences of English-like nonsense text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip @@ -85788,8 +85864,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.12.1"; - sha256 = "0nxd4rn4n87m5h3wi72rrm0bm7nx9b23bqsjbz3q05wi77cmg8c9"; + version = "0.12.2"; + sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; buildDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -86936,7 +87012,6 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -87798,10 +87873,9 @@ self: { ({ mkDerivation, base, contravariant, ghc-prim, transformers }: mkDerivation { pname = "one-liner"; - version = "0.5"; - sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; + version = "0.5.1"; + sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0"; buildDepends = [ base contravariant ghc-prim transformers ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -92178,6 +92252,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-gtk-ui" = callPackage + ({ mkDerivation, base, cairo, colour, fixed-vector, gtk, hmatrix + , plot, text, vector + }: + mkDerivation { + pname = "plot-gtk-ui"; + version = "0.0.3.0"; + sha256 = "12slwfhhrzjyscxbs5f8nqayqcbk1lh7b4cla419lbwixhbs3zbg"; + buildDepends = [ + base cairo colour fixed-vector gtk hmatrix plot text vector + ]; + homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; + description = "A quick way to use Mathematica like Manipulation abilities"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "plot-gtk3" = callPackage ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }: mkDerivation { @@ -96219,8 +96309,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.3"; - sha256 = "01bmh77cjcz7phl4fzn97hzjnjx3wicr12m7nrdyflw2zckxycwl"; + version = "0.4.2"; + sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s"; buildDepends = [ base containers parsec ]; testDepends = [ base Cabal containers hspec parsec QuickCheck ]; jailbreak = true; @@ -97285,8 +97375,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.3.0"; - sha256 = "0kyhvdpk6xr111yyd828f6sdfc4f7ayhdmwsyml6j4c7npxb1g6i"; + version = "0.3.1"; + sha256 = "11ddiz2i4rx0rydcm82j8gwf9zr26if78ij539hfdyi2zbvyri85"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -102228,17 +102318,18 @@ self: { "scroll" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, IfElse, monad-loops, mtl, ncurses - , optparse-applicative, random, text, vector + , optparse-applicative, random, text, unix, vector }: mkDerivation { pname = "scroll"; - version = "1.20150313"; - sha256 = "1q9zmdhqbz6w20fcf2gvv92ln7461b0ksr98a3kghqz3d7p5w0m3"; + version = "1.20150314"; + sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring case-insensitive containers data-default IfElse - monad-loops mtl ncurses optparse-applicative random text vector + monad-loops mtl ncurses optparse-applicative random text unix + vector ]; homepage = "https://joeyh.name/code/scroll/"; description = "scroll(6), a roguelike game"; @@ -104111,8 +104202,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.2"; - sha256 = "1njnmhs5y6nmmy8yrx87x98aqsjkivrsyxz01ybdjg0y7n5r1cva"; + version = "0.6.3"; + sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -104452,6 +104543,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signals" = callPackage + ({ mkDerivation, array, base, constraints, containers, data-reify + , exception-mtl, exception-transformers, language-c-quote + , mainland-pretty, mtl, operational + }: + mkDerivation { + pname = "signals"; + version = "0.0.0.1"; + sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2"; + buildDepends = [ + array base constraints containers data-reify exception-mtl + exception-transformers language-c-quote mainland-pretty mtl + operational + ]; + homepage = "https://github.com/markus-git/signals"; + description = "Stream Processing for Embedded Domain Specific Languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -104963,8 +105073,8 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.0"; - sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + version = "0.4.1"; + sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl parsec pretty ]; @@ -108601,8 +108711,8 @@ self: { }: mkDerivation { pname = "stable-tree"; - version = "0.6.1"; - sha256 = "02asd3qrnydmw70ibf2w2q6phkvrls1yvlrbwmwhqz839ry0jhyx"; + version = "0.7.0"; + sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110998,18 +111108,17 @@ self: { }: mkDerivation { pname = "syncthing-hs"; - version = "0.1.0.0"; - sha256 = "1yz37c01s2740idh5w8mvidjzd5fwy9sh2x2qdqivasg3c3kscic"; + version = "0.1.1.0"; + sha256 = "0377mykydnwdbwjbbfr56nrdh2c18ik5m9jj2wgw7qg2npnfyj2v"; buildDepends = [ aeson base bytestring connection containers either http-client http-client-tls lens old-locale regex-posix text time transformers unordered-containers wreq ]; testDepends = [ - aeson base bytestring connection containers derive either - http-client http-client-tls lens old-locale quickcheck-instances - regex-posix tasty tasty-hunit tasty-quickcheck text time - transformers unordered-containers wreq + aeson base bytestring containers derive either lens + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + transformers wreq ]; homepage = "https://github.com/jetho/syncthing-hs"; description = "Haskell bindings for the Syncthing REST API"; @@ -115583,21 +115692,20 @@ self: { }) {}; "tn" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , optparse-applicative, text, time + ({ mkDerivation, base, bytestring, containers, directory, process + , safe, text, time, yaml }: mkDerivation { pname = "tn"; - version = "0.2.0.0"; - sha256 = "0m402p4ik8z07dj08wm0jy6w82fzgmsrf1v4v2chg9qb505qigm4"; + version = "1.0.2"; + sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring optparse-applicative text time + base bytestring containers directory process safe text time yaml ]; - jailbreak = true; - description = "A journaling program for Linux"; - license = stdenv.lib.licenses.bsd3; + description = "A simple daily journal program"; + license = stdenv.lib.licenses.gpl3; }) {}; "tnet" = callPackage @@ -128014,8 +128122,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.0.1"; - sha256 = "10fj095za1ga7hv76g9gjcc9narp3bnpfb71vs3j3ldfihxk6syv"; + version = "0.5.0.2"; + sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; isLibrary = false; isExecutable = true; buildDepends = [ From 42ab5ea077f1a7b4ab2d36cc5007af69bb853000 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 12:54:30 +0100 Subject: [PATCH 152/947] hackage-packages: re-generate from Hackage 2015-03-16T12:54:30+0100 --- .../haskell-modules/hackage-packages.nix | 200 +++++++++++++----- 1 file changed, 142 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f93da206181..f1d5d43de05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12790,8 +12790,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.2"; - sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh"; + version = "0.3.3"; + sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr"; buildDepends = [ array base mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -20915,6 +20915,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "auto" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , profunctors, random, semigroups, transformers + }: + mkDerivation { + pname = "auto"; + version = "0.2.0.3"; + sha256 = "1aplwr8lgl3x0sskjwlp85zrqj13468r9ddn5rzbaqj4j3kbpvcx"; + buildDepends = [ + base bytestring cereal containers deepseq profunctors random + semigroups transformers + ]; + jailbreak = true; + homepage = "https://github.com/mstksg/auto"; + description = "Denotative, locally stateful programming DSL & platform"; + license = stdenv.lib.licenses.mit; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21597,8 +21615,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.2.5"; - sha256 = "0n5zc0k5fdpcljvrw38ma7x8q3dbqjbw98ji2mqb4rxbkqxz75jh"; + version = "0.3.1"; + sha256 = "13j69i6jmx4qibavr7rwwrnmabf7l5rqd8hs308n0xdnwmvfldbx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25471,12 +25489,12 @@ self: { }) {}; "broccoli" = callPackage - ({ mkDerivation, base, stm, time }: + ({ mkDerivation, base, containers, stm, time }: mkDerivation { pname = "broccoli"; - version = "0.3.0.0"; - sha256 = "0jdrly4xm2fdxr7vbqk4zhf3aya50m0gryrpnn0alc3kbrpbh8l6"; - buildDepends = [ base stm time ]; + version = "0.4.1.0"; + sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; + buildDepends = [ base containers stm time ]; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30557,6 +30575,18 @@ self: { license = "unknown"; }) {}; + "cmark" = callPackage + ({ mkDerivation, base, mtl, syb, text }: + mkDerivation { + pname = "cmark"; + version = "0.1.0.1"; + sha256 = "0js8hhl6j16yywq27rz4jcyibac7zwkkryjqfsdq6wapb3z0d4ad"; + buildDepends = [ base mtl syb text ]; + homepage = "https://github.com/jgm/commonmark-hs"; + description = "Haskell bindings to libcmark, CommonMark parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmath" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41872,18 +41902,23 @@ self: { }) {}; "ehs" = callPackage - ({ mkDerivation, base, dlist, haskell-src-meta, parsec - , template-haskell + ({ mkDerivation, base, bytestring, haskell-src-meta, parsec + , template-haskell, text, time, transformers }: mkDerivation { pname = "ehs"; - version = "0.1.0.1"; - sha256 = "1g1mq956jd9fnh17zzgpyfc4b8pc10iqfgmm691hskx6wf6lc641"; + version = "0.7.0"; + sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; + editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base dlist haskell-src-meta parsec template-haskell + base bytestring haskell-src-meta parsec template-haskell text time + transformers ]; + jailbreak = true; homepage = "http://github.com/minpou/ehs/"; - description = "embedded Haskell by using quasiquotes"; + description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; }) {}; @@ -41908,8 +41943,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.2.5"; - sha256 = "1xhi89zy0yf1p3xgjb07870mm9lrqpcrmikcs23kc3mhzwfjyd37"; + version = "2.0.1"; + sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; buildDepends = [ base primitive vector ]; testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; @@ -42849,11 +42884,11 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.1.0"; - sha256 = "1rlqb5wcqws0rz66cd704swmcx93617ai25hsx4ah45r18qs3qsh"; + version = "0.2.0"; + sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; - homepage = "http://example.com/"; + homepage = "https://supki.github.io/envparse"; description = "Parse environment variables"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -43426,18 +43461,15 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, conduit - , conduit-extra, directory, filepath, http-conduit, http-types - , network, process, regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, transformers + , utf8-string }: mkDerivation { pname = "eternal"; - version = "0.1.0"; - sha256 = "1ixxv6m9vj5ygry28c9zi3swhivl48r9cf4kj0r8yraqwv1givda"; + version = "0.1.1"; + sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9"; buildDepends = [ - base base-unicode-symbols bytestring conduit conduit-extra - directory filepath http-conduit http-types network process - regex-compat transformers utf8-string + base base-unicode-symbols transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43540,8 +43572,8 @@ self: { }: mkDerivation { pname = "euler"; - version = "0.7.0"; - sha256 = "0n3sngaa8zz7wlaqhk2lk7s0klcnq7p1vws9aic5mchrh24nm0sz"; + version = "0.8.0"; + sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; buildDepends = [ base ]; testDepends = [ base directory happy hlint hspec process regex-posix xml @@ -44972,6 +45004,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed-crawl" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection + , http-conduit, http-types, hxt, text, transformers + }: + mkDerivation { + pname = "feed-crawl"; + version = "0.1.0.0"; + sha256 = "1q68z0288sl4il2i2mm94b51xgfdzxvljralqd6rr650qbgbbbgy"; + buildDepends = [ + base bytestring conduit connection http-conduit http-types hxt text + transformers + ]; + homepage = "https://github.com/danchoi/feed-crawl"; + description = "Feed crawling utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -55700,8 +55749,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.3.1"; - sha256 = "1ybsdzm5lzx8zwf9dcw1f6sf29xk4j9whcs578d6fmif2ggm7gym"; + version = "1.2.3.2"; + sha256 = "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc"; buildDepends = [ base bytestring ghc-prim integer-gmp text ]; testDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -59948,8 +59997,8 @@ self: { }: mkDerivation { pname = "hfoil"; - version = "0.2.0"; - sha256 = "1749408l0abnh6d2dnh7dn30spp7798q862sfrr7kp8c1kcpx0wc"; + version = "0.2.0.1"; + sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61274,8 +61323,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "0.24"; - sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc"; + version = "0.24.1"; + sha256 = "0k09bdr3y975581mpqpmg4jynghl8v4j2386nzqprh0k6a602nv8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61370,8 +61419,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "0.24"; - sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns"; + version = "0.24.1"; + sha256 = "1clzy72f34b497hsjkfjpgkhmn0dl19an9j4r11mn2q8z06106nc"; buildDepends = [ array base blaze-markup bytestring cmdargs containers csv Decimal directory filepath HUnit mtl old-locale old-time parsec pretty-show @@ -61617,8 +61666,8 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.16.1.4"; - sha256 = "1bxhps1imw3iik0wvwa4x95kqa1qsm5jqwz16nalaclg2cynaaws"; + version = "0.16.1.5"; + sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq"; buildDepends = [ array base binary bytestring deepseq random split storable-complex vector @@ -61657,12 +61706,12 @@ self: { }) {}; "hmatrix-glpk" = callPackage - ({ mkDerivation, base, glpk, hmatrix }: + ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.4.0.2"; - sha256 = "0ixsybmhm3fiwb3kgxm0bgnbbxkgv0k42k8phd7k78mhhsd5jmng"; - buildDepends = [ base hmatrix ]; + version = "0.4.1.0"; + sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi"; + buildDepends = [ base containers hmatrix ]; extraLibraries = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; @@ -78290,8 +78339,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.9.3"; - sha256 = "1l07pi7lnwyk3y747f7bgr1200p6apyfn7bch5v30kh7dy0wyi8m"; + version = "0.10.0.1"; + sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -89185,14 +89234,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.1"; - sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq"; + version = "1.12.4.2"; + sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -91515,6 +91564,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pinboard" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , HsOpenSSL, http-streams, http-types, io-streams, mtl, old-locale + , random, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pinboard"; + version = "0.1"; + sha256 = "1zm2qad94dsdglqb79jphac81cff5sjyya8644nbsz10jl39y508"; + buildDepends = [ + aeson base bytestring containers either HsOpenSSL http-streams + http-types io-streams mtl old-locale random text time transformers + unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework , test-framework-quickcheck2, transformers @@ -109586,17 +109654,19 @@ self: { }) {}; "stomp-queue" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, mime, network, split - , stompl, time, utf8-string + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, mime, mtl, network-conduit-tls, split, stompl + , time, utf8-string }: mkDerivation { pname = "stomp-queue"; - version = "0.1.4"; - sha256 = "0qn6mnplwqzz05g1k8ib4q7ga6if2iw3y9a5yba61gn1ghhwhgl9"; + version = "0.2.0"; + sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr"; buildDepends = [ - attoparsec base bytestring mime network split stompl time - utf8-string + attoparsec base bytestring conduit conduit-extra mime mtl + network-conduit-tls split stompl time utf8-string ]; + jailbreak = true; homepage = "http://github.com/toschoo/mom"; description = "Stompl Client Library"; license = "LGPL"; @@ -113706,8 +113776,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.0.1"; - sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn"; + version = "0.8.0.2"; + sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -116014,6 +116084,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "touched" = callPackage + ({ mkDerivation, base, cmdargs, directory, process, time }: + mkDerivation { + pname = "touched"; + version = "0.1.0.3"; + sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base cmdargs directory process time ]; + jailbreak = true; + description = "Library (and cli) to execute a procedure on file change"; + license = stdenv.lib.licenses.mit; + }) {}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, containers , data-default-class, data-interval, deepseq, exceptions @@ -121442,8 +121526,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.2.7"; - sha256 = "158fycy2l6pahc0bb64vbadrs1xsw095f1m0d2802blb0h0z8ajn"; + version = "5.2.8"; + sha256 = "01wra0gfv94wbv0blrixix0bggjg9cg72axgg3r9brp7qmh1qv14"; isLibrary = true; isExecutable = true; buildDepends = [ From cd89c697984c31198b5918a7a017e32b1234aeab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Nov 2014 13:56:48 +0100 Subject: [PATCH 153/947] Switch default version of GNU Make to 4.1. --- 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 83459a53e02..302ba09b22a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4952,7 +4952,7 @@ let gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; - gnumake = gnumake382; + gnumake = gnumake41; gob2 = callPackage ../development/tools/misc/gob2 { }; From 9a971364ac68185e3aaec310396e5df017c0d42c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 16 Mar 2015 13:21:23 +0100 Subject: [PATCH 154/947] Patch gnome-control-center not to override VPN plugin paths. The network-manager vpn plugin configuration files contain the correct absolute paths to the plugin libraries in the store; however upstream (unsuccessfully) tries to find them in a predefined path. --- .../core/gnome-control-center/default.nix | 2 +- .../vpn_plugins_path.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index bcb49b6cafe..4a394b3b897 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./search_providers_dir.patch ]; + patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; meta = with stdenv.lib; { description = "Single sign-on framework for GNOME"; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch new file mode 100644 index 00000000000..e25105a303f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch @@ -0,0 +1,19 @@ +diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c +index 7dc23c2..fcb1384 100644 +--- a/panels/network/connection-editor/vpn-helpers.c ++++ b/panels/network/connection-editor/vpn-helpers.c +@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) + if (!so_path) + goto next; + +- /* Remove any path and extension components, then reconstruct path +- * to the SO in LIBDIR +- */ +- so_name = g_path_get_basename (so_path); +- g_free (so_path); +- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); +- g_free (so_name); +- + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " From 82ee506f43eb641bdca2a68ad1fa1bcc23d93ded Mon Sep 17 00:00:00 2001 From: Artyom Shalkhakov Date: Mon, 16 Mar 2015 19:58:55 +0600 Subject: [PATCH 155/947] Bump to ATS-0.2.12 --- pkgs/development/compilers/ats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 18fe0ffe204..002f34daa13 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats-${version}"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6"; + sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; }; # this is necessary because atxt files usually include some .hats files From 2479dc0c636995788301892b92c3c061477b4738 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 16 Mar 2015 15:39:52 +0100 Subject: [PATCH 156/947] add puredata-with-plugins: a wrapper for puredata, plus packages for the following plugins: cyclone helmholtz maxlib mrpeach puremapping timbreid zexy --- .../audio/pd-plugins/cyclone/default.nix | 41 +++++++++++++ .../audio/pd-plugins/helmholtz/default.nix | 42 +++++++++++++ .../audio/pd-plugins/maxlib/default.nix | 33 ++++++++++ .../audio/pd-plugins/mrpeach/default.nix | 60 +++++++++++++++++++ .../audio/pd-plugins/puremapping/default.nix | 30 ++++++++++ .../audio/pd-plugins/timbreid/default.nix | 35 +++++++++++ .../audio/pd-plugins/zexy/default.nix | 36 +++++++++++ pkgs/applications/audio/puredata/wrapper.nix | 23 +++++++ pkgs/top-level/all-packages.nix | 15 +++++ 9 files changed, 315 insertions(+) create mode 100644 pkgs/applications/audio/pd-plugins/cyclone/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/helmholtz/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/maxlib/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/mrpeach/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/puremapping/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/timbreid/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/zexy/default.nix create mode 100644 pkgs/applications/audio/puredata/wrapper.nix diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix new file mode 100644 index 00000000000..30bdd534d40 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "cyclone-${version}"; + version = "0.1-alpha55"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + }; + + buildInputs = [ puredata ]; + + /*unpackPhase = ''*/ + /*unzip $src*/ + /*'';*/ + + patchPhase = '' + for file in `grep -r -l g_canvas.h` + do + sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file + done + for file in `grep -r -l m_imp.h` + do + sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file + done + ''; + + installPhase = '' + mkdir -p $out/cyclone + cp -r bin/* $out/cyclone + ''; + + meta = { + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments."; + homepage = http://puredata.info/downloads/cyclone; + license = stdenv.lib.licenses.tcltk; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix new file mode 100644 index 00000000000..edc8aeb6eb0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "helmholtz"; + + src = fetchurl { + url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + name = "helmholtz.zip"; + sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv helmholtz~/src/helmholtz\~.cpp . + mv helmholtz~/src/Helmholtz.cpp . + mv helmholtz~/src/include/ . + mv helmholtz~/src/Makefile . + rm -rf helmholtz~/src/ + rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.dll + rm -rf __MACOSX + ''; + + patchPhase = '' + sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile + sed -i "s@-Wl@@g" Makefile + ''; + + installPhase = '' + cp -r helmholtz~/ $out/ + ''; + + meta = { + description = "time domain pitch tracker for Pure Data"; + homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix new file mode 100644 index 00000000000..0d8b2dd8e2e --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "maxlib-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + sed -i "s@/usr@$out@g" Makefile + ''; + + postInstall = '' + mv $out/local/lib/pd-externals/maxlib/ $out + rm -rf $out/local/ + ''; + + meta = { + description = "A library of non-tilde externals for puredata, by Miller Puckette."; + homepage = http://puredata.info/downloads/maxlib; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix new file mode 100644 index 00000000000..1d553231ded --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "mrpeach-${version}"; + version = "1.1"; + + # this was to only usable url I could find: + # - The main url changes hash: http://pure-data.cvs.sourceforge.net/viewvc/pure-data/externals/mrpeach/?view=tar + # - There are lot's of places where this SW is available as part of a big pkg: pd-extended, pd-l2ork + # - It's just 211K + + src = fetchurl { + url = "http://slackonly.com/pub/korgie/sources/pd_mrpeach-2011.10.21.tar.gz"; + sha256 = "12jqba3jsdrk20ib9wc2wiivki88ypcd4mkzgsri9siywbbz9w8x"; + }; + + buildInputs = [puredata ]; + + patchPhase = '' + for D in net osc + do + sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile + for i in ${puredata}/include/pd/*; do + ln -s $i $D/ + done + done + ''; + + buildPhase = '' + for D in net osc + do + cd $D + make + cd .. + done + ''; + + installPhase = '' + for D in net osc + do + cd $D + make install + cd .. + done + ''; + + fixupPhase = '' + mv $out/lib/pd-externals/net $out + mv $out/lib/pd-externals/osc $out + rm -rf $out/lib + ''; + + meta = { + description = "A collection of Pd objectclasses for OSC-messages."; + homepage = http://puredata.info/downloads/osc; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix new file mode 100644 index 00000000000..f7f1969fe27 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "puremapping"; + + src = fetchurl { + url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; + name = "puremapping"; + sha256 = "1ygzxsfj3rnzjkpmgi4wch810q8s5vm1gdam6a938hbbvamafgvc"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/puremapping + mv puremapping/ $out + ''; + + meta = { + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system."; + homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix new file mode 100644 index 00000000000..f8a25256bb0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "timbreid-${version}"; + + src = fetchurl { + url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; + sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv timbreID-0.6.0-src/tID/* . + rm -rf timbreID-0.6.0-src/tID/ + rm -rf timbreID-0.6.0-src/INSTALL.txt + ''; + + installPhase = '' + mkdir -p $out/ + cp -r *.pd $out/ + cp -r *.pd_linux $out/ + cp -r *.wav $out/ + ''; + + meta = { + description = "A collection of audio feature analysis externals for puredata"; + homepage = http://williambrent.conflations.com/pages/research.html; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix new file mode 100644 index 00000000000..89a0f8191df --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, automake, puredata }: + +stdenv.mkDerivation rec { + name = "zexy-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; + }; + + buildInputs = [ autoconf automake puredata ]; + + patchPhase = '' + cd src/ + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + patchShebangs + ./bootstrap.sh + ./configure --enable-lpt=no --prefix=$out + ''; + + postInstall = '' + mv $out/lib/pd/extra/zexy $out + rm -rf $out/lib + ''; + + meta = { + description = "the swiss army knife for puredata"; + homepage = http://puredata.info/downloads/zexy; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix new file mode 100644 index 00000000000..0a30037b226 --- /dev/null +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, buildEnv, puredata, makeWrapper, plugins }: + +let +puredataFlags = map (x: "-path ${x}/") plugins; +drv = buildEnv { + name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version; + + paths = [ puredata ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${puredata}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pd \ + --add-flags "${toString puredataFlags}" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dcabd9bb21..9e1882ab584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9993,6 +9993,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + d4x = callPackage ../applications/misc/d4x { }; darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { @@ -10659,6 +10661,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -11082,6 +11086,8 @@ let vaapiSupport = config.mpv.vaapiSupport or false; }; + mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; + mrxvt = callPackage ../applications/misc/mrxvt { }; mudlet = callPackage ../games/mudlet { @@ -11152,6 +11158,8 @@ let lua = lua5; }; + maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; + mupdf = callPackage ../applications/misc/mupdf { openjpeg = openjpeg_2_0_1; }; @@ -11337,6 +11345,9 @@ let pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; + puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + + puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -11741,6 +11752,8 @@ let gtk = gtk3; }; + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -12328,6 +12341,8 @@ let zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + girara = callPackage ../applications/misc/girara { gtk = gtk3; stdenv = overrideCC stdenv gcc49; From c843cebeda96bbf95a26f74a7c29061ac12014aa Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 16 Mar 2015 10:23:26 -0700 Subject: [PATCH 157/947] emacs-packages: add two themes --- pkgs/top-level/emacs-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 035ba621186..fb1ee300b35 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -666,6 +666,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + monokai-theme = melpaBuild rec { + pname = "monokai-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "oneKelvinSmith"; + repo = "monokai-emacs"; + rev = "v${version}"; + sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz"; + }; + meta = { license = gpl3Plus; }; + }; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; org-plus-contrib = melpaBuild rec { @@ -1016,4 +1028,17 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + zenburn-theme = melpaBuild rec { + pname = "zenburn-theme"; + version = "2.2"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "zenburn-emacs"; + rev = "v${version}"; + sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv"; + }; + meta = { license = gpl3Plus; }; + }; + + }; in self From 30ec369a9903e30eeac645dc259fcf66b0bf26b9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 16 Mar 2015 18:38:21 +0100 Subject: [PATCH 158/947] xine-ui: update from 0.99.7 to 0.99.9 --- pkgs/applications/video/xine-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 9307b9e1d1b..6ae4100c827 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.7"; + name = "xine-ui-0.99.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; + sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; nativeBuildInputs = [ pkgconfig shared_mime_info ]; From 46658b8a19e30b2c0bce5571a541b886bb44d05f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 16 Mar 2015 19:34:36 +0100 Subject: [PATCH 159/947] Punctuation and capitalisation. --- pkgs/applications/audio/pd-plugins/cyclone/default.nix | 6 +----- pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 2 +- pkgs/applications/audio/pd-plugins/maxlib/default.nix | 2 +- pkgs/applications/audio/pd-plugins/mrpeach/default.nix | 2 +- pkgs/applications/audio/pd-plugins/puremapping/default.nix | 2 +- pkgs/applications/audio/pd-plugins/zexy/default.nix | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 30bdd534d40..b90c6a0ea36 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ puredata ]; - /*unpackPhase = ''*/ - /*unzip $src*/ - /*'';*/ - patchPhase = '' for file in `grep -r -l g_canvas.h` do @@ -32,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments."; + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = http://puredata.info/downloads/cyclone; license = stdenv.lib.licenses.tcltk; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index edc8aeb6eb0..9046ec0a87f 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "time domain pitch tracker for Pure Data"; + description = "Time domain pitch tracker for Pure Data"; homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 0d8b2dd8e2e..dc4d0375961 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library of non-tilde externals for puredata, by Miller Puckette."; + description = "A library of non-tilde externals for puredata, by Miller Puckette"; homepage = http://puredata.info/downloads/maxlib; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 1d553231ded..5f76b208e14 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A collection of Pd objectclasses for OSC-messages."; + description = "A collection of Pd objectclasses for OSC-messages"; homepage = http://puredata.info/downloads/osc; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index f7f1969fe27..fc7fc5ee3d0 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system."; + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; license = stdenv.lib.licenses.gpl1; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 89a0f8191df..68996e9e6e4 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "the swiss army knife for puredata"; + description = "The swiss army knife for puredata"; homepage = http://puredata.info/downloads/zexy; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; From 5f3a2cb0d1c364c8ab970047d96d8b0e19209154 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:36:40 +0100 Subject: [PATCH 160/947] rustc: Re-enable parallel building --- pkgs/development/compilers/rustc/makeRustcDerivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 0059fd82227..913e65de59a 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; - enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 + enableParallelBuilding = true; preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; From 01d1ec25f744eb6d7a12a6f1149321aa3688b2aa Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 16 Mar 2015 18:42:15 +0100 Subject: [PATCH 161/947] rustc: Fix test failure due to hardcoded path to /home --- .../compilers/rustc/patches/alpha2.patch | 11 ++++++++++ .../compilers/rustc/patches/head.patch | 21 ++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/alpha2.patch index 8c15af5aca9..8165a42cf85 100644 --- a/pkgs/development/compilers/rustc/patches/alpha2.patch +++ b/pkgs/development/compilers/rustc/patches/alpha2.patch @@ -42,3 +42,14 @@ index ef849bb..e090b99 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index a0ecdaeb049..f82f85fb162 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -15,11 +15,11 @@ index ca59b1c..65ee7bf 100755 # do not fail if one of the above fails, as all we need is a working rustc! exit 0 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index 6bf7453..319f9af 100644 +index ed44bf8..2b84627 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs -@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, - paths: &[&Path]) -> ProcessOutput { +@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, + paths: &[&Path]) -> Output { let ar = match *maybe_ar_prog { Some(ref ar) => &ar[..], - None => "ar" @@ -28,10 +28,10 @@ index 6bf7453..319f9af 100644 let mut cmd = Command::new(ar); diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index ea5001a..911445c 100644 +index 3087a8e..578448f 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -350,8 +350,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri +@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -42,3 +42,14 @@ index ea5001a..911445c 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } From f41f7a0bb9a0ce5f728302f72e3438b7f373d26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Mar 2015 21:27:37 +0100 Subject: [PATCH 162/947] ddccontrol*: cleanup - remove doubled file for ddccontrol-db - adding stdenv to buildInputs is pointless - fix doubled http:// - whitespace, etc. --- pkgs/data/misc/ddccontrol-db/default.nix | 5 ++- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 37 -------------------- pkgs/tools/misc/ddccontrol/default.nix | 15 ++++---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 199ed5b7eb0..3757b10754b 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { }; buildInputs = [ - stdenv perl perlPackages.libxml_perl libxml2 @@ -29,9 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = "http://http://ddccontrol.sourceforge.net/"; + homepage = "http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix deleted file mode 100644 index 199ed5b7eb0..00000000000 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, fetchurl -, perl -, perlPackages -, libxml2 -, pciutils -, pkgconfig -, gtk -}: - -let version = "20061014"; in -let verName = "${version}"; in -stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; - }; - buildInputs = - [ - stdenv - perl - perlPackages.libxml_perl - libxml2 - pciutils - pkgconfig - gtk - ]; - - meta = with stdenv.lib; { - description = "Monitor database for DDCcontrol"; - homepage = "http://http://ddccontrol.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; - }; -} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 3da2a14f4c7..2d5d10054b5 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -14,15 +14,14 @@ }: let version = "0.4.2"; in -let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-${verName}"; + name = "ddccontrol-${version}"; src = fetchurl { url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; }; buildInputs = - [ stdenv + [ intltool libtool autoconf @@ -35,25 +34,25 @@ stdenv.mkDerivation { gtk ddccontrol-db ]; - + prePatch = '' newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") mv configure.ac configure.ac.old oldPath="\$" oldPath+="{datadir}\/ddccontrol-db" sed "s/$oldPath/$newPath/" configure.ac - rm configure.ac.old + rm configure.ac.old ''; preConfigure = '' autoreconf --install ''; - + meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = "http://http://ddccontrol.sourceforge.net/"; + homepage = "http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } - \ No newline at end of file + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfbef1ac006..8df7d40e0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1010,7 +1010,7 @@ let ddccontrol = callPackage ../tools/misc/ddccontrol { }; ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; - + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; From eaa362db6e688954fbe934db532da473c2c6550c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Mar 2015 16:39:22 +0100 Subject: [PATCH 163/947] libiconv: cleanup - no more double callPackage --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dcabd9bb21..fc5f92a851d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1399,7 +1399,6 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { - libiconv = libiconvOrLibc; ruby = ruby_2_1_3; }; @@ -6427,10 +6426,7 @@ let # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = - if stdenv.isGlibc - then stdenv.cc.libc - else callPackage ../development/libraries/libiconv { }; + libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; libiconvReal = callPackage ../development/libraries/libiconv { }; From 8f5f0472868c656b697d704c68033370b1d92c71 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Mon, 16 Mar 2015 21:57:51 +0000 Subject: [PATCH 164/947] Added GNU APL, a free APL interpreter. It is an almost complete implementation of ISO 13751: Programming Language APL, Extended. --- .../interpreters/gnu-apl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/interpreters/gnu-apl/default.nix diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix new file mode 100644 index 00000000000..8600d17f366 --- /dev/null +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: + +stdenv.mkDerivation rec { + name = "gnu-apl-${version}"; + version = "1.4"; + + src = fetchurl { + url = "mirror://gnu/apl/apl-${version}.tar.gz"; + sha256 = "0fl9l4jb5wpnb54kqkphavi657z1cv15h9qj2rqy2shf33dk3nk9"; + }; + + buildInputs = [ liblapack readline gettext ncurses ]; + + postInstall = '' + cp -r support-files/ $out/share/doc/ + find $out/share/doc/support-files -name 'Makefile*' -delete + ''; + + meta = { + description = "Free interpreter for the APL programming language."; + homepage = http://www.gnu.org/software/apl/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + platforms = stdenv.lib.platforms.linux; + + longDescription = '' + GNU APL is a free interpreter for the programming language APL, with an + (almost) complete implementation of ISO standard 13751 aka. Programming + Language APL, Extended. GNU APL was written and is being maintained by + Jürgen Sauermann. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e87229f814..0516761090a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1421,6 +1421,8 @@ let inherit (xorg) libXpm; }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; From 7ad6dac43b5e152957f5b438fbf896af00173ee3 Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Mon, 16 Mar 2015 22:42:22 +0000 Subject: [PATCH 165/947] owncloud: don't store plaintext adminPassword in nix store Rather than using openssl to hash the password at build time, and hence leaving the plaintext password world-readable in the nix store, we can instead hash the password in the nix expression itself using builtins.hashString. --- nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 3bea3c3ee1d..a5e539bc9ba 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -384,8 +384,7 @@ rec { }; adminPassword = mkOption { - description = "The admin password for accessing owncloud. - Warning: this is stored in cleartext in the Nix store!"; + description = "The admin password for accessing owncloud."; }; dbType = mkOption { @@ -571,7 +570,7 @@ rec { chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true - QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','`echo -n "${config.adminPassword}" | ${pkgs.openssl}/bin/openssl dgst -sha1 | ${pkgs.gawk}/bin/awk '{print $2}'`'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" + QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true ''; } From af15b26ee806c9058a6b6312203f1630e39ff731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 00:35:24 +0100 Subject: [PATCH 166/947] libxcomp: switch to release 3.5.0.30 instead of git --- pkgs/development/libraries/libxcomp/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 989373315d0..09888035b81 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "libxcomp-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression library"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; From 3a73e3bf92bd8e7765b6c5e2079090e0ad0c8bd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 00:36:02 +0100 Subject: [PATCH 167/947] nxproxy: switch to release 3.5.0.30 instead of git --- pkgs/tools/admin/nxproxy/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 67d07d6eb3b..098dd82eec7 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libxcomp }: +{ stdenv, fetchurl, autoconf, libxcomp }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "nxproxy-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression proxy"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; @@ -25,5 +24,5 @@ stdenv.mkDerivation { autoconf ''; - installTargets = [ "install.bin" ]; + makeFlags = [ "exec_prefix=$(out)" ]; } From ca6cf1a79d6627c2a4d5e150eea813949cca5fc6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 01:05:04 +0100 Subject: [PATCH 168/947] cassandra 2.0.12 -> 2.0.13 --- pkgs/servers/nosql/cassandra/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index 96724ec52f5..a67afd45f39 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -10,8 +10,8 @@ let - version = "2.0.12"; - sha256 = "125yga0h155fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + version = "2.0.13"; + sha256 = "125yga0h055fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; in From 25b6058628870b6b59fc0cfbb1ef5062a35b5cf3 Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 17 Mar 2015 00:24:37 +0000 Subject: [PATCH 169/947] logrotate: 3.8.7 -> 3.8.9 --- pkgs/tools/system/logrotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 964ee217108..771de9205a9 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.8.7"; + name = "logrotate-3.8.9"; src = fetchurl { url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; - sha256 = "0r1bs40gwi8awx6rjq3n4lw9fgws97ww2li7z87683p380gnkfpn"; + sha256 = "19yzs7gc8ixr6iqq22n5gbixmvzsgmwp96kp4jiwr8bjj37df3kh"; }; # Logrotate wants to access the 'mail' program; to be done. From 92501d62f4218da6ea9a215e8b8cb02f9f2926a5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 16 Mar 2015 03:49:00 +0100 Subject: [PATCH 170/947] zfs_git: Update to 2015-03-12 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 1318722d395..680ac295cff 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-10"; + version = "2015-03-12"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "7f3e4662832269b687ff20dafc6a33f8e1d28912"; - sha256 = "1z0aizn212m6vygp4iqd3dv2xpqb883bvz12sw6hg7w8isq83ila"; + rev = "4c7b7eedcde7fababf457ca04445e6d9d1617e29"; + sha256 = "1v0rb4rfs48c66wihfmigc6cmqk6j5r5xlkv5d03shb9h5ypff84"; }; patches = [ From 614751bb168328f516a5c1d47b0b2ae5bd46b04b Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Fri, 13 Mar 2015 23:46:17 -0700 Subject: [PATCH 171/947] Package ario --- pkgs/applications/audio/ario/default.nix | 29 ++++++++++++++ .../audio/ario/glib-single-include.patch | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/applications/audio/ario/default.nix create mode 100644 pkgs/applications/audio/ario/glib-single-include.patch diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix new file mode 100644 index 00000000000..3840d06dd46 --- /dev/null +++ b/pkgs/applications/audio/ario/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libsoup, avahi, taglib + }: + +stdenv.mkDerivation rec { + version = "1.5.1"; + name = "ario-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + }; + + patches = [ ./glib-single-include.patch ]; + + buildInputs = [ + pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + ]; + + meta = { + description = "GTK2 client for MPD (Music player daemon)"; + homepage = "http://ario-player.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch new file mode 100644 index 00000000000..45e0a1738f8 --- /dev/null +++ b/pkgs/applications/audio/ario/glib-single-include.patch @@ -0,0 +1,40 @@ +From: Michael Biebl +Origin: vendor +Bug-Debian: http://bugs.debian.org/665506 +Subject: Including individual glib headers no longer supported + +--- a/src/ario-profiles.h ++++ b/src/ario-profiles.h +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include ++#include + #include "servers/ario-server.h" + + G_BEGIN_DECLS +--- a/src/plugins/ario-plugin-info.c ++++ b/src/plugins/ario-plugin-info.c +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "plugins/ario-plugin-info-priv.h" + #include "ario-debug.h" +--- a/src/ario-util.h ++++ b/src/ario-util.h +@@ -18,8 +18,8 @@ + */ + + #include "servers/ario-server.h" +-#include "glib/gslist.h" +-#include "gdk/gdkpixbuf.h" ++#include ++#include + + /* Number of covers used to generate the drag & drop image */ + #define MAX_COVERS_IN_DRAG 3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783f5ea6ad7..92e676a0b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9770,6 +9770,8 @@ let inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ario = callPackage ../applications/audio/ario { }; + arora = callPackage ../applications/networking/browsers/arora { }; atom = callPackage ../applications/editors/atom { From 1e4ba025c260fa6852765e9f5c59e985f10c6a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Mar 2015 08:53:33 +0100 Subject: [PATCH 172/947] Reverts a bunch of commits as a try to fix GC errors. Commits - 694f01db2d2e1cde06ee243a5909d196e84f0a18 - 829479d1dda5dbb579885e16dc655716127457ed - bd81885f706dae5cdeb8c03845fa43d8b74fa57c - b2fdcf801ce08bf0c44e63bafe8ae2c720704da7 --- lib/lists.nix | 6 +- .../web/nodejs/build-node-package.nix | 170 ++++++------------ 2 files changed, 62 insertions(+), 114 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index fa8cbddfd94..2dda700bef3 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -234,8 +234,8 @@ rec { in [x] ++ remove x xs; # Intersects list 'e' and another list - intersectLists = e: filter (x: elem x e); + intersect = e: filter (x: elem x e); - # Subtracts list 'e' from another list - subtractLists = e: filter (x: !(elem x e)); + # Substracts list 'e' from another list + substract = e: filter (x: !(elem x e)); } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 042e29f2970..cda1162c947 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,33 +1,25 @@ { stdenv, runCommand, nodejs, neededNatives}: { - name, version ? "", src, + name, src, # by default name of nodejs interpreter e.g. "nodejs-${name}" namePrefix ? nodejs.interpreterName + "-", # Node package name - pkgName ? - if version != "" then stdenv.lib.removeSuffix "-${version}" name else - (builtins.parseDrvName name).name, + pkgName ? (builtins.parseDrvName name).name, # List or attribute set of dependencies deps ? {}, # List or attribute set of peer depencies - peerDependencies ? {}, - - # List or attribute set of optional dependencies - optionalDependencies ? {}, - - # List of optional dependencies to skip - skipOptionalDependencies ? [], + peerDependencies ? [], # Whether package is binary or library - bin ? false, + bin ? null, - # Additional flags passed to npm install - flags ? "", + # Flags passed to npm install + flags ? [], # Command to be run before shell hook preShellHook ? "", @@ -35,12 +27,6 @@ # Command to be run after shell hook postShellHook ? "", - # Same as https://docs.npmjs.com/files/package.json#os - os ? [], - - # Same as https://docs.npmjs.com/files/package.json#cpu - cpu ? [], - # Attribute set of already resolved deps (internal), # for avoiding infinite recursion resolvedDeps ? {}, @@ -51,72 +37,42 @@ with stdenv.lib; let + npmFlags = concatStringsSep " " (map (v: "--${v}") flags); + + sources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv $(find . -type d -mindepth 1 -maxdepth 1) $out + ''; + + # Convert deps to attribute set + attrDeps = if isAttrs deps then deps else + (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); + + # All required node modules, without already resolved dependencies + requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps); + + # Recursive dependencies that we want to avoid with shim creation + recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps); + + peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies; + self = let - sources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv $(find . -type d -mindepth 1 -maxdepth 1) $out - ''; - - platforms = if os == [] then nodejs.meta.platforms else - fold (entry: platforms: - let - filterPlatforms = - stdenv.lib.platforms.${removePrefix "!" entry} or []; - in - # Ignore unknown platforms - if filterPlatforms == [] then platforms - else - if hasPrefix "!" entry then - subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms - else - platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) - ) [] os; - - mapDependencies = deps: f: rec { - # Convert deps to attribute set - attrDeps = if isAttrs deps then deps else - (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); - - # All required node modules, without already resolved dependencies - # Also override with already resolved dependencies - requiredDeps = mapAttrs (name: dep: - dep.override { - resolvedDeps = resolvedDeps // { "${name}" = self; }; - } - ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps))); - - # Recursive dependencies that we want to avoid with shim creation - recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps)); - }; - - _dependencies = mapDependencies deps (name: dep: - dep.pkgName != pkgName); - _optionalDependencies = mapDependencies optionalDependencies (name: dep: - (builtins.tryEval dep).success && - !(elem dep.pkgName skipOptionalDependencies) - ); - _peerDependencies = mapDependencies peerDependencies (name: dep: - dep.pkgName != pkgName); - - requiredDependencies = - _dependencies.requiredDeps // - _optionalDependencies.requiredDeps // - _peerDependencies.requiredDeps; - - recursiveDependencies = - _dependencies.recursiveDeps // - _optionalDependencies.recursiveDeps // - _peerDependencies.recursiveDeps; + # Pass resolved dependencies to dependencies of this package + deps = map ( + dep: dep.override { + resolvedDeps = resolvedDeps // { "${name}" = self; }; + } + ) (attrValues requiredDeps); patchShebangs = dir: '' - node=`type -p node` - coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ - xargs sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' || true + node=`type -p node` + coffee=`type -p coffee || true` + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' || true ''; in stdenv.mkDerivation ({ @@ -194,9 +150,9 @@ let # We do not handle shrinkwraps yet rm npm-shrinkwrap.json 2>/dev/null || true - mkdir ../build-dir + mkdir build-dir ( - cd ../build-dir + cd build-dir mkdir node_modules # Symlink or copy dependencies for node modules @@ -208,7 +164,12 @@ let '' else '' cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/ '' - ) (attrValues requiredDependencies)} + ) deps} + + # Symlink peer dependencies + ${concatMapStrings (dep: '' + ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ + '') peerDeps} # Create shims for recursive dependenceies ${concatMapStrings (dep: '' @@ -219,10 +180,10 @@ let "version": "${getVersion dep}" } EOF - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} ) - export HOME=$PWD/../build-dir + export HOME=$PWD/build-dir runHook postConfigure ''; @@ -231,14 +192,14 @@ let # If source was a file, repackage it, so npm pre/post publish hooks are not triggered, if [[ -f $src ]]; then - GZIP=-1 tar -czf ../build-dir/package.tgz ./ + tar --exclude='build-dir' -czf build-dir/package.tgz ./ export src=$HOME/package.tgz else export src=$PWD fi # Install package - (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags}) + (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}) runHook postBuild ''; @@ -253,7 +214,7 @@ let ${concatMapStrings (dep: '' rm node_modules/${dep.pkgName}/package.json rmdir node_modules/${dep.pkgName} - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} mkdir -p $out/lib/node_modules @@ -272,10 +233,10 @@ let done fi - # Move peer dependencies to node_modules + # Symlink dependencies ${concatMapStrings (dep: '' mv node_modules/${dep.pkgName} $out/lib/node_modules - '') (attrValues _peerDependencies.requiredDeps)} + '') peerDeps} # Install binaries and patch shebangs mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true @@ -298,36 +259,23 @@ let mkdir -p node_modules ${concatMapStrings (dep: '' ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') (attrValues requiredDependencies)} + '') deps} ${postShellHook} ''; - # Stipping does not make a lot of sense in node packages - dontStrip = true; - - meta = { - inherit platforms; - maintainers = [ stdenv.lib.maintainers.offline ]; - }; - passthru.pkgName = pkgName; - } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // { + } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { name = namePrefix + name; # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; - nativeBuildInputs = - (args.nativeBuildInputs or []) ++ neededNatives ++ - (attrValues requiredDependencies); + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; # Expose list of recursive dependencies upstream, up to the package that # caused recursive dependency - recursiveDeps = - (flatten ( - map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies) - )) ++ - (attrNames recursiveDependencies); + recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); }); in self From 7e285b8b872e7de3b7e312fd1f2aa77fa989e62c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 17 Mar 2015 11:02:44 +0300 Subject: [PATCH 173/947] Update Botan unstable and fix source link --- pkgs/development/libraries/botan/generic.nix | 5 ++++- pkgs/development/libraries/botan/unstable.nix | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index b01ea401b38..c843a00b836 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { src = fetchurl { name = "Botan-${version}.tgz"; - url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"; + urls = [ + "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" + "http://botan.randombit.net/releases/Botan-${version}.tgz" + ]; inherit sha256; }; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 87a3e49b89b..f586d6fd622 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "14"; - sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb"; + revision = "15"; + sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0"; openssl = null; }) From c1e1092b8b601b2cac96213a482c5b71476ff7d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Mar 2015 17:32:41 +0100 Subject: [PATCH 174/947] rsyslog: Move systemd check --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e253a4ef00e..2f62ce31949 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 systemd jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ]; + ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783f5ea6ad7..f88a6000d82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,7 +787,6 @@ let libgcrypt = libgcrypt_1_6; czmq = null; # Currently Broken hadoop = null; # Currently Broken - systemd = if stdenv.isLinux then systemd else null; }; rsyslog-light = callPackage ../tools/system/rsyslog { From eb7b6e2137fb4abc1807f22aaccb43e88deeafd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 18:41:51 +0100 Subject: [PATCH 175/947] haskell-exceptions: upstream has fixed the test suite --- 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 466af76185f..1f634f3f55f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -504,9 +504,6 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/42 - exceptions = dontCheck super.exceptions; - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); From 04611ab692911089b5b2839a36b6b32d5eb38f2a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 14:48:11 +0100 Subject: [PATCH 176/947] ghc: update 7.10.1 to rc3 --- pkgs/development/compilers/ghc/7.10.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 47888679f24..7938e45605b 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150123"; + version = "7.10.0.20150315"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz"; - sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn"; + url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; + sha256 = "0drj8llsf17iqlr04dp0xd5ypfsv5cgcm7ncvh675sas2rw5qhjx"; }; buildInputs = [ ghc perl ]; From 14106ba4f74974bdf1e55eae97445c1e15d5f85b Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Mon, 16 Mar 2015 20:24:13 +0100 Subject: [PATCH 177/947] graph-tool: enable drawing and openmp for algorithms --- .../python-modules/graph-tool/2.x.x.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 835b4f6514a..e647dfc809f 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper }: +{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, +pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, +gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { version = "2.2.36"; @@ -20,9 +22,26 @@ stdenv.mkDerivation rec { configureFlags="--with-python-module-path=$out/${python.sitePackages}" ''; - buildInputs = [ python cairomm pycairo sparsehash automake m4 pkgconfig makeWrapper boost expat scipy numpy cgal lndir gmp mpfr ]; + buildInputs = [ automake m4 pkgconfig makeWrapper ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + boost + cgal + expat + gmp + mpfr + python + scipy + # optional + sparsehash + # drawing + cairomm + gobjectIntrospection + gtk3 + pycairo + matplotlib + pygobject3 + ]; enableParallelBuilding = false; } From 2c1041acc74844251a2456024e99f25126419f35 Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 17 Mar 2015 00:11:54 +0000 Subject: [PATCH 178/947] curl: 7.40.0 -> 7.41.0 (close #6844) --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index fa0a15ea044..08c00fc4b34 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -12,11 +12,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.40.0"; + name = "curl-7.41.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1fizi07p0h76zaa3wxh4d9vr4hln97sgfpcr5y56pyh077mhk4c9"; + sha256 = "1slbbxp2k8m34mdzrl5qhafr5zhhcv7fgjhs2mcxjmswvimm92wz"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From 566cd9ba19fe9fcc4ea87accf9f99edb2c901392 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Tue, 17 Mar 2015 09:46:52 -0300 Subject: [PATCH 179/947] Remove unnecessary propagatedBuildInputs line --- pkgs/development/tools/misc/sqitch/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index bef21abc0f0..c4c8e065bc5 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { name = "sqitch-0.999"; buildInputs = [ makeWrapper ]; - propagatedNativeBuildInputs = [ sqitchModule ]; builder = writeScript (name + "-builder.sh") '' . ${stdenv}/setup mkdir -p $out/bin @@ -12,12 +11,10 @@ stdenv.mkDerivation rec { fixupPhase wrapProgram $out/bin/sqitch \ --prefix PERL5LIB : \ - "$(for i in "$propagatedNativeBuildInputs" ; do - for j in $(cat $i/nix-support/propagated-native-build-inputs) ; do - echo -n "$j"/lib/perl5/site_perl: - done + "$(for i in $(cat ${sqitchModule}/nix-support/propagated-native-build-inputs) ; do + echo -n "$i"/lib/perl5/site_perl: done - echo "$propagatedNativeBuildInputs"/lib/perl5/site_perl + echo ${sqitchModule}/lib/perl5/site_perl )" ''; } From 2ed90cd27fa9059d783889bc05617b11b3ca6498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 17 Mar 2015 13:56:14 +0100 Subject: [PATCH 180/947] gdal: fix build by adding openssl I'm not sure why it started needing it, but I suspect mysql (mariadb). --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a59b526fee1..579d22ad754 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -10,7 +10,7 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ]; + buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. From 6683a5a2c1d65d2be3ceb7efbd7bc07a76e3c825 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Tue, 17 Mar 2015 14:40:29 +0100 Subject: [PATCH 181/947] Update putty derivation - Use source code tarball instead of svn. - Add meta information on package. --- .../networking/remote/putty/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e35f8c739c5..fe89ce61604 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut -, libtool }: - -let - rev = 9690; -in -stdenv.mkDerivation { - name = "putty-${toString rev}"; - # builder = ./builder.sh; +{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: + +stdenv.mkDerivation rec { + version = "0.64"; + name = "putty-${version}"; + + src = fetchurl { + url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; + sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia"; + }; preConfigure = '' perl mkfiles.pl @@ -17,14 +18,17 @@ stdenv.mkDerivation { ./mkauto.sh cd unix ''; - - # The hash is going to change on new snapshot. - # I don't know of any better URL - src = fetchsvn { - url = svn://svn.tartarus.org/sgt/putty; - rev = rev; - sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; - }; buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + + meta = with stdenv.lib; { + description = "A Free Telnet/SSH Client"; + longDescription = '' + PuTTY is a free implementation of Telnet and SSH for Windows and Unix + platforms, along with an xterm terminal emulator. + It is written and maintained primarily by Simon Tatham. + ''; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + license = licenses.mit; + }; } From 54857abfc971489aa1ce584bae0aa0d01f002c48 Mon Sep 17 00:00:00 2001 From: koral Date: Mon, 16 Mar 2015 14:10:16 +0000 Subject: [PATCH 182/947] Added icecast module. --- nixos/modules/module-list.nix | 3 +- nixos/modules/services/audio/icecast.nix | 130 +++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/audio/icecast.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23809796878..c8cf5bfa798 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -91,8 +91,9 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix - # Disabled as fuppes it does no longer builds. + # Disabled as fuppes no longer builds. # ./services/audio/fuppes.nix + ./services/audio/icecast.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix new file mode 100644 index 00000000000..6a8a0f9975b --- /dev/null +++ b/nixos/modules/services/audio/icecast.nix @@ -0,0 +1,130 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.icecast; + configFile = pkgs.writeText "icecast.xml" '' + + ${cfg.hostname} + + + ${cfg.admin.user} + ${cfg.admin.password} + + + + ${cfg.logDir} + ${pkgs.icecast}/share/icecast/admin + ${pkgs.icecast}/share/icecast/web + + + + + ${toString cfg.listen.port} + ${cfg.listen.address} + + + + 0 + + ${cfg.user} + ${cfg.group} + + + + ${cfg.extraConf} + + ''; +in { + + ###### interface + + options = { + + services.icecast = { + + enable = mkEnableOption "Icecast server"; + + hostname = mkOption { + type = types.str; + description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; + default = config.networking.domain; + }; + + admin = { + user = mkOption { + type = types.str; + description = "Username used for all administration functions."; + default = "admin"; + }; + + password = mkOption { + type = types.str; + description = "Password used for all administration functions."; + }; + }; + + logDir = mkOption { + type = types.path; + description = "Base directory used for logging."; + default = "/var/log/icecast"; + }; + + listen = { + port = mkOption { + type = types.int; + description = "TCP port that will be used to accept client connections."; + default = 8000; + }; + + address = mkOption { + type = types.str; + description = "Address Icecast will listen on."; + default = "::"; + }; + }; + + user = mkOption { + type = types.str; + description = "User privileges for the server."; + default = "nobody"; + }; + + group = mkOption { + type = types.str; + description = "Group privileges for the server."; + default = "nogroup"; + }; + + extraConf = mkOption { + type = types.lines; + description = "icecast.xml content."; + default = ""; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.icecast = { + after = [ "network.target" ]; + description = "Icecast Network Audio Streaming Server"; + wantedBy = [ "multi-user.target" ]; + + preStart = "mkdir -p ${cfg.logDir} && chown ${cfg.user}:${cfg.group} ${cfg.logDir}"; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.icecast}/bin/icecast -c ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + + }; + +} From 87970786954fcc5a33533199bc661bfe4b95facb Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 17 Mar 2015 17:18:12 +0000 Subject: [PATCH 183/947] git: 2.3.2 -> 2.3.3 --- .../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 1a0ea9e02da..123bb65da8d 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.3.2"; + version = "2.3.3"; 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 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; + sha256 = "11s6w6dsv9kfgpfa75sas4pi6spw75ph0b0b6b12xq37hl4l8ma7"; }; patches = [ From ebba9e66810e27aaba348ada586b399f9a14283d Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 17 Mar 2015 17:31:35 +0000 Subject: [PATCH 184/947] mpv: 0.8.2 -> 0.8.3 --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6f5e20c6579..464f5130b67 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -59,11 +59,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "19vlh2bzgf2vp1a4887xj7cmnhb42sc0cbqrdya4mck8yr5r6rd5"; + sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409"; }; buildInputs = From 6a230188c65b8b7b0a3bb3303e027a862d93a161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 17 Mar 2015 18:29:58 +0100 Subject: [PATCH 185/947] xorg.libXfont: security update Fixes CVE-2015-{1802,1803,1804}. http://lists.x.org/archives/xorg-announce/2015-March/002550.html Almost nothing needs rebuilding. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 55bc13f2273..2a1fb67b4cb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -705,11 +705,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.0"; + name = "libXfont-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2; - sha256 = "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s"; + url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2; + sha256 = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index e199672942d..1e16bbef97f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 From f7f0fd0dfe439fc8dbfebc106788ba6ce35e46c9 Mon Sep 17 00:00:00 2001 From: lukasepple Date: Tue, 17 Mar 2015 20:39:03 +0100 Subject: [PATCH 186/947] Added CC-BY-SA 4.0 License --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9b3acf8653b..d4810d412b1 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Creative Commons Attribution 4.0"; }; + cc-by-sa-40 = spdx { + spdxId = "CC-BY-SA-4.0"; + fullName = "Creative Commons Attribution Share Alike 4.0"; + }; + cddl = spdx { spdxId = "CDDL-1.0"; fullName = "Common Development and Distribution License 1.0"; From 90b083d3871f3552c06fa8d9ad821da6dbc930fa Mon Sep 17 00:00:00 2001 From: Bence Fabian Date: Mon, 16 Mar 2015 15:45:21 +0100 Subject: [PATCH 187/947] Add alsa-firmware package --- .../linux/alsa-firmware/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-firmware/default.nix diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix new file mode 100644 index 00000000000..f1d73ac245a --- /dev/null +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "alsa-firmware-1.0.29"; + + src = fetchurl { + urls = [ + "ftp://ftp.alsa-project.org/pub/firmware/${name}.tar.bz2" + "http://alsa.cybermirror.org/firmware/${name}.tar.bz2" + ]; + sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw"; + }; + + configureFlags = '' + --with-hotplug-dir=$(out)/lib/firmware + ''; + + installFlags = '' + DESTDIR=$(out) + ''; + + postInstall = '' + # These are lifted from the Arch PKGBUILD + # remove files which conflicts with linux-firmware + rm -rf $out/usr/lib/firmware/{ct{efx,speq}.bin,ess,korg,sb16,yamaha} + # remove broken symlinks (broken upstream) + rm -rf $out/usr/lib/firmware/turtlebeach + # remove empty dir + rm -rf $out/usr/bin + ''; + + meta = { + homepage = http://www.alsa-project.org/main/index.php/Main_Page; + longDescription = " + Soundcard firmwares from the alsa project. + "; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abb065689a6..9ea536d9950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8545,6 +8545,8 @@ let alienfx = callPackage ../os-specific/linux/alienfx { }; + alsaFirmware = callPackage ../os-specific/linux/alsa-firmware { }; + alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { From 66e5b36378ad2e2abc1e79b90d7f238f92981591 Mon Sep 17 00:00:00 2001 From: Bence Fabian Date: Mon, 16 Mar 2015 17:55:45 +0100 Subject: [PATCH 188/947] remove /usr prefix in postInstall --- pkgs/os-specific/linux/alsa-firmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index f1d73ac245a..9802992434e 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { postInstall = '' # These are lifted from the Arch PKGBUILD # remove files which conflicts with linux-firmware - rm -rf $out/usr/lib/firmware/{ct{efx,speq}.bin,ess,korg,sb16,yamaha} + rm -rf $out/lib/firmware/{ct{efx,speq}.bin,ess,korg,sb16,yamaha} # remove broken symlinks (broken upstream) - rm -rf $out/usr/lib/firmware/turtlebeach + rm -rf $out/lib/firmware/turtlebeach # remove empty dir - rm -rf $out/usr/bin + rm -rf $out/bin ''; meta = { From ba6aee260ebcc93c27d050f1afde49b8b02850d9 Mon Sep 17 00:00:00 2001 From: Bence Fabian Date: Tue, 17 Mar 2015 01:12:21 +0100 Subject: [PATCH 189/947] remove DESTDIR and don't strip --- pkgs/os-specific/linux/alsa-firmware/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 9802992434e..d636e55f337 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { --with-hotplug-dir=$(out)/lib/firmware ''; - installFlags = '' - DESTDIR=$(out) - ''; + dontStrip = true; postInstall = '' # These are lifted from the Arch PKGBUILD From ec9f528961af01831485c8063a5e61380b7e5434 Mon Sep 17 00:00:00 2001 From: hmuehlhans Date: Tue, 17 Mar 2015 21:04:05 +0100 Subject: [PATCH 190/947] p2pvc: new package Added myself to maintainers --- lib/maintainers.nix | 1 + pkgs/applications/video/p2pvc/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/applications/video/p2pvc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 12a5108c050..194aaec5c25 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -190,6 +190,7 @@ thoughtpolice = "Austin Seipp "; titanous = "Jonathan Rudenberg "; tomberek = "Thomas Bereknyei "; + trino = "Hubert Mühlhans "; tstrobel = "Thomas Strobel "; ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix new file mode 100644 index 00000000000..e6f62967c78 --- /dev/null +++ b/pkgs/applications/video/p2pvc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: + +stdenv.mkDerivation { + name = "p2pvc"; + + buildInputs = [ pkgconfig opencv ncurses portaudio ]; + + enableParallelBuilding = true; + + installPhase = "mkdir -p $out/bin; cp p2pvc $out/bin/"; + + src = fetchFromGitHub { + owner = "mofarrell"; + repo = "p2pvc"; + rev = "d7b1c70288a7750fc8f9a22dbddbe51d34b5b9e5"; + sha256 = "0d4vvrsjad5gk4rrjwgydn9ffj12jfb4aksw2px6jw75hp9pzmka"; + }; + + meta = { + description = "A point to point color terminal video chat."; + homepage = "https://github.com/mofarrell/p2pvc"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ trino ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abb065689a6..7c4c185e37e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2255,6 +2255,8 @@ let owncloudclient = callPackage ../applications/networking/owncloud-client { }; + p2pvc = callPackage ../applications/video/p2pvc {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; From 22625fbf37bd463b32a8b87bec8bbaa9250a5124 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 21:56:00 +0100 Subject: [PATCH 191/947] netsniff-ng 0.5.9-rc4-40-g5107740 -> 0.5.9-rc4-49-g6f54288 Adds support for IGMP packet generation. --- 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 f192e8dba15..e8436c040fd 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -3,14 +3,14 @@ , pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.5.9-rc4-40-g5107740"; + version = "0.5.9-rc4-49-g6f54288"; name = "netsniff-ng-${version}"; src = fetchFromGitHub rec { # Upstream recommends and supports git repo = "netsniff-ng"; owner = repo; - rev = "5107740603d10feed6104afd75042970cb392843"; - sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; + rev = "6f542884d002d55d517a50dd9892068e95400b25"; + sha256 = "0j7rqigfn9zazmzi8w3hapzi8028jr3q27lwyjw7k7lpnayj5iaa"; }; buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack From 463c78a509ee94314a419bd0fcec6e946b3eb848 Mon Sep 17 00:00:00 2001 From: William Giokas Date: Tue, 17 Mar 2015 14:30:47 -0700 Subject: [PATCH 192/947] vim: Add python3 support to vim_configurable --- pkgs/applications/editors/vim/configurable.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 94ae1d9c846..cb2f562d51c 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -102,6 +102,19 @@ composableDerivation { }; } + // edf { + name = "python3"; + feat = "python3interp"; + enable = { + nativeBuildInputs = [ pkgs.python3 ]; + } // lib.optionalAttrs stdenv.isDarwin { + configureFlags + = [ "--enable-python3interp=yes" + "--with-python3-config-dir=${pkgs.python3}/lib" + "--disable-pythoninterp" ]; + }; + } + // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. // edf { @@ -131,6 +144,7 @@ composableDerivation { cfg = { luaSupport = config.vim.lua or true; pythonSupport = config.vim.python or true; + python3Support = config.vim.python3 or false; rubySupport = config.vim.ruby or true; nlsSupport = config.vim.nls or false; tclSupport = config.vim.tcl or false; From 30beb0ad7df2bdfc88fdd95bd25b28a9b8dd0c12 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Tue, 17 Feb 2015 07:50:11 +0100 Subject: [PATCH 193/947] flightgear: bump version to 3.4 (close #6385) - openscenegraph: bump version to 3.2.1: http://www.openscenegraph.org/index.php/download-section/stable-releases - remove obsolete patch - simgear: bump version to 3.4.0 - flightgear: add qt5 as build input --- .../libraries/openscenegraph/default.nix | 11 +++++------ .../libraries/openscenegraph/xine.patch | 18 ------------------ pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 12 ++++++------ 4 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/libraries/openscenegraph/xine.patch diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 01993fa1cd8..9be9f838632 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,7 +2,8 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 - , curl, a52dec, faad2, gdk_pixbuf + , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL + , qt4, poppler, librsvg, gtk , ...}: builderDefsPackage (a : @@ -14,10 +15,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="OpenSceneGraph"; - version="3.0.1"; + version="3.2.1"; name="${baseName}-${version}"; - url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip"; - hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c"; + url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip"; + hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; }; in rec { @@ -32,8 +33,6 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; - patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659 - cmakeFlags = [ "-D MATH_LIBRARY=" ]; diff --git a/pkgs/development/libraries/openscenegraph/xine.patch b/pkgs/development/libraries/openscenegraph/xine.patch deleted file mode 100644 index 8fbc8ceec52..00000000000 --- a/pkgs/development/libraries/openscenegraph/xine.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c -+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c -@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - rgb_class->driver_class.get_identifier = get_identifier; - rgb_class->driver_class.get_description = get_description; -+#else -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); -+#endif -+ - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); - diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 0fd3caffd5c..df732c40f57 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "3.0.0"; + version = "3.4.0"; src = fetchurl { url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2"; - sha256 = "1ssrcmvk3a4dv0k4vjzndmirwmdgzk689d7wpmjm423nydmwajh0"; + sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj"; }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 31ae3aa3aa4..58649f9220d 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,21 +2,21 @@ , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem +, makeDesktopItem, qt5 }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.4.0"; name = "flightgear-${version}"; src = fetchurl { - url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2"; - sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4"; + url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2"; + sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m"; }; datasrc = fetchurl { url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2"; - sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4"; + sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr + libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5 ]; preConfigure = '' From 1b1f26636ed2cb65c4e8baba41c1534cda3c83c1 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Mar 2015 15:00:16 -0700 Subject: [PATCH 194/947] iojs: Fix update-iojs script The nix-instantiate invocations only work correctly if this script is run from the root directory of nixpkgs, or in a directory without a default.nix file and NIX_PATH set appropriately. --- pkgs/development/web/iojs/update-iojs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs index e0e073a0ff9..3140c5e842b 100755 --- a/pkgs/development/web/iojs/update-iojs +++ b/pkgs/development/web/iojs/update-iojs @@ -1,10 +1,12 @@ -#!/bin/sh -e +#!/bin/sh # # Fetch the latest io.js release (stable/nightly) and update # `default.nix` in this directory. # -cd "$(dirname "$0")" +set -e + +HERE="$(dirname "$0")" latest() { curl -s "$1" | grep 'href="v' \ @@ -39,11 +41,11 @@ nightly=$(latest_log nightly 'https://iojs.org/download/nightly/') sed -i \ "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \ - default.nix + "$HERE/default.nix" stableHash=$(hash_log "$(url iojs.src)") nightlyHash=$(hash_log "$(url iojs-nightly.src)") sed -i \ "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \ - default.nix + "$HERE/default.nix" From c8da20fa5e4e05d1a439af7282a74ee215630112 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Mar 2015 11:31:50 +0000 Subject: [PATCH 195/947] osrm-backend: patch to hardcode path to default lua profiles once installed into $out --- .../4.5.0-default-profile-path.template.patch | 13 +++++++++++++ pkgs/servers/osrm-backend/default.nix | 11 +++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch new file mode 100644 index 00000000000..12fcdb4fd02 --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch @@ -0,0 +1,13 @@ +diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp +index d14d8d9..c64d7fd 100644 +--- a/extractor/extractor_options.cpp ++++ b/extractor/extractor_options.cpp +@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e + boost::program_options::options_description config_options("Configuration"); + config_options.add_options()("profile,p", + boost::program_options::value( +- &extractor_config.profile_path)->default_value("profile.lua"), ++ &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"), + "Path to LUA routing profile")( + "threads,t", + boost::program_options::value(&extractor_config.requested_num_threads) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 035ba9658a6..8e33d6e30b9 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib}: +{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}: stdenv.mkDerivation rec { name = "osrm-backend-4.5.0"; @@ -8,10 +8,17 @@ stdenv.mkDerivation rec { sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c"; }; - patches = [ ./4.5.0-openmp.patch ]; + patches = [ + ./4.5.0-openmp.patch + (substituteAll { + src = ./4.5.0-default-profile-path.template.patch; + }) + ]; buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; + meta = { homepage = https://github.com/Project-OSRM/osrm-backend/wiki; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project."; From 5a45003800d0aa9a2546ae0f3658eef1f1ceeccd Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 17 Mar 2015 22:05:13 +0000 Subject: [PATCH 196/947] luajit: declare lua in propagatedBuildInputs, remove from osrm-backend's buildInputs --- pkgs/development/libraries/luabind/default.nix | 2 ++ pkgs/servers/osrm-backend/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 5afbb71ab65..edb914123e1 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost-build lua boost ]; + propagatedBuildInputs = [ lua ]; + buildPhase = "LUA_PATH=${lua} bjam release"; installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install"; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8e33d6e30b9..37d3650f683 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; From e3eb1aa71919e07efe8e2ca61aae792aaf138206 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Mar 2015 15:22:35 -0700 Subject: [PATCH 197/947] Update iojs using the fixed-up script --- pkgs/development/web/iojs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 631c3305f81..c0518921383 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }: let - version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0"; + version = if nightly then "1.5.2-nightly201503173c8ae2d934" else "1.5.1"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "1bk0jiha7n3s9xawj77d4q1navq28pq061w2wa6cs70lik7n6ri4" - else "08g0kmz2978jrfx4551fi12ypcsv9p6vic89lfs08ki7ajw2yrgb"; + then "10blf1hr80fknrzyrbj7qy2xn7wilnyn6y2r7ijrw2gns4ia3d0h" + else "0zdxdb9n0yk6dp6j6x3bka7vrnf7kz8jjcpl6fw5fr9f742s9s26"; }; prePatch = '' From 30e577cdfe8ef5807c418a982993f49b346be26d Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 17 Mar 2015 23:44:03 +0100 Subject: [PATCH 198/947] audacity: Fix nyquist support. --- pkgs/applications/audio/audacity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 7308d84e098..6f25693f734 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm mkdir lib-src - mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/ + mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/ rm -r lib-src-rm/ ''; From fd60b5f496ae7fcfe1c7dc1e9aa107e7dab914d7 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 17 Mar 2015 17:25:51 -0700 Subject: [PATCH 199/947] gnupg: dont demand pcsclite on darwin --- pkgs/tools/security/gnupg/20.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 10f4b587861..cf11ecb8232 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + '' + stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' From 075c1886a3ac9f3a1c0ed9b2349aa10080eeee06 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:34:17 -0500 Subject: [PATCH 200/947] nixpkgs: libressl 2.1.4 -> 2.1.5 Signed-off-by: Austin Seipp --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index e15daf2d42d..aa138613ec4 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0km0m4y442gf0sn4g31cljhvfi3l627fw4lljyd12x47j8sqbq78"; + sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8"; }; enableParallelBuilding = true; From 1840694a84587d80567860b608a6867fdfd69c17 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:45:46 -0500 Subject: [PATCH 201/947] nixpkgs: lockdep 3.17 -> 3.19.1 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/lockdep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 6fa59e4ae5f..612291e62e4 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lockdep-${version}"; - version = "3.17"; - fullver = "3.17.0"; # The library ver is 3.17.0, but the kernel is 3.17 + version = "3.19.1"; + fullver = "3.19.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; + sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi"; }; preConfigure = "cd tools/lib/lockdep"; From 70528e9f8e09a85db31e50187d4386f626508d56 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:48:52 -0500 Subject: [PATCH 202/947] nixpkgs: ninja 1.5.1 -> 1.5.3 Signed-off-by: Austin Seipp --- pkgs/development/tools/build-managers/ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index d62e000fc2a..5ba5d86ac77 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/martine/ninja/archive/v${version}.tar.gz"; - sha256 = "0z9rzay6ipy6q025n1f2im8d8jy6in9pcdsiqj30xpdlsjg7p9zv"; + sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw"; }; buildInputs = [ python asciidoc re2c ]; From c8d46c73747a4e761dabf0813269edb89976253e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:50:52 -0500 Subject: [PATCH 203/947] nixpkgs: re2c 0.13.7.5 -> 0.14.1 Signed-off-by: Austin Seipp --- pkgs/development/tools/parsing/re2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 4176182ab62..9f02b10c898 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.13.7.5"; + version = "0.14.1"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0qdly4493d4p6jif0anf79c8h6ylc34aw622zk4n8icyax8gv2nm"; + sha256 = "0xfskwzr6n94sa22m24x7z051qfbb9d6k4dipcv95s8j8zq74dcv"; }; meta = { From 0c1daca24a31630aabc07585c39924ed736e3d3d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:52:16 -0500 Subject: [PATCH 204/947] nixpkgs: stunnel 5.05 -> 5.11 Signed-off-by: Austin Seipp --- pkgs/tools/networking/stunnel/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 039f9bc0913..2dba887adb8 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,12 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.05"; + version = "5.11"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - # SHA256 provided by upstream. - sha256 = "c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef"; + sha256 = "137zxnavc7880fxfbmhlgw97lk4rj8if1bb70adm0d4fwlvvra3i"; }; buildInputs = [ openssl ]; From b0519234dd5de9a84b579763a13fae2070cb461a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:55:23 -0500 Subject: [PATCH 205/947] nixpkgs: musl 1.1.4 -> 1.1.6 Signed-off-by: Austin Seipp --- 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 97407c887ce..cd13914580a 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.4"; + version = "1.1.6"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1kgmi17zpzgjhywmmqxazj8qsx8cf9siwa65jqd2i6rs7jnnb335"; + sha256 = "1d7inhai37g1ph6yg7ldyl4k5c7i8xvaa5w62n85n3albk2n00as"; }; enableParallelBuilding = true; From 5bbbb2c96b570fce9733a4ed7b7c152eb1d124e9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:57:12 -0500 Subject: [PATCH 206/947] nixpkgs: concurrencykit 0.4.4 -> 0.4.5 Signed-off-by: Austin Seipp --- pkgs/development/libraries/concurrencykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 276f1219444..3fad256e572 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "0m3gzv5l7hw3zwhndjjvwmkhh66lvgnk0mspa2s12r1hlzc91zi3"; + sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9"; }; enableParallelBuilding = true; From 4122cd0ec4eef1e8ec12b92a7c2ecddc846d96d5 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 17 Mar 2015 22:11:56 -0700 Subject: [PATCH 207/947] emacs-packages: add alert, caml, and tuareg, and update use-package --- pkgs/top-level/emacs-packages.nix | 76 ++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index fb1ee300b35..fd536bb3181 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -96,6 +96,19 @@ let self = _self // overrides; }; }; + alert = melpaBuild rec { + pname = "alert"; + version = "1.2"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = pname; + rev = "v${version}"; + sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"; + }; + packageRequires = [ gntp log4e ]; + meta = { license = gpl2Plus; }; + }; + anzu = melpaBuild rec { pname = "anzu"; version = "0.52"; @@ -185,12 +198,12 @@ let self = _self // overrides; bind-key = melpaBuild { pname = "bind-key"; - version = "20141013"; + version = "20150317"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; - sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; + sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; }; files = [ "bind-key.el" ]; meta = { license = gpl3Plus; }; @@ -212,6 +225,20 @@ let self = _self // overrides; }; }; + caml = melpaBuild rec { + pname = "caml"; + version = "4.2.1"; # TODO: emacs doesn't seem to like 02 as a version component.. + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "4.02.1"; + sha256 = "05lms9qhcnwgi7k034kiiic58c9da22r32mpak0ahmvp5fylvjpb"; + }; + fileSpecs = [ "emacs/*.el" ]; + configurePhase = "true"; + meta = { license = gpl2Plus; }; + }; + change-inner = melpaBuild rec { pname = "change-inner"; version = "20130208"; @@ -496,6 +523,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + gntp = melpaBuild rec { + pname = "gntp"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tekai"; + repo = "${pname}.el"; + rev = "v${version}"; + sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"; + }; + meta = { license = gpl2Plus; }; + }; + gnus = melpaBuild rec { pname = "gnus"; version = "20140501"; @@ -627,6 +666,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + log4e = melpaBuild rec { + pname = "log4e"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "aki2o"; + repo = pname; + rev = "v${version}"; + sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; + }; + meta = { license = gpl2Plus; }; + }; + lui = melpaBuild rec { pname = "lui"; version = "1.5"; @@ -942,6 +993,19 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + tuareg = melpaBuild rec { + pname = "tuareg"; + version = "2.0.9"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = pname; + rev = version; + sha256 = "1j2smhqrwy0zydhbyjkpnwzq05fgfa85kc0d9kzwq0mppdndspp4"; + }; + packageRequires = [ caml ]; + meta = { license = gpl3Plus; }; + }; + undo-tree = melpaBuild rec { pname = "undo-tree"; version = "0.6.4"; @@ -955,12 +1019,12 @@ let self = _self // overrides; use-package = melpaBuild rec { pname = "use-package"; - version = "20141013"; + version = "20150317"; src = fetchFromGitHub { owner = "jwiegley"; repo = pname; - rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; - sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; + sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; From 0d1b3aa8b8596f01187c7ef9da4d26fa44b4064d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 13 Mar 2015 18:05:42 +0100 Subject: [PATCH 208/947] pythonPackages: add pyasn1-modules, qrcode, and tlslite for electrum --- pkgs/top-level/python-packages.nix | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c262470400..3c155e9beb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7689,6 +7689,25 @@ let }; }); + pyasn1-modules = buildPythonPackage rec { + name = "pyasn1-modules-${version}"; + version = "0.0.5"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyasn1-modules/${name}.tar.gz"; + sha256 = "0hcr6klrzmw4d9j9s5wrhqva5014735pg4zk3rppac4fs87g0rdy"; + }; + + propagatedBuildInputs = with self; [ pyasn1 ]; + + meta = { + description = "A collection of ASN.1-based protocols modules"; + homepage = https://pypi.python.org/pypi/pyasn1-modules; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; # same as pyasn1 + }; + }; pyaudio = pkgs.stdenv.mkDerivation rec { name = "python-pyaudio-${version}"; @@ -10795,6 +10814,40 @@ let }; }; + tlslite = buildPythonPackage rec { + name = "tlslite-${version}"; + version = "0.4.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/tlslite/${name}.tar.gz"; + sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r"; + }; + + meta = { + description = "A pure Python implementation of SSL and TLS"; + homepage = https://pypi.python.org/pypi/tlslite; + license = stdenv.lib.licenses.bsd3; + }; + }; + + qrcode = buildPythonPackage rec { + name = "qrcode-${version}"; + version = "5.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/qrcode/${name}.tar.gz"; + sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + }; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "Quick Response code generation for Python"; + home = "https://pypi.python.org/pypi/qrcode"; + license = stdenv.lib.licenses.bsd3; + }; + }; + tmdb3 = buildPythonPackage rec { name = "tmdb3-${version}"; version = "0.6.17"; From 86b0c186d2449d631f05853c868af05c7382d6eb Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 23:29:35 +0100 Subject: [PATCH 209/947] electrum: bump to 2.0.3 With improvements suggested by @lethalman. --- pkgs/applications/misc/electrum/default.nix | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 97ffd02e751..2638594d7e5 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, buildPythonPackage, slowaes, ecdsa, pyqt4 }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: buildPythonPackage rec { namePrefix = ""; name = "electrum-${version}"; - version = "1.9.8"; + version = "2.0.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff"; + sha256 = "1kzrbnkl5jps0kf0420vzpiqjk3v1jxvlrxwhc0f58xbqyc7l4mj"; }; - buildInputs = [ slowaes ecdsa ]; - - propagatedBuildInputs = [ - slowaes + propagatedBuildInputs = with pythonPackages; [ + dns ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules pyqt4 + qrcode + requests + slowaes + tlslite ]; postPatch = '' @@ -28,6 +34,6 @@ buildPythonPackage rec { long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; homepage = "https://electrum.org"; license = stdenv.lib.licenses.gpl3; - maintainers = [ "emery@vfemail.net" ]; + maintainers = [ "emery@vfemail.net" stdenv.lib.maintainers.joachifm ]; }; } From ff0ca7fcedc99aef46f77f23e5f686e9d736b324 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 18 Mar 2015 10:11:41 +0100 Subject: [PATCH 210/947] p2pvc: remove dot at the end of description --- pkgs/applications/video/p2pvc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index e6f62967c78..c9cffe3fa96 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; meta = { - description = "A point to point color terminal video chat."; + description = "A point to point color terminal video chat"; homepage = "https://github.com/mofarrell/p2pvc"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ trino ]; From a2dc00c17777d6ffa767e9466fcb793c69beffa1 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 18 Mar 2015 02:17:24 +0100 Subject: [PATCH 211/947] nvidiabl: fix for other kernel versions than current It was using the version of currently *running* kernel (impurely). Close #6869. --- pkgs/os-specific/linux/nvidiabl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 6260134bf11..a5a43926e04 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=$(out)" + "KVER=${kernel.modDirVersion}" ]; meta = { From 224d0d530241a666fc6d929019e07098230bd24e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Jan 2015 16:57:34 +0100 Subject: [PATCH 212/947] Set stricter permissions on /nix/store The nixbld group doesn't need read permission, it only needs write and execute permission. (cherry picked from commit 066758758e7c0768ff8da51d208cdae0f33b368c) --- nixos/modules/installer/tools/nixos-install.sh | 2 +- nixos/modules/system/boot/stage-2-init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index bfb42d40b06..8f3de10c613 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -128,7 +128,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/nix/db \ $mountPoint/nix/var/log/nix/drvs -mkdir -m 1775 -p $mountPoint/nix/store +mkdir -m 1735 -p $mountPoint/nix/store chown root:nixbld $mountPoint/nix/store diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 173453a17f7..42148957be4 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -53,7 +53,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg # Silence chown/chmod to fail gracefully on a readonly filesystem # like squashfs. chown -f 0:30000 /nix/store -chmod -f 1775 /nix/store +chmod -f 1735 /nix/store if [ -n "@readOnlyStore@" ]; then if ! readonly-mountpoint /nix/store; then mount --bind /nix/store /nix/store From 1ef6f44e5dd2000c31967ff09e9f43997cd058b3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Mar 2015 19:32:10 -0500 Subject: [PATCH 213/947] nixpkgs: hhvm 3.3.0 -> 3.6.0 - We need {perl,git,krb5,libvpx,etc} as a dependency - Drop upstream patches. - Simplify build (uses cmake configuration) - Simplify install (uses cmake generated installer) Signed-off-by: Austin Seipp --- pkgs/development/compilers/hhvm/default.nix | 38 ++++++--------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index bc2629513a5..e38c37360f0 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,39 +1,34 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre +{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype, gdb +, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libvpx, imagemagick, fribidi }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.3.0"; + version = "3.6.0"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; - sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; + rev = "6ef13f20da20993dc8bab9eb103f73568618d3e8"; + sha256 = "29a2d4b56cfd348b199d8f90b4e4b07de85dfb2ef1538479cd1e84f5bc1fbf96"; fetchSubmodules = true; }; - patches = [ - ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch - ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch - ]; - buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5 + gmp libyaml libedit libvpx imagemagick fribidi ]; enableParallelBuilding = true; dontUseCmakeBuildDir = true; - dontUseCmakeConfigure = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; - USE_HHVM=1; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; MYSQL_DIR=mariadb; @@ -46,19 +41,8 @@ stdenv.mkDerivation rec { substituteInPlace ./configure \ --replace "/usr/bin/env bash" ${stdenv.shell} ''; - installPhase = '' - mkdir -p $out/bin $out/lib - mv hphp/hhvm/hhvm $out/bin - mv hphp/hack/bin/hh_server $out/bin - mv hphp/hack/bin/hh_client $out/bin - mv hphp/hack/hhi $out/lib/hack-hhi - cat > $out/bin/hhvm-hhi-copy < Date: Wed, 18 Mar 2015 11:50:19 +0100 Subject: [PATCH 214/947] Fix a bad revert at 1e4ba025c260fa6852765e9f5c59e985f10c6a43 --- pkgs/development/web/nodejs/build-node-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index cda1162c947..6c616aef05c 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -264,7 +264,7 @@ let ''; passthru.pkgName = pkgName; - } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { +} // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args)// { name = namePrefix + name; # Run the node setup hook when this package is a build input From 532337d67324c13c0231f5d39b0d0ae099902df1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 11:04:31 +0100 Subject: [PATCH 215/947] Cleanup AppArmor module Remove excessive whitespace & comment sections --- nixos/modules/security/apparmor.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 92f020edce5..4fef62cbffd 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -6,37 +6,26 @@ let in { - #### interface options = { - security.apparmor = { - enable = mkOption { type = types.bool; default = false; description = "Enable the AppArmor Mandatory Access Control system."; }; - profiles = mkOption { type = types.listOf types.path; default = []; description = "List of files containing AppArmor profiles."; }; - }; - }; - #### implementation config = mkIf cfg.enable { - - environment.systemPackages = [ - pkgs.apparmor-utils - ]; + environment.systemPackages = [ pkgs.apparmor-utils ]; systemd.services.apparmor = { wantedBy = [ "local-fs.target" ]; - serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; @@ -50,12 +39,11 @@ in }; security.pam.services.apparmor.text = '' - ## The AppArmor service changes hats according to order: first try - ## user, then group, and finally fall back to a hat called "DEFAULT" + ## AppArmor changes hats according to `order`: first try user, then + ## group, and finally fall back to a hat called "DEFAULT" ## ## For now, enable debugging as this is an experimental feature. session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug ''; - }; } From a470b2748bb5ec3957138ec812c27739b5c950e1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 11:05:00 +0100 Subject: [PATCH 216/947] Cleanup apparmor expression Remove excessive whitespace & comments. --- pkgs/os-specific/linux/apparmor/2.9/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index a8d8b2a9e1c..2d7400ad2fa 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -40,18 +40,15 @@ let ]; prePatch = '' - ### common substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" - ### libapparmor substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" ''; buildPhase = '' - ### libapparmor cd ./libraries/libapparmor ./autogen.sh ./configure --prefix="$out" --with-python @@ -76,7 +73,6 @@ let ]; prePatch = '' - ### common substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" @@ -106,12 +102,10 @@ let ]; prePatch = '' - ### common substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" - ### apparmor-parser substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" @@ -158,9 +152,7 @@ let name = "apparmor-profiles-${apparmor-version}"; src = apparmor-sources; - buildInputs = [ - which - ]; + buildInputs = [ which ]; buildPhase = '' cd ./profiles From dc71d5b60218533ee658278bc35cad666bc17c5a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 11:11:26 +0100 Subject: [PATCH 217/947] apparmor: factor out common prePatch --- .../linux/apparmor/2.9/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index 2d7400ad2fa..b1f424fdf1f 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -20,6 +20,12 @@ let sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; }; + prePatchCommon = '' + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ''; + libapparmor = stdenv.mkDerivation { name = "libapparmor-${apparmor-version}"; src = apparmor-sources; @@ -39,11 +45,7 @@ let which ]; - prePatch = '' - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" - substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" - + prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" ''; @@ -72,11 +74,7 @@ let which ]; - prePatch = '' - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" - substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" - ''; + prePatch = prePatchCommon; buildPhase = '' cd ./utils @@ -101,11 +99,7 @@ let which ]; - prePatch = '' - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" - substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" - substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" - + prePatch = prePatchCommon + '' substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" From b0698d4342a0057c019becebc8482ad5ff893f7d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 11:28:20 +0100 Subject: [PATCH 218/947] apparmor: fixup install locations This patch fixes install locations for man pages, python modules and vim scripts. This patch improves but does not fix the user-land AppArmor utilities (i.e., they can now import the modules they need but are broken in other ways still). --- pkgs/os-specific/linux/apparmor/2.9/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index b1f424fdf1f..788297ba339 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -24,6 +24,7 @@ let substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; libapparmor = stdenv.mkDerivation { @@ -82,7 +83,7 @@ let ''; installPhase = '' - make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" + make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" VIM_INSTALL_PATH="$out/share" PYPREFIX="" ''; meta = apparmor-meta "user-land utilities"; @@ -154,7 +155,7 @@ let ''; installPhase = '' - make install DESTDIR="$out" + make install DESTDIR="$out" EXTRAS_DEST="$out/share/apparmor/extra-profiles" ''; meta = apparmor-meta "profiles"; From 53fa11398c3a472c70d7b8189809860b65f75139 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Mar 2015 11:52:05 +0100 Subject: [PATCH 219/947] hackage-packages.nix: re-generate from Hackage 2015-03-17T11:52:35+0100 --- .../configuration-ghc-7.2.x.nix | 2 +- .../haskell-modules/hackage-packages.nix | 323 +++++++++++++----- 2 files changed, 239 insertions(+), 86 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 04cf2d9760f..6d18d8294d6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -40,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_2_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f1d5d43de05..1a8a761cc85 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16340,6 +16340,7 @@ self: { testDepends = [ array base newtype QuickCheck semigroupoids semigroups vector-space ]; + jailbreak = true; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21615,8 +21616,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.3.1"; - sha256 = "13j69i6jmx4qibavr7rwwrnmabf7l5rqd8hs308n0xdnwmvfldbx"; + version = "0.4.0"; + sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28380,6 +28381,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ceilometer-common" = callPackage + ({ mkDerivation, base, bimap, binary, bytestring, containers + , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes + , QuickCheck, siphash, template-haskell, text, transformers + , vaultaire-common + }: + mkDerivation { + pname = "ceilometer-common"; + version = "0.2.2"; + sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + buildDepends = [ + base bimap binary bytestring containers foldl lens pipes siphash + template-haskell text vaultaire-common + ]; + testDepends = [ + base bimap binary bytestring containers data-ordlist foldl hspec + lens lens-properties mtl pipes QuickCheck siphash template-haskell + text transformers vaultaire-common + ]; + homepage = "https://github.com/anchor/ceilometer-common"; + description = "Common Haskell types and encoding for ceilometer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cellrenderer-cairo" = callPackage ({ mkDerivation, base, c2hs, cairo, glib, gtk, mtl }: mkDerivation { @@ -29494,24 +29519,44 @@ self: { "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , hexpat, hs-bibutils, HTTP, json, mtl, network, old-locale - , pandoc-types, parsec, syb, time, utf8-string + , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri + , old-locale, pandoc-types, parsec, syb, time, utf8-string }: mkDerivation { pname = "citeproc-hs"; - version = "0.3.9"; - sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg"; + version = "0.3.10"; + sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r"; buildDepends = [ base bytestring containers directory filepath hexpat hs-bibutils - HTTP json mtl network old-locale pandoc-types parsec syb time - utf8-string + HTTP json mtl network network-uri old-locale pandoc-types parsec + syb time utf8-string ]; - homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; + homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "citeproc-hs-pandoc-filter" = callPackage + ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers + , directory, filepath, mtl, pandoc, pandoc-types, parsec, tagsoup + , texmath, utf8-string, yaml + }: + mkDerivation { + pname = "citeproc-hs-pandoc-filter"; + version = "0.1"; + sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base bytestring citeproc-hs containers directory filepath mtl + pandoc pandoc-types parsec tagsoup texmath utf8-string yaml + ]; + homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/"; + description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "cityhash" = callPackage ({ mkDerivation, base, bytestring, largeword, QuickCheck , test-framework, test-framework-quickcheck2 @@ -30162,6 +30207,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cless" = callPackage + ({ mkDerivation, base, highlighting-kate, optparse-applicative + , terminfo, wl-pprint-extras, wl-pprint-terminfo + }: + mkDerivation { + pname = "cless"; + version = "0.1.0.0"; + sha256 = "1y5mah8x7r0lfc9b6vv69hj2hw6ka1gc9b9qp3bkxlw003rib484"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base highlighting-kate optparse-applicative terminfo + wl-pprint-extras wl-pprint-terminfo + ]; + homepage = "https://github.com/tanakh/cless"; + description = "Colorized LESS"; + license = stdenv.lib.licenses.mit; + }) {}; + "clevercss" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -30579,11 +30643,11 @@ self: { ({ mkDerivation, base, mtl, syb, text }: mkDerivation { pname = "cmark"; - version = "0.1.0.1"; - sha256 = "0js8hhl6j16yywq27rz4jcyibac7zwkkryjqfsdq6wapb3z0d4ad"; + version = "0.2.0.2"; + sha256 = "0kjkqjyvkh4ppvmmbhjjdbhihz7ffsy6kn7dfms21si50qwciq4b"; buildDepends = [ base mtl syb text ]; homepage = "https://github.com/jgm/commonmark-hs"; - description = "Haskell bindings to libcmark, CommonMark parser and renderer"; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -31346,8 +31410,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.4"; - sha256 = "0wycd7ir3bjrf9k1fh81jl09lk9s99fg8z25lwhb8bc70q50sab8"; + version = "4.2.5"; + sha256 = "07ilryqgvnkr4vmifg0dncgzmx87i2fbfbgrgc3jn1yz808s7wqf"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -37986,8 +38050,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.5.21"; - sha256 = "0msmcrhax7lgwkny6gml04d3ki0j8fbgq5isrbdps4737l62csfm"; + version = "2.5.22"; + sha256 = "0g2grz9y23n8g4wwjinx5cc70aawswl84i3njgj6l1fl29fk1yf2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -38360,6 +38424,7 @@ self: { diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text vector-space ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38387,6 +38452,7 @@ self: { base containers diagrams-lib HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38405,6 +38471,7 @@ self: { base containers dual-tree lens MemoTrie monoid-extras newtype semigroups vector-space vector-space-points ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38445,6 +38512,7 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; @@ -38486,6 +38554,7 @@ self: { JuicyPixels lens MemoTrie monoid-extras optparse-applicative semigroups tagged vector-space vector-space-points ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -38525,6 +38594,7 @@ self: { filepath hashable lens monoid-extras mtl semigroups split vector-space ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -43831,6 +43901,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "executable-hash" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, directory + , executable-path, file-embed + }: + mkDerivation { + pname = "executable-hash"; + version = "0.1.1.1"; + sha256 = "1k01qsd2cfrhmxxs8l84g6xc0wcr2hb4s50k3yiin6r8wzli915r"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring cryptohash directory executable-path file-embed + ]; + testDepends = [ base ]; + homepage = "http://github.com/fpco/executable-hash"; + description = "Provides the SHA1 hash of the program executable"; + license = stdenv.lib.licenses.mit; + }) {}; + "executable-path" = callPackage ({ mkDerivation, base, directory, filepath, unix }: mkDerivation { @@ -46692,6 +46781,7 @@ self: { base containers data-default-class lens vector-space vector-space-points ]; + jailbreak = true; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51930,18 +52020,19 @@ self: { }) {}; "groundhog" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, containers, monad-control, monad-logger, mtl - , scientific, text, time, transformers, transformers-base + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, containers, monad-control + , monad-logger, mtl, scientific, text, time, transformers + , transformers-base }: mkDerivation { pname = "groundhog"; - version = "0.7.0.2"; - sha256 = "09wyhqpwmdmw13nbxrrdkc4jsl46pwnq0yhcjzdn9g3s5049s0by"; + version = "0.7.0.3"; + sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r"; buildDepends = [ - aeson base base64-bytestring blaze-builder bytestring containers - monad-control monad-logger mtl scientific text time transformers - transformers-base + aeson attoparsec base base64-bytestring blaze-builder bytestring + containers monad-control monad-logger mtl scientific text time + transformers transformers-base ]; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; @@ -59554,20 +59645,20 @@ self: { "hermit" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, containers - , data-default, directory, ghc, happy, haskeline, kure + , data-default-class, directory, ghc, happy, haskeline, kure , marked-pretty, mtl, operational, process, stm, temporary - , terminfo, transformers + , terminfo, transformers, transformers-compat }: mkDerivation { pname = "hermit"; - version = "0.6.0.0"; - sha256 = "19ry542k5ffr2vb075ylx2l35bn5sdclvz1byhj5bfdvz4rji09l"; + version = "0.7.0.0"; + sha256 = "03k22rc5a3g9mq20q530h40j29k5pz5d9flamzb4svs3jamgz5hz"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal array base containers data-default directory ghc - haskeline kure marked-pretty mtl operational process stm temporary - terminfo transformers + ansi-terminal array base containers data-default-class directory + ghc haskeline kure marked-pretty mtl operational process stm + temporary terminfo transformers transformers-compat ]; buildTools = [ alex happy ]; description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; @@ -61549,8 +61640,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.17"; - sha256 = "1z304qas7h8y9d2jnq8hkg3p50cpx3ni6fwyaj1qwlqrcm4n5rv8"; + version = "1.9.18"; + sha256 = "03wdfl0jmb5szcv61dd8cm0xh5z6qhpy0d5xf6wh3lybma9pjmsb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -63430,8 +63521,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.4"; - sha256 = "1ahwymwksfh40lay41wfzfr02fzgls6h2mg3ylw0i794dhpgqq92"; + version = "0.1.2.6"; + sha256 = "1ncbq9a3hbg9716msjqr7yfr7ay1ky9xpm5f8ajj1rd94fkbq5ya"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -67007,15 +67098,15 @@ self: { "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, clock, containers - , cookie, data-default-class, deepseq, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, publicsuffixlist, random, streaming-commons, text - , time, transformers, zlib + , cookie, data-default-class, deepseq, directory, exceptions + , filepath, ghc-prim, hspec, http-types, mime-types, monad-control + , network, network-uri, publicsuffixlist, random, streaming-commons + , text, time, transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.4.8.1"; - sha256 = "08dd730ix5j0y7jrzrb8d0i153g2jmvklj97npdizmqhwxjfwiis"; + version = "0.4.9"; + sha256 = "1dr8xd1y615hrc9557804zc9k1zi39rfb0hrmpr8ay28f71mb4an"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -67025,8 +67116,8 @@ self: { ]; testDepends = [ async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq hspec http-types monad-control - network streaming-commons text time transformers zlib + case-insensitive containers deepseq directory hspec http-types + monad-control network streaming-commons text time transformers zlib ]; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; @@ -78104,8 +78195,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.3.0.0"; - sha256 = "0m6sg2bng9ihak3hkbzqabdif0m8bblr8cvwgsdhq2ss059vmnws"; + version = "0.3.1.1"; + sha256 = "1qk3dlinhic9m8ahynqqi90y7ai728p10c4mkmj2w135wp8a8ran"; buildDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -80574,12 +80665,16 @@ self: { }) { eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, binary, primitive, vector + , vector-binary-instances + }: mkDerivation { pname = "matrices"; - version = "0.3.0"; - sha256 = "18253z4ah4yxl8di0zsngsi1dip0yd85a62k9h5ha7i9mdq7k0hi"; - buildDepends = [ base primitive vector ]; + version = "0.3.2"; + sha256 = "09d2c6b99hiw858j9llawljb0ls2biky8ddc1cjc72605aacac73"; + buildDepends = [ + base binary primitive vector vector-binary-instances + ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80823,6 +80918,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "mdcat" = callPackage + ({ mkDerivation, ansi-terminal, base, directory, pandoc, terminfo + }: + mkDerivation { + pname = "mdcat"; + version = "0.1.0.0"; + sha256 = "0z3fgs2vsga8wr4ksaqqwx9bxminf9dw9a2kgr9k852r14m234sh"; + isLibrary = false; + isExecutable = true; + buildDepends = [ ansi-terminal base directory pandoc terminfo ]; + homepage = "https://github.com/dorafmon/mdcat"; + description = "Markdown viewer in your terminal"; + license = stdenv.lib.licenses.mit; + }) {}; + "mdo" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -83330,8 +83440,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.0.0"; - sha256 = "1hlbw6xnglmwvjy1zbggxbd3xylx545hp535mjrjnpzda6bydkvd"; + version = "0.1.2.0"; + sha256 = "0d94hpgkrh61cax0f4p71irgvq3psn53qiy7x9bwql8qwsdni1qg"; buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; @@ -87213,13 +87323,14 @@ self: { }) {}; "nsis" = callPackage - ({ mkDerivation, base, process, transformers, uniplate }: + ({ mkDerivation, base, directory, process, transformers, uniplate + }: mkDerivation { pname = "nsis"; - version = "0.2.4"; - sha256 = "17jl5s48msa6c5rb9lvlcsjmv6kzml3yrfmz7h1ipxsdl0yf7nd3"; + version = "0.2.5"; + sha256 = "1lbd1yx2yr96mv58jk3d9qpxpvc9nqkgvi62z4jahwv6wz5wap61"; buildDepends = [ base transformers uniplate ]; - testDepends = [ base process transformers uniplate ]; + testDepends = [ base directory process transformers uniplate ]; homepage = "https://github.com/ndmitchell/nsis#readme"; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; @@ -94286,13 +94397,14 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "process_1_2_2_0" = callPackage + "process_1_2_3_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.2.2.0"; - sha256 = "0rxxcimwhsgcphy0brq6gxcrm8spgpqha8fhppj956kp401hx3s8"; + version = "1.2.3.0"; + sha256 = "1ib01nkh513v5ab7wa255jqpsnqjsjdmh8d9dz8inqw3f4ah97k1"; buildDepends = [ base deepseq directory filepath unix ]; + testDepends = [ base ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95092,8 +95204,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.0.0"; - sha256 = "1b4kmb57k21wk5740jwahkc3xx2nldmjp7lc37ws24zyang84m4c"; + version = "0.2.0.1"; + sha256 = "1c1m5dzglpn3la61gxd6cz1b9fdmn9fkc9y5xnl4wf12fwpsg8bf"; buildDepends = [ base deepseq ghc-prim hashable ]; testDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -100759,8 +100871,8 @@ self: { }: mkDerivation { pname = "rtorrent-rpc"; - version = "0.2.1.0"; - sha256 = "0l2hpdf6vn3532zk5snhwsby5rp28mzys7zbg9qc62dpfscja3v7"; + version = "0.2.2.0"; + sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s"; buildDepends = [ attoparsec base blaze-builder blaze-textual bytestring deepseq haxr mtl network split utf8-string @@ -101657,8 +101769,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "4.1"; - sha256 = "03igvz1xmp20bx2cqsjw6f36p6i10z51kkhpj54xmmqkphb7alpw"; + version = "4.2"; + sha256 = "1q62fa2wi8sxkbx93qpxqr6sivs5q028kdbs35j3ym9mb3pa8y8q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -106066,8 +106178,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.14.0"; - sha256 = "11vf7v1aqbm1lzb5jjjna6j8gj7757xkc8zk820z9d73ak8bq7m8"; + version = "0.14.0.1"; + sha256 = "1mmc6ymd0bic7rw9vsrn1jwwjhlc5jqwh8z7zik5wsk75rvddgph"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -106803,14 +106915,13 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6"; - sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6"; + version = "0.6.0.1"; + sha256 = "0njs0nlznq0yh7gmihwjvxbngw3r0f7csw26pynyi3q0daccsgxg"; buildDepends = [ base bytestring clientsession configurator errors lens MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -109923,6 +110034,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-histogram" = callPackage + ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "streaming-histogram"; + version = "0.1.0.0"; + sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7"; + buildDepends = [ base containers criterion ]; + testDepends = [ + base containers tasty tasty-hunit tasty-quickcheck + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -113587,15 +113713,15 @@ self: { "test-sandbox-compose" = callPackage ({ mkDerivation, aeson, base, bytestring, cabal-test-bin - , containers, directory, hastache, hspec, http-conduit, lifted-base - , network, optparse-applicative, process, shakespeare, shelly - , test-sandbox, text, unix, wai, wai-extra, warp, yaml, yesod - , yesod-core + , containers, directory, hastache, hspec, hspec-test-sandbox + , http-conduit, lifted-base, network, optparse-applicative, process + , shakespeare, shelly, test-sandbox, text, unix, wai, wai-extra + , warp, yaml, yesod, yesod-core }: mkDerivation { pname = "test-sandbox-compose"; - version = "0.1.1"; - sha256 = "1v2zvds3c8g0svh4jafzpdylnkn02hfrnwgxf7pilpd7x718id17"; + version = "0.1.2"; + sha256 = "1hc23yxlf8mwd6rq44i7bbx1aa9p7d7d920625gwd7khcn5x9kyy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113604,7 +113730,8 @@ self: { test-sandbox text unix wai wai-extra warp yaml yesod yesod-core ]; testDepends = [ - base bytestring cabal-test-bin hspec process shakespeare text unix + base bytestring cabal-test-bin hspec hspec-test-sandbox process + shakespeare test-sandbox text unix ]; description = "Lightweight development enviroments using test-sandbox"; license = stdenv.lib.licenses.bsd3; @@ -120578,6 +120705,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vaultaire-common" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , cereal, containers, hashable, hslogger, hspec, locators, mtl + , old-locale, packer, QuickCheck, siphash, text, time, transformers + , unix, unordered-containers + }: + mkDerivation { + pname = "vaultaire-common"; + version = "2.9.1"; + sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr"; + buildDepends = [ + async attoparsec base blaze-builder bytestring cereal containers + hashable hslogger locators old-locale packer QuickCheck siphash + text time transformers unix unordered-containers + ]; + testDepends = [ + base bytestring containers hspec locators mtl QuickCheck text + unordered-containers + ]; + description = "Common types and instances for Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vcache" = callPackage ({ mkDerivation, base, bytestring, containers, direct-murmur-hash , easy-file, filelock, lmdb, random, stm, transformers @@ -120986,8 +121136,8 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.9"; - sha256 = "0rq1753rfm35x3jck4xfs8jyf6r712rp2c5lh0kzylxfib4lwkj2"; + version = "0.10"; + sha256 = "06nrjis2ba61vpbng1yfxbj6s207x94aia7g4njgjwbb8clm66aw"; buildDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -121030,6 +121180,7 @@ self: { version = "0.2.1"; sha256 = "061gpayzqz0shn2s6fx4ss0dfgxcq717dycmkxjhrx3hy0dczv34"; buildDepends = [ base vector-space ]; + jailbreak = true; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122548,15 +122699,17 @@ self: { }) {}; "waitra" = callPackage - ({ mkDerivation, aeson, base, http-types, regex-applicative, tasty - , tasty-hunit, text, wai, wai-extra + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , http-types, regex-applicative, tasty, tasty-hunit + , template-haskell, text, wai, wai-extra }: mkDerivation { pname = "waitra"; - version = "0.0.2.0"; - sha256 = "1hzwxwaw5w38bmsyh15mggrawjbfn1bnkjjjv4aigynv19kdjf03"; + version = "0.0.3.0"; + sha256 = "0yismhhgwzrssla2bcg44jy0fdwwxh2szypyjn8wfjvmkfhzshvn"; buildDepends = [ - aeson base http-types regex-applicative text wai + aeson base bytestring directory filepath http-types + regex-applicative template-haskell text wai ]; testDepends = [ aeson base http-types regex-applicative tasty tasty-hunit wai @@ -125155,8 +125308,8 @@ self: { ({ mkDerivation, base, mtl, safe, transformers, xml }: mkDerivation { pname = "xml-extractors"; - version = "0.3.0.0"; - sha256 = "0mna299sdbxxi2asaa2wk3pwnhr35ah363g2lja7lg82an7np8kp"; + version = "0.4.0.0"; + sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq"; buildDepends = [ base mtl safe transformers xml ]; homepage = "https://github.com/holmisen/xml-extractors"; description = "Wrapper over xml to extract data from parsed xml"; From fe8d65c9a6e4c555590fe2593858cc80081600cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 11:06:42 +0100 Subject: [PATCH 220/947] Add required overrrides for haskell-hosc and haskell-tidal-midi. Fixes https://github.com/NixOS/nixpkgs/issues/6864. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dc43d296ba3..d865c65d55c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -75,8 +75,8 @@ self: super: { seqid-streams = super.seqid-streams_0_1_0; # Need binary >= 0.7.2, but our compiler has only 0.7.1.0. - hosc = dontDistribute super.hosc; - tidal-midi = dontDistribute super.tidal-midi; + hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); # These packages need mtl 2.2.x directly or indirectly via dependencies. amazonka = markBroken super.amazonka; From 25f4f78c924725115c2639e47b4b94b6a0449034 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 11:36:24 +0100 Subject: [PATCH 221/947] haskell-mysql: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f634f3f55f..5a7eff594d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -25,6 +25,9 @@ self: super: { # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; + # Use the default version of mysql to build this package (which is actually mariadb). + mysql = super.mysql.override { inherit (pkgs) mysql; }; + # Please also remove optparse-applicative special case from # cabal2nix/hackage2nix.hs when removing the following. elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1a8a761cc85..fef222e1d66 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -84955,18 +84955,19 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, containers, mysql, zlib }: + ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib + }: mkDerivation { pname = "mysql"; version = "0.1.1.7"; sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; buildDepends = [ base bytestring containers ]; buildTools = [ mysql ]; - extraLibraries = [ zlib ]; + extraLibraries = [ openssl zlib ]; homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { mysql = null; inherit (pkgs) zlib;}; + }) { mysql = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql From dfb8f0dbcf74a286d8e28622862f0e72f1eea6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 18 Mar 2015 12:52:32 +0100 Subject: [PATCH 222/947] sweethome3d.{application,furniture-editor}: version bumps sweethome3d.*: make sure gsetting schemas are picked up --- pkgs/applications/misc/sweethome3d/default.nix | 13 +++++++------ pkgs/applications/misc/sweethome3d/editors.nix | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 978dd19e3df..0c9b6e8c08a 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip }: let @@ -17,20 +17,21 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jdk jre makeWrapper p7zip ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' ant furniture textures help mkdir -p $out/share/{java,applications} - mv build/*.jar $out/share/java/. + mv "build/"*.jar $out/share/java/. ant ''; installPhase = '' mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. - cp ${sweethome3dItem}/share/applications/* $out/share/applications + cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -50,14 +51,14 @@ let in rec { application = mkSweetHome3D rec { - version = "4.4"; + version = "4.6.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "1ziqq8wm6la7bsqya6gc8cc2vz02phl88msqjgqqfl2jf8bz9afv"; + sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index b48b95cda5b..87da1c6643b 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip, sweethome3dApp }: +, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: let @@ -24,7 +24,7 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jre jdk makeWrapper ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -38,8 +38,9 @@ let mkdir -p $out/bin mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. - cp ${editorItem}/share/applications/* $out/share/applications + cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -57,7 +58,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { textures-editor = mkEditorProject rec { version = "1.4"; @@ -74,14 +75,14 @@ in rec { }; furniture-editor = mkEditorProject rec { - version = "1.14"; + version = "1.16"; module = "FurnitureLibraryEditor"; name = sweetName module version; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = stdenv.lib.licenses.gpl2; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0rdcd8vjbcv9jdms2xr3y7ykm2a9bkmwj4y7ybk9zcldayqsgn6z"; + sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374"; module = module; tag = "V_" + d2u version; }; From 5cdd855938b0e4df5ab455f7c18a021ecbd43616 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 11:45:12 +0100 Subject: [PATCH 223/947] haskell-lens: update to 4.8 --- .../haskell-modules/hackage-packages.nix | 72 ++++++++----------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fef222e1d66..f0c8f4d6ae2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2171,6 +2171,7 @@ self: { array base colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2188,6 +2189,7 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2208,6 +2210,7 @@ self: { data-default-class diagrams-core diagrams-lib diagrams-postscript diagrams-svg lens mtl old-locale operational SVGFonts text time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -19990,6 +19993,7 @@ self: { base containers filepath FontyFruity JuicyPixels lens linear mtl optparse-applicative rasterific-svg svg-tree text vector ]; + jailbreak = true; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21601,6 +21605,7 @@ self: { mmap mtl pipes pipes-interleave transformers vector ]; testDepends = [ base binary containers pipes QuickCheck ]; + jailbreak = true; homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; @@ -26538,6 +26543,7 @@ self: { base directory filepath Glob process tasty tasty-golden ]; buildTools = [ cabal-install ]; + jailbreak = true; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26559,6 +26565,7 @@ self: { unordered-containers ]; testDepends = [ base filepath tasty tasty-golden ]; + jailbreak = true; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26842,6 +26849,7 @@ self: { version = "0.4.4"; sha256 = "13gggbbzcq5allf2b76rgxmilrzkvvr3srshfpzh4xavdlm8wmch"; buildDepends = [ base Cabal lens unordered-containers ]; + jailbreak = true; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28883,6 +28891,7 @@ self: { buildDepends = [ base Chart colour data-default-class lens vector ]; + jailbreak = true; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38404,6 +38413,7 @@ self: { lens mtl old-time optparse-applicative pango process split statestack time transformers unix vector ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38629,6 +38639,7 @@ self: { old-time optparse-applicative process Rasterific split statestack time unix ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -38932,6 +38943,7 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; + jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -61339,6 +61351,7 @@ self: { aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/seagreen/hjsonschema"; description = "Haskell implementation of JSON Schema Draft 4"; license = stdenv.lib.licenses.mit; @@ -72570,21 +72583,18 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell - , text, transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, hslogger, lens, template-haskell, text + , transformers }: mkDerivation { pname = "jsaddle"; version = "0.2.0.3"; sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x"; - buildDepends = [ - base lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; + buildDepends = [ base lens template-haskell text transformers ]; testDepends = [ - base glib gtk3 hslogger lens template-haskell text transformers - webkitgtk3 webkitgtk3-javascriptcore + base hslogger lens template-haskell text transformers ]; + jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -72690,6 +72700,7 @@ self: { hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -75888,41 +75899,6 @@ self: { }) {}; "lens" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, comonad - , containers, contravariant, deepseq, directory, distributive - , doctest, exceptions, filepath, free, generic-deriving, ghc-prim - , hashable, hlint, HUnit, mtl, nats, parallel, primitive - , profunctors, QuickCheck, reflection, semigroupoids, semigroups - , simple-reflect, split, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.7"; - sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; - buildDepends = [ - array base bifunctors bytestring comonad containers contravariant - distributive exceptions filepath free ghc-prim hashable mtl - parallel primitive profunctors reflection semigroupoids semigroups - split tagged template-haskell text transformers transformers-compat - unordered-containers vector void - ]; - testDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect split test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens_4_8" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, comonad , containers, contravariant, deepseq, directory, distributive , doctest, exceptions, filepath, free, generic-deriving, ghc-prim @@ -81646,6 +81622,7 @@ self: { random resource-pool transformers ]; testDepends = [ base bytestring hspec network QuickCheck ]; + jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81804,6 +81781,7 @@ self: { base containers lens MonadRandom mtl mtl-compat parsec parsec3-numbers readline ]; + jailbreak = true; description = "Miniature FORTH-like interpreter"; license = stdenv.lib.licenses.mit; }) {}; @@ -83445,6 +83423,7 @@ self: { buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; + jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -87754,6 +87733,7 @@ self: { testDepends = [ base base-compat dotenv hspec hspec-expectations text transformers ]; + jailbreak = true; homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; @@ -88895,6 +88875,7 @@ self: { base bifunctors containers lens mtl pretty template-haskell ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; @@ -89335,6 +89316,7 @@ self: { version = "0.3.1"; sha256 = "1h943cyj6ph5w32rmkzlvszjbb7s65is1h9ifws4m7nj9mbn13lf"; buildDepends = [ base containers lens pandoc-types ]; + jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -99896,6 +99878,7 @@ self: { buildDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; + jailbreak = true; homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; @@ -115424,6 +115407,7 @@ self: { version = "0.1.3.1"; sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n"; buildDepends = [ base intervals lens thyme vector-space ]; + jailbreak = true; homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; @@ -117418,6 +117402,7 @@ self: { template-haskell text time transformers transformers-base twitter-types twitter-types-lens ]; + jailbreak = true; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -126192,6 +126177,7 @@ self: { buildDepends = [ base bytestring containers lens mtl mtl-compat parsec ]; + jailbreak = true; description = "Yet Another Brainfuck Interpreter"; license = stdenv.lib.licenses.mit; }) {}; From 3f45fe100a33a66432e051bd0b08e13f4ea72736 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 11:39:44 +0100 Subject: [PATCH 224/947] haskell-bindings-GLFW is broken (and has been for quite a while). --- .../haskell-modules/configuration-common.nix | 14 ++++++- .../haskell-modules/hackage-packages.nix | 38 ------------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a7eff594d1..14b0e1104d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -292,7 +292,6 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; @@ -325,7 +324,6 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -630,6 +628,18 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; + # https://github.com/bsl/bindings-GLFW/issues/25 + bindings-GLFW = markBroken super.bindings-GLFW; + dynamic-graph = dontDistribute super.dynamic-graph; + fwgl-glfw = dontDistribute super.fwgl-glfw; + glapp = dontDistribute super.glapp; + GLFW-b-demo = dontDistribute super.GLFW-b-demo; + GLFW-b = dontDistribute super.GLFW-b; + GLFW = dontDistribute super.GLFW; + lambdacube-samples = dontDistribute super.lambdacube-samples; + nehe-tuts = dontDistribute super.nehe-tuts; + netwire-input-glfw = dontDistribute super.netwire-input-glfw; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0c8f4d6ae2..63aaa0a11cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4796,22 +4796,6 @@ self: { inherit (pkgs.xlibs) libXrandr;}; "GLFW-b" = callPackage - ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "GLFW-b"; - version = "1.4.6"; - sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy"; - buildDepends = [ base bindings-GLFW ]; - testDepends = [ - base bindings-GLFW HUnit test-framework test-framework-hunit - ]; - description = "Bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "GLFW-b_1_4_7_1" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework , test-framework-hunit }: @@ -4823,7 +4807,6 @@ self: { testDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit ]; - jailbreak = true; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23305,27 +23288,6 @@ self: { }) { esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext - , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "bindings-GLFW"; - version = "3.0.3.3"; - sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; - buildDepends = [ base bindings-DSL ]; - testDepends = [ base HUnit test-framework test-framework-hunit ]; - extraLibraries = [ - libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa - ]; - description = "Low-level bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xlibs) libXi; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; - inherit (pkgs) mesa;}; - - "bindings-GLFW_3_1_1" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework , test-framework-hunit From 17b940568571ebc81344cf22740e8452157556eb Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 2 Mar 2015 02:14:24 +0100 Subject: [PATCH 225/947] bundlerEnv: add support for additional build inputs --- pkgs/development/interpreters/ruby/bundler-env/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix index ea4e141b8fe..b51a6d49bd3 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix @@ -11,6 +11,7 @@ , postInstall ? null , documentation ? false , meta ? {} +, ... }@args: let @@ -253,7 +254,7 @@ let ruby bundler git - ]; + ] ++ args.buildInputs or []; phases = [ "installPhase" "fixupPhase" ]; From b5298683aaf7220ec796ad3662af4f439e8a30a8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 2 Mar 2015 02:15:43 +0100 Subject: [PATCH 226/947] Add chef-dk --- pkgs/development/tools/chefdk/Gemfile | 3 + pkgs/development/tools/chefdk/Gemfile.lock | 99 ++++++ pkgs/development/tools/chefdk/default.nix | 20 ++ pkgs/development/tools/chefdk/gemset.nix | 344 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 5 files changed, 470 insertions(+) create mode 100644 pkgs/development/tools/chefdk/Gemfile create mode 100644 pkgs/development/tools/chefdk/Gemfile.lock create mode 100644 pkgs/development/tools/chefdk/default.nix create mode 100644 pkgs/development/tools/chefdk/gemset.nix diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile new file mode 100644 index 00000000000..9cd40fd3f4b --- /dev/null +++ b/pkgs/development/tools/chefdk/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'chef-dk' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock new file mode 100644 index 00000000000..60ff7b5ba3e --- /dev/null +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -0,0 +1,99 @@ +GEM + remote: https://rubygems.org/ + specs: + chef (12.0.3) + chef-zero (~> 3.2) + diff-lcs (~> 1.2, >= 1.2.4) + erubis (~> 2.7) + ffi-yajl (~> 1.2) + highline (~> 1.6, >= 1.6.9) + mixlib-authentication (~> 1.3) + mixlib-cli (~> 1.4) + mixlib-config (~> 2.0) + mixlib-log (~> 1.3) + mixlib-shellout (>= 2.0.0.rc.0, < 3.0) + net-ssh (~> 2.6) + net-ssh-multi (~> 1.1) + ohai (~> 8.0) + plist (~> 3.1.0) + pry (~> 0.9) + chef-dk (0.4.0) + chef (~> 12.0) + cookbook-omnifetch (~> 0.2) + ffi-yajl (~> 1.0) + mixlib-cli (~> 1.5) + mixlib-shellout (>= 2.0.0.rc.0, < 3.0.0) + solve (~> 1.2) + chef-zero (3.2.1) + ffi-yajl (~> 1.1) + hashie (~> 2.0) + mixlib-log (~> 1.3) + rack + uuidtools (~> 2.1) + coderay (1.1.0) + cookbook-omnifetch (0.2.0) + minitar (~> 0.5.4) + dep-selector-libgecode (1.0.2) + dep_selector (1.0.3) + dep-selector-libgecode (~> 1.0) + ffi (~> 1.9) + diff-lcs (1.2.5) + erubis (2.7.0) + ffi (1.9.6) + ffi-yajl (1.4.0) + ffi (~> 1.5) + libyajl2 (~> 1.2) + hashie (2.1.2) + highline (1.7.1) + ipaddress (0.8.0) + libyajl2 (1.2.0) + method_source (0.8.2) + mime-types (2.4.3) + minitar (0.5.4) + mixlib-authentication (1.3.0) + mixlib-log + mixlib-cli (1.5.0) + mixlib-config (2.1.0) + mixlib-log (1.6.0) + mixlib-shellout (2.0.1) + net-dhcp (1.3.2) + net-ssh (2.9.2) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + net-ssh-multi (1.2.0) + net-ssh (>= 2.6.5) + net-ssh-gateway (>= 1.2.0) + ohai (8.1.1) + ffi (~> 1.9) + ffi-yajl (~> 1.1) + ipaddress + mime-types (~> 2.0) + mixlib-cli + mixlib-config (~> 2.0) + mixlib-log + mixlib-shellout (~> 2.0) + net-dhcp + rake (~> 10.1) + systemu (~> 2.6.4) + wmi-lite (~> 1.0) + plist (3.1.0) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + rack (1.6.0) + rake (10.4.2) + semverse (1.2.1) + slop (3.6.0) + solve (1.2.1) + dep_selector (~> 1.0) + semverse (~> 1.1) + systemu (2.6.4) + uuidtools (2.1.5) + wmi-lite (1.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + chef-dk diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix new file mode 100644 index 00000000000..8352c71a686 --- /dev/null +++ b/pkgs/development/tools/chefdk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby, perl }: + +bundlerEnv { + name = "chefdk-0.4.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ perl ]; + + meta = with lib; { + description = "A streamlined development and deployment workflow for Chef platform."; + homepage = https://downloads.chef.io/chef-dk/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix new file mode 100644 index 00000000000..f83e73693d8 --- /dev/null +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -0,0 +1,344 @@ +{ + "chef" = { + version = "12.0.3"; + source = { + type = "gem"; + sha256 = "0lqix0mli6fm3lwrf563sjvfkfsrnyzbz8xqkp54q65dkl63ldy0"; + }; + dependencies = [ + "chef-zero" + "diff-lcs" + "erubis" + "ffi-yajl" + "highline" + "mixlib-authentication" + "mixlib-cli" + "mixlib-config" + "mixlib-log" + "mixlib-shellout" + "net-ssh" + "net-ssh-multi" + "ohai" + "plist" + "pry" + ]; + }; + "chef-dk" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "12fdk5j6cymwk4vk45mvi5i1hs9a88jvg6g7x6pxbc0bp3if2c6a"; + }; + dependencies = [ + "chef" + "cookbook-omnifetch" + "ffi-yajl" + "mixlib-cli" + "mixlib-shellout" + "solve" + ]; + }; + "chef-zero" = { + version = "3.2.1"; + source = { + type = "gem"; + sha256 = "04zypmygpxz8nwhjs4gvr8rcb9vqhmz37clbh7k7xxh5b2hs654k"; + }; + dependencies = [ + "ffi-yajl" + "hashie" + "mixlib-log" + "rack" + "uuidtools" + ]; + }; + "coderay" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; + }; + }; + "cookbook-omnifetch" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "027zz78693jd5g0fwp0xlzig2zijsxcgvfw5854ig37gy5a54wy4"; + }; + dependencies = [ + "minitar" + ]; + }; + "dep-selector-libgecode" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0755ps446wc4cf26ggmvibr4wmap6ch7zhkh1qmx1p6lic2hr4gn"; + }; + }; + "dep_selector" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "1ic90j3d6hmyxmdxzdz8crwmvw61f4kj0jphk43m6ipcx6bkphzw"; + }; + dependencies = [ + "dep-selector-libgecode" + "ffi" + ]; + }; + "diff-lcs" = { + version = "1.2.5"; + source = { + type = "gem"; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + "erubis" = { + version = "2.7.0"; + source = { + type = "gem"; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + }; + }; + "ffi" = { + version = "1.9.6"; + source = { + type = "gem"; + sha256 = "1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj"; + }; + }; + "ffi-yajl" = { + version = "1.4.0"; + source = { + type = "gem"; + sha256 = "1l289wyzc06v0rn73msqxx4gm48iqgxkd9rins22f13qicpczi5g"; + }; + dependencies = [ + "ffi" + "libyajl2" + ]; + }; + "hashie" = { + version = "2.1.2"; + source = { + type = "gem"; + sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9"; + }; + }; + "highline" = { + version = "1.7.1"; + source = { + type = "gem"; + sha256 = "1355zfwmm6baq44rp0ny7zdnsipgn5maxk19hvii0jx2bsk417fr"; + }; + }; + "ipaddress" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + }; + }; + "libyajl2" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; + }; + }; + "method_source" = { + version = "0.8.2"; + source = { + type = "gem"; + sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; + }; + }; + "mime-types" = { + version = "2.4.3"; + source = { + type = "gem"; + sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; + }; + }; + "minitar" = { + version = "0.5.4"; + source = { + type = "gem"; + sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka"; + }; + }; + "mixlib-authentication" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1c5p5ipa3cssmwgdn0q3lyy1w7asikh9qfpnn7xcfz2f9m7v02zg"; + }; + dependencies = [ + "mixlib-log" + ]; + }; + "mixlib-cli" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0im6jngj76azrz0nv69hgpy1af4smcgpfvmmwh5iwsqwa46zx0k0"; + }; + }; + "mixlib-config" = { + version = "2.1.0"; + source = { + type = "gem"; + sha256 = "13mb628614nl4dfwyyqpxc7b688ls6cfnjx06j8c13sl003xkp7g"; + }; + }; + "mixlib-log" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1xblfxby3psh4n5cgc6j6xnvmmssyr8qjy0l76f92nr4b9yvv9m2"; + }; + }; + "mixlib-shellout" = { + version = "2.0.1"; + source = { + type = "gem"; + sha256 = "16n2zli15504bfzxwj5riq92zz3h8n8xswvs5gi0dp2dhyjd7lp3"; + }; + }; + "net-dhcp" = { + version = "1.3.2"; + source = { + type = "gem"; + sha256 = "13mq3kwk6k3cd0vhnj1xq0gvbg2hbynzpnvq6fa6vqakbyc0iznd"; + }; + }; + "net-ssh" = { + version = "2.9.2"; + source = { + type = "gem"; + sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + }; + }; + "net-ssh-gateway" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-ssh-multi" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "0927244ac8h3z6wl5cifkblsa95ddpsxr6k8h2fmdvg5wdqs4ydh"; + }; + dependencies = [ + "net-ssh" + "net-ssh-gateway" + ]; + }; + "ohai" = { + version = "8.1.1"; + source = { + type = "gem"; + sha256 = "1lcbl7lrmy56x6l6ca7miawj9h40ff6nv4b3n6bz3w7fa3vh9xz0"; + }; + dependencies = [ + "ffi" + "ffi-yajl" + "ipaddress" + "mime-types" + "mixlib-cli" + "mixlib-config" + "mixlib-log" + "mixlib-shellout" + "net-dhcp" + "rake" + "systemu" + "wmi-lite" + ]; + }; + "plist" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; + }; + }; + "pry" = { + version = "0.10.1"; + source = { + type = "gem"; + sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; + }; + dependencies = [ + "coderay" + "method_source" + "slop" + ]; + }; + "rack" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + }; + }; + "rake" = { + version = "10.4.2"; + source = { + type = "gem"; + sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; + }; + }; + "semverse" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8"; + }; + }; + "slop" = { + version = "3.6.0"; + source = { + type = "gem"; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + }; + }; + "solve" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0ff5iwhsr6fcp10gd2ivrx1fcw3lm5f5f11srhy2z5dc3v79mcja"; + }; + dependencies = [ + "dep_selector" + "semverse" + ]; + }; + "systemu" = { + version = "2.6.4"; + source = { + type = "gem"; + sha256 = "16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z"; + }; + }; + "uuidtools" = { + version = "2.1.5"; + source = { + type = "gem"; + sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + }; + }; + "wmi-lite" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c4c185e37e..393bb2ef68f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4859,6 +4859,10 @@ let cgdb = callPackage ../development/tools/misc/cgdb { }; + chefdk = callPackage ../development/tools/chefdk { + ruby = ruby_2_0_0; + }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; From 536694bcd4d8aa260096d3f2388cf020980c693f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 14:30:12 +0100 Subject: [PATCH 227/947] nixos/cadvisor: fixes - run as non root user, because of docker - run docker by default --- nixos/modules/services/monitoring/cadvisor.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 0a06291da2a..b6cf397f35c 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,17 +90,9 @@ in { ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} ''} ''; - User = "cadvisor"; }; }; - virtualisation.docker.enable = true; - - users.extraUsers = singleton { - name = "cadvisor"; - uid = config.ids.uids.cadvisor; - description = "Cadvisor user"; - extraGroups = [ "docker" ]; - }; + virtualisation.docker.enable = mkDefault true; }; } From a3a98d724220ef5e6577d726055cf4c993ce31a8 Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Wed, 18 Mar 2015 10:32:46 -0300 Subject: [PATCH 228/947] Improved builder for Sqitch --- .../development/tools/misc/sqitch/default.nix | 23 ++++++++----------- pkgs/top-level/all-packages.nix | 6 +++-- pkgs/top-level/perl-packages.nix | 15 ++++++------ 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index c4c8e065bc5..0a1032cecf8 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,20 +1,15 @@ -{ stdenv, writeScript, makeWrapper, sqitchModule }: -stdenv.mkDerivation rec { - name = "sqitch-0.999"; - buildInputs = [ makeWrapper ]; - builder = writeScript (name + "-builder.sh") '' - . ${stdenv}/setup +{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: +stdenv.mkDerivation { + name = "${name}-${sqitchModule.version}"; + buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; + unpackPhase = ":"; + buildPhase = ":"; + installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do ln -s ${sqitchModule}/$d $out/$d done - fixupPhase - wrapProgram $out/bin/sqitch \ - --prefix PERL5LIB : \ - "$(for i in $(cat ${sqitchModule}/nix-support/propagated-native-build-inputs) ; do - echo -n "$i"/lib/perl5/site_perl: - done - echo ${sqitchModule}/lib/perl5/site_perl - )" ''; + dontStrip = true; + postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0c012ba93..437ec5b1ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7816,8 +7816,10 @@ let planetary_annihilation = callPackage ../games/planetaryannihilation { }; - sqitch = callPackage ../development/tools/misc/sqitch { - inherit stdenv writeScript makeWrapper ; + sqitchPg = callPackage ../development/tools/misc/sqitch { + inherit stdenv perl makeWrapper; + name = "sqitch-pg"; + databaseModule = perlPackages.DBDPg; sqitchModule = perlPackages.AppSqitch; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23077aed55a..a96b05bd998 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -219,8 +219,9 @@ let self = _self // overrides; _self = with self; { }; }; - AppSqitch = buildPerlModule { - name = "App-Sqitch-0.999"; + AppSqitch = buildPerlModule rec { + version = "0.999"; + name = "App-Sqitch-${version}"; src = fetchurl { url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.999.tar.gz; sha256 = "e7e02194a7b0c42fb4df046cd834d5eb99ff9a2c169f5c60a52c362e89351da6"; @@ -235,11 +236,11 @@ let self = _self // overrides; _self = with self; { IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI URIdb libintlperl namespaceautoclean - strictures ModuleRuntime DevelGlobalDestruction SubExporterProgressive - ImportInto ExporterTiny DataOptList ParamsUtil SubInstall RoleTiny - MooXTypesMooseLike ClassLoad ModuleImplementation ClassLoadXS - BHooksEndOfScope namespaceclean PackageStash SubIdentify - ClassMethodModifiers + # strictures ModuleRuntime DevelGlobalDestruction SubExporterProgressive + # ImportInto ExporterTiny DataOptList ParamsUtil SubInstall RoleTiny + # MooXTypesMooseLike ClassLoad ModuleImplementation ClassLoadXS + # BHooksEndOfScope namespaceclean PackageStash SubIdentify + # ClassMethodModifiers ]; doCheck = false; # Can't find home directory. meta = { From 079520ced5dfcb223057fa344eac9c0f2d0e84b2 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 14:12:13 +0100 Subject: [PATCH 229/947] panamax: update, fix module --- nixos/modules/services/cluster/panamax.nix | 5 +- .../panamax/{Gemfile-api => api/Gemfile} | 0 .../{Gemfile-api.lock => api/Gemfile.lock} | 8 +- .../panamax/{api.nix => api/default.nix} | 28 ++-- .../{gemset-api.nix => api/gemset.nix} | 23 ++-- .../panamax/{Gemfile-ui => ui/Gemfile} | 11 +- .../{Gemfile-ui.lock => ui/Gemfile.lock} | 71 +++++----- .../panamax/{ui.nix => ui/default.nix} | 25 ++-- .../panamax/{gemset-ui.nix => ui/gemset.nix} | 121 +++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 10 files changed, 169 insertions(+), 127 deletions(-) rename pkgs/applications/networking/cluster/panamax/{Gemfile-api => api/Gemfile} (100%) rename pkgs/applications/networking/cluster/panamax/{Gemfile-api.lock => api/Gemfile.lock} (97%) rename pkgs/applications/networking/cluster/panamax/{api.nix => api/default.nix} (88%) rename pkgs/applications/networking/cluster/panamax/{gemset-api.nix => api/gemset.nix} (96%) rename pkgs/applications/networking/cluster/panamax/{Gemfile-ui => ui/Gemfile} (77%) rename pkgs/applications/networking/cluster/panamax/{Gemfile-ui.lock => ui/Gemfile.lock} (83%) rename pkgs/applications/networking/cluster/panamax/{ui.nix => ui/default.nix} (88%) rename pkgs/applications/networking/cluster/panamax/{gemset-ui.nix => ui/gemset.nix} (85%) diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index a7233f23c91..b47ff744fc2 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -124,14 +124,15 @@ in { }; preStart = '' - rm -rf ${cfg.dataDir}/state/tmp mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} + chown -R panamax:panamax ${cfg.dataDir} ''; serviceConfig = { ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; User = "panamax"; Group = "panamax"; + PermissionsStartOnly = true; }; }; @@ -145,6 +146,8 @@ in { services.journald.enableHttpGateway = mkDefault true; services.fleet.enable = mkDefault true; + services.cadvisor.enable = mkDefault true; + services.cadvisor.port = mkDefault 3002; virtualisation.docker.enable = mkDefault true; environment.systemPackages = [ panamax_api panamax_ui ]; diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api b/pkgs/applications/networking/cluster/panamax/api/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/panamax/Gemfile-api rename to pkgs/applications/networking/cluster/panamax/api/Gemfile diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock similarity index 97% rename from pkgs/applications/networking/cluster/panamax/Gemfile-api.lock rename to pkgs/applications/networking/cluster/panamax/api/Gemfile.lock index e0ebe72132b..597c691700a 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock +++ b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock @@ -58,7 +58,7 @@ GEM faraday (= 0.8.9) faraday_middleware (= 0.9.0) hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) its (0.2.0) rspec-core json (1.8.1) @@ -66,7 +66,7 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - minitest (5.4.3) + minitest (5.5.1) multi_json (1.10.1) multipart-post (1.2.0) octokit (3.2.0) @@ -74,7 +74,7 @@ GEM puma (2.8.2) rack (>= 1.1, < 2.0) rack (1.5.2) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -126,7 +126,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) diff --git a/pkgs/applications/networking/cluster/panamax/api.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix similarity index 88% rename from pkgs/applications/networking/cluster/panamax/api.nix rename to pkgs/applications/networking/cluster/panamax/api/default.nix index 415392627ea..6cbec878a48 100644 --- a/pkgs/applications/networking/cluster/panamax/api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -4,29 +4,31 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "panamax-api-${version}"; + version = "0.2.16"; + + env = bundlerEnv { + name = "panamax-api-gems-${version}"; + inherit ruby; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; + }; + bundler = bundler_HEAD.override { inherit ruby; }; + database_yml = builtins.toFile "database.yml" '' production: adapter: sqlite3 database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> timeout: 5000 ''; - env = bundlerEnv { - name = "panamax-api-gems"; - inherit ruby; - gemset = ./gemset-api.nix; - gemfile = ./Gemfile-api; - lockfile = ./Gemfile-api.lock; - }; - bundler = bundler_HEAD.override { inherit ruby; }; -in stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.11"; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "01sz7jibn1rqfga85pr4p8wk6jfldzfaxj1726vs6znmcwhfkcgj"; + sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-api.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix similarity index 96% rename from pkgs/applications/networking/cluster/panamax/gemset-api.nix rename to pkgs/applications/networking/cluster/panamax/api/gemset.nix index 62cf5dcd3af..8182543a2bb 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -223,10 +221,10 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; "its" = { @@ -271,10 +269,10 @@ in { }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -310,7 +308,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -320,10 +317,10 @@ in { }; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -491,10 +488,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.0"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "042fxqskvaa0wn9kpy02nv6p7sa355py9pi58zw96l30170sd3hl"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -568,4 +565,4 @@ in { "crack" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui b/pkgs/applications/networking/cluster/panamax/ui/Gemfile similarity index 77% rename from pkgs/applications/networking/cluster/panamax/Gemfile-ui rename to pkgs/applications/networking/cluster/panamax/ui/Gemfile index 7efcabfd9e5..6f7dc59d04d 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile @@ -13,10 +13,11 @@ gem 'zeroclipboard-rails' group :test, :development do - gem 'rspec-rails', '2.14.2' - gem 'capybara', '2.3.0' - gem 'teaspoon', '0.8.0' - gem 'phantomjs', '1.9.7.1' + gem 'rspec-rails' + gem 'its' + gem 'capybara' + gem 'teaspoon' + gem 'phantomjs' gem 'dotenv-rails', '0.11.1' gem 'pry' gem 'pry-byebug' @@ -24,7 +25,7 @@ group :test, :development do end group :test do - gem 'webmock', '1.18.0' + gem 'webmock' gem 'sinatra', '1.4.5' gem 'coveralls', '0.7.0' end diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock similarity index 83% rename from pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock rename to pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock index 67504f41a86..e1dfc0d4a3d 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock @@ -40,7 +40,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) slop (~> 3.6) - capybara (2.3.0) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -56,7 +56,7 @@ GEM thor crack (0.4.2) safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.4) + ctl_base_ui (0.0.5) haml (~> 4.0) jquery-rails (~> 3.1) jquery-ui-rails (~> 4.2) @@ -72,28 +72,31 @@ GEM dotenv-rails (0.11.1) dotenv (= 0.11.1) erubis (2.7.0) - execjs (2.2.1) + execjs (2.2.2) haml (4.0.5) tilt hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) + its (0.2.0) + rspec-core jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (1.8.1) + json (1.8.2) kramdown (1.4.0) libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (2.4.3) - mini_portile (0.6.0) - minitest (5.4.3) + mini_portile (0.6.1) + minitest (5.5.1) multi_json (1.10.1) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + netrc (0.8.0) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) phantomjs (1.9.7.1) pry (0.10.1) coderay (~> 1.1.0) @@ -110,7 +113,7 @@ GEM rack (1.5.2) rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -129,23 +132,28 @@ GEM activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.1) + rake (10.4.0) ref (1.0.5) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - safe_yaml (1.0.3) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) + safe_yaml (1.0.4) sass (3.3.9) simplecov (0.9.1) docile (~> 1.1.0) @@ -162,7 +170,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -176,13 +184,13 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.1.0) + tins (1.3.3) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) - webmock (1.18.0) + webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) xpath (2.0.0) @@ -195,23 +203,24 @@ PLATFORMS DEPENDENCIES activeresource (= 4.0.0) - capybara (= 2.3.0) + capybara coveralls (= 0.7.0) ctl_base_ui dotenv-rails (= 0.11.1) haml (= 4.0.5) + its kramdown (= 1.4.0) - phantomjs (= 1.9.7.1) + phantomjs pry pry-byebug pry-stack_explorer puma (= 2.8.2) rails (= 4.1.7) - rspec-rails (= 2.14.2) + rspec-rails sass (= 3.3.9) sinatra (= 1.4.5) - teaspoon (= 0.8.0) + teaspoon therubyracer (= 0.12.1) uglifier (= 2.5.1) - webmock (= 1.18.0) + webmock zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix similarity index 88% rename from pkgs/applications/networking/cluster/panamax/ui.nix rename to pkgs/applications/networking/cluster/panamax/ui/default.nix index 4d4e4fe964d..572deb62ba0 100644 --- a/pkgs/applications/networking/cluster/panamax/ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -3,24 +3,25 @@ with stdenv.lib; -let - env = bundlerEnv { - name = "panamax-api-gems"; - inherit ruby; - gemset = ./gemset-ui.nix; - gemfile = ./Gemfile-ui; - lockfile = ./Gemfile-ui.lock; - }; - bundler = bundler_HEAD.override { inherit ruby; }; -in stdenv.mkDerivation rec { name = "panamax-ui-${version}"; - version = "0.2.11"; + version = "0.2.14"; + + env = bundlerEnv { + name = "panamax-ui-gems-${version}"; + inherit ruby; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; + }; + + bundler = bundler_HEAD.override { inherit ruby; }; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "17j5ac8fzp377bzg7f239jdcc9j0c63bkx0ill5nl10i3h05z7jh"; + sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix similarity index 85% rename from pkgs/applications/networking/cluster/panamax/gemset-ui.nix rename to pkgs/applications/networking/cluster/panamax/ui/gemset.nix index 3793a250215..cfb2b6f460f 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -131,10 +129,10 @@ in { ]; }; "capybara" = { - version = "2.3.0"; + version = "2.4.4"; source = { type = "gem"; - sha256 = "12x24zsn3y7sigmz45ijd9bkq7l14r2a00ay6k9mdgrbncbr3ins"; + sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; }; dependencies = [ "mime-types" @@ -183,10 +181,10 @@ in { ]; }; "ctl_base_ui" = { - version = "0.0.4"; + version = "0.0.5"; source = { type = "gem"; - sha256 = "0h0dbl0mf6cql7yp10jywv22rn0iy2188phdxvr2ladwwn2vxf5d"; + sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; }; dependencies = [ "haml" @@ -259,10 +257,10 @@ in { }; }; "execjs" = { - version = "2.2.1"; + version = "2.2.2"; source = { type = "gem"; - sha256 = "1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b"; + sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; }; }; "haml" = { @@ -283,12 +281,22 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; + "its" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; + }; + dependencies = [ + "rspec-core" + ]; + }; "jquery-rails" = { version = "3.1.2"; source = { @@ -311,10 +319,10 @@ in { ]; }; "json" = { - version = "1.8.1"; + version = "1.8.2"; source = { type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; }; "kramdown" = { @@ -356,17 +364,17 @@ in { }; }; "mini_portile" = { - version = "0.6.0"; + version = "0.6.1"; source = { type = "gem"; - sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn"; + sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -376,11 +384,18 @@ in { sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; }; }; - "nokogiri" = { - version = "1.6.2.1"; + "netrc" = { + version = "0.8.0"; source = { type = "gem"; - sha256 = "0dj8ajm9hlfpa71qz1xn5prqy5qdi32ll74qh8ssjwknp1a35cnz"; + sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; + }; + }; + "nokogiri" = { + version = "1.6.5"; + source = { + type = "gem"; + sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; }; dependencies = [ "mini_portile" @@ -436,7 +451,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -456,10 +470,10 @@ in { ]; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -506,10 +520,10 @@ in { ]; }; "rake" = { - version = "10.4.1"; + version = "10.4.0"; source = { type = "gem"; - sha256 = "1446zzdpwpvwkd0zk19b2smmmvdiarh4b26cdbcw4fy5p67wxkw2"; + sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; }; }; "ref" = { @@ -520,60 +534,75 @@ in { }; }; "rest-client" = { - version = "1.6.7"; + version = "1.7.2"; source = { type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; + sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; }; dependencies = [ "mime-types" + "netrc" ]; }; "rspec-core" = { - version = "2.14.8"; + version = "3.1.7"; source = { type = "gem"; - sha256 = "0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc"; + sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-expectations" = { - version = "2.14.5"; + version = "3.1.2"; source = { type = "gem"; - sha256 = "1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9"; + sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; }; dependencies = [ "diff-lcs" + "rspec-support" ]; }; "rspec-mocks" = { - version = "2.14.6"; + version = "3.1.3"; source = { type = "gem"; - sha256 = "1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30"; + sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-rails" = { - version = "2.14.2"; + version = "3.1.0"; source = { type = "gem"; - sha256 = "1j9nbha6p12kwy9c5g3lw541xg20yzk95lzgmsq7kvngiqz88p57"; + sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; }; dependencies = [ "actionpack" - "activemodel" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" + "rspec-support" ]; }; - "safe_yaml" = { - version = "1.0.3"; + "rspec-support" = { + version = "3.1.2"; source = { type = "gem"; - sha256 = "063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl"; + sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; }; }; "sass" = { @@ -635,10 +664,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.2"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -699,10 +728,10 @@ in { }; }; "tins" = { - version = "1.1.0"; + version = "1.3.3"; source = { type = "gem"; - sha256 = "0jddc40lw8lzn421p6pjvvs7b37qyd8jgsl5nrq16rc46wgx2r2r"; + sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; }; }; "tzinfo" = { @@ -727,10 +756,10 @@ in { ]; }; "webmock" = { - version = "1.18.0"; + version = "1.20.4"; source = { type = "gem"; - sha256 = "1r21a4x7dljb3cqxp7w7mdq5a1xvw9kn6m3gldsldsfza5b4hq03"; + sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; }; dependencies = [ "addressable" @@ -757,4 +786,4 @@ in { "railties" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 393bb2ef68f..6aa25b8cc1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11134,10 +11134,10 @@ let withSidebar = true; }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api.nix { + panamax_api = callPackage ../applications/networking/cluster/panamax/api { ruby = ruby_2_1; }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui.nix { + panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { ruby = ruby_2_1; }; From 2482b75eaeb0848b2be89848437a794dc3eee413 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 14:26:40 +0100 Subject: [PATCH 230/947] kubernetes: update to 0.12.1, fix module --- nixos/modules/services/cluster/kubernetes.nix | 142 ++++++++++++------ nixos/tests/kubernetes.nix | 17 ++- .../networking/cluster/kubernetes/default.nix | 11 +- 3 files changed, 109 insertions(+), 61 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 7fd2d77aa82..d9ae0454ba5 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -44,6 +44,12 @@ in { type = types.path; }; + dockerCfg = mkOption { + description = "Kubernetes contents of dockercfg file."; + default = ""; + type = types.lines; + }; + apiserver = { enable = mkOption { description = "Whether to enable kubernetes apiserver."; @@ -217,13 +223,13 @@ in { }; machines = mkOption { - description = "Kubernetes apiserver list of machines to schedule to schedule onto"; + description = "Kubernetes controller list of machines to schedule to schedule onto"; default = []; type = types.listOf types.str; }; extraOpts = mkOption { - description = "Kubernetes scheduler extra command line options."; + description = "Kubernetes controller extra command line options."; default = ""; type = types.str; }; @@ -260,6 +266,30 @@ in { type = types.bool; }; + apiServers = mkOption { + description = "Kubernetes kubelet list of Kubernetes API servers for publishing events, and reading pods and services."; + default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"]; + type = types.listOf types.str; + }; + + cadvisorPort = mkOption { + description = "Kubernetes kubelet local cadvisor port."; + default = config.services.cadvisor.port; + type = types.int; + }; + + clusterDns = mkOption { + description = "Use alternative dns."; + default = ""; + type = types.str; + }; + + clusterDomain = mkOption { + description = "Use alternative domain."; + default = ""; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes kubelet extra command line options."; default = ""; @@ -295,6 +325,7 @@ in { systemd.services.kubernetes-apiserver = { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; + requires = ["kubernetes-setup.service"]; after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = let @@ -306,26 +337,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} \ + --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"} \ ${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}"} \ - ${optionalString (cfg.apiserver.tlsCertFile!="" && cfg.apiserver.tlsCertFile!="") - "-secure_port=${toString cfg.apiserver.securePort}"} \ - -portal_net=${cfg.apiserver.portalNet} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + "--authorization_policy_file=${authorizationPolicyFile}"} \ + --secure_port=${toString cfg.apiserver.securePort} \ + --portal_net=${cfg.apiserver.portalNet} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; User = "kubernetes"; @@ -345,11 +375,11 @@ in { after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-scheduler \ - -address=${cfg.scheduler.address} \ - -port=${toString cfg.scheduler.port} \ - -master=${cfg.scheduler.master} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --address=${cfg.scheduler.address} \ + --port=${toString cfg.scheduler.port} \ + --master=${cfg.scheduler.master} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.scheduler.extraOpts} ''; User = "kubernetes"; @@ -364,13 +394,12 @@ in { after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-controller-manager \ - -address=${cfg.controllerManager.address} \ - -port=${toString cfg.controllerManager.port} \ - -master=${cfg.controllerManager.master} \ - ${optionalString (cfg.controllerManager.machines != []) - "-machines=${concatStringsSep "," cfg.controllerManager.machines}"} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --address=${cfg.controllerManager.address} \ + --port=${toString cfg.controllerManager.port} \ + --master=${cfg.controllerManager.master} \ + --machines=${concatStringsSep "," cfg.controllerManager.machines} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.controllerManager.extraOpts} ''; User = "kubernetes"; @@ -382,23 +411,28 @@ in { systemd.services.kubernetes-kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; + requires = ["kubernetes-setup.service"]; after = [ "network-interfaces.target" "etcd.service" "docker.service" ]; - serviceConfig = { - ExecStart = ''${cfg.package}/bin/kubelet \ - -etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - -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} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + script = '' + export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" + exec ${cfg.package}/bin/kubelet \ + --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ + --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ + --address=${cfg.kubelet.address} \ + --port=${toString cfg.kubelet.port} \ + --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}''} \ + ${optionalString (cfg.kubelet.clusterDomain != "") + ''--cluster_domain=${cfg.kubelet.clusterDomain}''} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.kubelet.extraOpts} ''; - User = "kubernetes"; - PermissionsStartOnly = true; - WorkingDirectory = cfg.dataDir; - }; + serviceConfig.WorkingDirectory = cfg.dataDir; }; }) @@ -409,10 +443,10 @@ in { after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - -etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ - -bind_address=${cfg.proxy.address} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ + --bind_address=${cfg.proxy.address} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.proxy.extraOpts} ''; }; @@ -427,6 +461,8 @@ in { (mkIf (any (el: el == "node") cfg.roles) { virtualisation.docker.enable = mkDefault true; + services.cadvisor.enable = mkDefault true; + services.cadvisor.port = mkDefault 4194; services.kubernetes.kubelet.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; }) @@ -442,6 +478,16 @@ in { cfg.kubelet.enable || cfg.proxy.enable ) { + systemd.services.kubernetes-setup = { + description = "Kubernetes setup."; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p /var/run/kubernetes + chown kubernetes /var/run/kubernetes + ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} /var/run/kubernetes/.dockercfg + ''; + }; + services.kubernetes.package = mkDefault pkgs.kubernetes; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 8bc7c8d618a..0a9eda930ba 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -13,7 +13,7 @@ import ./make-test.nix rec { id: redis-master-pod containers: - name: master - image: master:5000/scratch + image: master:5000/nix cpu: 100 ports: - name: redis-server @@ -50,8 +50,8 @@ import ./make-test.nix rec { virtualisation.memorySize = 768; services.kubernetes = { roles = ["master" "node"]; + dockerCfg = ''{"master:5000":{}}''; controllerManager.machines = ["master" "node"]; - kubelet.extraOpts = "-network_container_image=master:5000/pause"; apiserver.address = "0.0.0.0"; verbose = true; }; @@ -94,7 +94,8 @@ import ./make-test.nix rec { { services.kubernetes = { roles = ["node"]; - kubelet.extraOpts = "-network_container_image=master:5000/pause"; + dockerCfg = ''{"master:5000":{}}''; + kubelet.apiServers = ["master:8080"]; verbose = true; }; virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000"; @@ -155,14 +156,14 @@ import ./make-test.nix rec { $node->waitForUnit("kubernetes-kubelet.service"); $node->waitForUnit("kubernetes-proxy.service"); - $master->waitUntilSucceeds("kubecfg list minions | grep master"); - $master->waitUntilSucceeds("kubecfg list minions | grep node"); + $master->waitUntilSucceeds("kubectl get minions | grep master"); + $master->waitUntilSucceeds("kubectl get minions | grep node"); $client->waitForUnit("docker.service"); - $client->succeed("tar cv --files-from /dev/null | docker import - scratch"); - $client->succeed("docker tag scratch master:5000/scratch"); + $client->succeed("tar cv --files-from /dev/null | docker import - nix"); + $client->succeed("docker tag nix master:5000/nix"); $master->waitForUnit("docker-registry.service"); - $client->succeed("docker push master:5000/scratch"); + $client->succeed("docker push master:5000/nix"); $client->succeed("mkdir -p /root/pause"); $client->succeed("cp /etc/test/pause /root/pause/"); $client->succeed("cp /etc/test/Dockerfile /root/pause/"); diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7931da602d6..c89ad0a5168 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils }: stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "v0.5.4"; + version = "0.12.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; - rev = version; - sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; + rev = "v${version}"; + sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; }; buildInputs = [ makeWrapper which go iptables rsync ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" + wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" + wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin" ''; meta = with stdenv.lib; { From 853358bca6500106bc58fbe6467624aa3380298a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 14:38:46 +0100 Subject: [PATCH 231/947] cadvisor: update to 0.10.1 --- pkgs/servers/monitoring/cadvisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index b7dbdb893f1..1e818a508d9 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.7.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "${version}"; - sha256 = "1vc9fydi6wra45khxsmfw5mx2qyggi7cg6kgajzw518rqa52ivmg"; + sha256 = "0k0qfhw755k3ripsfkhml0ixaglhy64hdzxrjvlmbgc50s3j37vh"; }; buildInputs = [ go ]; From 7ef59c4fe2a87682054572a504fc7c6046c282e5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 13 Mar 2015 14:11:59 +0000 Subject: [PATCH 232/947] nixos: Multiple service instances, apply to nginx. See #6784 --- lib/types.nix | 15 ++++++++++++++ .../services/web-servers/nginx/default.nix | 20 +++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 1e7abf36535..ba0f9a5b890 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -227,4 +227,19 @@ rec { }; + mkMultiInstance = path: args: f: + let + def = f (args // { name = "default"; config = getAttrFromPath path args.config; }); + in { + options = setAttrByPath path (def.options // { + instances = mkOption { + type = types.attrsOf (types.submodule f); + default = {}; + description = "Additional instances of this service"; + }; + }); + + config = def.config; + }; + } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0f21ef01263..94dad49f9fd 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1,9 +1,12 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }@args: with lib; +let topconfig = config; +in mkMultiInstance [ "services" "nginx" ] args ({ config, name, ... }: + let - cfg = config.services.nginx; + cfg = config; nginx = cfg.package; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -20,7 +23,6 @@ in { options = { - services.nginx = { enable = mkOption { default = false; type = types.bool; @@ -82,15 +84,13 @@ in description = "Group account under which nginx runs."; }; - }; - }; config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test - systemd.services.nginx = { - description = "Nginx Web Server"; + systemd.services."nginx-${name}" = { + description = "Nginx Web Server - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ nginx ]; @@ -111,12 +111,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; - uid = config.ids.uids.nginx; + uid = topconfig.ids.uids.nginx; }); users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; - gid = config.ids.gids.nginx; + gid = topconfig.ids.gids.nginx; }); }; -} +}) From cb45b7ec3e94fc5e19c319e43bf28319714a50f1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 18 Mar 2015 14:09:24 +0000 Subject: [PATCH 233/947] Revert "nixos: Multiple service instances, apply to nginx. See #6784" This reverts commit 7ef59c4fe2a87682054572a504fc7c6046c282e5. Wrong push! Sorry! --- lib/types.nix | 15 -------------- .../services/web-servers/nginx/default.nix | 20 +++++++++---------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index ba0f9a5b890..1e7abf36535 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -227,19 +227,4 @@ rec { }; - mkMultiInstance = path: args: f: - let - def = f (args // { name = "default"; config = getAttrFromPath path args.config; }); - in { - options = setAttrByPath path (def.options // { - instances = mkOption { - type = types.attrsOf (types.submodule f); - default = {}; - description = "Additional instances of this service"; - }; - }); - - config = def.config; - }; - } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 94dad49f9fd..0f21ef01263 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1,12 +1,9 @@ -{ config, lib, pkgs, ... }@args: +{ config, lib, pkgs, ... }: with lib; -let topconfig = config; -in mkMultiInstance [ "services" "nginx" ] args ({ config, name, ... }: - let - cfg = config; + cfg = config.services.nginx; nginx = cfg.package; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -23,6 +20,7 @@ in { options = { + services.nginx = { enable = mkOption { default = false; type = types.bool; @@ -84,13 +82,15 @@ in description = "Group account under which nginx runs."; }; + }; + }; config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test - systemd.services."nginx-${name}" = { - description = "Nginx Web Server - ${name}"; + systemd.services.nginx = { + description = "Nginx Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ nginx ]; @@ -111,12 +111,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; - uid = topconfig.ids.uids.nginx; + uid = config.ids.uids.nginx; }); users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; - gid = topconfig.ids.gids.nginx; + gid = config.ids.gids.nginx; }); }; -}) +} From b94b08488f06a6ed4ebef88e74d9b3c5bfce04bc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 18 Mar 2015 14:06:09 +0000 Subject: [PATCH 234/947] nixos/pulseaudio: don't put 32bit libs in systemPackages Fixes the useless collisions in the system path. The 64bit and 32bit variants have the same files, hence it's pointless to put the 32bit pulseaudio in systemPackages. --- nixos/modules/config/pulseaudio.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b38489a8c1..c41e4ea604d 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -124,9 +124,7 @@ in { } (mkIf cfg.enable { - environment.systemPackages = [ - cfg.package - ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; + environment.systemPackages = [ cfg.package ]; environment.etc = singleton { target = "asound.conf"; From 3dd03330d1e19c7870b10d37941164aebb37e82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Tue, 17 Mar 2015 16:37:51 +0000 Subject: [PATCH 235/947] apache-kafka: Update apache kafka to version 0.8.2.1 Also use scala version recommended in Kafka docs (2.10). --- pkgs/servers/apache-kafka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index b1f732a451f..f3d0a43c4cf 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, jre, makeWrapper, bash }: let - kafkaVersion = "0.8.1.1"; - scalaVersion = "2.8.0"; + kafkaVersion = "0.8.2.1"; + scalaVersion = "2.10"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - sha256 = "1bya4qs0ccrqibmdivgdxcsyiay4c3vywddrkci1dz9v3ymrqby9"; + sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; }; buildInputs = [ jre makeWrapper bash ]; From 105f933f649739a6544f23b1cba684a02b603b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Mar 2015 17:44:12 +0100 Subject: [PATCH 236/947] ffmpeg: add new branch 2.6.1 (no switching yet) /cc maintainers @codyopel, @fuuzetsu. Release notes don't indicate any new options or dependencies. http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6 APIchanges looks like we should be able to replace 2.5 by 2.6 without anything breaking (belongs to staging and needs some testing). --- pkgs/development/libraries/ffmpeg/2.6.nix | 7 +++++++ pkgs/development/libraries/ffmpeg/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ffmpeg/2.6.nix diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix new file mode 100644 index 00000000000..9e097ddfebb --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.6.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "2.6"; + sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 35a847d9769..1a46a0e5386 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -383,7 +383,7 @@ stdenv.mkDerivation rec { (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") (mkFlag (libiconv != null) "1.2" "iconv") #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") - (mkFlag (libmfz != null) "2.6" "libmfx") + #(mkFlag (libmfx != null) "2.6" "libmfx") (mkFlag (libmodplug != null) "0.9" "libmodplug") #(mkFlag (libnut != null) "0.5" "libnut") (mkFlag (libopus != null) "1.0" "libopus") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e13fa1e0871..b4f73137298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5593,6 +5593,7 @@ let ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; ffmpeg_2_5 = callPackage ../development/libraries/ffmpeg/2.5.nix { }; + ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; # Aliases ffmpeg_0 = ffmpeg_0_11; ffmpeg_1 = ffmpeg_1_2; From cb9e0343d15b266ac7af908a6ff6cb666619a4db Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 18 Mar 2015 19:16:24 +0100 Subject: [PATCH 237/947] yubikey-personalization: Install udev-rules. --- pkgs/tools/misc/yubikey-personalization/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 37b2fcb7a75..e420b1705a1 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { "--with-backend=libusb-1.0" ]; + postInstall = '' + mkdir -p $out/lib/udev/rules.d/ + cp -v *.rules $out/lib/udev/rules.d/ + ''; + meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization; description = "a library and command line tool to personalize YubiKeys"; From e73933da9c2fb4d731d8bedd7603e6850b38632e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Mar 2015 20:20:18 +0100 Subject: [PATCH 238/947] coreutils: skip dd/sparse test (fixes #6306) It's not done very nicely, as the main build log still prints as if the test ran and succeeded, but I'm lazy to dig deeper into the framework. --- pkgs/tools/misc/coreutils/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 28f45d972e2..a15c78e0a81 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -18,6 +18,11 @@ let sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc"; }; + # The test tends to fail on btrfs and maybe other unusual filesystems. + postPatch = '' + sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh + ''; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl From 12fde06cdd7bea759ec296fa78c0eaa6c11ed92d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 20:30:49 +0100 Subject: [PATCH 239/947] rippled: update to 0.27.3-sp2 --- pkgs/servers/rippled/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index ca0a331e321..39a7460674e 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.26.0"; + version = "0.27.3-sp2"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; - rev = "0.26.2"; - sha256 = "06hcc3nnzp9f6j00890f41rrn4djwlcwkzmqnw4yra74sswgji5y"; + rev = version; + sha256 = "1q4i87cc7yks9slpgrfnlimngm45n3h035ssjvywmfwhhh7r9m3y"; }; postPatch = '' @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { buildPhase = "scons build/rippled"; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin cp build/rippled $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = https://ripple.com; - maintainers = [ stdenv.lib.maintainers.emery ]; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.emery maintainers.offline ]; + license = licenses.isc; + platforms = platforms.linux; }; } From 414dbacfa77528d6e819cbc65ee3e12370d8da3e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 20:58:04 +0100 Subject: [PATCH 240/947] Add t, command line tool for twitter --- pkgs/tools/misc/t/Gemfile | 3 + pkgs/tools/misc/t/Gemfile.lock | 52 +++++++++ pkgs/tools/misc/t/default.nix | 18 ++++ pkgs/tools/misc/t/gemset.nix | 185 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 260 insertions(+) create mode 100644 pkgs/tools/misc/t/Gemfile create mode 100644 pkgs/tools/misc/t/Gemfile.lock create mode 100644 pkgs/tools/misc/t/default.nix create mode 100644 pkgs/tools/misc/t/gemset.nix diff --git a/pkgs/tools/misc/t/Gemfile b/pkgs/tools/misc/t/Gemfile new file mode 100644 index 00000000000..3a31c54c5a7 --- /dev/null +++ b/pkgs/tools/misc/t/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 't' diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock new file mode 100644 index 00000000000..d85f5a1a752 --- /dev/null +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -0,0 +1,52 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.3.7) + buftok (0.2.0) + equalizer (0.0.9) + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + geokit (1.9.0) + multi_json (>= 1.3.2) + htmlentities (4.3.3) + http (0.6.3) + http_parser.rb (~> 0.6.0) + http_parser.rb (0.6.0) + json (1.8.2) + launchy (2.4.3) + addressable (~> 2.3) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + multi_json (1.11.0) + multipart-post (2.0.0) + naught (1.0.0) + oauth (0.4.7) + retryable (2.0.1) + simple_oauth (0.3.1) + t (2.9.0) + geokit (>= 1.8.3, < 2) + htmlentities (~> 4.3) + launchy (~> 2.4) + oauth (~> 0.4.7) + retryable (~> 2.0) + thor (>= 0.19.1, < 2) + twitter (~> 5.13) + thor (0.19.1) + thread_safe (0.3.5) + twitter (5.14.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.9) + faraday (~> 0.9.0) + http (~> 0.6.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + t diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix new file mode 100644 index 00000000000..10db8764f89 --- /dev/null +++ b/pkgs/tools/misc/t/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "t-2.9.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A command-line power tool for Twitter."; + homepage = http://sferik.github.io/t/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix new file mode 100644 index 00000000000..6c721111c67 --- /dev/null +++ b/pkgs/tools/misc/t/gemset.nix @@ -0,0 +1,185 @@ +{ + "addressable" = { + version = "2.3.7"; + source = { + type = "gem"; + sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh"; + }; + }; + "buftok" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + }; + }; + "equalizer" = { + version = "0.0.9"; + source = { + type = "gem"; + sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; + }; + }; + "faraday" = { + version = "0.9.1"; + source = { + type = "gem"; + sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "geokit" = { + version = "1.9.0"; + source = { + type = "gem"; + sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy"; + }; + dependencies = [ + "multi_json" + ]; + }; + "htmlentities" = { + version = "4.3.3"; + source = { + type = "gem"; + sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p"; + }; + }; + "http" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv"; + }; + dependencies = [ + "http_parser.rb" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "launchy" = { + version = "2.4.3"; + source = { + type = "gem"; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + }; + dependencies = [ + "addressable" + ]; + }; + "memoizable" = { + version = "0.4.2"; + source = { + type = "gem"; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; + "naught" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd"; + }; + }; + "oauth" = { + version = "0.4.7"; + source = { + type = "gem"; + sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; + }; + }; + "retryable" = { + version = "2.0.1"; + source = { + type = "gem"; + sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f"; + }; + }; + "simple_oauth" = { + version = "0.3.1"; + source = { + type = "gem"; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; + }; + }; + "t" = { + version = "2.9.0"; + source = { + type = "gem"; + sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv"; + }; + dependencies = [ + "geokit" + "htmlentities" + "launchy" + "oauth" + "retryable" + "thor" + "twitter" + ]; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "thread_safe" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + }; + }; + "twitter" = { + version = "5.14.0"; + source = { + type = "gem"; + sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5"; + }; + dependencies = [ + "addressable" + "buftok" + "equalizer" + "faraday" + "http" + "http_parser.rb" + "json" + "memoizable" + "naught" + "simple_oauth" + ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 657f3ac44c5..c77792b4e82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2748,6 +2748,8 @@ let swaks = callPackage ../tools/networking/swaks { }; + t = callPackage ../tools/misc/t { }; + t1utils = callPackage ../tools/misc/t1utils { }; tarsnap = callPackage ../tools/backup/tarsnap { }; From 6db8155e379f69d97285da4cba6dc176d28238d6 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 18 Mar 2015 21:01:35 +0100 Subject: [PATCH 241/947] nsd: Update from 4.1.0 -> 4.1.1 --- nixos/modules/services/networking/nsd.nix | 14 ++++++++++++++ pkgs/servers/dns/nsd/default.nix | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 140b7ed2da3..707bb38ec02 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -107,6 +107,7 @@ let zone: name: "${name}" zonefile: "${stateDir}/zones/${name}" + ${maybeString "zonestats: " zone.zoneStats} ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} @@ -270,6 +271,19 @@ let Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; }; + + zoneStats = mkOption { + type = types.nullOr types.str; + default = null; + example = "%s"; + description = '' + When config.nsd.zoneStats is set to true NSD is able of collecting + statistics per zone. All statistics of this zone(s) will be added + to the group specified by this given name. Use "%s" to use the zones + name as the group. The groups are output from nsd-control stats + and stats_noreset. + ''; + }; }; }; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index c0b460778d9..85f0883b5de 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -8,14 +8,15 @@ , ratelimit ? false , recvmmsg ? false , rootServer ? false +, zoneStats ? false }: stdenv.mkDerivation rec { - name = "nsd-4.1.0"; + name = "nsd-4.1.1"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62"; + sha256 = "b0c3fab40ac7a8b5ffca642bc9e1b424aa72aebd03adf13a1f24ab4874734640"; }; buildInputs = [ libevent openssl ]; @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { ++ edf ratelimit "ratelimit" ++ edf recvmmsg "recvmmsg" ++ edf rootServer "root-server" + ++ edf zoneStats "zone-stats" ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; meta = with stdenv.lib; { From 7bf0458cb6a018e03b88f9c2cf756a9212966ace Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Mar 2015 00:23:20 +0100 Subject: [PATCH 242/947] Add checkbashisms package --- .../tools/misc/checkbashisms/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/misc/checkbashisms/default.nix diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix new file mode 100644 index 00000000000..259224aac5d --- /dev/null +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + inherit perl; + + name = "checkbashisms"; + version = "2.0.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/checkbaskisms/${version}/${name}"; + sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + }; + + meta = { + homepage = http://sourceforge.net/projects/checkbaskisms/; + description = "Performs basic checks on shell scripts for the presence of non portable syntax."; + license = stdenv.lib.licenses.gpl2; + }; + + # The link returns directly the script. No need for unpacking + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/checkbashisms + chmod 755 $out/bin/checkbashisms + ''; + + # Makes sure to point to the proper perl version + fixupPhase = '' + sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abb065689a6..b7c68b272b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -999,6 +999,8 @@ let biosdevname = callPackage ../tools/networking/biosdevname { }; + checkbashism = callPackage ../development/tools/misc/checkbashisms { }; + clamav = callPackage ../tools/security/clamav { }; clex = callPackage ../tools/misc/clex { }; From e8892b3ba5acc02ef45d25aa6308fd3bc9f37c35 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 18 Mar 2015 21:15:55 +0100 Subject: [PATCH 243/947] bosun/scollector: Update to rev 20150311224711 --- pkgs/servers/monitoring/bosun/default.nix | 4 ++-- pkgs/servers/monitoring/bosun/scollector.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index bbe92bd1329..d37a4ff5b70 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150202222550"; + rev = "20150311224711"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0xrnyq85nxj6rddrhd19r2bz59pzxci6bnjh61j4z8hd6ryp8j2c"; + sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg"; }; subPackages = [ "cmd/bosun" ]; diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index f7e5c99c91d..ba6b0f369b9 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150202222550"; + rev = "20150311224711"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0xrnyq85nxj6rddrhd19r2bz59pzxci6bnjh61j4z8hd6ryp8j2c"; + sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg"; }; subPackages = [ "cmd/scollector" ]; From bdbdaee3c052474d0a208bea0fca0b1528e40336 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 18 Mar 2015 21:16:23 +0100 Subject: [PATCH 244/947] scollector module: Add extraOpts option --- .../modules/services/monitoring/scollector.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index ce70739abbc..0143d2e327b 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -20,6 +20,10 @@ let cfg.collectors)} ''; + cmdLineOpts = concatStringsSep " " ( + [ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts + ); + in { options = { @@ -79,6 +83,15 @@ in { ''; }; + extraOpts = mkOption { + type = with types; listOf str; + default = []; + example = [ "-d" ]; + description = '' + Extra scollector command line options + ''; + }; + }; }; @@ -95,9 +108,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = '' - ${cfg.package}/bin/scollector -h=${cfg.bosunHost} -c=${collectors} - ''; + ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}"; }; }; From fca0aa707715a50e2d5fd3a0a5d67f14008ce376 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Mar 2015 20:33:52 +0100 Subject: [PATCH 245/947] Add fluentd package and module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/logging/fluentd.nix | 39 +++++ pkgs/tools/misc/fluentd/Gemfile | 4 + pkgs/tools/misc/fluentd/Gemfile.lock | 49 ++++++ pkgs/tools/misc/fluentd/default.nix | 20 +++ pkgs/tools/misc/fluentd/gemset.nix | 171 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 7 files changed, 286 insertions(+) create mode 100644 nixos/modules/services/logging/fluentd.nix create mode 100644 pkgs/tools/misc/fluentd/Gemfile create mode 100644 pkgs/tools/misc/fluentd/Gemfile.lock create mode 100644 pkgs/tools/misc/fluentd/default.nix create mode 100644 pkgs/tools/misc/fluentd/gemset.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c8cf5bfa798..f19456f5143 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -160,6 +160,7 @@ ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thermald.nix + ./services/logging/fluentd.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix new file mode 100644 index 00000000000..61eeec504e0 --- /dev/null +++ b/nixos/modules/services/logging/fluentd.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fluentd; +in { + ###### interface + + options = { + + services.fluentd = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable fluentd."; + }; + + config = mkOption { + type = types.lines; + default = ""; + description = "Fluentd config."; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.fluentd = with pkgs; { + description = "Fluentd Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.fluentd}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; + }; + }; + }; +} diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile new file mode 100644 index 00000000000..41c5bde1acc --- /dev/null +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'fluentd' +gem 'fluent-plugin-elasticsearch' diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock new file mode 100644 index 00000000000..ba4cc4bb4a8 --- /dev/null +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -0,0 +1,49 @@ +GEM + remote: https://rubygems.org/ + specs: + cool.io (1.3.0) + elasticsearch (1.0.8) + elasticsearch-api (= 1.0.7) + elasticsearch-transport (= 1.0.7) + elasticsearch-api (1.0.7) + multi_json + elasticsearch-transport (1.0.7) + faraday + multi_json + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + fluent-plugin-elasticsearch (0.7.0) + elasticsearch + fluentd (>= 0.10.43) + patron (~> 0) + fluentd (0.12.6) + cool.io (>= 1.2.2, < 2.0.0) + http_parser.rb (>= 0.5.1, < 0.7.0) + json (>= 1.4.3) + msgpack (>= 0.5.11, < 0.6.0) + sigdump (~> 0.2.2) + string-scrub (>= 0.0.3) + tzinfo (>= 1.0.0) + tzinfo-data (>= 1.0.0) + yajl-ruby (~> 1.0) + http_parser.rb (0.6.0) + json (1.8.2) + msgpack (0.5.11) + multi_json (1.11.0) + multipart-post (2.0.0) + patron (0.4.20) + sigdump (0.2.2) + string-scrub (0.0.5) + thread_safe (0.3.5) + tzinfo (1.2.2) + thread_safe (~> 0.1) + tzinfo-data (1.2015.1) + tzinfo (>= 1.0.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + fluent-plugin-elasticsearch + fluentd diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix new file mode 100644 index 00000000000..b659dafddeb --- /dev/null +++ b/pkgs/tools/misc/fluentd/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby, curl }: + +bundlerEnv { + name = "fluentd-0.12.6"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Fluentd data collector."; + homepage = http://www.fluentd.org/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix new file mode 100644 index 00000000000..4d0072c6afe --- /dev/null +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -0,0 +1,171 @@ +{ + "cool.io" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1s3x0a32gbr6sg4lb0yk5irh48z4260my6g5ssifyl54rh4b6lzh"; + }; + }; + "elasticsearch" = { + version = "1.0.8"; + source = { + type = "gem"; + sha256 = "0kfiza9p98gchqgd0a64ryw77wgy42b7hhy89ba1s2jy2kcm3ahl"; + }; + dependencies = [ + "elasticsearch-api" + "elasticsearch-transport" + ]; + }; + "elasticsearch-api" = { + version = "1.0.7"; + source = { + type = "gem"; + sha256 = "0fb7pmzhfl48zxkbx3ayc61x1gv3qvvs4xcp4yf1rxflz1iw6ck9"; + }; + dependencies = [ + "multi_json" + ]; + }; + "elasticsearch-transport" = { + version = "1.0.7"; + source = { + type = "gem"; + sha256 = "0p5yzbvgpw84asfj8ifbqckw6qbssc6xrw086qfh58kxpfnin0zc"; + }; + dependencies = [ + "faraday" + "multi_json" + ]; + }; + "faraday" = { + version = "0.9.1"; + source = { + type = "gem"; + sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fluent-plugin-elasticsearch" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "1jav4lqf9j3w014ksgl3zr05kg62lkc58xnhjjriqp3c1412vwpy"; + }; + dependencies = [ + "elasticsearch" + "fluentd" + "patron" + ]; + }; + "fluentd" = { + version = "0.12.6"; + source = { + type = "gem"; + sha256 = "04lrr133ci6m3j85cj2rhhjkw3b1r12fxcymk943lsdlrip0brr1"; + }; + dependencies = [ + "cool.io" + "http_parser.rb" + "json" + "msgpack" + "sigdump" + "string-scrub" + "tzinfo" + "tzinfo-data" + "yajl-ruby" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "msgpack" = { + version = "0.5.11"; + source = { + type = "gem"; + sha256 = "1jmi0i3j8xfvidx6ivbcbdwpyf54r0d7dc4rrq1jbvhd1ffvr79w"; + }; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; + "patron" = { + version = "0.4.20"; + source = { + type = "gem"; + sha256 = "0wdgjazzyllnajkzgdh55q60mlczq8h5jhwpzisrj2i8izrq45zb"; + }; + }; + "sigdump" = { + version = "0.2.2"; + source = { + type = "gem"; + sha256 = "1h4d4vfg1g3wbbmqahmk7khzhswk5mjv4hwbs7bhmp808h8mz973"; + }; + }; + "string-scrub" = { + version = "0.0.5"; + source = { + type = "gem"; + sha256 = "0fy4qby2az268qzmf00mb3p0hiqgshz9g6kvgl5vg76y90hl178g"; + }; + }; + "thread_safe" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + }; + }; + "tzinfo" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "tzinfo-data" = { + version = "1.2015.1"; + source = { + type = "gem"; + sha256 = "1x6fa8ayd2kal397d5gdsdg0fjqynfqv1n9n0q702mq839dw593h"; + }; + dependencies = [ + "tzinfo" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4f73137298..7707eb48d4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1309,6 +1309,8 @@ let flpsed = callPackage ../applications/editors/flpsed { }; + fluentd = callPackage ../tools/misc/fluentd { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; libbsd = callPackage ../development/libraries/libbsd { }; From cf0dfec1065aa08ec640af484a82065940126750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 18 Mar 2015 21:21:42 +0100 Subject: [PATCH 246/947] alsa-firmware: align attrname with pkgname The expression was added only two days ago, so I don't think we need to keep a copy of the old attribute around. --- 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 b4f73137298..3aeec5e4113 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8552,7 +8552,7 @@ let alienfx = callPackage ../os-specific/linux/alienfx { }; - alsaFirmware = callPackage ../os-specific/linux/alsa-firmware { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; alsaLib = callPackage ../os-specific/linux/alsa-lib { }; From 5c59b23cefe7471b638dcb628e67c76a6ba54bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 18 Mar 2015 21:22:33 +0100 Subject: [PATCH 247/947] alsa-firmware: longDescription => description --- pkgs/os-specific/linux/alsa-firmware/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index d636e55f337..ab81ece5f71 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alsa-project.org/main/index.php/Main_Page; - longDescription = " - Soundcard firmwares from the alsa project. - "; + description = "Soundcard firmwares from the alsa project"; license = stdenv.lib.licenses.gpl2Plus; }; } From 05d6d77c8e6cbd9ff1afbc8bbd00ab5ed69294a8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 18 Mar 2015 14:37:12 -0600 Subject: [PATCH 248/947] VLC wants a newer version of libdvdnav * Updated libdvdnav/libdvdread to latest versions * Removed libdvdnav patches since they have been incorporated into the latest release * Added `--enable-dvdnav` configure flag to VLC to ensure that if this happens again VLC will fail to build --- pkgs/applications/video/vlc/default.nix | 1 + .../libraries/libdvdnav/A08-dvdnav-dup.patch | 137 ------------------ .../libdvdnav/P00-mingw-no-examples.patch | 21 --- .../libraries/libdvdnav/default.nix | 20 +-- .../libraries/libdvdread/default.nix | 11 +- 5 files changed, 13 insertions(+), 177 deletions(-) delete mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch delete mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e25f833eabc..69fc448ca15 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" + "--enable-dvdnav" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch deleted file mode 100644 index c0991b43555..00000000000 --- a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch +++ /dev/null @@ -1,137 +0,0 @@ -Index: src/dvdnav.c -=================================================================== ---- libdvdnav.orig/src/dvdnav.c (revision 1168) -+++ libdvdnav/src/dvdnav.c (working copy) -@@ -71,6 +71,67 @@ - return DVDNAV_STATUS_OK; - } - -+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) { -+ dvdnav_t *this; -+ -+ (*dest) = NULL; -+ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); -+ if(!this) -+ return DVDNAV_STATUS_ERR; -+ -+ memcpy(this, src, sizeof(dvdnav_t)); -+ this->file = NULL; -+ -+ pthread_mutex_init(&this->vm_lock, NULL); -+ -+ this->vm = vm_new_copy(src->vm); -+ if(!this->vm) { -+ printerr("Error initialising the DVD VM."); -+ pthread_mutex_destroy(&this->vm_lock); -+ free(this); -+ return DVDNAV_STATUS_ERR; -+ } -+ -+ /* Start the read-ahead cache. */ -+ this->cache = dvdnav_read_cache_new(this); -+ -+ (*dest) = this; -+ return DVDNAV_STATUS_OK; -+} -+ -+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) { -+ -+#ifdef LOG_DEBUG -+ fprintf(MSG_OUT, "libdvdnav: free_dup:called\n"); -+#endif -+ -+ if (this->file) { -+ pthread_mutex_lock(&this->vm_lock); -+ DVDCloseFile(this->file); -+#ifdef LOG_DEBUG -+ fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); -+#endif -+ this->file = NULL; -+ pthread_mutex_unlock(&this->vm_lock); -+ } -+ -+ /* Free the VM */ -+ if(this->vm) -+ vm_free_copy(this->vm); -+ -+ pthread_mutex_destroy(&this->vm_lock); -+ -+ /* We leave the final freeing of the entire structure to the cache, -+ * because we don't know, if there are still buffers out in the wild, -+ * that must return first. */ -+ if(this->cache) -+ dvdnav_read_cache_free(this->cache); -+ else -+ free(this); -+ -+ return DVDNAV_STATUS_OK; -+} -+ - dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { - dvdnav_t *this; - struct timeval time; -Index: src/dvdnav/dvdnav.h -=================================================================== ---- libdvdnav.orig/src/dvdnav/dvdnav.h (revision 1168) -+++ libdvdnav/src/dvdnav.h (working copy) -@@ -89,6 +89,9 @@ - */ - dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path); - -+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src); -+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this); -+ - /* - * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any - * memory associated with it. -Index: src/vm/vm.c -=================================================================== ---- libdvdnav.orig/src/vm/vm.c (revision 1168) -+++ libdvdnav/src/vm/vm.c (working copy) -@@ -96,6 +98,7 @@ - - static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang); - static pgcit_t* get_PGCIT(vm_t *vm); -+static void vm_close(vm_t *vm); - - - /* Helper functions */ -@@ -262,7 +265,7 @@ - } - - void vm_free_vm(vm_t *vm) { -- vm_stop(vm); -+ vm_close(vm); - free(vm); - } - -@@ -289,12 +292,20 @@ - - int vm_start(vm_t *vm) { - /* Set pgc to FP (First Play) pgc */ -+ if (vm->stopped) { -+ vm_reset(vm, NULL); -+ vm->stopped = 0; -+ } - set_FP_PGC(vm); - process_command(vm, play_PGC(vm)); - return !vm->stopped; - } - - void vm_stop(vm_t *vm) { -+ vm->stopped = 1; -+} -+ -+static void vm_close(vm_t *vm) { - if(vm->vmgi) { - ifoClose(vm->vmgi); - vm->vmgi=NULL; -@@ -346,7 +357,7 @@ - - if (vm->dvd && dvdroot) { - /* a new dvd device has been requested */ -- vm_stop(vm); -+ vm_close(vm); - } - if (!vm->dvd) { - vm->dvd = DVDOpen(dvdroot); diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch deleted file mode 100644 index 0e061861735..00000000000 --- a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am ---- libdvdnav.orig/Makefile.am 2008-10-03 16:11:46.000000000 -0400 -+++ libdvdnav/Makefile.am 2009-04-24 02:53:15.000000000 -0400 -@@ -1,7 +1,7 @@ - include $(top_srcdir)/misc/Makefile.common - - --SUBDIRS = src examples doc misc m4 -+SUBDIRS = src doc misc m4 - - EXTRA_DIST = autogen.sh \ - AUTHORS \ -diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac ---- libdvdnav.orig/configure.ac 2009-01-08 17:57:11.000000000 -0500 -+++ libdvdnav/configure.ac 2009-04-24 02:52:34.000000000 -0400 -@@ -252,5 +252,4 @@ - misc/relchk.sh - m4/Makefile - doc/Makefile --examples/Makefile - ]) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 9b4e912772b..343eb7ce9f9 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,25 +1,17 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: -stdenv.mkDerivation { - name = "libdvdnav-4.2.1"; - +stdenv.mkDerivation rec { + name = "libdvdnav"; + version = "5.0.3"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; - sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; + url = "http://download.videolan.org/pub/videolan/${name}/${version}/${name}-${version}.tar.bz2"; + sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; - configureScript = "./configure2"; # wtf? - - preConfigure = '' - mkdir -p $out - ''; - - # From Handbrake - patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; - meta = { homepage = http://dvdnav.mplayerhq.hu/; description = "A library that implements DVD navigation features such as DVD menus"; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index eb5a48a99f1..4832feacd87 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, libdvdcss}: -stdenv.mkDerivation { - name = "libdvdread-4.9.9"; - +stdenv.mkDerivation rec { + name = "libdvdread"; + version = "5.0.2"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; - sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; + url = "http://download.videolan.org/pub/videolan/${name}/${version}/${name}-${version}.tar.bz2"; + sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; }; buildInputs = [libdvdcss]; From 8e0134c2cd72401a2883606f34cb26b2145abc61 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Mar 2015 21:42:50 +0100 Subject: [PATCH 249/947] Add networkx python package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 200e617e101..f614df5c31b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13951,5 +13951,21 @@ let }; }; + networkx = buildPythonPackage rec { + name = "networkx-1.9.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/networkx/networkx-1.9.1.tar.gz"; + sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59"; + }; + + buildInputs = with self; [ nose decorator ]; + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks."; + license = licenses.bsd3; + }; + }; }); in pythonPackages From 9e2d8fd25956268d9b27ef614fbdc80749c08b29 Mon Sep 17 00:00:00 2001 From: William Giokas Date: Wed, 18 Mar 2015 15:50:37 -0700 Subject: [PATCH 250/947] vim: Fix vim_configurable options mzscheme and tcl were using `--enable-mzscheme` and `--enable-tcl` when those are not actual flags. They should be set to `*interp` instead. --- pkgs/applications/editors/vim/configurable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index cb2f562d51c..e6c2cacc49a 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -87,7 +87,7 @@ composableDerivation { // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. // edf { @@ -115,7 +115,7 @@ composableDerivation { }; } - // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua"; From 80c7a6f107949b308b184c8fd202508a5a1e4537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Mar 2015 23:51:19 +0100 Subject: [PATCH 251/947] nmap: extend platforms Tested briefly by @jcf on darwin, web site claims BSDs are also supported. --- pkgs/tools/security/nmap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f6e9a07b68f..57cc9c24248 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A free and open source utility for network discovery and security auditing"; homepage = http://www.nmap.org; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ mornfall thoughtpolice ]; }; } From 1e28cd0c83bcbf0621189f7357dcec49dd98f7d5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Mar 2015 01:03:50 +0000 Subject: [PATCH 252/947] spl: Update from 0.6.3-1.2 -> 0.6.3-1.3 Removed time.patch (applied upstream). --- pkgs/os-specific/linux/spl/default.nix | 6 +++--- pkgs/os-specific/linux/spl/time.patch | 18 ------------------ 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/time.patch diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 618b59b32aa..4e13aa2687c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,14 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.2"; + version = "0.6.3-1.3"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; + sha256 = "1d4gdlkhshlyfkswbqx06fhs8m5lxgk3vhds6g7ipd3q93ngrczx"; }; - patches = [ ./install_prefix.patch ./const.patch ./time.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; }) diff --git a/pkgs/os-specific/linux/spl/time.patch b/pkgs/os-specific/linux/spl/time.patch deleted file mode 100644 index 6b1e23bc05e..00000000000 --- a/pkgs/os-specific/linux/spl/time.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/module/spl/spl-time.c b/module/spl/spl-time.c -index 0ed49cc..b0fad4f 100644 ---- a/module/spl/spl-time.c -+++ b/module/spl/spl-time.c -@@ -40,12 +40,7 @@ extern unsigned long long monotonic_clock(void); - void - __gethrestime(timestruc_t *ts) - { -- struct timespec tspec; -- -- getnstimeofday(&tspec); -- -- ts->tv_sec = tspec.tv_sec; -- ts->tv_nsec = tspec.tv_nsec; -+ *ts = current_kernel_time(); - } - EXPORT_SYMBOL(__gethrestime); - From 5b074d20f88aac6ae37a31b9b26b64e2afe31e97 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Mar 2015 01:04:04 +0000 Subject: [PATCH 253/947] zfs: Update from 0.6.3-1.2 -> 0.6.3-1.3 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 11b77c3d66f..3f456802286 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.2"; + version = "0.6.3-1.3"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "1iqkh08ikmsg8zi7s2pr46z9z7lshbb65pv2ihg1llwmgcm42r9r"; + sha256 = "08m5ah8a6zp96djz2xj9rb94zq973dwwfpc26jy0adzdq2q20zb4"; }; patches = [ From 5972edc1485162378ff49c65255c85f9018f5be8 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 18 Mar 2015 23:09:58 -0700 Subject: [PATCH 254/947] New package: Honcho (Python clone of Foreman) --- pkgs/tools/system/honcho/default.nix | 36 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/system/honcho/default.nix diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix new file mode 100644 index 00000000000..1c231e90db4 --- /dev/null +++ b/pkgs/tools/system/honcho/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, pythonPackages, buildPythonPackage }: + +let honcho = buildPythonPackage rec { + name = "honcho-${version}"; + version = "0.6.6"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz"; + md5 = "f5e6a7f6c1d0c167d410d7f601b4407e"; + }; + + buildInputs = with pythonPackages; [ nose mock jinja2 ]; + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python clone of Foreman, a tool for managing Procfile-based applications."; + license = licenses.mit; + homePage = https://github.com/nickstenning/honcho; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +}; + +in + +# Some of honcho's tests require that honcho be installed in the environment in +# order to work. This is a trick to build it without running tests, then pass +# it to itself as a buildInput so the tests work. +honcho.overrideDerivation (x: { buildInputs = [ honcho ]; doCheck = true; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b0f1981d70..f2b0e6abf60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1622,6 +1622,8 @@ let lua = lua5; }; + honcho = callPackage ../tools/system/honcho { }; + host = callPackage ../tools/networking/host { }; hping = callPackage ../tools/networking/hping { }; From 80d8d1fc276cd6a075b28e89f75f141bc6770b7f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 19 Mar 2015 11:50:08 +0100 Subject: [PATCH 255/947] Revert "Add a kafka package". Closes #6892 This reverts commit b34a1cc248c9331495864016051ad535b174c346. Conflicts: pkgs/top-level/all-packages.nix Duplicate package kafka, already existed and used in the nixos service. Retained the boothead addition to maintainers. --- pkgs/servers/kafka/default.nix | 34 --------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/servers/kafka/default.nix diff --git a/pkgs/servers/kafka/default.nix b/pkgs/servers/kafka/default.nix deleted file mode 100644 index 6ffd171d980..00000000000 --- a/pkgs/servers/kafka/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash }: - -stdenv.mkDerivation rec { - name = "kafka"; - version = "0.8.1.1"; - src = fetchurl { - url = "http://www.mirrorservice.org/sites/ftp.apache.org/${name}/${version}/${name}_2.9.2-${version}.tgz"; - sha256 = "cb141c1d50b1bd0d741d68e5e21c090341d961cd801e11e42fb693fa53e9aaed"; - }; - - buildInputs = [ makeWrapper jre ]; - - installPhase = '' - mkdir -p $out - cp -R config libs $out - mkdir -p $out/bin - cp -R bin/${name}-*.sh $out/bin - for i in $out/bin/${name}-*.sh; do - wrapProgram $i \ - --set JAVA_HOME "${jre}" \ - --prefix PATH : "${bash}/bin" - done - - ''; - - meta = with stdenv.lib; { - homepage = "http://kafka.apache.org"; - description = "Apache Kafka"; - license = licenses.asl20; - maintainers = [ maintainers.boothead ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da79e55c7f6..c2492b102eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8173,8 +8173,6 @@ let joseki = callPackage ../servers/http/joseki {}; - kafka = callPackage ../servers/kafka { }; - rdkafka = callPackage ../development/libraries/rdkafka { }; leafnode = callPackage ../servers/news/leafnode { }; From d3a2edb8cec1e24ba221276e7d1380a3df745993 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Thu, 19 Mar 2015 12:10:55 +0100 Subject: [PATCH 256/947] nsd: Fix automatic config options --- nixos/modules/services/networking/nsd.nix | 28 +++++++++++++++-------- pkgs/servers/dns/nsd/default.nix | 2 ++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 707bb38ec02..36d9f5d2f16 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -9,6 +9,14 @@ let stateDir = "/var/lib/nsd"; pidFile = stateDir + "/var/nsd.pid"; + nsdPkg = pkgs.nsd.override { + bind8Stats = cfg.bind8Stats; + ipv6 = cfg.ipv6; + ratelimit = cfg.ratelimit.enable; + rootServer = cfg.rootServer; + zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; + }; + zoneFiles = pkgs.stdenv.mkDerivation { preferLocalBuild = true; name = "nsd-env"; @@ -277,7 +285,7 @@ let default = null; example = "%s"; description = '' - When config.nsd.zoneStats is set to true NSD is able of collecting + When set to something distinct to null NSD is able to collect statistics per zone. All statistics of this zone(s) will be added to the group specified by this given name. Use "%s" to use the zones name as the group. The groups are output from nsd-control stats @@ -300,6 +308,15 @@ in ''; }; + bind8Stats = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Wheter to enable BIND8 like statisics. + ''; + }; + rootServer = mkOption { type = types.bool; default = false; @@ -673,13 +690,6 @@ in config = mkIf cfg.enable { - # this is not working :( - nixpkgs.config.nsd = { - ipv6 = cfg.ipv6; - ratelimit = cfg.ratelimit.enable; - rootServer = cfg.rootServer; - }; - users.extraGroups = singleton { name = username; gid = config.ids.gids.nsd; @@ -702,7 +712,7 @@ in serviceConfig = { PIDFile = pidFile; Restart = "always"; - ExecStart = "${pkgs.nsd}/sbin/nsd -d -c ${configFile}"; + ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}"; }; preStart = '' diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 85f0883b5de..a6bb4171934 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -8,6 +8,7 @@ , ratelimit ? false , recvmmsg ? false , rootServer ? false +, rrtypes ? false , zoneStats ? false }: @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { ++ edf ratelimit "ratelimit" ++ edf recvmmsg "recvmmsg" ++ edf rootServer "root-server" + ++ edf rrtypes "draft-rrtypes" ++ edf zoneStats "zone-stats" ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; From 63d54cf5b75ea6921cea70c97b1632278538af4a Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Thu, 19 Mar 2015 09:02:46 -0300 Subject: [PATCH 257/947] Remove unnecessary propagatedNativeBuildInputs from AppSqitch --- pkgs/top-level/perl-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a96b05bd998..ef3f2409041 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -236,11 +236,6 @@ let self = _self // overrides; _self = with self; { IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI URIdb libintlperl namespaceautoclean - # strictures ModuleRuntime DevelGlobalDestruction SubExporterProgressive - # ImportInto ExporterTiny DataOptList ParamsUtil SubInstall RoleTiny - # MooXTypesMooseLike ClassLoad ModuleImplementation ClassLoadXS - # BHooksEndOfScope namespaceclean PackageStash SubIdentify - # ClassMethodModifiers ]; doCheck = false; # Can't find home directory. meta = { From f30743b86ba89b663b8cb67b3f05e61307cf7c89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Mar 2015 13:19:17 +0100 Subject: [PATCH 258/947] Revert "VLC wants a newer version of libdvdnav" --- pkgs/applications/video/vlc/default.nix | 1 - .../libraries/libdvdnav/A08-dvdnav-dup.patch | 137 ++++++++++++++++++ .../libdvdnav/P00-mingw-no-examples.patch | 21 +++ .../libraries/libdvdnav/default.nix | 20 ++- .../libraries/libdvdread/default.nix | 11 +- 5 files changed, 177 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch create mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 69fc448ca15..e25f833eabc 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" - "--enable-dvdnav" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch new file mode 100644 index 00000000000..c0991b43555 --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch @@ -0,0 +1,137 @@ +Index: src/dvdnav.c +=================================================================== +--- libdvdnav.orig/src/dvdnav.c (revision 1168) ++++ libdvdnav/src/dvdnav.c (working copy) +@@ -71,6 +71,67 @@ + return DVDNAV_STATUS_OK; + } + ++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) { ++ dvdnav_t *this; ++ ++ (*dest) = NULL; ++ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); ++ if(!this) ++ return DVDNAV_STATUS_ERR; ++ ++ memcpy(this, src, sizeof(dvdnav_t)); ++ this->file = NULL; ++ ++ pthread_mutex_init(&this->vm_lock, NULL); ++ ++ this->vm = vm_new_copy(src->vm); ++ if(!this->vm) { ++ printerr("Error initialising the DVD VM."); ++ pthread_mutex_destroy(&this->vm_lock); ++ free(this); ++ return DVDNAV_STATUS_ERR; ++ } ++ ++ /* Start the read-ahead cache. */ ++ this->cache = dvdnav_read_cache_new(this); ++ ++ (*dest) = this; ++ return DVDNAV_STATUS_OK; ++} ++ ++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) { ++ ++#ifdef LOG_DEBUG ++ fprintf(MSG_OUT, "libdvdnav: free_dup:called\n"); ++#endif ++ ++ if (this->file) { ++ pthread_mutex_lock(&this->vm_lock); ++ DVDCloseFile(this->file); ++#ifdef LOG_DEBUG ++ fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); ++#endif ++ this->file = NULL; ++ pthread_mutex_unlock(&this->vm_lock); ++ } ++ ++ /* Free the VM */ ++ if(this->vm) ++ vm_free_copy(this->vm); ++ ++ pthread_mutex_destroy(&this->vm_lock); ++ ++ /* We leave the final freeing of the entire structure to the cache, ++ * because we don't know, if there are still buffers out in the wild, ++ * that must return first. */ ++ if(this->cache) ++ dvdnav_read_cache_free(this->cache); ++ else ++ free(this); ++ ++ return DVDNAV_STATUS_OK; ++} ++ + dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { + dvdnav_t *this; + struct timeval time; +Index: src/dvdnav/dvdnav.h +=================================================================== +--- libdvdnav.orig/src/dvdnav/dvdnav.h (revision 1168) ++++ libdvdnav/src/dvdnav.h (working copy) +@@ -89,6 +89,9 @@ + */ + dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path); + ++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src); ++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this); ++ + /* + * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any + * memory associated with it. +Index: src/vm/vm.c +=================================================================== +--- libdvdnav.orig/src/vm/vm.c (revision 1168) ++++ libdvdnav/src/vm/vm.c (working copy) +@@ -96,6 +98,7 @@ + + static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang); + static pgcit_t* get_PGCIT(vm_t *vm); ++static void vm_close(vm_t *vm); + + + /* Helper functions */ +@@ -262,7 +265,7 @@ + } + + void vm_free_vm(vm_t *vm) { +- vm_stop(vm); ++ vm_close(vm); + free(vm); + } + +@@ -289,12 +292,20 @@ + + int vm_start(vm_t *vm) { + /* Set pgc to FP (First Play) pgc */ ++ if (vm->stopped) { ++ vm_reset(vm, NULL); ++ vm->stopped = 0; ++ } + set_FP_PGC(vm); + process_command(vm, play_PGC(vm)); + return !vm->stopped; + } + + void vm_stop(vm_t *vm) { ++ vm->stopped = 1; ++} ++ ++static void vm_close(vm_t *vm) { + if(vm->vmgi) { + ifoClose(vm->vmgi); + vm->vmgi=NULL; +@@ -346,7 +357,7 @@ + + if (vm->dvd && dvdroot) { + /* a new dvd device has been requested */ +- vm_stop(vm); ++ vm_close(vm); + } + if (!vm->dvd) { + vm->dvd = DVDOpen(dvdroot); diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch new file mode 100644 index 00000000000..0e061861735 --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch @@ -0,0 +1,21 @@ +diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am +--- libdvdnav.orig/Makefile.am 2008-10-03 16:11:46.000000000 -0400 ++++ libdvdnav/Makefile.am 2009-04-24 02:53:15.000000000 -0400 +@@ -1,7 +1,7 @@ + include $(top_srcdir)/misc/Makefile.common + + +-SUBDIRS = src examples doc misc m4 ++SUBDIRS = src doc misc m4 + + EXTRA_DIST = autogen.sh \ + AUTHORS \ +diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac +--- libdvdnav.orig/configure.ac 2009-01-08 17:57:11.000000000 -0500 ++++ libdvdnav/configure.ac 2009-04-24 02:52:34.000000000 -0400 +@@ -252,5 +252,4 @@ + misc/relchk.sh + m4/Makefile + doc/Makefile +-examples/Makefile + ]) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 343eb7ce9f9..9b4e912772b 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,17 +1,25 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: -stdenv.mkDerivation rec { - name = "libdvdnav"; - version = "5.0.3"; - +stdenv.mkDerivation { + name = "libdvdnav-4.2.1"; + src = fetchurl { - url = "http://download.videolan.org/pub/videolan/${name}/${version}/${name}-${version}.tar.bz2"; - sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; + url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; + configureScript = "./configure2"; # wtf? + + preConfigure = '' + mkdir -p $out + ''; + + # From Handbrake + patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; + meta = { homepage = http://dvdnav.mplayerhq.hu/; description = "A library that implements DVD navigation features such as DVD menus"; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 4832feacd87..eb5a48a99f1 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, libdvdcss}: -stdenv.mkDerivation rec { - name = "libdvdread"; - version = "5.0.2"; - +stdenv.mkDerivation { + name = "libdvdread-4.9.9"; + src = fetchurl { - url = "http://download.videolan.org/pub/videolan/${name}/${version}/${name}-${version}.tar.bz2"; - sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; + url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; }; buildInputs = [libdvdcss]; From d56831a9af39068b22d0bbee6f78c2c74dd3cde4 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 19 Mar 2015 12:32:39 +0000 Subject: [PATCH 259/947] ghc: update link and version of 7.10 RC3 --- pkgs/development/compilers/ghc/7.10.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 7938e45605b..09d89b80f34 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150315"; + version = "7.10.0.20150316"; name = "ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; - sha256 = "0drj8llsf17iqlr04dp0xd5ypfsv5cgcm7ncvh675sas2rw5qhjx"; + sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; }; buildInputs = [ ghc perl ]; From cd55b6b5bba70a33e87dfb5c79fb4e49d6ed8b33 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 19 Mar 2015 14:08:16 +0100 Subject: [PATCH 260/947] kernelPatches: remove unused parameters --- pkgs/os-specific/linux/kernel/patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 72ca1a0bb31..19a3b5bd6c3 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, apparmor }: +{ stdenv, fetchurl }: let From fa843cdf11cb2e6f35871f7b67456e62d59b00c0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Mar 2015 18:04:16 +0100 Subject: [PATCH 261/947] lxc: use AppArmor 2.9 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 04ca4514a0f..97f80b53032 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x +{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x , docbook_xml_dtd_45, gnutls, pkgconfig }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0"; }; - buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; + buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; From 0e52c562b5f37d2dc1a0e62701c59ec333e9d32f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 19 Mar 2015 14:14:28 +0100 Subject: [PATCH 262/947] RAppArmor: use AppArmor 2.9 --- pkgs/development/r-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f905459d648..9aa6af66ccf 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -256,7 +256,7 @@ let qtpaint = [ pkgs.qt4 ]; R2GUESS = [ pkgs.gsl ]; R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; - RAppArmor = [ pkgs.apparmor ]; + RAppArmor = [ pkgs.libapparmor ]; rbamtools = [ pkgs.zlib ]; RCA = [ pkgs.gmp ]; rcdd = [ pkgs.gmp ]; @@ -1003,7 +1003,7 @@ let RAppArmor = old.RAppArmor.overrideDerivation (attrs: { patches = [ ./patches/RAppArmor.patch ]; - LIBAPPARMOR_HOME = "${pkgs.apparmor}"; + LIBAPPARMOR_HOME = "${pkgs.libapparmor}"; }); RMySQL = old.RMySQL.overrideDerivation (attrs: { From 2fe351c7e31f47400d752a59ab7b1e2e89acf392 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Mar 2015 15:57:17 +0100 Subject: [PATCH 263/947] openssl: Update to 1.0.1m Fixes various "Moderate" / "Low" CVEs: http://openssl.org/news/secadv_20150319.txt --- .../libraries/openssl/cert-file.patch | 42 +++++++++---------- .../development/libraries/openssl/default.nix | 6 ++- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch index 26b51c0295e..e6e66111201 100644 --- a/pkgs/development/libraries/openssl/cert-file.patch +++ b/pkgs/development/libraries/openssl/cert-file.patch @@ -1,6 +1,6 @@ -diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c ---- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200 -+++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200 +diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c +--- openssl-1.0.1m-orig/crypto/x509/x509_def.c 2015-03-19 14:19:00.000000000 +0100 ++++ openssl-1.0.1m/crypto/x509/x509_def.c 2015-03-19 15:50:44.676683616 +0100 @@ -57,6 +57,10 @@ */ @@ -12,30 +12,28 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt #include "cryptlib.h" #include #include -@@ -71,7 +75,25 @@ - { return(X509_CERT_DIR); } +@@ -78,7 +82,23 @@ const char *X509_get_default_cert_file(void) -- { return(X509_CERT_FILE); } -+ { -+ static char buf[PATH_MAX] = X509_CERT_FILE; -+ static int init = 0; -+ if (!init) { -+ init = 1; -+ char * s = getenv("OPENSSL_X509_CERT_FILE"); -+ if (s) { + { +- return (X509_CERT_FILE); ++ static char buf[PATH_MAX] = X509_CERT_FILE; ++ static int init = 0; ++ if (!init) { ++ init = 1; ++ char * s = getenv("OPENSSL_X509_CERT_FILE"); ++ if (s) { +#ifndef OPENSSL_SYS_WINDOWS -+ if (getuid() == geteuid()) { ++ if (getuid() == geteuid()) { +#endif -+ strncpy(buf, s, sizeof(buf)); -+ buf[sizeof(buf) - 1] = 0; ++ strncpy(buf, s, sizeof(buf)); ++ buf[sizeof(buf) - 1] = 0; +#ifndef OPENSSL_SYS_WINDOWS -+ } ++ } +#endif -+ } -+ } -+ return buf; -+ } ++ } ++ } ++ return buf; + } const char *X509_get_default_cert_dir_env(void) - { return(X509_CERT_DIR_EVP); } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 9a1df52d3f7..7255e91f282 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1l"; + name = "openssl-1.0.1m"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -18,6 +18,8 @@ let # hardcoding something like /etc/ssl/cert.pem is impure and # cannot be overriden per-process. For security, the # environment variable is ignored for setuid binaries. + # FIXME: drop this patch; it really isn't necessary, because + # OpenSSL already supports a ‘SSL_CERT_FILE’ variable. ./cert-file.patch ] @@ -43,7 +45,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1m6i80y9c9g7h4303bqbxnsk5wm6jd0n57hwqr0g4jaxzr44vkxj"; + sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9"; }; patches = patchesCross false; From afb0874e060298f2fadb770201547b931a014336 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 12:12:28 +0100 Subject: [PATCH 264/947] hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 --- .../configuration-ghc-7.0.x.nix | 2 +- .../configuration-ghc-7.2.x.nix | 2 +- .../haskell-modules/hackage-packages.nix | 509 +++++++++++------- 3 files changed, 309 insertions(+), 204 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index f676e223563..36afb31ffcd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -35,7 +35,7 @@ self: super: { binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_0_0; + deepseq = self.deepseq_1_4_1_0; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 6d18d8294d6..23e939853af 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -32,7 +32,7 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_0_0; + deepseq = self.deepseq_1_4_1_0; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 63aaa0a11cf..b7413ec9aee 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4304,8 +4304,8 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "FenwickTree"; - version = "0.1.2"; - sha256 = "0kxlz0x4lzkn7xkilpcwpphp5hwr7nq56wh9vmh5zmsyr4adg3zy"; + version = "0.1.2.1"; + sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww"; buildDepends = [ base QuickCheck template-haskell ]; testDepends = [ base QuickCheck template-haskell ]; homepage = "https://github.com/mgajda/FenwickTree"; @@ -4801,8 +4801,8 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "1.4.7.1"; - sha256 = "1dzqvlxif5vadyd6vl9q260hhfp1rhmab9jwy3y1xmai31ddhlbb"; + version = "1.4.7.2"; + sha256 = "1hjsv6yqkwqi18c1vha105jl56xjvb5dqwqs4bgjkk99qcqq70rd"; buildDepends = [ base bindings-GLFW ]; testDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit @@ -5221,6 +5221,7 @@ self: { pname = "Glob"; version = "0.7.5"; sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0"; + editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b"; buildDepends = [ base containers directory dlist filepath transformers ]; @@ -11023,14 +11024,14 @@ self: { }: mkDerivation { pname = "OpenSCAD"; - version = "0.2.0.0"; - sha256 = "1gg5x50631piay35jifh70nq88av71ar896q9vci65isz9a51yvb"; + version = "0.2.1.0"; + sha256 = "0b451v2sa9gaslhg03y6nyvjwbhwlg2qxwahcj6qpyx4qlmiywnh"; buildDepends = [ base colour filepath ]; testDepends = [ base Cabal colour filepath HUnit test-framework test-framework-hunit ]; - homepage = "https://graphics-openscad.googlecode.com/"; + homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/"; description = "ADT wrapper and renderer for OpenSCAD models"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -11895,6 +11896,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_8" = callPackage + ({ mkDerivation, base, containers, random, template-haskell + , test-framework, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.8"; + sha256 = "04xs6mq22bcnkpi616qrbm7jlivh9csnhmvjgp1ifq52an1wr4rx"; + buildDepends = [ + base containers random template-haskell tf-random transformers + ]; + testDepends = [ base containers template-haskell test-framework ]; + jailbreak = true; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -18415,8 +18434,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.12.1"; - sha256 = "0s1v64b0m7xv7nrjmfpamfj40vh7cl9l5z7ccilbry5y4qacpsv9"; + version = "0.12.2"; + sha256 = "07nk8xxpkdh9w19rwwc87h2vbhfam339czkvyrmx7jh2dp51pnag"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19299,6 +19318,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "applicative-fail" = callPackage + ({ mkDerivation, base, bifunctors }: + mkDerivation { + pname = "applicative-fail"; + version = "0.0.3"; + sha256 = "057ii1519qwjhg64vahbg2z2a4ydb2ndd1bjzz6cb1cx3n7nigr8"; + buildDepends = [ base bifunctors ]; + homepage = "https://bitbucket.org/s9gf4ult/applicative-fail"; + description = "Applicative functor which collects all your fails"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "applicative-numbers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20909,8 +20940,8 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.2.0.3"; - sha256 = "1aplwr8lgl3x0sskjwlp85zrqj13468r9ddn5rzbaqj4j3kbpvcx"; + version = "0.2.0.4"; + sha256 = "1a2sz8snlxc7jgqs33vgczi1k4m4ssixq5xxgzclv0sz050cigh9"; buildDepends = [ base bytestring cereal containers deepseq profunctors random semigroups transformers @@ -23288,23 +23319,25 @@ self: { }) { esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext - , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework - , test-framework-hunit + ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor + , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm + , mesa, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.1.1"; - sha256 = "17r6q72s3gfbcr1l9wlh4v0wd6r1lajaq6yqyd0r29qnz3ahpvs5"; + version = "3.1.1.2"; + sha256 = "1r9nny6873nzk8ij53byqad0hfni8f1ysrajm430867pizvyfj50"; buildDepends = [ base bindings-DSL ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; extraLibraries = [ - libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa + libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr + libXxf86vm mesa ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xlibs) libXi; + }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; + inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; + inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs) mesa;}; @@ -25969,6 +26002,7 @@ self: { pname = "bytes"; version = "0.15"; sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; + editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386"; buildDepends = [ base binary bytestring cereal containers mtl text time transformers transformers-compat void @@ -26719,6 +26753,7 @@ self: { pname = "cabal-install"; version = "1.22.0.1"; sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7"; + editedCabalFile = "85c5296e1b0aff3717c9ce62e98a8b9b6d5509e55f76cd80ae7179269c46592c"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -29564,20 +29599,19 @@ self: { }) {}; "clac" = callPackage - ({ mkDerivation, base, containers, optparse-applicative, plailude - , pretty-tree, safe, split + ({ mkDerivation, base, containers, dsp, optparse-applicative + , plailude, pretty-tree, safe, split }: mkDerivation { pname = "clac"; - version = "0.4.0"; - sha256 = "1p9gjdcwknls6p488bi00g1zfpbizg854c5636n0xzk8iapcap4x"; + version = "0.5.0"; + sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8"; isLibrary = false; isExecutable = true; buildDepends = [ - base containers optparse-applicative plailude pretty-tree safe + base containers dsp optparse-applicative plailude pretty-tree safe split ]; - jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -30180,16 +30214,16 @@ self: { "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative - , terminfo, wl-pprint-extras, wl-pprint-terminfo + , process, terminfo, wl-pprint-extras, wl-pprint-terminfo }: mkDerivation { pname = "cless"; - version = "0.1.0.0"; - sha256 = "1y5mah8x7r0lfc9b6vv69hj2hw6ka1gc9b9qp3bkxlw003rib484"; + version = "0.2.0.0"; + sha256 = "10q68rs85zxk9pqd5rkd1pndp2nsvxxdznil2jf1027r0bqyxjyn"; isLibrary = false; isExecutable = true; buildDepends = [ - base highlighting-kate optparse-applicative terminfo + base highlighting-kate optparse-applicative process terminfo wl-pprint-extras wl-pprint-terminfo ]; homepage = "https://github.com/tanakh/cless"; @@ -30614,8 +30648,8 @@ self: { ({ mkDerivation, base, mtl, syb, text }: mkDerivation { pname = "cmark"; - version = "0.2.0.2"; - sha256 = "0kjkqjyvkh4ppvmmbhjjdbhihz7ffsy6kn7dfms21si50qwciq4b"; + version = "0.3"; + sha256 = "0zhhcgcikixgnkblfqpf08did3ykjwb1pfg7dq3zndjic116xasm"; buildDepends = [ base mtl syb text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; @@ -34440,8 +34474,8 @@ self: { ({ mkDerivation, base, bytestring, securemem, unix, vector }: mkDerivation { pname = "crypto-random"; - version = "0.0.8"; - sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv"; + version = "0.0.9"; + sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp"; buildDepends = [ base bytestring securemem unix vector ]; homepage = "http://github.com/vincenthz/hs-crypto-random"; description = "Simple cryptographic random related types"; @@ -37524,14 +37558,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_0_0" = callPackage + "deepseq_1_4_1_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.0.0"; - sha256 = "0ns8njkigxa05z2mif9dz2r41j8c717q7f7lswvbp4wwfhr7vdk9"; + version = "1.4.1.0"; + sha256 = "1azyq3vralgqi3sl61xhx0r7q7bwjfjhgk8jrjmziq55ymfkssna"; buildDepends = [ array base ghc-prim ]; testDepends = [ array base HUnit test-framework test-framework-hunit @@ -39272,15 +39306,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory_1_2_1_0" = callPackage + "directory_1_2_2_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.1.0"; - sha256 = "110ch0nd2hh5fsq3whrvj85s0h27ch1q6xg7z9s6mqbd6k6p9yzs"; - editedCabalFile = "05fdf6015e1368e0da696dcd55b7283336d95257075a32c4a2768dd0dd27742f"; + version = "1.2.2.0"; + sha256 = "1dbn6d48gdqh0n2rkh02asxv94ikd8849659ndc7p3h93kgj1dy4"; buildDepends = [ base filepath time unix ]; - description = "library for directory handling"; + testDepends = [ base ]; + description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -40019,8 +40053,8 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.7.1"; - sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr"; + version = "0.7.1.1"; + sha256 = "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08"; buildDepends = [ base deepseq ]; testDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/spl/dlist"; @@ -41591,12 +41625,12 @@ self: { ({ mkDerivation, base, cmdargs, hint }: mkDerivation { pname = "eddie"; - version = "0.5"; - sha256 = "013fcf13pb771hkcfn0l1h57qczyn24s6d7hjszwgf9fazx713vd"; + version = "0.5.1"; + sha256 = "1kqrxv195r1dhrnizaml9v20jpwgxq66xdr7jfmri4ai0pvjpzmk"; isLibrary = false; isExecutable = true; buildDepends = [ base cmdargs hint ]; - homepage = "http://eddie.googlecode.com/"; + homepage = "http://chiselapp.com/user/mwm/repository/eddie/"; description = "Command line file filtering with haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41766,8 +41800,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.2"; - sha256 = "1g75qzsmwpcxs18ildnvy9df8fsns5ya8dparx7fdybjlr5wv5xd"; + version = "0.1.0.4"; + sha256 = "1qsr8xsv3hhk3m97zlzmpspjx9b4aghg0axyriwfy5mkbl3kqy93"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -42692,8 +42726,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.3"; - sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc"; + version = "1.2.4"; + sha256 = "08445vp6ma2jids99b21grw8pds086yvbcbh6iyr8x3z74020y1m"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -45069,18 +45103,18 @@ self: { "feed-crawl" = callPackage ({ mkDerivation, base, bytestring, conduit, connection - , http-conduit, http-types, hxt, text, transformers + , http-conduit, http-types, hxt, network-uri, text, transformers }: mkDerivation { pname = "feed-crawl"; - version = "0.1.0.0"; - sha256 = "1q68z0288sl4il2i2mm94b51xgfdzxvljralqd6rr650qbgbbbgy"; + version = "0.1.1.0"; + sha256 = "0137b0bi24cdmwbvpz9cr3iavcyz95xvq48ydqdilazr6gl81m13"; buildDepends = [ - base bytestring conduit connection http-conduit http-types hxt text - transformers + base bytestring conduit connection http-conduit http-types hxt + network-uri text transformers ]; homepage = "https://github.com/danchoi/feed-crawl"; - description = "Feed crawling utilities"; + description = "Utility for fetching feeds with redirect info and HTML link detection"; license = stdenv.lib.licenses.mit; }) {}; @@ -45552,17 +45586,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_3_0_2" = callPackage - ({ mkDerivation, base, QuickCheck, random }: + "filepath_1_4_0_0" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.3.0.2"; - sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2"; - editedCabalFile = "42c2b0c550f4c73d044f186a58e34285632705b6936dc24fb6012eb10bf70cc7"; + version = "1.4.0.0"; + sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4"; buildDepends = [ base ]; - testDepends = [ base QuickCheck random ]; - jailbreak = true; - homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; + testDepends = [ base QuickCheck ]; + homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -46493,8 +46525,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.1.0"; - sha256 = "0lzn1wrqq7mnxlf8axb4nj90mq9c4w299dilp9k4s4s9lzag2gib"; + version = "0.2.2.0"; + sha256 = "0gg9nhfmhi7qz79i4jbqixyw032sk394gmcjcb3hna09jqas71ab"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -46585,8 +46617,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.7"; - sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9"; + version = "1.0.8"; + sha256 = "1v8g1n17lwjwr2d1r3zam44qlm3jrr5j30d4cs4n4gf5pgxlrzvp"; buildDepends = [ base bytestring containers primitive text transformers vector ]; @@ -49845,12 +49877,13 @@ self: { , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, dataenc, DAV, dbus, directory - , dlist, dns, edit-distance, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client - , http-conduit, http-types, IfElse, json, lsof, MissingH - , monad-control, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, process, QuickCheck + , dlist, dns, edit-distance, esqueleto, exceptions, fdo-notify + , feed, filepath, git, gnupg1, 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, old-locale + , openssh, optparse-applicative, path-pieces, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem , SHA, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, text, time, torrent, transformers @@ -49860,24 +49893,25 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150219"; - sha256 = "0psx113vjb1wicaywknhn13x0la5hrggwf8b0rs4gxd472ix5ha6"; + version = "5.20150317"; + sha256 = "1n57h97z6jw1pqxmkgfy7s24f88ypskgvsw3gcfyah9inkx1rhr5"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession conduit conduit-extra containers crypto-api cryptohash data-default dataenc DAV dbus directory dlist - dns edit-distance exceptions fdo-notify feed filepath gnutls hamlet - hinotify hslogger http-client http-conduit http-types IfElse json - MissingH monad-control mtl network network-info network-multicast - network-protocol-xmpp network-uri old-locale optparse-applicative - path-pieces process QuickCheck random regex-tdfa resourcet - SafeSemaphore securemem SHA shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static + dns edit-distance esqueleto exceptions fdo-notify feed filepath + gnutls hamlet hinotify hslogger http-client http-conduit http-types + IfElse json MissingH monad-control monad-logger mtl network + network-info network-multicast network-protocol-xmpp network-uri + old-locale optparse-applicative path-pieces persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore securemem SHA shakespeare stm + tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell + text time torrent transformers unix unix-compat utf8-string uuid + wai wai-extra warp warp-tls xml-types yesod yesod-core + yesod-default yesod-form yesod-static ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync wget which @@ -50440,6 +50474,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gitrev" = callPackage + ({ mkDerivation, base, directory, filepath, process + , template-haskell + }: + mkDerivation { + pname = "gitrev"; + version = "1.0.0"; + sha256 = "05jxzhpjzd9n5sdaa8d9y2zczs2v5w4n9718wl411ghvx54jhnfd"; + buildDepends = [ + base directory filepath process template-haskell + ]; + homepage = "https://github.com/acfoltzer/gitrev"; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, errors, filepath, flock, Glob, hspec, monad-control @@ -56514,30 +56564,28 @@ self: { "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit - , lifted-base, monad-control, mtl, QuickCheck, resourcet - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-base, transformers-compat, unordered-containers - , vector + , lifted-base, mtl, QuickCheck, resourcet, scientific + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-base + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.12"; - sha256 = "1kh1xglqcz8yg1660ham0k4y0mxs63x75hv9xxjk2ms5386jpj6c"; + version = "0.3.0.13"; + sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP - http-conduit http-types lifted-base monad-control mtl resourcet - scientific text transformers transformers-base transformers-compat + http-conduit http-types lifted-base mtl resourcet scientific text + transformers transformers-base transformers-compat unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit - http-types HUnit lifted-base monad-control mtl QuickCheck resourcet - scientific test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - transformers-base transformers-compat unordered-containers vector + http-types HUnit lifted-base mtl QuickCheck resourcet scientific + test-framework test-framework-hunit test-framework-quickcheck2 + test-framework-th text transformers transformers-base + transformers-compat unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; @@ -59625,8 +59673,8 @@ self: { }: mkDerivation { pname = "hermit"; - version = "0.7.0.0"; - sha256 = "03k22rc5a3g9mq20q530h40j29k5pz5d9flamzb4svs3jamgz5hz"; + version = "0.7.1.0"; + sha256 = "0ckjh7ql2s6l09lbgdn9plfpvmdcx6b3yh9lbdih9l4lcf1k8f56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64886,8 +64934,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.21"; - sha256 = "1smzr83c3fk3fwfkp973j2nz985nbj9j9ps9fpwndsxxfyqj830d"; + version = "1.22"; + sha256 = "1iqmxvpvj3icg7mhx4450p2wqjsfx1xh3lwgrrmxvm339hksx3rw"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -66670,21 +66718,20 @@ self: { }) {}; "hsx2hs" = callPackage - ({ mkDerivation, base, haskell-src-exts, haskell-src-meta, mtl - , template-haskell, utf8-string + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string }: mkDerivation { pname = "hsx2hs"; - version = "0.13.2"; - sha256 = "1xszshj94vwh9mxm1h4pvj7x0jivid065f1gqf1l4crd4d4488mc"; + version = "0.13.3.1"; + sha256 = "12hj4vqkz097kjf2gk40jj9r61sydfmlhm6b5r0z1q96ys9m82k9"; isLibrary = true; isExecutable = true; buildDepends = [ - base haskell-src-exts haskell-src-meta mtl template-haskell - utf8-string + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string ]; - jailbreak = true; - homepage = "http://hub.darcs.net/nibro/hsx2hs"; + homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67327,8 +67374,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.5"; - sha256 = "12vvv5vjwbmgsmrmkxs72z4qvkbb7gns749j7dmnf39sy7c5s93g"; + version = "0.0.6"; + sha256 = "0f1s4bfazckl016pi2nzrmmiv0f6pnr9mgvsdj33ysvknp0md3c9"; buildDepends = [ array attoparsec base bytestring ]; testDepends = [ base bytestring doctest hspec old-locale time ]; description = "HTTP Date parser/formatter"; @@ -72460,6 +72507,7 @@ self: { safe semigroups template-haskell text time unordered-containers vector x509 ]; + jailbreak = true; homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; @@ -72653,8 +72701,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.8"; - sha256 = "1p6pkhi50a81c4ldkqpvs8m2gmz1h3ayxhfshyy1dl06nrbfc0i0"; + version = "0.2.5.9"; + sha256 = "0ajsxg515484bqmg94l9gmg4jpfvv6ykcbnyglkh1j86phggxrf2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73412,14 +73460,13 @@ self: { }) {}; "kdt" = callPackage - ({ mkDerivation, base, deepseq, deepseq-generics, pqueue - , QuickCheck + ({ mkDerivation, base, deepseq, deepseq-generics, heap, QuickCheck }: mkDerivation { pname = "kdt"; - version = "0.2.2"; - sha256 = "1kj914xya5msw9hb2lqa36jf68pna8dfq21jbylq2m68k0ydcivi"; - buildDepends = [ base deepseq deepseq-generics pqueue ]; + version = "0.2.3"; + sha256 = "0chxxl53jnnhfs02gxr2a3kzppmsnwrrfr1fjyx71lkvigwy71yk"; + buildDepends = [ base deepseq deepseq-generics heap ]; testDepends = [ base deepseq deepseq-generics QuickCheck ]; homepage = "https://github.com/giogadi/kdt"; description = "Fast and flexible k-d trees for various types of point queries"; @@ -73836,8 +73883,8 @@ self: { }: mkDerivation { pname = "koofr-client"; - version = "1.0.0.1"; - sha256 = "1kbdln4jyd9k9lsa4hzx5kjvjkajrf4b11fy6vj2k928gqv2vqmj"; + version = "1.0.0.2"; + sha256 = "094rhsf910ifzazy3j937hgdkibvwjc5x69yxvglmizc3xl6qqfv"; buildDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -77082,8 +77129,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.17.1"; - sha256 = "009bp2lv2fniq0pnn19xiapc9fc9pp6qi9rcnzw1a646gmmb9si6"; + version = "1.18.0.1"; + sha256 = "06gbrmr7yv9s6la14g22lwqfjyfr0xrlmkrffizy4n01xknmkbig"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -78027,8 +78074,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.4.4"; - sha256 = "1rx07pk6g46k4652mznga7v51pp6bi32h3wk0dnmihn8n4536m4x"; + version = "3.4.5.0"; + sha256 = "19rvpy7hfgkfjkijnasajrvzbw75ij7sfwg9z4w080x6w39rgppr"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -78053,8 +78100,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.4.1"; - sha256 = "147s03km3gp4v5gk5fi179qrha962w3xm7rnaxia9xzvh1161j9g"; + version = "3.4.5.0"; + sha256 = "0gb06b8bb5d7fmkjpbi3smjssjxk5xgmf3lv5axhm0rbndi6y9vc"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -80099,8 +80146,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.2.0.0"; - sha256 = "1v110ji153gnr3rjlj6m3w9w30pmf6zc9z25d9l52rxggfd5pfy8"; + version = "0.2.1.0"; + sha256 = "0gmlf50hq9dh2xh74dvsyywrbrv7i31d6j7k4pgmfinn8pih03lz"; buildDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -80861,9 +80908,9 @@ self: { }: mkDerivation { pname = "mdcat"; - version = "0.1.0.0"; - sha256 = "0z3fgs2vsga8wr4ksaqqwx9bxminf9dw9a2kgr9k852r14m234sh"; - isLibrary = false; + version = "0.1.0.4"; + sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l"; + isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base directory pandoc terminfo ]; homepage = "https://github.com/dorafmon/mdcat"; @@ -81674,8 +81721,8 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.0.5"; - sha256 = "04ajhr0izfixhvz0c7m1zz3c7z2lnabyifn4flqv5d41gkkg0pr1"; + version = "0.1.0.6"; + sha256 = "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw"; buildDepends = [ base bytestring containers text ]; homepage = "https://github.com/yesodweb/wai"; description = "Basic mime-type handling types and functions"; @@ -83028,8 +83075,8 @@ self: { ({ mkDerivation, array, base, stm, transformers }: mkDerivation { pname = "monadic-arrays"; - version = "0.2.1.3"; - sha256 = "0qqf640zzv4dn0b1mpz54pdirdz3scc8z72vz884x88gzvdpr025"; + version = "0.2.1.4"; + sha256 = "1vlqh0mqfkg1f47dhl5lw49b7xawlbyjmq7xpmmf16q3idxnkahh"; buildDepends = [ array base stm transformers ]; homepage = "http://github.com/ekmett/monadic-arrays/"; description = "Boxed and unboxed arrays for monad transformers"; @@ -86000,6 +86047,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-builder" = callPackage + ({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec + , hspec-server, optparse-applicative, process, shelly, text, yaml + }: + mkDerivation { + pname = "network-builder"; + version = "0.1.0"; + sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring optparse-applicative shelly text yaml + ]; + testDepends = [ base cabal-test-bin hspec hspec-server process ]; + description = "Linux NetworkNameSpace Builder"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -88360,8 +88425,8 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.0.0"; - sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc"; + version = "1.2.1.0"; + sha256 = "1jqrc9wxvw196vgcbhpazi9vldqs31jb6jxc529iy9k7vh4mk5m9"; buildDepends = [ base bytestring HsOpenSSL io-streams network ]; testDepends = [ base bytestring HsOpenSSL HUnit io-streams network test-framework @@ -89119,6 +89184,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagarme" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens, text + , wreq + }: + mkDerivation { + pname = "pagarme"; + version = "0.1.0.0"; + sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0"; + isLibrary = true; + isExecutable = true; + buildDepends = [ aeson base bytestring containers lens text wreq ]; + homepage = "https://github.com/diogob/pagarme_haskell"; + description = "Pagarme API wrapper"; + license = stdenv.lib.licenses.mit; + }) {}; + "pagerduty" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions @@ -90847,8 +90928,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.1.7"; - sha256 = "1nj2nwjzg95k1xyhk31mpmyy0flw4hjjf8r0959i1x1makrfy32f"; + version = "2.1.2"; + sha256 = "17p81s1w7wqs2hm5zcwncvidd808gm4zlha7mqv9wwpf6ql1b359"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -91028,6 +91109,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-ratelimit" = callPackage + ({ mkDerivation, base, time, yesod }: + mkDerivation { + pname = "persistent-ratelimit"; + version = "0.1.0.0"; + sha256 = "00kvmqisi6y8r8vpfa61kzxr0iyy6varj8920kjwsd2jk2i7q8wl"; + buildDepends = [ base time yesod ]; + homepage = "https://github.com/jprider63/persistent-ratelimit"; + description = "A library for rate limiting activities with a persistent backend"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-redis" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis , monad-control, mtl, path-pieces, persistent, persistent-template @@ -94007,12 +94100,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_3_1" = callPackage + "pretty_1_1_3_2" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.3.1"; - sha256 = "0v1g7gr8nki1bka5dxagayx9azj2gyyd5y23202pnk53synj2lzh"; + version = "1.1.3.2"; + sha256 = "0k61v71c40dy4whvy1q1n3hs0xnhscg4svp0prcihn7s57j2spvi"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -94380,8 +94473,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.1"; - sha256 = "1lwjm402q92ibd66xiz5zwwqd8nkyvlhnrw60ja3zngq8z8dsk7g"; + version = "0.3.3.2"; + sha256 = "0kv4fpg5qndqf97c1znhibhzqd5z6mdk38ma72yk3ixkp45rvarh"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -95554,19 +95647,19 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, base, containers, directory, file-embed, filepath - , haskeline, mtl, nodejs, optparse-applicative, parsec + ({ mkDerivation, base, boxes, containers, directory, file-embed + , filepath, haskeline, mtl, nodejs, optparse-applicative, parsec , pattern-arrows, process, time, transformers, unordered-containers , utf8-string }: mkDerivation { pname = "purescript"; - version = "0.6.8"; - sha256 = "02bcy8qfcsaxz0ygcajskj9dmpyl291vgvjp0jlrjsfcv8ym4izl"; + version = "0.6.9.3"; + sha256 = "1hdxj1qxxvkjacm8msfn1xjbgwhmg0kx5ha1fxv11nks0m0h4wcr"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers directory file-embed filepath haskeline mtl + base boxes containers directory file-embed filepath haskeline mtl optparse-applicative parsec pattern-arrows process time transformers unordered-containers utf8-string ]; @@ -98706,8 +98799,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.0.1"; - sha256 = "15fgh42j2fhgqxr2z6ayg7kwrdmsmakl5v1dkxyrp7k3iah3ak5d"; + version = "0.1.0.2"; + sha256 = "1267bv92z2k8s2cmn8sgw0i0vs3y2m8jyvnv969v15lrpsid1vvw"; buildDepends = [ base bytestring containers persistable-record relational-query template-haskell time @@ -102102,8 +102195,8 @@ self: { }: mkDerivation { pname = "scientific"; - version = "0.3.3.7"; - sha256 = "16976av2cag4gn06mfqqvj8knj64b966f6101cszxffk530q42y0"; + version = "0.3.3.8"; + sha256 = "0k6f9g3jpwhm52af4zayhdby8xibarn60mpxbb8xxgm78hmdw373"; buildDepends = [ array base bytestring deepseq ghc-prim hashable integer-gmp text ]; @@ -105456,8 +105549,8 @@ self: { }: mkDerivation { pname = "singletons"; - version = "1.1"; - sha256 = "183y9kj6f8ikrf1r4j24l1r1hnmw6n3aw77nlwqz24qfficdc7z8"; + version = "1.1.1"; + sha256 = "1pbz42i2vxmw3sf3f4sqvgyp9a1b1q5my7xq64h37a9g6jd2246a"; buildDepends = [ base containers mtl template-haskell th-desugar ]; testDepends = [ base Cabal constraints filepath process tasty tasty-golden @@ -105978,8 +106071,8 @@ self: { ({ mkDerivation, base, linear, vector }: mkDerivation { pname = "smoothie"; - version = "0.1.1"; - sha256 = "0v5bj96ggw2j4jqzj4k6rdzklr6j0bpjgvxryiyjjw97f9q8fiwx"; + version = "0.1.3"; + sha256 = "1326hqinlfipbxcynqfsskh4bq5136b48z3kjic8qnddkgkhgg1s"; buildDepends = [ base linear vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several splines and polynomials"; @@ -107304,8 +107397,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "snowflake"; - version = "0.1.1.0"; - sha256 = "139chvzj0caxglid92njs8jaxyxmyqcvqnf6yi4d8vzpbcrly29w"; + version = "0.1.1.1"; + sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi"; buildDepends = [ base time ]; description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers."; license = stdenv.lib.licenses.asl20; @@ -108156,6 +108249,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spir-v" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "spir-v"; + version = "0.0.0.1"; + sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p"; + buildDepends = [ base ]; + homepage = "https://github.com/expipiplus1/spir-v"; + description = "Some utilities for reading and writing SPIR-V files"; + license = stdenv.lib.licenses.mit; + }) {}; + "splaytree" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -108873,9 +108978,9 @@ self: { "stackage" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal - , classy-prelude-conduit, conduit-extra, containers + , classy-prelude-conduit, conduit, conduit-extra, containers , data-default-class, directory, filepath, hspec, http-client - , http-client-tls, mono-traversable, mtl, old-locale + , http-client-tls, http-conduit, mono-traversable, mtl, old-locale , optparse-applicative, process, QuickCheck, semigroups, stm , streaming-commons, system-fileio, system-filepath, tar, temporary , text, time, transformers, unix-compat, utf8-string, xml-conduit @@ -108883,17 +108988,17 @@ self: { }: mkDerivation { pname = "stackage"; - version = "0.5.2"; - sha256 = "08rxph7xb0kcbcdhcvm3frmrcm5rsyvr8fr2pczd1xxlz37fwbh3"; + version = "0.6.0.1"; + sha256 = "0y785cc71rw5g6jlbrljabing0dpizqyid36hp97r3kwa1bc5x2m"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async base bytestring Cabal classy-prelude-conduit + aeson async base bytestring Cabal classy-prelude-conduit conduit conduit-extra containers data-default-class directory filepath - http-client http-client-tls mono-traversable mtl old-locale - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath tar temporary text time transformers - unix-compat utf8-string xml-conduit yaml zlib + http-client http-client-tls http-conduit mono-traversable mtl + old-locale optparse-applicative process semigroups stm + streaming-commons system-fileio system-filepath tar temporary text + time transformers unix-compat utf8-string xml-conduit yaml zlib ]; testDepends = [ base Cabal classy-prelude-conduit containers hspec http-client @@ -111059,8 +111164,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.2"; - sha256 = "0dg6m8p8w6razxcphz3nl0di59r46sya9c2x4iq21b3n96wj1n59"; + version = "0.9.1.3"; + sha256 = "07h5677d1liap81z3gvjab5yjib2vbmzvhfzqqmkjg7grk1dblld"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111243,19 +111348,19 @@ self: { "syncthing-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers - , derive, either, http-client, http-client-tls, lens, old-locale - , quickcheck-instances, regex-posix, tasty, tasty-hunit + , derive, either, exceptions, http-client, http-client-tls, lens + , old-locale, quickcheck-instances, regex-posix, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers , wreq }: mkDerivation { pname = "syncthing-hs"; - version = "0.1.1.0"; - sha256 = "0377mykydnwdbwjbbfr56nrdh2c18ik5m9jj2wgw7qg2npnfyj2v"; + version = "0.1.2.0"; + sha256 = "15s2pz775bgygq2pnb6x546sf16vcr2dzyn5qnwf4wl7gg4hjalj"; buildDepends = [ - aeson base bytestring connection containers either http-client - http-client-tls lens old-locale regex-posix text time transformers - unordered-containers wreq + aeson base bytestring connection containers either exceptions + http-client http-client-tls lens old-locale regex-posix text time + transformers unordered-containers wreq ]; testDepends = [ aeson base bytestring containers derive either lens @@ -112689,8 +112794,8 @@ self: { ({ mkDerivation, base, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.9.1"; - sha256 = "1sxha5m2kcxi16gi8xkg2zgyqilk8qdplj8fifd1qq9n2ak8qha7"; + version = "0.9.2"; + sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf"; buildDepends = [ base tasty ]; homepage = "http://documentup.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; @@ -113666,8 +113771,8 @@ self: { }: mkDerivation { pname = "test-sandbox-compose"; - version = "0.1.2"; - sha256 = "1hc23yxlf8mwd6rq44i7bbx1aa9p7d7d920625gwd7khcn5x9kyy"; + version = "0.1.3"; + sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -114390,17 +114495,18 @@ self: { "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-lift + , template-haskell, th-lift, th-orphans }: mkDerivation { pname = "th-desugar"; - version = "1.5"; - sha256 = "18ailfvwiljscyzjxci6k9h05kf9wwb6dy3ms6q928cr80qnr4d5"; + version = "1.5.2"; + sha256 = "0kd5yn98nhji9yshnai4ffw7p8a1mn3xslbw57lvgmyln96sw096"; buildDepends = [ - base containers mtl syb template-haskell th-lift + base containers mtl syb template-haskell th-lift th-orphans ]; testDepends = [ base containers hspec HUnit mtl syb template-haskell th-lift + th-orphans ]; homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; @@ -116861,22 +116967,21 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring - , bytestring-builder, containers, directory, filepath, ghc-prim - , hashable, JuicyPixels, mtl, old-locale, parsec, process - , template-haskell, text, time, unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl + , old-locale, parsec, process, template-haskell, text, time + , unordered-containers, vector, yaml }: mkDerivation { pname = "tttool"; - version = "1.1"; - sha256 = "1qdsal3kn35npq4nd0vp5hj96cp316d5mbfr5gxrlwj12qf7kgzb"; + version = "1.3"; + sha256 = "03wb7ra4zk6x40z2h2i8rdlf53abd9lnj67c2438y2vk70ljmlny"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson base binary bytestring bytestring-builder containers - directory filepath ghc-prim hashable JuicyPixels mtl old-locale - parsec process template-haskell text time unordered-containers - vector yaml + aeson base binary bytestring containers directory filepath ghc-prim + hashable JuicyPixels mtl old-locale parsec process template-haskell + text time unordered-containers vector yaml ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -121882,8 +121987,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.5"; - sha256 = "1d139jid65qf64607m79b6z5d8al888krypfpwzc7gbl1mlhyna4"; + version = "3.0.4.6"; + sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -122475,8 +122580,8 @@ self: { }: mkDerivation { pname = "wai-session"; - version = "0.3"; - sha256 = "07b9d7ggsj662zya16g36bwczw72fw9z15xnkjrpgr6fl9b4kg0y"; + version = "0.3.1"; + sha256 = "1h2z1zahbrlw9r489vd6xjwra7nmy67lmv77gr912zls5fpf9aws"; buildDepends = [ base blaze-builder bytestring containers cookie http-types StateVar time transformers vault wai From 2d46220863c51719756aeddfc9debbc3a00d9be8 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 19 Mar 2015 17:11:57 +0000 Subject: [PATCH 265/947] New python package: clf --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f614df5c31b..0cc3a9d56f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1530,6 +1530,27 @@ let }; }; + clf = buildPythonPackage rec { + name = "clf-${version}"; + version = "0.5.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/clf/${name}.tar.gz"; + sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; + }; + + # Error when running tests: + # No local packages or download links found for requests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ncrocfer/clf; + description = "Command line tool to search snippets on Commandlinefu.com"; + license = licenses.mit; + maintainers = [ maintainers.koral ]; + }; + }; + click = buildPythonPackage rec { name = "click-3.3"; From e4c0225c29d5cbd4efb6630f989319d702adfeb7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Mar 2015 09:34:33 +0100 Subject: [PATCH 266/947] tuareg-mode: update from 2.0.6 to 2.0.9 --- .../editors/emacs-modes/tuareg/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index ce25f5ab05d..364daed439d 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchzip, emacs }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. -let version = "2.0.8"; +let version = "2.0.9"; in stdenv.mkDerivation { name = "tuareg-mode-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.8.tar.bz2; - sha256 = "128ibdzv5rf33b71d7b3gr9plmfamc28aprl8y0ap0ivc8jaqyga"; + src = fetchzip { + url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; + sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; }; buildInputs = [ emacs ]; @@ -20,8 +20,9 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://caml.inria.fr; + homepage = https://github.com/ocaml/tuareg; description = "OCaml mode package for Emacs"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } From d52b6f1d3ec82a150a2298ec63996585789b68de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Mar 2015 19:13:39 +0100 Subject: [PATCH 267/947] ocaml-re: update from 1.3.0 to 1.3.1 --- pkgs/development/ocaml-modules/re/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 6fd7f2f2e5e..b2dd0609a0e 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.3.0"; + name = "ocaml-re-1.3.1"; - src = fetchgit { - url = https://github.com/ocaml/ocaml-re.git; - rev = "refs/tags/${name}"; - sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; + sha256 = "11d4k43pc97kvdbjgjcxpc0gq6yal4galkxlrfdp1iypwdcni92g"; }; buildInputs = [ ocaml findlib ]; From 20b150b26cb93cd8465b84fe6606c78d3132ae11 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Mar 2015 19:14:18 +0100 Subject: [PATCH 268/947] Adds ocaml-dolog-1.0 dolog is a minimalistic lazy logger in OCaml Homepage: https://github.com/UnixJunkie/dolog --- .../ocaml-modules/dolog/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dolog/default.nix diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix new file mode 100644 index 00000000000..6d046ce5294 --- /dev/null +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "1.0"; in + +stdenv.mkDerivation { + name = "ocaml-dolog-${version}"; + src = fetchzip { + url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; + sha256 = "1yy3a0h9xn5mv8q38yx5jgavj2hgfw42mdnrzixl25pqx7idvcmf"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + doCheck = true; + checkTarget = "test"; + + meta = { + homepage = https://github.com/UnixJunkie/dolog; + description = "Minimalistic lazy logger in OCaml"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2e615d5a77..9189a272a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3969,6 +3969,8 @@ let deriving = callPackage ../development/tools/ocaml/deriving { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; eff = callPackage ../development/interpreters/eff { }; From 4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Mar 2015 19:24:39 +0100 Subject: [PATCH 269/947] nixos/zfs: Don't default to git version for kernels >= 3.19 Stable version 0.6.3-1.3 works with kernels 3.19.x. --- nixos/modules/tasks/filesystems/zfs.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 93782ffa4d5..1ac89c4c255 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -55,8 +55,7 @@ in boot.zfs = { useGit = mkOption { type = types.bool; - # TODO(wkennington): Revert when 0.6.4 is out - default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19"; + default = false; example = true; description = '' Use the git version of the SPL and ZFS packages. From b841e8a201a6e6b0440060d3ca207a69aa51ac6b Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Thu, 19 Mar 2015 19:48:47 +0100 Subject: [PATCH 270/947] Update davmail to 2.6.1. Bugfix release to fix recent regression with Office 365, also includes a few Linux and IMAP enhancements. http://sourceforge.net/projects/davmail/files/davmail/4.6.1/releasenotes.txt/download --- pkgs/applications/networking/davmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index f4f1e94438d..37d4870d181 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.5.1"; + name = "davmail-4.6.1"; src = fetchurl { - url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.5.1-2303.tgz"; - sha256 = "0y9dwxlfrfm6yf010fad1p5vsyz2ddci6vhz4sa1js2fq4rvyx7a"; + url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.6.1-2343.tgz"; + sha256 = "15kpbrmw9pcifxj4k4m3q0azbl95kfgwvgb8bc9aj00q0yi3wgiq"; }; buildInputs = [ makeWrapper ]; From 14fc74054ba3861b7f14ad7e26011ba9fbe5cee3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 19 Mar 2015 22:12:57 +0300 Subject: [PATCH 271/947] Update Conkeror. Works now --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4cb356fcab1..f6e3cd3cf8d 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20140616"; + name = "conkeror-1.0pre-20150319"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2"; - sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7"; + rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; + sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; }; buildInputs = [ unzip makeWrapper ]; From cd97c581106208e902f32569d3ff14592e8dc416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 19 Mar 2015 20:28:35 +0100 Subject: [PATCH 272/947] openssl_1_0_1j: fix after updating the main version --- pkgs/development/libraries/openssl/1.0.1j.nix | 2 +- .../libraries/openssl/cert-file-1.0.1j.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openssl/cert-file-1.0.1j.patch diff --git a/pkgs/development/libraries/openssl/1.0.1j.nix b/pkgs/development/libraries/openssl/1.0.1j.nix index 29656f7ef88..541561b0b70 100644 --- a/pkgs/development/libraries/openssl/1.0.1j.nix +++ b/pkgs/development/libraries/openssl/1.0.1j.nix @@ -18,7 +18,7 @@ let # hardcoding something like /etc/ssl/cert.pem is impure and # cannot be overriden per-process. For security, the # environment variable is ignored for setuid binaries. - ./cert-file.patch + ./cert-file-1.0.1j.patch # Remove the compilation time from the library ./no-date-in-library.patch ] diff --git a/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch b/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch new file mode 100644 index 00000000000..26b51c0295e --- /dev/null +++ b/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch @@ -0,0 +1,41 @@ +diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c +--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200 ++++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200 +@@ -57,6 +57,10 @@ + */ + + #include ++#include ++#include ++#include ++#include + #include "cryptlib.h" + #include + #include +@@ -71,7 +75,25 @@ + { return(X509_CERT_DIR); } + + const char *X509_get_default_cert_file(void) +- { return(X509_CERT_FILE); } ++ { ++ static char buf[PATH_MAX] = X509_CERT_FILE; ++ static int init = 0; ++ if (!init) { ++ init = 1; ++ char * s = getenv("OPENSSL_X509_CERT_FILE"); ++ if (s) { ++#ifndef OPENSSL_SYS_WINDOWS ++ if (getuid() == geteuid()) { ++#endif ++ strncpy(buf, s, sizeof(buf)); ++ buf[sizeof(buf) - 1] = 0; ++#ifndef OPENSSL_SYS_WINDOWS ++ } ++#endif ++ } ++ } ++ return buf; ++ } + + const char *X509_get_default_cert_dir_env(void) + { return(X509_CERT_DIR_EVP); } From 9b41cf0281974ad92f8bb97f0b2a5a84e92a01ed Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 18 Mar 2015 06:36:00 -0500 Subject: [PATCH 273/947] nixpkgs: arcanist 20150118 -> 20150318 Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index de7b2cfc689..64de64dea06 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/phacility/libphutil.git"; - rev = "00f1fcdc19e0d5712f4d8cdb4e6804adc6dfa2ec"; - sha256 = "92031c50c61a8b46b7e978566b1add50dae5849f3c4c2870826d343c4bc458ce"; + rev = "ce3959b4046f5dcc4f3413a59328bda2a42e76b0"; + sha256 = "3c206b428fa5e0391868f7782db4af4d1cf2f338899831a36771cef74db14a76"; }; arcanist = fetchgit { url = "git://github.com/phacility/arcanist.git"; - rev = "8173ea3eea73abe12935ffc80fdd65f2d658336b"; - sha256 = "efcbfb42cb879e7589c94c7bf293de996981cf2175935790501c389253aa7f43"; + rev = "b961869edac9469be93f2c3ac7a24562d3186860"; + sha256 = "2ae1272c76a1e2bdedd87d453ddb75f6110f9224063e7ee39e88fcb8b3b4c884"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20150118"; + version = "20150318"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; From d68e9b855c0a8fffef309bb5ce702b299664e591 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Mar 2015 08:32:52 +0100 Subject: [PATCH 274/947] haxe: Add setup-hook and patch to add haxlib path. Introduces a new environment variable called HAXELIB_PATH and the patch for haxelib is trying to search that environment variable for other libraries. If the haxelib path for a particular library isn't found, it reverts to the normal behaviour of searching the user's home directory for a file called .haxelib, which in turn points to a repsitory path and that in turn has .current/.dev files to point it to the right version number. This avoids workarounds like this when using Nix to build Haxe projects: configurePhase = '' export HOME="$(pwd)" echo "$(pwd)" > .haxelib mkdir dependency1 echo dev > dependency1/.current echo "${dependency1}" > dependency1/.dev mkdir dependency2 echo dev > dependency2/.current echo "${dependency2}" > dependency2/.dev ''; Now every haxelib is expected to be in $out/lib/haxe/$name and whenever it is listed in buildInputs of another Haxe derivation, HAXELIB_PATH gets automatically set in the build environment. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 4 + .../compilers/haxe/haxelib-nix.patch | 126 ++++++++++++++++++ pkgs/development/compilers/haxe/setup-hook.sh | 5 + 3 files changed, 135 insertions(+) create mode 100644 pkgs/development/compilers/haxe/haxelib-nix.patch create mode 100644 pkgs/development/compilers/haxe/setup-hook.sh diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 3173b892261..8e6828bce46 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; + patches = [ ./haxelib-nix.patch ]; + buildFlags = [ "all" "tools" ]; installPhase = '' @@ -26,6 +28,8 @@ stdenv.mkDerivation { cp -vr std "$out/lib/haxe" ''; + setupHook = ./setup-hook.sh; + dontStrip = true; meta = { diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch new file mode 100644 index 00000000000..da7e4c8dacb --- /dev/null +++ b/pkgs/development/compilers/haxe/haxelib-nix.patch @@ -0,0 +1,126 @@ +diff --git a/extra/haxelib_src/src/tools/haxelib/Main.hx b/extra/haxelib_src/src/tools/haxelib/Main.hx +index a44a785..0eb811a 100644 +--- a/extra/haxelib_src/src/tools/haxelib/Main.hx ++++ b/extra/haxelib_src/src/tools/haxelib/Main.hx +@@ -996,21 +996,26 @@ class Main { + } + + function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { +- var pdir = getRepository() + Data.safe(prj); +- if( !FileSystem.exists(pdir) ) +- throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; +- var version = if( version != null ) version else getCurrent(pdir); +- var vdir = pdir + "/" + Data.safe(version); +- if( vdir.endsWith("dev") ) +- vdir = getDev(pdir); +- if( !FileSystem.exists(vdir) ) +- throw "Library "+prj+" version "+version+" is not installed"; +- for( p in l ) +- if( p.project == prj ) { +- if( p.version == version ) +- return; +- throw "Library "+prj+" has two version included "+version+" and "+p.version; +- } ++ var vdir = this.getNixLib(prj); ++ if (vdir == null) { ++ var pdir = getRepository() + Data.safe(prj); ++ if( !FileSystem.exists(pdir) ) ++ throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; ++ var version = if( version != null ) version else getCurrent(pdir); ++ var vdir = pdir + "/" + Data.safe(version); ++ if( vdir.endsWith("dev") ) ++ vdir = getDev(pdir); ++ if( !FileSystem.exists(vdir) ) ++ throw "Library "+prj+" version "+version+" is not installed"; ++ for( p in l ) ++ if( p.project == prj ) { ++ if( p.version == version ) ++ return; ++ throw "Library "+prj+" has two version included "+version+" and "+p.version; ++ } ++ } else { ++ version = null; ++ } + var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; + var inf = Data.readData(json,false); + l.add({ project : prj, version : version, info: inf }); +@@ -1025,15 +1030,21 @@ class Main { + var a = args[argcur++].split(":"); + checkRec(a[0],a[1],list); + } +- var rep = getRepository(); + for( d in list ) { +- var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/"; +- var dir = rep + pdir; +- try { +- dir = getDev(rep+Data.safe(d.project)); ++ var dir = this.getNixLib(d.project); ++ var pdir = Data.safe(d.project)+"/"; ++ if (dir == null) { ++ var rep = getRepository(); ++ pdir += Data.safe(d.version)+"/"; ++ dir = rep + pdir; ++ try { ++ dir = getDev(rep+Data.safe(d.project)); ++ dir = Path.addTrailingSlash(dir); ++ pdir = dir; ++ } catch( e : Dynamic ) {} ++ } else { + dir = Path.addTrailingSlash(dir); +- pdir = dir; +- } catch( e : Dynamic ) {} ++ } + var ndir = dir + "ndll"; + if( FileSystem.exists(ndir) ) { + var sysdir = ndir+"/"+Sys.systemName(); +@@ -1153,21 +1164,39 @@ class Main { + print(' Path: $devPath'); + } + ++ function getNixLib(project:String):Null ++ { ++ var hlibPath = Sys.getEnv("HAXELIB_PATH"); ++ if (hlibPath != null) { ++ for (libDir in hlibPath.split(":")) { ++ var fullpath = libDir; ++ fullpath += libDir.substr(-1, 1) == "/" ? "" : "/"; ++ fullpath += Data.safe(project); ++ if (FileSystem.exists(fullpath)) ++ return fullpath; ++ } ++ } ++ return null; ++ } ++ + function run() { +- var rep = getRepository(); + var project = param("Library"); + var temp = project.split(":"); + project = temp[0]; +- var pdir = rep + Data.safe(project); +- if( !FileSystem.exists(pdir) ) +- throw "Library "+project+" is not installed"; +- pdir += "/"; +- var version = temp[1] != null ? temp[1] : getCurrent(pdir); +- var dev = try getDev(pdir) catch ( e : Dynamic ) null; +- var vdir = dev!=null ? dev : pdir + Data.safe(version); +- var rdir = vdir + "/run.n"; +- if( !FileSystem.exists(rdir) ) +- throw "Library "+project+" version "+version+" does not have a run script"; ++ var vdir = this.getNixLib(project); ++ if (vdir == null) { ++ var rep = getRepository(); ++ var pdir = rep + Data.safe(project); ++ if( !FileSystem.exists(pdir) ) ++ throw "Library "+project+" is not installed"; ++ pdir += "/"; ++ var version = temp[1] != null ? temp[1] : getCurrent(pdir); ++ var dev = try getDev(pdir) catch ( e : Dynamic ) null; ++ vdir = dev!=null ? dev : pdir + Data.safe(version); ++ var rdir = vdir + "/run.n"; ++ if( !FileSystem.exists(rdir) ) ++ throw "Library "+project+" version "+version+" does not have a run script"; ++ } + args.push(Sys.getCwd()); + Sys.setCwd(vdir); + var cmd = "neko run.n"; diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh new file mode 100644 index 00000000000..a29e04a989b --- /dev/null +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -0,0 +1,5 @@ +addHaxeLibPath() { + addToSearchPath HAXELIB_PATH "$1/lib/haxe" +} + +envHooks+=(addHaxeLibPath) From 3bb0e6df8a19c445b199aa74838aba3a63859a2e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Mar 2015 08:47:11 +0100 Subject: [PATCH 275/947] haxe: Add package for the hxcpp runtime library. I'm not adding this to pkgs/development/libraries because it somewhat is strongly tied to Haxe itself, because otherwise you can't compile to C++ and in the event that someone is going to create something like "haxePackages" someday it is easier to notice when it's residing in the Haxe folder. In theory it would also work by using imperative haxelib, but you'll get precompiled libraries which need to be patched on NixOS systems. That's the main reason I was packaging this, among from the fact that even when patching the libraries, it still leads to occasional library hell and instabilities. The package has two outputs: One with the library itself, needed for compile time ($out) and another one ($lib) which is needed at runtime, so after compiling, the $out path can be safely garbage collected. Right now, I've set meta.platforms to Linux only, because that's where I've tested it. In order to get it running on other platforms the targetArch attribute has to be set accordingly. We also build everything completely from scratch, even though there are binaries within the source ZIP file. The main reason is to make smaller library dependencies by avoiding bundled libraries and using the ones we already ship with nixpkgs. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/hxcpp.nix | 52 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/compilers/haxe/hxcpp.nix diff --git a/pkgs/development/compilers/haxe/hxcpp.nix b/pkgs/development/compilers/haxe/hxcpp.nix new file mode 100644 index 00000000000..56b43fc128e --- /dev/null +++ b/pkgs/development/compilers/haxe/hxcpp.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchzip, haxe, neko, pcre, sqlite, zlib }: + +stdenv.mkDerivation rec { + name = "hxcpp-3.2.27"; + + src = let + zipFile = stdenv.lib.replaceChars ["."] [","] name; + in fetchzip { + inherit name; + url = "http://lib.haxe.org/files/3.0/${zipFile}.zip"; + sha256 = "1hw4kr1f8q7f4fkzis7kvkm7h1cxhv6cf5v1iq7rvxs2fxiys7fr"; + }; + + NIX_LDFLAGS = "-lpcre -lz -lsqlite3"; + + outputs = [ "out" "lib" ]; + + patchPhase = '' + rm -rf bin lib project/thirdparty project/libs/sqlite/sqlite3.[ch] + find . -name '*.n' -delete + sed -i -re '/(PCRE|ZLIB)_DIR|\/d' project/Build.xml + sed -i -e 's/mFromFile = "@";/mFromFile = "";/' tools/hxcpp/Linker.hx + sed -i -e '/dll_ext/s,HX_CSTRING("./"),HX_CSTRING("'"$lib"'/"),' \ + src/hx/Lib.cpp + ''; + + buildInputs = [ haxe neko pcre sqlite zlib ]; + + targetArch = "linux-m${if stdenv.is64bit then "64" else "32"}"; + + buildPhase = '' + haxe -neko project/build.n -cp tools/build -main Build + haxe -neko run.n -cp tools/run -main RunMain + haxe -neko hxcpp.n -cp tools/hxcpp -main BuildTool + (cd project && neko build.n "ndll-$targetArch") + ''; + + installPhase = '' + for i in bin/Linux*/*.dso; do + install -vD "$i" "$lib/$(basename "$i")" + done + find *.n toolchain/*.xml build-tool/BuildCommon.xml src include \ + -type f -exec install -vD -m 0644 {} "$out/lib/haxe/hxcpp/{}" \; + ''; + + meta = { + homepage = "http://lib.haxe.org/p/hxcpp"; + description = "Runtime support library for the Haxe C++ backend"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9189a272a1a..fa60e9c76b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3650,6 +3650,7 @@ let }; haxe = callPackage ../development/compilers/haxe { }; + hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; hhvm = callPackage ../development/compilers/hhvm { }; hiphopvm = hhvm; /* Compatibility alias */ From c30b11c776b17922793e39395534deb14d05c686 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Mon, 26 Jan 2015 14:02:59 +0100 Subject: [PATCH 276/947] libatomic_ops: Allow on all unix platforms --- pkgs/development/libraries/libatomic_ops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 0e8dae7bb91..35ffe6d5fa5 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From c3d92c8efe8035ffa6f95c27f31586c4249d31a8 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Fri, 20 Mar 2015 15:10:50 +0000 Subject: [PATCH 277/947] Update Django to latest minor versions --- pkgs/top-level/python-packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f614df5c31b..2956c2d4110 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3926,15 +3926,15 @@ let }; }; - django = self.django_1_6; + django = self.django_1_7; django_1_7 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.7.6"; + version = "1.7.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; - sha256 = "142cim55wnv5q0zg039rankwah1gbpq46dgmp9yg78jrzq7mxwdh"; + sha256 = "0crfpnf246c25887by2fjlxinp4rnhya4ksqfydcls9m0s9gh5j8"; }; # error: invalid command 'test' @@ -3948,11 +3948,11 @@ let django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6.6"; + version = "1.6.11"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "143yp984n8a2bs1dflxjp1s7skmji0cwkw05s9ikbfikwmabsv2k"; + sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y"; }; # error: invalid command 'test' @@ -3966,11 +3966,11 @@ let django_1_5 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.5.9"; + version = "1.5.12"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1lm0pa6m9f4cd6pv239lqj32z1snf8xjbvlbh8bqihs6a1f51kj7"; + sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk"; }; # error: invalid command 'test' @@ -3984,11 +3984,11 @@ let django_1_4 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.14"; + version = "1.4.20"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "173ci9ml2vs1z2x51wahssfn8mrmhd02varmg9kibm8z460svvc1"; + sha256 = "1cgb23afinmbvbaryvy3yj5m40h68mq6gvadcqyv3j64cja73b2q"; }; # error: invalid command 'test' From 87c86f67118c1b6d7419ffd27bc757ae77f891a7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 16:18:10 +0100 Subject: [PATCH 278/947] pam_console: Remove This package is no longer used in NixOS. --- .../linux/pam_console/configure.ac | 27 ---------------- .../os-specific/linux/pam_console/default.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 5 files changed, 64 deletions(-) delete mode 100644 pkgs/os-specific/linux/pam_console/configure.ac delete mode 100644 pkgs/os-specific/linux/pam_console/default.nix diff --git a/pkgs/os-specific/linux/pam_console/configure.ac b/pkgs/os-specific/linux/pam_console/configure.ac deleted file mode 100644 index 0d2d0288acf..00000000000 --- a/pkgs/os-specific/linux/pam_console/configure.ac +++ /dev/null @@ -1,27 +0,0 @@ -AC_PREREQ([2.59]) -AC_INIT([pam_console], [@PV@]) -AM_INIT_AUTOMAKE([pam_console], [@PV@]) - -AC_CONFIG_HEADER([config.h]) - -AC_GNU_SOURCE - -AM_CONDITIONAL([HAVE_VERSIONING], [test "x" = "y"]) - -PKG_CHECK_MODULES([GLIB], [glib-2.0]) - -m4_undefine([AC_PROG_CXX]) -m4_defun([AC_PROG_CXX],[]) -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) -AC_PROG_LIBTOOL - -AC_PROG_YACC - -SECUREDIR=${libdir}/security -SCONFIGDIR=${sysconfdir}/security - -AC_SUBST([SECUREDIR]) -AC_SUBST([SCONFIGDIR]) - -AC_OUTPUT([Makefile]) diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix deleted file mode 100644 index 7c1e83c0ed6..00000000000 --- a/pkgs/os-specific/linux/pam_console/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pam, autoconf, automake, libtool, pkgconfig, glib, bison, flex}: - -let - - # Configure script borrowed from the good folks at Gentoo - # (http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-auth/pam_console/files/pam_console-configure.ac). - configure = ./configure.ac; - -in - -stdenv.mkDerivation { - name = "pam_console-0.99.5-1"; - - src = fetchurl { - url = http://cvs.fedora.redhat.com/repo/dist/pam/pam-redhat-0.99.5-1.tar.bz2/e2edde7861c48195728bc531e5a277e0/pam-redhat-0.99.5-1.tar.bz2; - sha256 = "077xdhwspc785fas4yfw50mpy92rdfh35kq9awlrpbzq1fnapsfs"; - }; - - buildInputs = [pam autoconf automake libtool pkgconfig glib bison flex]; - - makeFlags = "LEX=flex"; - - preConfigure = " - cd pam_console - cp ${configure} configure.ac - touch NEWS AUTHORS ChangeLog - # Don't try to create /var/run/console. - substituteInPlace Makefile.am --replace 'mkdir -m $(LOCKMODE) -p -p $(DESTDIR)$(LOCKDIR)' '' - autoreconf --install - "; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07bf2111498..3a059686707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9232,10 +9232,6 @@ let pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; - pam_console = callPackage ../os-specific/linux/pam_console { - libtool = libtool_1_5; - }; - pam_devperm = callPackage ../os-specific/linux/pam_devperm { }; pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8929da61ead..1e484e81646 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -128,7 +128,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; ntp = linux; openssh = linux; openssl = all; - pam_console = linux; pam_login = linux; pan = gtkSupported; par2cmdline = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 11a6a6c9c5c..b0822b69b45 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -171,7 +171,6 @@ let nss_ldap = linux; nssmdns = linux; ocaml = linux; - pam_console = linux; pam_login = linux; pan = gtkSupported; par2cmdline = all; From dda16e0c06d6f92cd720579c214221fbf5e93306 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 16:38:21 +0100 Subject: [PATCH 279/947] pam_login: Remove We haven't used/updated this package in years. --- pkgs/os-specific/linux/pam_login/default.nix | 20 ------------------- .../linux/pam_login/sys-stat-h.patch | 12 ----------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 5 files changed, 36 deletions(-) delete mode 100644 pkgs/os-specific/linux/pam_login/default.nix delete mode 100644 pkgs/os-specific/linux/pam_login/sys-stat-h.patch diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix deleted file mode 100644 index 46da3053d20..00000000000 --- a/pkgs/os-specific/linux/pam_login/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, pam}: - -stdenv.mkDerivation { - name = "pam_login-3.35"; - - src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.35.tar.bz2; - sha256 = "1w2hpwjhmwjhf8rg789xpl0hibahqlr3ccivfy3m4kgrm5gf04kv"; - }; - - patches = [ ./sys-stat-h.patch ]; - - # To overcome a gcc 4.4 warning: - # "#ident is a deprecated GCC extension" - postPatch = '' - sed -i s/-Werror// configure - ''; - - buildInputs = [pam]; -} diff --git a/pkgs/os-specific/linux/pam_login/sys-stat-h.patch b/pkgs/os-specific/linux/pam_login/sys-stat-h.patch deleted file mode 100644 index 163fd7ce8e2..00000000000 --- a/pkgs/os-specific/linux/pam_login/sys-stat-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -Include the needed since recent glibc is stricter about that. - ---- pam_login-3.35/src/login.c~ 2007-05-04 14:07:49.000000000 +0200 -+++ pam_login-3.35/src/login.c 2010-04-27 11:38:13.000000000 +0200 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a059686707..9c50341bccf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9238,8 +9238,6 @@ let pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; - pam_login = callPackage ../os-specific/linux/pam_login { }; - pam_mount = callPackage ../os-specific/linux/pam_mount { }; pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 1e484e81646..85ee84d8d6d 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -128,7 +128,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; ntp = linux; openssh = linux; openssl = all; - pam_login = linux; pan = gtkSupported; par2cmdline = all; pciutils = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b0822b69b45..d2f9daafa47 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -171,7 +171,6 @@ let nss_ldap = linux; nssmdns = linux; ocaml = linux; - pam_login = linux; pan = gtkSupported; par2cmdline = all; pciutils = linux; From ef0e4d56f57b936aa2f15ecea730bdeb53837c0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 15:53:25 +0100 Subject: [PATCH 280/947] Use builtin seq/deepSeq --- lib/trivial.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index ed59eff4847..8addde1b86c 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,8 +1,3 @@ -with { - inherit (import ./lists.nix) deepSeqList; - inherit (import ./attrsets.nix) deepSeqAttrs; -}; - rec { # Identity function. @@ -23,23 +18,11 @@ rec { # Flip the order of the arguments of a binary function. flip = f: a: b: f b a; - # `seq x y' evaluates x, then returns y. That is, it forces strict - # evaluation of its first argument. - seq = x: y: if x == null then y else y; - - # Like `seq', but recurses into lists and attribute sets to force evaluation - # of all list elements/attributes. - deepSeq = x: y: - if builtins.isList x - then deepSeqList x y - else if builtins.isAttrs x - then deepSeqAttrs x y - else seq x y; - # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool isFunction - isInt add sub lessThan; + isInt add sub lessThan + seq deepSeq; # Return the Nixpkgs version number. nixpkgsVersion = From b981eb3f7b96a6feef12aad0c26bc27f364427a8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 17:05:30 +0100 Subject: [PATCH 281/947] release-lib.nix: Style cleanup --- pkgs/top-level/release-lib.nix | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 5ee574bbabf..a5a74de6690 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,5 +1,7 @@ { supportedSystems, packageSet ? (import ./all-packages.nix) }: +with import ../../lib; + rec { # Ensure that we don't build packages marked as unfree. @@ -7,7 +9,7 @@ rec { config.allowUnfree = false; }); - pkgs = allPackages { system = "x86_64-linux"; }; + pkgs = pkgsFor "x86_64-linux"; /* !!! Hack: poor man's memoisation function. Necessary to prevent @@ -33,10 +35,10 @@ rec { /* The working or failing mails for cross builds will be sent only to the following maintainers, as most package maintainers will not be interested in the result of cross building a package. */ - crossMaintainers = with pkgs.lib.maintainers; [ viric ]; + crossMaintainers = [ maintainers.viric ]; - toJob = x: if builtins.isAttrs x then x else + toJob = x: if isAttrs x then x else { type = "job"; systems = x; }; @@ -45,8 +47,8 @@ rec { platform as an argument . We return an attribute set containing a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ - testOn = systems: f: pkgs.lib.genAttrs - (pkgs.lib.filter (x: pkgs.lib.elem x supportedSystems) systems) + testOn = systems: f: genAttrs + (filter (x: elem x supportedSystems) systems) (system: f (pkgsFor system)); @@ -54,62 +56,60 @@ rec { 'crossSystem' parameter for allPackages, defining the target platform for cross builds. */ testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}: - if pkgs.lib.elem system systems + if elem system systems then f (allPackages { inherit system crossSystem; }) else {}; /* Map an attribute of the form `foo = [platforms...]' to `testOn [platforms...] (pkgs: pkgs.foo)'. */ - mapTestOn = pkgs.lib.mapAttrsRecursiveCond + mapTestOn = mapAttrsRecursiveCond (as: as.type or "" != "job") (path: value: let job = toJob value; - getPkg = pkgs: pkgs.lib.getAttrFromPath path pkgs; + getPkg = pkgs: getAttrFromPath path pkgs; in testOn job.systems getPkg); /* Similar to the testOn function, but with an additional 'crossSystem' * parameter for allPackages, defining the target platform for cross builds, * and triggering the build of the host derivation (cross built - crossDrv). */ - mapTestOnCross = crossSystem: pkgs.lib.mapAttrsRecursiveCond + mapTestOnCross = crossSystem: mapAttrsRecursiveCond (as: as.type or "" != "job") (path: value: let job = toJob value; - getPkg = pkgs: pkgs.lib.addMetaAttrs { maintainers = crossMaintainers; } - (pkgs.lib.getAttrFromPath path pkgs); + getPkg = pkgs: addMetaAttrs { maintainers = crossMaintainers; } + (getAttrFromPath path pkgs); in testOnCross crossSystem job.systems getPkg); /* Find all packages that have a meta.platforms field listing the supported platforms. */ packagesWithMetaPlatform = attrSet: - let pairs = pkgs.lib.concatMap + let pairs = concatMap (x: let pair = builtins.tryEval (let - attrVal = (builtins.getAttr x attrSet); + attrVal = attrSet.${x}; in { val = processPackage attrVal; attrVal = attrVal; - attrValIsAttrs = builtins.isAttrs attrVal; + attrValIsAttrs = isAttrs attrVal; }); success = (builtins.tryEval pair.value.attrVal).success; in - pkgs.lib.optional (success && pair.value.attrValIsAttrs && pair.value.val != []) + optional (success && pair.value.attrValIsAttrs && pair.value.val != []) { name = x; value = pair.value.val; }) - (builtins.attrNames attrSet); + (attrNames attrSet); in - builtins.listToAttrs pairs; + listToAttrs pairs; # May fail as much as it wishes, we will catch the error. processPackage = attrSet: - if attrSet.recurseForDerivations or false then - packagesWithMetaPlatform attrSet - else if attrSet.recurseForRelease or false then + if attrSet.recurseForDerivations or false || attrSet.recurseForRelease or false then packagesWithMetaPlatform attrSet else if attrSet.meta.broken or false then [] @@ -118,7 +118,7 @@ rec { /* Common platform groups on which to test packages. */ - inherit (pkgs.lib.platforms) unix linux darwin cygwin allBut all mesaPlatforms; + inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms; /* Platform groups for specific kinds of applications. */ x11Supported = linux; From 6938090725b54170e1e5965dcb813a13c961e919 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 17:59:39 +0100 Subject: [PATCH 282/947] prosody: Remove bogus recurseIntoAttrs --- pkgs/top-level/all-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c50341bccf..55efd061edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8153,12 +8153,11 @@ let erlang = erlangR16; }; - prosody = recurseIntoAttrs ( - callPackage ../servers/xmpp/prosody { - lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; - withLibevent = true; - }); + prosody = callPackage ../servers/xmpp/prosody { + lua5 = lua5_1; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; + withLibevent = true; + }; elasticmq = callPackage ../servers/elasticmq { }; From 738cf42639c6e45b097bb1fd29508e95a36eb5c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 18:16:43 +0100 Subject: [PATCH 283/947] release-lib: Simplify --- pkgs/top-level/release-lib.nix | 74 +++++++++----------------------- pkgs/top-level/release-small.nix | 2 +- pkgs/top-level/release.nix | 4 +- 3 files changed, 24 insertions(+), 56 deletions(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a5a74de6690..0d608ed44ac 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -38,18 +38,13 @@ rec { crossMaintainers = [ maintainers.viric ]; - toJob = x: if isAttrs x then x else - { type = "job"; systems = x; }; - - /* Build a package on the given set of platforms. The function `f' is called for each supported platform with Nixpkgs for that platform as an argument . We return an attribute set containing a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ testOn = systems: f: genAttrs - (filter (x: elem x supportedSystems) systems) - (system: f (pkgsFor system)); + (filter (x: elem x supportedSystems) systems) (system: f (pkgsFor system)); /* Similar to the testOn function, but with an additional @@ -61,60 +56,33 @@ rec { else {}; - /* Map an attribute of the form `foo = [platforms...]' to `testOn - [platforms...] (pkgs: pkgs.foo)'. */ - mapTestOn = mapAttrsRecursiveCond - (as: as.type or "" != "job") - (path: value: - let - job = toJob value; - getPkg = pkgs: getAttrFromPath path pkgs; - in testOn job.systems getPkg); + /* Given a nested set where the leaf nodes are lists of platforms, + map each leaf node to `testOn [platforms...] (pkgs: + pkgs.)'. */ + mapTestOn = mapAttrsRecursive + (path: systems: testOn systems (pkgs: getAttrFromPath path pkgs)); /* Similar to the testOn function, but with an additional 'crossSystem' * parameter for allPackages, defining the target platform for cross builds, * and triggering the build of the host derivation (cross built - crossDrv). */ - mapTestOnCross = crossSystem: mapAttrsRecursiveCond - (as: as.type or "" != "job") - (path: value: - let - job = toJob value; - getPkg = pkgs: addMetaAttrs { maintainers = crossMaintainers; } - (getAttrFromPath path pkgs); - in testOnCross crossSystem job.systems getPkg); + mapTestOnCross = crossSystem: mapAttrsRecursive + (path: systems: testOnCross crossSystem systems + (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs))); - /* Find all packages that have a meta.platforms field listing the - supported platforms. */ - packagesWithMetaPlatform = attrSet: - let pairs = concatMap - (x: - let pair = builtins.tryEval - (let - attrVal = attrSet.${x}; - in - { val = processPackage attrVal; - attrVal = attrVal; - attrValIsAttrs = isAttrs attrVal; - }); - success = (builtins.tryEval pair.value.attrVal).success; - in - optional (success && pair.value.attrValIsAttrs && pair.value.val != []) - { name = x; value = pair.value.val; }) - (attrNames attrSet); - in - listToAttrs pairs; - - - # May fail as much as it wishes, we will catch the error. - processPackage = attrSet: - if attrSet.recurseForDerivations or false || attrSet.recurseForRelease or false then - packagesWithMetaPlatform attrSet - else if attrSet.meta.broken or false then - [] - else - attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []); + /* Recursively map a (nested) set of derivations to an isomorphic + set of meta.platforms values. */ + packagePlatforms = mapAttrs (name: value: + let res = builtins.tryEval ( + if isDerivation value then + value.meta.hydraPlatforms or (value.meta.platforms or []) + else if value.recurseForDerivations or false || value.recurseForRelease or false then + packagePlatforms value + else + []); + in if res.success then res.value else [] + ); /* Common platform groups on which to test packages. */ diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 85ee84d8d6d..8f2c548bebc 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -153,7 +153,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; sqlite = allBut cygwin; squid = linux; ssmtp = linux; - stdenv = prio 175 all; + stdenv = all; strace = linux; su = linux; sudo = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d2f9daafa47..4d5237504ca 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -47,7 +47,7 @@ let ]; }; - } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // rec { abcde = linux; apacheHttpd = linux; @@ -270,7 +270,7 @@ let gnome_vfs = linux; }; - haskell-ng.compiler = packagesWithMetaPlatform pkgs.haskell-ng.compiler; + haskell-ng.compiler = packagePlatforms pkgs.haskell-ng.compiler; strategoPackages = { sdf = linux; From 0461f3589499168867e2de88c78f32e44c8ed557 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 19:23:55 +0100 Subject: [PATCH 284/947] Rename scrubDrv -> hydraJob and make it more effective It now strictly evaluates all remaining attributes, preventing unevaluated thunks that cannot be garbage-collected. It's also applied to all jobs in Nixpkgs' release.nix. This reduces hydra-eval-jobs' memory consumption on the 14.12 release-combined jobset from 5.1 GB to 2.0 GB. --- lib/customisation.nix | 35 +++++++++++++++++ nixos/release-combined.nix | 4 +- nixos/release-small.nix | 4 +- nixos/release.nix | 68 +++++++++++++++++----------------- pkgs/top-level/release-lib.nix | 2 +- 5 files changed, 73 insertions(+), 40 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index f16043cf9a3..960eebfc79b 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -105,6 +105,7 @@ rec { let f = if builtins.isFunction fn then fn else import fn; in makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args); + /* Add attributes to each output of a derivation without changing the derivation itself */ addPassthru = drv: passthru: let @@ -122,4 +123,38 @@ rec { outputsList = map outputToAttrListElement outputs; in commonAttrs.${drv.outputName}; + + + /* Strip a derivation of all non-essential attributes, returning + only those needed by hydra-eval-jobs. Also strictly evaluate the + result to ensure that there are no thunks kept alive to prevent + garbage collection. */ + hydraJob = drv: + let + outputs = drv.outputs or ["out"]; + + commonAttrs = + { inherit (drv) name system meta; inherit outputs; } + // lib.optionalAttrs (drv._hydraAggregate or false) { + _hydraAggregate = true; + constituents = map hydraJob (lib.flatten drv.constituents); + } + // (lib.listToAttrs outputsList); + + makeOutput = outputName: + let output = drv.${outputName}; in + { name = outputName; + value = commonAttrs // { + outPath = output.outPath; + drvPath = output.drvPath; + type = "derivation"; + inherit outputName; + }; + }; + + outputsList = map makeOutput outputs; + + drv' = (lib.head outputsList).value; + in lib.deepSeq drv' drv'; + } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2381132bb45..22d14aa57a0 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -31,7 +31,7 @@ in rec { nixpkgs = nixpkgsSrc; })) [ "unstable" ]; - tested = pkgs.releaseTools.aggregate { + tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; @@ -85,6 +85,6 @@ in rec { nixpkgs.tarball (all nixpkgs.emacs) ]; - }; + }); } diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 7f53a101bdf..11155c85369 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -79,7 +79,7 @@ in rec { vim; }; - tested = pkgs.releaseTools.aggregate { + tested = lib.hydraJob (pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; @@ -88,6 +88,6 @@ in rec { constituents = let all = x: map (system: x.${system}) supportedSystems; in [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos; - }; + }); } diff --git a/nixos/release.nix b/nixos/release.nix index cc451f7fe15..1712c90ad33 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -3,22 +3,20 @@ , supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: +with import ../lib; + let version = builtins.readFile ../.version; versionSuffix = (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - forAllSystems = pkgs.lib.genAttrs supportedSystems; + forAllSystems = genAttrs supportedSystems; - scrubDrv = drv: let res = { inherit (drv) drvPath outPath type name system meta; outputName = "out"; out = res; }; in res; - - callTest = fn: args: forAllSystems (system: scrubDrv (import fn ({ inherit system; } // args))); + callTest = fn: args: forAllSystems (system: hydraJob (import fn ({ inherit system; } // args))); pkgs = import nixpkgs { system = "x86_64-linux"; }; - lib = pkgs.lib; - versionModule = { system.nixosVersionSuffix = versionSuffix; @@ -42,10 +40,10 @@ let in # Declare the ISO as a build product so that it shows up in Hydra. - scrubDrv (runCommand "nixos-iso-${config.system.nixosVersion}" + hydraJob (runCommand "nixos-iso-${config.system.nixosVersion}" { meta = { description = "NixOS installation CD (${description}) - ISO image for ${system}"; - maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; + maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit iso; passthru = { inherit config; }; @@ -74,7 +72,7 @@ let tarball // { meta = { description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; - maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; + maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; }; @@ -83,12 +81,12 @@ let makeClosure = module: buildFromConfig module (config: config.system.build.toplevel); - buildFromConfig = module: sel: forAllSystems (system: scrubDrv (sel (import ./lib/eval-config.nix { + buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ module versionModule ] ++ lib.singleton + modules = [ module versionModule ] ++ singleton ({ config, lib, ... }: - { fileSystems."/".device = lib.mkDefault "/dev/sda1"; - boot.loader.grub.device = lib.mkDefault "/dev/sda"; + { fileSystems."/".device = mkDefault "/dev/sda1"; + boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config)); @@ -175,10 +173,10 @@ in rec { in # Declare the OVA as a build product so that it shows up in Hydra. - scrubDrv (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" + hydraJob (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" { meta = { description = "NixOS VirtualBox appliance (${system})"; - maintainers = lib.maintainers.eelco; + maintainers = maintainers.eelco; }; ova = config.system.build.virtualBoxOVA; } @@ -195,9 +193,9 @@ in rec { dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { inherit system; - modules = lib.singleton ({ config, pkgs, ... }: - { fileSystems."/".device = lib.mkDefault "/dev/sda1"; - boot.loader.grub.device = lib.mkDefault "/dev/sda"; + modules = singleton ({ config, pkgs, ... }: + { fileSystems."/".device = mkDefault "/dev/sda1"; + boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config.system.build.toplevel; } @@ -242,34 +240,34 @@ in rec { tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; - tests.cadvisor = scrubDrv (import tests/cadvisor.nix { system = "x86_64-linux"; }); + tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callTest tests/chromium.nix {}; #tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; - tests.docker = scrubDrv (import tests/docker.nix { system = "x86_64-linux"; }); - tests.dockerRegistry = scrubDrv (import tests/docker-registry.nix { system = "x86_64-linux"; }); - tests.etcd = scrubDrv (import tests/etcd.nix { system = "x86_64-linux"; }); + 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.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); #tests.gitlab = callTest tests/gitlab.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; - tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test); - tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test); - tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test); - tests.installer.separateBoot = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).separateBoot.test); - tests.installer.simple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simple.test); - tests.installer.simpleLabels = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleLabels.test); - tests.installer.simpleProvided = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleProvided.test); - tests.installer.btrfsSimple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSimple.test); - tests.installer.btrfsSubvols = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvols.test); - tests.installer.btrfsSubvolDefault = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); + 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.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); + tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test); + tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test); + tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.kde4 = callTest tests/kde4.nix {}; - tests.kubernetes = scrubDrv (import tests/kubernetes.nix { system = "x86_64-linux"; }); + tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; @@ -301,7 +299,7 @@ in rec { tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; - tests.panamax = scrubDrv (import tests/panamax.nix { system = "x86_64-linux"; }); + tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 0d608ed44ac..1f324de8544 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -44,7 +44,7 @@ rec { a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ testOn = systems: f: genAttrs - (filter (x: elem x supportedSystems) systems) (system: f (pkgsFor system)); + (filter (x: elem x supportedSystems) systems) (system: hydraJob (f (pkgsFor system))); /* Similar to the testOn function, but with an additional From 2ed5c2bd6b437780a039c217a4bde52010a54519 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Mar 2015 16:52:02 +0100 Subject: [PATCH 285/947] Set some meta.platforms Also fix meta.platform -> meta.platforms in a few places. --- .../networking/newsreaders/pan/default.nix | 1 + pkgs/data/misc/iana-etc/default.nix | 1 + pkgs/development/compilers/orc/default.nix | 2 +- .../interpreters/perl/5.20/default.nix | 11 ++-- .../libraries/keybinder/default.nix | 2 +- .../libraries/keybinder3/default.nix | 2 +- .../libraries/libvisual/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- .../tools/misc/autoconf/default.nix | 2 +- .../tools/misc/automake/automake-1.11.x.nix | 2 +- .../tools/misc/automake/automake-1.12.x.nix | 2 +- .../tools/misc/automake/automake-1.13.x.nix | 2 + .../tools/misc/automake/automake-1.14.x.nix | 2 + pkgs/games/rogue/default.nix | 10 ++-- pkgs/os-specific/linux/kbd/default.nix | 1 + pkgs/os-specific/linux/macchanger/default.nix | 6 +-- pkgs/os-specific/linux/mingetty/default.nix | 5 +- pkgs/os-specific/linux/sysklogd/default.nix | 1 + pkgs/os-specific/linux/sysvinit/default.nix | 1 + pkgs/os-specific/linux/usbutils/default.nix | 1 + pkgs/os-specific/linux/util-linux/default.nix | 1 + pkgs/servers/gpm/default.nix | 4 +- pkgs/servers/portmap/default.nix | 1 + pkgs/shells/bash/default.nix | 2 + pkgs/tools/audio/liquidsoap/full.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 2 + pkgs/tools/filesystems/jfsutils/default.nix | 1 + pkgs/tools/misc/coreutils/default.nix | 2 + pkgs/tools/misc/findutils/default.nix | 2 + pkgs/tools/misc/grub/default.nix | 3 ++ pkgs/tools/misc/hddtemp/default.nix | 1 + pkgs/tools/misc/rlwrap/default.nix | 2 +- pkgs/tools/networking/cksfv/default.nix | 1 + .../networking/dnscrypt-proxy/default.nix | 2 +- pkgs/tools/networking/host/default.nix | 36 +++++++------ pkgs/tools/networking/i2pd/default.nix | 4 +- pkgs/tools/networking/par2cmdline/default.nix | 4 +- pkgs/tools/networking/tcpdump/default.nix | 1 + pkgs/tools/package-management/rpm/default.nix | 5 +- pkgs/tools/security/sudo/default.nix | 2 + pkgs/tools/system/at/default.nix | 1 + pkgs/tools/system/cron/default.nix | 3 +- pkgs/tools/system/which/default.nix | 1 + pkgs/tools/typesetting/tex/tetex/default.nix | 1 + pkgs/top-level/release.nix | 54 ------------------- 45 files changed, 94 insertions(+), 102 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index c9965a784e0..9ca5ace2caf 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { description = "A GTK+-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index a8935700166..cc676d0b35d 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sethwklein.net/projects/iana-etc/; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 83255824ac2..e6a418c1895 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 058b1776c66..7c5cb27e37f 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -18,9 +18,7 @@ let in -with { - inherit (stdenv.lib) optional optionalString; -}; +with stdenv.lib; stdenv.mkDerivation rec { name = "perl-5.20.1"; @@ -79,4 +77,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; passthru.libPrefix = "lib/perl5/site_perl"; + + meta = { + homepage = https://www.perl.org/; + description = "The standard implementation of the Perl 5 programmming language"; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0cc875e2656..0ab24df57ba 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/engla/keybinder/; license = licenses.gpl2Plus; - platform = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 75704848f7f..581e6e70b71 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Library for registering global key bindings"; homepage = https://github.com/engla/keybinder/; license = licenses.mit; - platform = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.cstrahan ]; }; } diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index b831fd9bdd3..dc2f0338b48 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "An abstraction library for audio visualisations"; homepage = "http://sourceforge.net/projects/libvisual/"; license = stdenv.lib.licenses.lgpl21Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 69617c0345e..bf1f38fbb83 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; homepage = http://www.jedsoft.org/slang/; license = stdenv.lib.licenses.gpl2Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ef8e1628185..472f437978b 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 7a4e2d7f44f..9b4864e92fe 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 70f3dbcbadc..34bffff23d4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 7190985ed02..96a481ade1c 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -37,5 +37,7 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index 65c92954a27..c78e9e6c0a4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -37,5 +37,7 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 16fb621d01d..6be9b06e907 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation { name = "rogue-5.4.4"; - + src = fetchurl { url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz; sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx"; }; - - buildInputs = [ncurses]; - + + buildInputs = [ ncurses ]; + meta = { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 673ad5d3165..d2413be6f5a 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { meta = { homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; description = "Linux keyboard utilities and keyboard maps"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1f046de40ed..1ab7a600fcd 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = with stdenv.lib.maintainers; [ joachifm ]; - license = with stdenv.lib.licenses; gpl2Plus; + maintainers = [ stdenv.lib.maintainers.joachifm ]; + license = stdenv.lib.licenses.gpl2Plus; homepage = "https://www.gnu.org/software/macchanger"; - platform = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 192e2c7ac5f..4e2888fa942 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "mingetty-1.08"; - + src = fetchurl { url = mirror://sourceforge/mingetty/mingetty-1.08.tar.gz; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/mingetty; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index b7bbdee369a..fd1d932990e 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = { description = "A system logging daemon"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 7b4ecbb027e..042e601ec14 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index aff730e387a..ca1f698fa31 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linux-usb.org/; description = "Tools for working with USB devices, such as lsusb"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ae13b7b267c..62fb4976ad0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/linux/utils/util-linux/; description = "A set of system utilities for Linux"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 7c16153e9b5..6572e63a14f 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "gpm-1.20.6"; - + src = fetchurl { url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; @@ -28,5 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nico.schottelius.org/software/gpm/; description = "A daemon that provides mouse support on the Linux console"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index f2152b65df3..e53690ebc11 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = http://neil.brown.name/portmap/; license = "BSD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index cc3108841b6..af51ab4e766 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 30b608c5ba4..d310d5017ed 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ emery ]; license = licenses.gpl2; - platform = ocaml.meta.platforms; + platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 196fce0d98a..44b121117ad 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { is just a bonus. ''; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 9712721021e..46ded088c69 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "IBM JFS utilities"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a15c78e0a81..ee85a4349c1 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -82,6 +82,8 @@ let license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; }; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index a6ea96b77db..eb8c026ab0f 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 00b0c31201a..cb561e8172f 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -52,4 +52,7 @@ stdenv.mkDerivation { passthru.grubTarget = ""; + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 835ceb32881..925ea13780a 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ee330c0bee5..86d81fd2585 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Readline wrapper for console programs"; homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/; license = stdenv.lib.licenses.gpl2Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 90f421f56ba..c14770fb32b 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://zakalwe.fi/~shd/foss/cksfv/; description = "A tool for verifying files against a SFV checksum file"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 818c764b1be..bdd2c4a0c24 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://dnscrypt.org/; license = with stdenv.lib.licenses; [ isc ]; maintainers = with stdenv.lib.maintainers; [ joachifm ]; - platform = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 54cb8b21aaf..85f94ccba10 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -1,24 +1,26 @@ { fetchurl, stdenv }: let version = "20000331"; in - stdenv.mkDerivation { - name = "host-${version}"; - src = fetchurl { - url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; - sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; - }; +stdenv.mkDerivation { + name = "host-${version}"; - preConfigure = '' - makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - mkdir -p "$out/bin" - mkdir -p "$out/share/man/man1" - ''; + src = fetchurl { + url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; + sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; + }; - installTargets = "install man"; + preConfigure = '' + makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + ''; - meta = { - description = "DNS resolution utility"; - license = "BSD-style"; - }; - } + installTargets = "install man"; + + meta = { + description = "DNS resolution utility"; + license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index aee26c63bb3..b8d2deb626b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Minimal I2P router written in C++"; licenses = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; - platform = platforms.linux; + platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 20446387f4a..68f1f763297 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { any kind of file. ''; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ muflax ]; - + maintainers = [ stdenv.lib.maintainers.muflax ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 6744fb7c551..179908a1007 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 7997603a706..0d537a1c30c 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include"; NIX_CFLAGS_LINK = "-L${elfutils}/lib"; - + configureFlags = "--with-external-db --without-lua --enable-python"; meta = with stdenv.lib; { homepage = http://www.rpm.org/; license = licenses.gpl2; description = "The RPM Package Manager"; - maintainers = with maintainers; [ mornfall ]; + maintainers = [ maintainers.mornfall ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 0d9ec876720..3a710d56406 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { license = http://www.sudo.ws/sudo/license.html; maintainers = [ stdenv.lib.maintainers.eelco ]; + + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 9a6e610389b..9991adf4013 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index e465b16b614..998be45d9c6 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation { ''; preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; - + meta = { description = "Daemon for running commands at specific times (Vixie Cron)"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index fc40cd4722b..6662d90e8bd 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -10,5 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://ftp.gnu.org/gnu/which/; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 173571eda23..79f768a086d 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { homepage = http://www.tug.org/tetex/; matintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4d5237504ca..f2c3f88e6bd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -50,25 +50,15 @@ let } // (mapTestOn ((packagePlatforms pkgs) // rec { abcde = linux; - apacheHttpd = linux; aspell = all; - at = linux; atlas = linux; - autoconf = all; - automake = all; - bash = all; - bashInteractive = all; bazaar = linux; # first let sqlite3 work on darwin binutils = linux; bind = linux; bvi = all; castle_combat = linux; cdrkit = linux; - cksfv = all; classpath = linux; - coreutils = all; - cron = linux; - cvs = linux; ddrescue = linux; dhcp = linux; dico = linux; @@ -91,13 +81,11 @@ let eprover = linux; expect = linux; exult = linux; - findutils = all; flex = all; fontforge = linux; gajim = linux; gawk = all; gcc = linux; - gcc34 = linux; gcc44 = linux; gcj = linux; ghostscript = linux; @@ -113,29 +101,16 @@ let gnutls = linux; gogoclient = linux; gphoto2 = linux; - gpm = linux; gpscorrelate = linux; gqview = gtkSupported; - graphviz = all; - grub = linux; gsl = linux; guile = linux; # tests fail on Cygwin - gzip = all; - hddtemp = linux; - host = linux; html-tidy = all; - iana_etc = linux; icewm = linux; - ifplugd = linux; inkscape = linux; irssi = linux; - jfsutils = linux; jnettop = linux; - jwhois = linux; - kbd = linux; keen4 = ["i686-linux"]; - # klibc = linux; - less = all; lftp = all; libarchive = linux; libtool = all; @@ -155,11 +130,9 @@ let mercurial = unix; mercurialFull = linux; mesa = mesaPlatforms; - mingetty = linux; mk = linux; mktemp = all; mod_python = linux; - module_init_tools = linux; mupen64plus = linux; mutt = linux; mysql = linux; @@ -171,17 +144,12 @@ let nss_ldap = linux; nssmdns = linux; ocaml = linux; - pan = gtkSupported; - par2cmdline = all; pciutils = linux; pdf2xml = all; - perl = all; php = linux; pinentry = linux; pltScheme = linux; pmccabe = linux; - portmap = linux; - postgresql = all; ppl = all; procps = linux; pthreadmanpages = linux; @@ -192,13 +160,8 @@ let qt3 = linux; quake3demo = linux; reiserfsprogs = linux; - rlwrap = all; - rogue = all; - rpm = linux; - rsync = linux; rubber = allBut cygwin; rxvt_unicode = linux; - screen = linux ++ darwin; scrot = linux; sdparm = linux; seccure = linux; @@ -209,32 +172,16 @@ let ssmtp = linux; stdenv = all; stlport = linux; - su = linux; - sudo = linux; superTuxKart = linux; swig = linux; - sysklogd = linux; - syslinux = ["i686-linux"]; - sysvinit = linux; - sysvtools = linux; tahoelafs = linux; tangogps = linux; tcl = linux; - tcpdump = linux; teeworlds = linux; - tetex = linux; - texLive = linux; - texLiveBeamer = linux; - texLiveExtra = linux; tightvnc = linux; time = linux; tinycc = linux; uae = linux; - unrar = linux; - upstart = linux; - usbutils = linux; - utillinux = linux; - utillinuxCurses = linux; viking = linux; vice = linux; vim = linux; @@ -244,7 +191,6 @@ let vsftpd = linux; w3m = all; weechat = linux; - which = all; wicd = linux; wine = ["i686-linux"]; wirelesstools = linux; From a62d652a3bf44b52b1cd7839aca820994a868ff2 Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Fri, 20 Mar 2015 15:50:11 -0400 Subject: [PATCH 286/947] add brasero, a gnome cd/dvd burner --- pkgs/tools/cd-dvd/brasero/default.nix | 57 +++++++++++++++++++ .../cd-dvd/brasero/remove-symlink-check.patch | 29 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/tools/cd-dvd/brasero/default.nix create mode 100644 pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix new file mode 100644 index 00000000000..f180e7f5ecb --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +, libcanberra_gtk3, intltool, gnome3, makeWrapper, dvdauthor, cdrdao +, dvdplusrwtools, cdrtools, libdvdcss }: + +let + major = "3.12"; + minor = "0"; + GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav ]; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "brasero-${version}"; + + src = fetchurl { + url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; + sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard dvdauthor + cdrdao dvdplusrwtools cdrtools ]; + + buildInputs = [ pkgconfig gtk3 itstool libxml2 libnotify libcanberra_gtk3 + intltool gnome3.gsettings_desktop_schemas makeWrapper libdvdcss + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + + # brasero checks that the applications it uses aren't symlinks, but this + # will obviously not work on nix + patches = [ ./remove-symlink-check.patch ]; + + configureFlags = [ + "--with-girdir=$out/share/gir-1.0" + "--with-typelibdir=$out/lib/girepository-1.0" ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" \ + --prefix LD_LIBRARY_PATH : ${libdvdcss}/lib + done + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + description = "A Gnome CD/DVD Burner"; + homepage = https://wiki.gnome.org/Apps/Brasero; + maintainers = [ maintainers.bdimcheff ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch b/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch new file mode 100644 index 00000000000..028ac12c4a0 --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch @@ -0,0 +1,29 @@ +diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c +index f97bc5f..88e9d35 100644 +--- a/libbrasero-burn/burn-plugin.c ++++ b/libbrasero-burn/burn-plugin.c +@@ -221,21 +221,10 @@ brasero_plugin_test_app (BraseroPlugin *plugin, + return; + } + +- /* make sure that's not a symlink pointing to something with another +- * name like wodim. +- * NOTE: we used to test the target and see if it had the same name as +- * the symlink with GIO. The problem is, when the symlink pointed to +- * another symlink, then GIO didn't follow that other symlink. And in +- * the end it didn't work. So forbid all symlink. */ +- if (g_file_test (prog_path, G_FILE_TEST_IS_SYMLINK)) { +- brasero_plugin_add_error (plugin, +- BRASERO_PLUGIN_ERROR_SYMBOLIC_LINK_APP, +- name); +- g_free (prog_path); +- return; +- } ++ /* disable symlink check on nixos */ ++ + /* Make sure it's a regular file */ +- else if (!g_file_test (prog_path, G_FILE_TEST_IS_REGULAR)) { ++ if (!g_file_test (prog_path, G_FILE_TEST_IS_REGULAR)) { + brasero_plugin_add_error (plugin, + BRASERO_PLUGIN_ERROR_MISSING_APP, + name); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..ad332125fd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -679,6 +679,8 @@ let boxfs = callPackage ../tools/filesystems/boxfs { }; + brasero = callPackage ../tools/cd-dvd/brasero { }; + bro = callPackage ../applications/networking/ids/bro { }; bsod = callPackage ../misc/emulators/bsod { }; From 62f925543970b05f944093e59d7cc07275d99af6 Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Fri, 20 Mar 2015 15:50:38 -0400 Subject: [PATCH 287/947] add sound juicer, a gnome cd ripper --- .../audio/sound-juicer/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/audio/sound-juicer/default.nix diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix new file mode 100644 index 00000000000..d53d059e7a7 --- /dev/null +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes, makeWrapper }: + +let + major = "3.15"; + minor = "92"; + GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav ]; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "sound-juicer-${version}"; + + src = fetchurl { + url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + sha256 = "b1420f267a4c553f6ca242d3b6082b60682c3d7b431ac3c979bd1ccfbf2687dd"; + }; + + buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 + gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + makeWrapper + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" + done + ''; + + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + description = "A Gnome CD Ripper"; + homepage = https://wiki.gnome.org/Apps/SoundJuicer; + maintainers = [ maintainers.bdimcheff ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad332125fd4..55b904fd21e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11428,6 +11428,8 @@ let sooperlooper = callPackage ../applications/audio/sooperlooper { }; + sound-juicer = callPackage ../applications/audio/sound-juicer { }; + spideroak = callPackage ../applications/networking/spideroak { }; ssvnc = callPackage ../applications/networking/remote/ssvnc { }; From ea2fd84ecd4139db82769dfeafe6da833146bb99 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Mar 2015 20:58:13 +0100 Subject: [PATCH 288/947] nixos/mpd: Fix creation of "mpd" group. The group is specified using a singleton list, so the loaOf merging is done by iterating through the list items with imap, so it enumerates every element and sets that as the default "name" attribute. From lib/types:143: name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; So, people get groups like "unnamed-X.Y" instead of "mpd". Signed-off-by: aszlig Reported-by: devhell <"^"@regexmail.net> Tested-by: devhell <"^"@regexmail.net> --- nixos/modules/services/audio/mpd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 5afe5f8f46f..d9b5bf7b5e6 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -125,6 +125,7 @@ in { }); users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { + name = "mpd"; gid = gid; }); }; From 51261196868c5c61d9e4d2b861d766f2970c6d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 9 Sep 2014 11:04:53 +0200 Subject: [PATCH 289/947] aiccu: added package --- pkgs/tools/networking/aiccu/default.nix | 34 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/aiccu/default.nix diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix new file mode 100644 index 00000000000..dd53234906d --- /dev/null +++ b/pkgs/tools/networking/aiccu/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gnutls, iproute, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "aiccu-${version}"; + version = "20070115"; + + src = fetchurl { + url = "https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz"; + sha256 = "2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760"; + }; + + buildInputs = [ gnutls iproute makeWrapper ]; + + configureFlags = "--prefix=$out"; + installPhase = '' + install -D -m 755 unix-console/aiccu $out/bin/aiccu + install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml + install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1 + wrapProgram "$out/bin/aiccu" \ + --prefix PATH : "${iproute}/bin" + ''; + + meta = with stdenv.lib; { + description = "Automatic IPv6 Connectivity Configuration Utility"; + homepage = "https://www.sixxs.net/tools/aiccu/"; + longDescription = '' + A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider. + ''; + maintainers = with maintainers; [ edwtjo ]; + license = "SixXS"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55efd061edb..4c980f25dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -492,6 +492,8 @@ let ahcpd = callPackage ../tools/networking/ahcpd { }; + aiccu = callPackage ../tools/networking/aiccu { }; + aide = callPackage ../tools/security/aide { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; From 664592561d2d725bdd3b663f7514c82d71075ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 20 Mar 2015 18:46:38 +0100 Subject: [PATCH 290/947] nixos: added aiccu service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/aiccu.nix | 195 ++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 nixos/modules/services/networking/aiccu.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7635e919d4b..28dad095761 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -233,6 +233,7 @@ ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix + ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix new file mode 100644 index 00000000000..4301da28881 --- /dev/null +++ b/nixos/modules/services/networking/aiccu.nix @@ -0,0 +1,195 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.aiccu; + showBool = b: if b then "true" else "false"; + notNull = a: ! isNull a; + configFile = pkgs.writeText "aiccu.conf" '' + ${if notNull cfg.username then "username " + cfg.username else ""} + ${if notNull cfg.password then "password " + cfg.password else ""} + protocol ${cfg.protocol} + server ${cfg.server} + ipv6_interface ${cfg.interfaceName} + verbose ${showBool cfg.verbose} + daemonize true + automatic ${showBool cfg.automatic} + requiretls ${showBool cfg.requireTLS} + pidfile ${cfg.pidFile} + defaultroute ${showBool cfg.defaultRoute} + ${if notNull cfg.setupScript then cfg.setupScript else ""} + makebeats ${showBool cfg.makeHeartBeats} + noconfigure ${showBool cfg.noConfigure} + behindnat ${showBool cfg.behindNAT} + ${if cfg.localIPv4Override then "local_ipv4_override" else ""} + ''; + +in { + + options = { + + services.aiccu = { + + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel"; + }; + + username = mkOption { + type = with types; nullOr str; + default = null; + example = "FAB5-SIXXS"; + description = "Login credential"; + }; + + password = mkOption { + type = with types; nullOr str; + default = null; + example = "TmAkRbBEr0"; + description = "Login credential"; + }; + + protocol = mkOption { + type = types.str; + default = "tic"; + example = "tic|tsp|l2tp"; + description = "Protocol to use for setting up the tunnel"; + }; + + server = mkOption { + type = types.str; + default = "tic.sixxs.net"; + example = "enabled.ipv6server.net"; + description = "Server to use for setting up the tunnel"; + }; + + interfaceName = mkOption { + type = types.str; + default = "aiccu"; + example = "sixxs"; + description = '' + The name of the interface that will be used as a tunnel interface. + On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels + or tunX (eg tun0) for AYIYA tunnels. + ''; + }; + + tunnelID = mkOption { + type = with types; nullOr str; + default = null; + example = "T12345"; + description = "The tunnel id to use, only required when there are multiple tunnels in the list"; + }; + + verbose = mkOption { + type = types.bool; + default = false; + example = true; + description = "Be verbose?"; + }; + + automatic = mkOption { + type = types.bool; + default = true; + example = false; + description = "Automatic Login and Tunnel activation"; + }; + + requireTLS = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + When set to true, if TLS is not supported on the server + the TIC transaction will fail. + When set to false, it will try a starttls, when that is + not supported it will continue. + In any case if AICCU is build with TLS support it will + try to do a 'starttls' to the TIC server to see if that + is supported. + ''; + }; + + pidFile = mkOption { + type = types.path; + default = "/run/aiccu.pid"; + example = "/var/lib/aiccu/aiccu.pid"; + description = "Location of PID File"; + }; + + defaultRoute = mkOption { + type = types.bool; + default = true; + example = false; + description = "Add a default route"; + }; + + setupScript = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/aiccu/fix-subnets.sh"; + description = "Script to run after setting up the interfaces"; + }; + + makeHeartBeats = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + In general you don't want to turn this off + Of course only applies to AYIYA and heartbeat tunnels not to static ones + ''; + }; + + noConfigure = mkOption { + type = types.bool; + default = false; + example = true; + description = "Don't configure anything"; + }; + + behindNAT = mkOption { + type = types.bool; + default = false; + example = true; + description = "Notify the user that a NAT-kind network is detected"; + }; + + localIPv4Override = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Overrides the IPv4 parameter received from TIC + This allows one to configure a NAT into "DMZ" mode and then + forwarding the proto-41 packets to an internal host. + + This is only needed for static proto-41 tunnels! + AYIYA and heartbeat tunnels don't require this. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd.services.aiccu = { + description = "Automatic IPv6 Connectivity Client Utility"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}"; + ExecStop = "${pkgs.aiccu}/bin/aiccu stop"; + Type = "forking"; + PIDFile = cfg.pidFile; + Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned. + }; + }; + + }; +} From 0517907801d5830676905bd2003c9c952d30771c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 14:15:59 -0700 Subject: [PATCH 291/947] kernel: 3.10.71 -> 3.10.72 --- 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 29067459ac2..31fe3081ab2 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.71"; + version = "3.10.72"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1h6s6bp7l71k7wnm59zgm1vk5hgja7cjs85smb3dix9vwffzjbhv"; + sha256 = "17qfy5hmd2cn5wfk4mfvv9ygn958a4j75lsya9xdjrw10in1a22a"; }; features.iwlwifi = true; From b9537d17f6708e9d9e4de8549b1d250b8094bb64 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 14:16:01 -0700 Subject: [PATCH 292/947] kernel: 3.12.38 -> 3.12.39 --- 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 e8c383b857e..951b55c2f35 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.38"; + version = "3.12.39"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0vwvvjzl6qx4nd4577lawmmb8lj3z0zfghm345dh20plhblcl3ck"; + sha256 = "0svd2rnkrzpmnrv5qd5vfz4wkff6973s68zg5a1blmjs4p5asvl6"; }; features.iwlwifi = true; From a7c32c8ea5b3e91a77215162e4d5434ddaa749f1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 14:16:06 -0700 Subject: [PATCH 293/947] kernel: 3.19.1 -> 3.19.2 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index c81643a28ff..2a34202c895 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.1"; + version = "3.19.2"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi"; + sha256 = "0b8bfpfpyrpccb8v4nld0a0siricg8f3awmhz8wn4kwdvhhf83hc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5f82c67c1ad..ec4f223850f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.19.1"; - revision = "201503122205"; + { kversion = "3.19.2"; + revision = "201503182219"; branch = "test"; - sha256 = "0g22wfmlim163gmsl4cn4nq4zif8zni3cpkk7cr93z92r9kafp4y"; + sha256 = "11w9bschyg6lsg6p8dn9mzck20hkniwg7rhigkx14ywh7h3mqvz8"; }; grsec_fix_path = From 36ada70250d3868d54559406276e71e2f4ebe5ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 14:16:03 -0700 Subject: [PATCH 294/947] kernel: 3.14.35 -> 3.14.36 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 62886ad5628..a1340335983 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.35"; + version = "3.14.36"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1d15m28iyv8g5g7gpipzswi9g2qyndrjxvgsx6adp2268cxd5my8"; + sha256 = "03pl303z3vvldc3hamlrq77mcy66nsqdfk7yi43nzyrnmrby3l0r"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ec4f223850f..0a7c77b5f82 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.35"; - revision = "201503092203"; + { kversion = "3.14.36"; + revision = "201503182218"; branch = "stable"; - sha256 = "0l8m0ixh0qcgwy8vcmfl8pal93wc03ahc3ci3sca79nx33a050v9"; + sha256 = "14njc3xih3v38fnh7wrx7xdapqi67032qa6gp2qzhp41f5q7i4i8"; }; grsecurity_unstable = grsecPatch From 9dc8335294b63a065313f5144d607af89d7cb518 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 14:41:03 -0700 Subject: [PATCH 295/947] kernel/common-config: Fix older kernels --- .../linux/kernel/common-config.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c1939f3218e..c3bd372d291 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -171,7 +171,9 @@ with stdenv.lib; XFS_RT? y # XFS Realtime subvolume support OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y + ${optionalString (versionAtLeast version "3.12") '' + UBIFS_FS_XATTR? y + ''} UBIFS_FS_ADVANCED_COMPR? y ${optionalString (versionAtLeast version "3.6") '' NFS_SWAP y @@ -194,12 +196,17 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.14") '' CEPH_FS_POSIX_ACL y ''} - SQUASHFS_FILE_DIRECT y - SQUASHFS_DECOMP_MULTI_PERCPU y + ${optionalString (versionAtLeast version "3.13") '' + SQUASHFS_FILE_DIRECT y + SQUASHFS_DECOMP_MULTI_PERCPU y + ''} SQUASHFS_XATTR y SQUASHFS_ZLIB y SQUASHFS_LZO y SQUASHFS_XZ y + ${optionalString (versionAtLeast version "3.19") '' + SQUASHFS_LZ4 y + ''} # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -235,7 +242,9 @@ with stdenv.lib; BT_HCIUART_BCSP? y BT_HCIUART_H4? y # UART (H4) protocol support BT_HCIUART_LL? y - BT_RFCOMM_TTY? y # RFCOMM TTY support + ${optionalString (versionAtLeast version "3.4") '' + BT_RFCOMM_TTY? y # RFCOMM TTY support + ''} CRASH_DUMP? n ${optionalString (versionOlder version "3.1") '' DMAR? n # experimental @@ -310,7 +319,9 @@ with stdenv.lib; FTRACE_SYSCALLS y SCHED_TRACER y STACK_TRACER y - UPROBE_EVENT y + ${optionalString (versionAtLeast version "3.10") '' + UPROBE_EVENT y + ''} FUNCTION_PROFILER y RING_BUFFER_BENCHMARK n From 6e404cb3382091310111545fb57e987cf9045287 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 15:02:01 -0700 Subject: [PATCH 296/947] linux-testing: 4.0.0-rc2 -> 4.0.0-rc4 --- 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 73280d1dd30..1c2a3edf298 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.0-rc2"; - modDirVersion = "4.0.0-rc2"; + version = "4.0-rc4"; + modDirVersion = "4.0.0-rc4"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1njjl31g27ddjdp5z14fhx4mpm69jqkxy43k7liisvxdc9j75jj9"; + sha256 = "01jn3mpxd1gly79psgh27l9ad24i07z9an0mw93pbs16nnncv0dn"; }; features.iwlwifi = true; From 6437ad00f05432d0cb801fec44b9b19e570486de Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 15:05:43 -0700 Subject: [PATCH 297/947] kernel/common-config: More fixes --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c3bd372d291..e7199fee67a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -171,9 +171,6 @@ with stdenv.lib; XFS_RT? y # XFS Realtime subvolume support OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y - ${optionalString (versionAtLeast version "3.12") '' - UBIFS_FS_XATTR? y - ''} UBIFS_FS_ADVANCED_COMPR? y ${optionalString (versionAtLeast version "3.6") '' NFS_SWAP y @@ -283,7 +280,9 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG? n + ${optionalString (versionOlder version "3.15") '' + USB_DEBUG? n + ''} USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y From fff38f354a47d0ebaf73c79da1e8415235387c76 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 15:44:51 -0700 Subject: [PATCH 298/947] btrfsProgs: 3.18.2 -> 3.19 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index ba2c9eeb34d..b8db8d9e52a 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.18.2"; in +let version = "3.19"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1v6zqac6c4xfkyd53wc3cfqqyb5w7zry3l2yl4rgspqy416xp3fx"; + sha256 = "1j1ni8baw6pgjh85jkdys8pzq870xy7z2n7ngn9r7g2f47bnafdj"; }; buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo + pkgconfig attr acl zlib libuuid e2fsprogs lzo asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; From 18ab69493472b4e01a7d220a7f64314b223c2978 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 21 Mar 2015 02:53:16 +0300 Subject: [PATCH 299/947] steam: fix: add gst lib (needed by audiosurf 2) --- pkgs/games/steam/chrootenv.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b4019f86e30..0a444cf61b4 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -59,6 +59,8 @@ buildFHSUserEnv { pkgs.pulseaudio pkgs.flashplayer + + pkgs.gst_all_1.gst-plugins-ugly # "Audiosurf 2" needs this ]; extraBuildCommandsMulti = '' From bea1c88205a724be81c006e3afe97a3d98c0471b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Mar 2015 21:20:33 -0700 Subject: [PATCH 300/947] openssh: 6.7p1 -> 6.8p1 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 68b1aab2d89..15c84a79a87 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.7p1"; + name = "openssh-6.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j"; + sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz"; }; prePatch = stdenv.lib.optionalString hpnSupport From 0f5a5cae76ab4677c2ffb1399266f7b0ba18cbc9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 21 Mar 2015 06:16:13 +0100 Subject: [PATCH 301/947] grsecurity: Update test patch from 3.1-3.19.2-201503182219 -> 3.1-3.19.2-201503201903 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0a7c77b5f82..a2473e3f4c8 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,9 +73,9 @@ rec { grsecurity_unstable = grsecPatch { kversion = "3.19.2"; - revision = "201503182219"; + revision = "201503201903"; branch = "test"; - sha256 = "11w9bschyg6lsg6p8dn9mzck20hkniwg7rhigkx14ywh7h3mqvz8"; + sha256 = "0ha4hvf2c9im9cyq9sxdbdx165i6ngywf46899aq3giyw74gnpf3"; }; grsec_fix_path = From a246b849eba9f54e695483de1476798316580bfc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 21 Mar 2015 05:43:57 +0000 Subject: [PATCH 302/947] firefox: Update from 36.0.1 -> 36.0.3 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 702a9974bc6..19e549d9da4 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "36.0.1"; in +let version = "36.0.3"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "cde80f5aee704827da43b9ca94a138a6c8a6c553"; + sha1 = "4719e77cfd6da66c4308eaae6b3ad54bff0bf332"; }; buildInputs = From 4967e78dc809c62b938a62ee72b045f83df97a6f Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 21 Mar 2015 16:50:20 +0800 Subject: [PATCH 303/947] document workaround for sourcing autojump init file from zsh --- pkgs/tools/misc/autojump/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index b0b82f3cc76..5f5baa17d42 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, python, bash }: -let +let version = "22.2.4"; in stdenv.mkDerivation rec { @@ -23,6 +23,8 @@ in cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d" # FIXME: What's the right place for `autojump.zsh'? + # This can be used as a workaround in .zshrc: + # . $(dirname $(readlink -f $HOME/.nix-profile/bin/autojump))/../share/autojump/autojump.zsh ''; meta = { From 4c8681fea1df607ded96b75a920f2c35b36f7a3b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Mar 2015 09:52:59 +0100 Subject: [PATCH 304/947] Adds ocaml-qtest-2.0.1 Inline test extraction utility for OCaml, originally developed internally for Batteries Homepage: https://github.com/vincent-hugot/iTeML --- .../ocaml-modules/qtest/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/qtest/default.nix diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix new file mode 100644 index 00000000000..e68a8729c01 --- /dev/null +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: + +let version = "2.0.1"; in + +stdenv.mkDerivation { + name = "ocaml-qtest-${version}"; + src = fetchzip { + url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; + sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + }; + + buildInputs = [ ocaml oasis findlib ]; + propagatedBuildInputs = [ ounit ]; + + buildPhase = "ocaml do.ml qtest build $out"; + createFindlibDestdir = true; + installPhase = "ocaml do.ml qtest install $out"; + + meta = { + description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; + homepage = https://github.com/vincent-hugot/iTeML; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c980f25dc4..c91c1625196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4179,6 +4179,10 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + qtest = callPackage ../development/ocaml-modules/qtest { + oasis = ocaml_oasis; + }; + re = callPackage ../development/ocaml-modules/re { }; safepass = callPackage ../development/ocaml-modules/safepass { }; From 0f2509a52d652c9e1fe98c0673ca03572d5513ee Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Mar 2015 09:56:28 +0100 Subject: [PATCH 305/947] ocaml-batteries: update from 2.2.0 to 2.3.1 --- .../ocaml-modules/batteries/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index ac7b8adfd8c..e83ea743263 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,17 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, camomile, ounit}: +{ stdenv, fetchzip, ocaml, findlib, qtest }: + +let version = "2.3.1"; in stdenv.mkDerivation { - name = "ocaml-batteries-2.2.0"; + name = "ocaml-batteries-${version}"; - src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz; - sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs"; + src = fetchzip { + url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; + sha256 = "1hjbzczchqnnxbn4ck84j5pi6prgfjfjg14kg26fzqz3gql427rl"; }; - buildInputs = [ocaml findlib camomile ounit]; + buildInputs = [ ocaml findlib qtest ]; configurePhase = "true"; # Skip configure + doCheck = true; + checkTarget = "test test"; + createFindlibDestdir = true; meta = { @@ -22,7 +27,7 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21; + license = stdenv.lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z From 348b26a52308dbd5e0b02a81976bf605e3900e7f Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 21 Mar 2015 11:34:49 +0000 Subject: [PATCH 306/947] pythonPackages: Add hypothesis 0.7.0. --- 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 f614df5c31b..7061420da02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5341,6 +5341,23 @@ let }; }; + hypothesis = pythonPackages.buildPythonPackage rec { + name = "hypothesis-0.7.0"; + + doCheck = false; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/h/hypothesis/hypothesis-0.7.0.tar.gz"; + md5 = "0c4112bab04b71979286387b033921b5"; + }; + + meta = with stdenv.lib; { + description = "A Python library for property based testing"; + homepage = https://github.com/DRMacIver/hypothesis; + license = licenses.mpl20; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.3"; From 4947bacd52c75fa5c1e5c067b31224e830678cde Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 Mar 2015 12:49:52 +0100 Subject: [PATCH 307/947] rippled: expose more options, make compatible with new rippled version --- nixos/modules/services/misc/rippled.nix | 521 ++++++++++++++---------- 1 file changed, 308 insertions(+), 213 deletions(-) diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 2c1fec9f6d7..85a1ed8ae9e 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -1,5 +1,3 @@ -# configuration building is commented out until better tested. - { config, lib, pkgs, ... }: with lib; @@ -7,29 +5,189 @@ with lib; let cfg = config.services.rippled; - rippledStateCfgFile = "/var/lib/rippled/rippled.cfg"; + b2i = val: if val then "1" else "0"; + + dbCfg = db: '' + type=${db.type} + path=${db.path} + ${optionalString (db.compression != null) ("compression=${b2i db.compression}") } + ${optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} + ${optionalString (db.advisoryDelete != null) ("advisory_delete=${toString db.advisoryDelete}")} + ${db.extraOpts} + ''; rippledCfg = '' + [server] + ${concatMapStringsSep "\n" (n: "port_${n}") (attrNames cfg.ports)} + + ${concatMapStrings (p: '' + [port_${p.name}] + ip=${p.ip} + port=${toString p.port} + protocol=${concatStringsSep "," p.protocol} + ${optionalString (p.user != "") "user=${p.user}"} + ${optionalString (p.password != "") "user=${p.password}"} + admin=${if p.admin then "allow" else "no"} + ${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}"} + '') (attrValues cfg.ports)} + + [database_path] + ${cfg.databasePath} + [node_db] - type=HyperLevelDB - path=/var/lib/rippled/db/hyperldb + ${dbCfg cfg.nodeDb} - [debug_logfile] - /var/log/rippled/debug.log + ${optionalString (cfg.tempDb != null) '' + [temp_db] + ${dbCfg cfg.tempDb}''} - '' - + optionalString (cfg.peerIp != null) '' - [peer_ip] - ${cfg.peerIp} + ${optionalString (cfg.importDb != null) '' + [import_db] + ${dbCfg cfg.importDb}''} - [peer_port] - ${toString cfg.peerPort} + [ips] + ${concatStringsSep "\n" cfg.ips} - '' - + cfg.extraConfig; + [ips_fixed] + ${concatStringsSep "\n" cfg.ipsFixed} + + [validators] + ${concatStringsSep "\n" cfg.validators} + + [node_size] + ${cfg.nodeSize} + + [ledger_history] + ${toString cfg.ledgerHistory} + + [fetch_depth] + ${toString cfg.fetchDepth} + + [validation_quorum] + ${toString cfg.validationQuorum} + + [sntp_servers] + ${concatStringsSep "\n" cfg.sntpServers} + + [rpc_startup] + { "command": "log_level", "severity": "${cfg.logLevel}" } + '' + cfg.extraConfig; + + portOptions = { name, ...}: { + options = { + name = mkOption { + internal = true; + default = name; + }; + + ip = mkOption { + default = "127.0.0.1"; + description = "Ip where rippled listens."; + type = types.str; + }; + + port = mkOption { + description = "Port where rippled listens."; + type = types.int; + }; + + protocol = mkOption { + description = "Protocols expose by rippled."; + type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); + }; + + user = mkOption { + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; + }; + + password = mkOption { + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; + }; + + admin = mkOption { + description = "Controls whether or not administrative commands are allowed."; + type = types.bool; + default = false; + }; + + ssl = { + key = mkOption { + description = '' + Specifies the filename holding the SSL key in PEM format. + ''; + default = null; + type = types.nullOr types.path; + }; + + cert = mkOption { + description = '' + Specifies the path to the SSL certificate file in PEM format. + This is not needed if the chain includes it. + ''; + default = null; + type = types.nullOr types.path; + }; + + chain = mkOption { + description = '' + If you need a certificate chain, specify the path to the + certificate chain here. The chain may include the end certificate. + ''; + default = null; + type = types.nullOr types.path; + }; + + }; + }; + }; + + dbOptions = { + type = mkOption { + description = "Rippled database type."; + type = types.enum ["rocksdb" "nudb" "sqlite"]; + default = "rocksdb"; + }; + + path = mkOption { + description = "Location to store the database."; + type = types.path; + default = cfg.databasePath; + }; + + compression = mkOption { + description = "Whether to enable snappy compression."; + type = types.nullOr types.bool; + default = null; + }; + + onlineDelete = mkOption { + description = "Enable automatic purging of older ledger information."; + type = types.addCheck (types.nullOr types.int) (v: v > 256); + default = cfg.ledgerHistory; + }; + + advisoryDelete = mkOption { + description = '' + If set, then require administrative RPC call "can_delete" + to enable online deletion of ledger records. + ''; + type = types.nullOr types.bool; + default = null; + }; + + extraOpts = mkOption { + description = "Extra database options."; + type = types.lines; + default = ""; + }; + }; - rippledCfgFile = pkgs.writeText "rippled.cfg" rippledCfg; - in { @@ -37,236 +195,176 @@ in ###### interface options = { - services.rippled = { + enable = mkEnableOption "Whether to enable rippled"; - enable = mkOption { - default = false; - description = "Whether to enable rippled"; + package = mkOption { + description = "Which rippled package to use."; + type = types.package; + default = pkgs.rippled; }; - # - # Rippled has a simple configuration file layout that is easy to - # build with nix. Many of the options are defined here but are - # commented out until the code to append them to the config above - # is written and they are tested. - # - # If you find a yourself implementing more options, please submit a - # pull request. - # + ports = mkOption { + description = "Ports exposed by rippled"; + type = types.attrsOf types.optionSet; + options = [portOptions]; + default = { + rpc = { + port = 5005; + admin = true; + protocol = ["http"]; + }; + + peer = { + port = 51235; + ip = "0.0.0.0"; + protocol = ["peer"]; + }; + + ws_public = { + port = 5006; + ip = "0.0.0.0"; + protocol = ["ws" "wss"]; + }; + }; + }; + + nodeDb = mkOption { + description = "Rippled main database options."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = { + type = "rocksdb"; + extraOpts = '' + open_files=2000 + filter_bits=12 + cache_mb=256 + file_size_pb=8 + file_size_mult=2; + ''; + }; + }; + + tempDb = mkOption { + description = "Rippled temporary database options."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = null; + }; + + importDb = mkOption { + description = "Settings for performing a one-time import."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = null; + }; + + nodeSize = mkOption { + description = '' + Rippled size of the node you are running. + "tiny", "small", "medium", "large", and "huge" + ''; + type = types.enum ["tiny" "small" "medium" "large" "huge"]; + default = "small"; + }; - /* ips = mkOption { - default = [ "r.ripple.com 51235" ]; - example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ]; description = '' List of hostnames or ips where the Ripple protocol is served. - For a starter list, you can either copy entries from: + For a starter list, you can either copy entries from: https://ripple.com/ripple.txt or if you prefer you can let it default to r.ripple.com 51235 - A port may optionally be specified after adding a space to the - address. By convention, if known, IPs are listed in from most + A port may optionally be specified after adding a space to the + address. By convention, if known, IPs are listed in from most to least trusted. ''; + type = types.listOf types.str; + default = ["r.ripple.com 51235"]; }; ipsFixed = mkOption { - default = null; - example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ]; description = '' - List of IP addresses or hostnames to which rippled should always - attempt to maintain peer connections with. This is useful for - manually forming private networks, for example to configure a - validation server that connects to the Ripple network through a + List of IP addresses or hostnames to which rippled should always + attempt to maintain peer connections with. This is useful for + manually forming private networks, for example to configure a + validation server that connects to the Ripple network through a public-facing server, or for building a set of cluster peers. A port may optionally be specified after adding a space to the address ''; - }; - */ - - peerIp = mkOption { - default = null; - example = "0.0.0.0"; - description = '' - IP address or domain to bind to allow external connections from peers. - Defaults to not binding, which disallows external connections from peers. - ''; + type = types.listOf types.str; + default = []; }; - peerPort = mkOption { - default = 51235; + validators = mkOption { description = '' - If peerIp is supplied, corresponding port to bind to for peer connections. + List of nodes to always accept as validators. Nodes are specified by domain + or public key. ''; + type = types.listOf types.str; + default = [ + "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" + "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" + "n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3" + "n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4" + "n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5" + ]; }; - /* - peerPortProxy = mkOption { - type = types.int; - example = 51236; + databasePath = mkOption { description = '' - An optional, additional listening port number for peers. Incoming - connections on this port will be required to provide a PROXY Protocol - handshake, described in this document (external link): - - http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt - - The PROXY Protocol is a popular method used by elastic load balancing - service providers such as Amazon, to identify the true IP address and - port number of external incoming connections. - - In addition to enabling this setting, it will also be required to - use your provider-specific control panel or administrative web page - to configure your server instance to receive PROXY Protocol handshakes, - and also to restrict access to your instance to the Elastic Load Balancer. + Path to the ripple database. ''; + type = types.path; + default = "/var/lib/rippled/db"; }; - peerPrivate = mkOption { - default = null; - example = 0; + validationQuorum = mkOption { description = '' - 0: Request peers to broadcast your address. Normal outbound peer connections [default] - 1: Request peers not broadcast your address. Only connect to configured peers. - ''; - }; - - peerSslCipherList = mkOption { - default = null; - example = "ALL:!LOW:!EXP:!MD5:@STRENGTH"; - description = '' - A colon delimited string with the allowed SSL cipher modes for peer. The - choices for for ciphers are defined by the OpenSSL API function - SSL_CTX_set_cipher_list, documented here (external link): - - http://pic.dhe.ibm.com/infocenter/tpfhelp/current/index.jsp?topic=%2Fcom.ibm.ztpf-ztpfdf.doc_put.cur%2Fgtpc2%2Fcpp_ssl_ctx_set_cipher_list.html - - The default setting of "ALL:!LOW:!EXP:!MD5:@STRENGTH", which allows - non-authenticated peer connections (they are, however, secure). - ''; - }; - - nodeSeed = mkOption { - default = null; - example = "RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE"; - description = '' - This is used for clustering. To force a particular node seed or key, the - key can be set here. The format is the same as the validation_seed field. - To obtain a validation seed, use the rippled validation_create command. - ''; - }; - - clusterNodes = mkOption { - default = null; - example = [ "n9KorY8QtTdRx7TVDpwnG9NvyxsDwHUKUEeDLY3AkiGncVaSXZi5" ]; - description = '' - To extend full trust to other nodes, place their node public keys here. - Generally, you should only do this for nodes under common administration. - Node public keys start with an 'n'. To give a node a name for identification - place a space after the public key and then the name. - ''; - }; - - sntpServers = mkOption { - default = null; - example = [ "time.nist.gov" "pool.ntp.org" ]; - description = '' - IP address or domain of NTP servers to use for time synchronization. - ''; - }; - - # TODO: websocket options - - rpcAllowRemote = mkOption { - default = false; - description = '' - false: Allow RPC connections only from 127.0.0.1. [default] - true: Allow RPC connections from any IP. - ''; - }; - - rpcAdminAllow = mkOption { - example = [ "10.0.0.4" ]; - description = '' - List of IP addresses allowed to have admin access. - ''; - }; - - rpcAdminUser = mkOption { - type = types.str; - description = '' - As a server, require this as the admin user to be specified. Also, require - rpc_admin_user and rpc_admin_password to be checked for RPC admin functions. - The request must specify these as the admin_user and admin_password in the - request object. - ''; - }; - - rpcAdminPassword = mkOption { - type = types.str; - description = '' - As a server, require this as the admin pasword to be specified. Also, - require rpc_admin_user and rpc_admin_password to be checked for RPC admin - functions. The request must specify these as the admin_user and - admin_password in the request object. - ''; - }; - - rpcIp = mkOption { - type = types.str; - description = '' - IP address or domain to bind to allow insecure RPC connections. - Defaults to not binding, which disallows RPC connections. + The minimum number of trusted validations a ledger must have before + the server considers it fully validated. ''; + type = types.int; + default = 3; }; - rpcPort = mkOption { - type = types.int; - description = '' - If rpcIp is supplied, corresponding port to bind to for peer connections. - ''; - }; - - rpcUser = mkOption { - type = types.str; + ledgerHistory = mkOption { description = '' - Require a this user to specified and require rpcPassword to - be checked for RPC access via the rpcIp and rpcPort. The user and password - must be specified via HTTP's basic authentication method. - As a client, supply this to the server via HTTP's basic authentication - method. + The number of past ledgers to acquire on server startup and the minimum + to maintain while running. ''; + type = types.either types.int (types.enum ["full"]); + default = 1296000; # 1 month }; - rpcPassword = mkOption { - type = types.str; + fetchDepth = mkOption { description = '' - Require a this password to specified and require rpc_user to - be checked for RPC access via the rpcIp and rpcPort. The user and password - must be specified via HTTP's basic authentication method. - As a client, supply this to the server via HTTP's basic authentication - method. + The number of past ledgers to serve to other peers that request historical + ledger data (or "full" for no limit). ''; + type = types.either types.int (types.enum ["full"]); + default = "full"; }; - rpcStartup = mkOption { - example = [ ''"command" : "log_level"'' ''"partition" : "ripplecalc"'' ''"severity" : "trace"'' ]; - description = "List of RPC commands to run at startup."; - }; - - rpcSecure = mkOption { - default = false; + sntpServers = mkOption { description = '' - false: Server certificates are not provided for RPC clients using SSL [default] - true: Client RPC connections wil be provided with SSL certificates. - - Note that if rpc_secure is enabled, it will also be necessasry to configure the - certificate file settings located in rpcSslCert, rpcSslChain, and rpcSslKey + IP address or domain of NTP servers to use for time synchronization.; ''; + type = types.listOf types.str; + default = [ + "time.windows.com" + "time.apple.com" + "time.nist.gov" + "pool.ntp.org" + ]; + }; + + logLevel = mkOption { + description = "Logging verbosity."; + type = types.enum ["debug" "error" "info"]; + default = "error"; }; - */ extraConfig = mkOption { default = ""; @@ -275,8 +373,11 @@ in ''; }; + config = mkOption { + internal = true; + default = pkgs.writeText "rippled.conf" rippledCfg; + }; }; - }; @@ -288,27 +389,21 @@ in { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; - home = "/var/lib/rippled"; + home = cfg.databasePath; + createHome = true; }; systemd.services.rippled = { - path = [ pkgs.rippled ]; - after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.rippled}/bin/rippled --fg -q --conf ${rippledStateCfgFile}"; - WorkingDirectory = "/var/lib/rippled"; + ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}"; + User = "rippled"; }; }; - networking.firewall.allowedTCPPorts = mkIf (cfg.peerIp != null) [ cfg.peerPort ]; + environment.systemPackages = [ cfg.package ]; - system.activationScripts.rippled = '' - mkdir -p /var/{lib,log}/rippled - chown -R rippled /var/{lib,log}/rippled - ln -sf ${rippledCfgFile} ${rippledStateCfgFile} - ''; }; } From 7e66337f6c5db5ac5c80ae57fcc8f6c3b2ae238a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 21 Mar 2015 10:11:12 -0400 Subject: [PATCH 308/947] cjdns: update to version 16 - 20150308 --- pkgs/tools/networking/cjdns/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index b0af961c733..e602ee5f412 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let - version = "15"; # see ${src}/util/version/Version.h - date = "20150207"; + version = "16"; # see ${src}/util/version/Version.h + date = "20150308"; in stdenv.mkDerivation { name = "cjdns-${version}-${date}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; - rev = "0fc585e15e25b1bd39be24a534f47bb966485a4a"; - sha256 = "090zx30bgfk6wyh10wbjqpkvjq9l30jc7fh2iagajsmpjs9iipqm"; + rev = "dc7eaf676cb83f13ba3e76a1bd0f2e093e6d6e1b"; + sha256 = "1llhv9kflh4rzv9b9qq9zhrckcc6a7xs0dp147adwmaxqjj8v601"; }; buildInputs = [ which python27 nodejs ] ++ From ba2074fc310796f1cb43b82b86cb85cfc0a8ca53 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 21 Mar 2015 10:13:03 -0400 Subject: [PATCH 309/947] nixos/tests/cjdns: do not build cjdns at evaluation Putting hostnames in the cjdns configuration requires a utility be present to convert public keys to ip addresses --- nixos/release.nix | 2 +- nixos/tests/cjdns.nix | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 1712c90ad33..f84501d741a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -242,7 +242,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callTest tests/chromium.nix {}; - #tests.cjdns = callTest tests/cjdns.nix {}; + tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 7bb3863c683..45164234b1b 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -3,15 +3,15 @@ let carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k"; carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; carolIp4 = "192.168.0.9"; - + basicConfig = { config, pkgs, ... }: { services.cjdns.enable = true; - + # Turning off DHCP isn't very realistic but makes # the sequence of address assignment less stochastic. networking.useDHCP = false; - + networking.interfaces.eth1.prefixLength = 24; # CJDNS output is incompatible with the XML log. systemd.services.cjdns.serviceConfig.StandardOutput = "null"; @@ -41,19 +41,18 @@ import ./make-test.nix { # Bob explicitly connects to Carol over UDPInterface. bob = { config, lib, nodes, ... }: - + let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in - + { imports = [ basicConfig ]; - + networking.interfaces.eth1.ipAddress = "192.168.0.2"; - + services.cjdns = { UDPInterface = { bind = "0.0.0.0:1024"; connectTo."192.168.0.1:1024}" = - { hostname = "carol.hype"; - password = carolPassword; + { password = carolPassword; publicKey = carolPubKey; }; }; @@ -75,7 +74,7 @@ import ./make-test.nix { ''; networking.interfaces.eth1.ipAddress = "192.168.0.1"; - + services.cjdns = { authorizedPasswords = [ carolPassword ]; ETHInterface.bind = "eth1"; @@ -106,13 +105,13 @@ import ./make-test.nix { my $carolIp6 = cjdnsIp $carol; # ping a few times each to let the routing table establish itself - + $alice->succeed("ping6 -c 4 $carolIp6"); - $bob->succeed("ping6 -c 4 carol.hype"); + $bob->succeed("ping6 -c 4 $carolIp6"); $carol->succeed("ping6 -c 4 $aliceIp6"); $carol->succeed("ping6 -c 4 $bobIp6"); - + $alice->succeed("ping6 -c 4 $bobIp6"); $bob->succeed("ping6 -c 4 $aliceIp6"); From fb03c7d7f458cd304ac62d9081da62a5a2679031 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 19:10:45 +0300 Subject: [PATCH 310/947] Update tempora-lgc source link as the original site seems to be permanently down --- pkgs/data/fonts/tempora-lgc/default.nix | 80 +++++++++++-------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index 16642d69566..53aefe9c31a 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,49 +1,39 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.2"; - baseName="tempora-lgc"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${baseName}.otf.zip"; - hash="18n5ml2chc1bhrv43i64sz2dz1zc2dw087wcwn5l9ysqsmf0387i"; - }; +{stdenv, fetchurl}: +let + srcs = [ + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf"; + sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf"; + sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf"; + sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode.otf"; + sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; + }) + ]; + buildInputs = [ + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + name = "tempora-lgc"; inherit buildInputs; - - phaseNames = ["doUnpack" "installFonts"]; - - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - + inherit srcs; + phases = "installPhase"; + installPhase = '' + mkdir -p "$out/share/fonts/opentype/public" + cp ${toString srcs} "$out/share/fonts/opentype/public" + ''; meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + description = ''Tempora font''; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; - }; -}) x - +} From 68647a4de5afa4a5743e262bf62b0d7048e08a95 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 21 Mar 2015 09:13:06 -0700 Subject: [PATCH 311/947] coreutils: don't use bare `sed` on darwin it will be BSD sed instead of GNU sed --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index ee85a4349c1..1dc5bfaccfb 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -19,7 +19,7 @@ let }; # The test tends to fail on btrfs and maybe other unusual filesystems. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh ''; From 51d465646a8e74a5fcff48f1fb11310119c6ef1f Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 21 Mar 2015 09:13:51 -0700 Subject: [PATCH 312/947] gnupg: don't demand pcsclite on darwin --- pkgs/tools/security/gnupg/21.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index db71408d12d..440d2294b0d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./socket-activate-2.1.1.patch ]; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; From f953d77be2617a41299eef2e938aad8201849860 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 Mar 2015 17:09:38 +0100 Subject: [PATCH 313/947] Revert "Reverts a bunch of commits as a try to fix GC errors." This reverts commit 1e4ba025c260fa6852765e9f5c59e985f10c6a43. Conflicts: pkgs/development/web/nodejs/build-node-package.nix --- lib/lists.nix | 6 +- .../web/nodejs/build-node-package.nix | 170 ++++++++++++------ 2 files changed, 114 insertions(+), 62 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index 2dda700bef3..fa8cbddfd94 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -234,8 +234,8 @@ rec { in [x] ++ remove x xs; # Intersects list 'e' and another list - intersect = e: filter (x: elem x e); + intersectLists = e: filter (x: elem x e); - # Substracts list 'e' from another list - substract = e: filter (x: !(elem x e)); + # Subtracts list 'e' from another list + subtractLists = e: filter (x: !(elem x e)); } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 6c616aef05c..042e29f2970 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,25 +1,33 @@ { stdenv, runCommand, nodejs, neededNatives}: { - name, src, + name, version ? "", src, # by default name of nodejs interpreter e.g. "nodejs-${name}" namePrefix ? nodejs.interpreterName + "-", # Node package name - pkgName ? (builtins.parseDrvName name).name, + pkgName ? + if version != "" then stdenv.lib.removeSuffix "-${version}" name else + (builtins.parseDrvName name).name, # List or attribute set of dependencies deps ? {}, # List or attribute set of peer depencies - peerDependencies ? [], + peerDependencies ? {}, + + # List or attribute set of optional dependencies + optionalDependencies ? {}, + + # List of optional dependencies to skip + skipOptionalDependencies ? [], # Whether package is binary or library - bin ? null, + bin ? false, - # Flags passed to npm install - flags ? [], + # Additional flags passed to npm install + flags ? "", # Command to be run before shell hook preShellHook ? "", @@ -27,6 +35,12 @@ # Command to be run after shell hook postShellHook ? "", + # Same as https://docs.npmjs.com/files/package.json#os + os ? [], + + # Same as https://docs.npmjs.com/files/package.json#cpu + cpu ? [], + # Attribute set of already resolved deps (internal), # for avoiding infinite recursion resolvedDeps ? {}, @@ -37,42 +51,72 @@ with stdenv.lib; let - npmFlags = concatStringsSep " " (map (v: "--${v}") flags); - - sources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv $(find . -type d -mindepth 1 -maxdepth 1) $out - ''; - - # Convert deps to attribute set - attrDeps = if isAttrs deps then deps else - (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); - - # All required node modules, without already resolved dependencies - requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps); - - # Recursive dependencies that we want to avoid with shim creation - recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps); - - peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies; - self = let - # Pass resolved dependencies to dependencies of this package - deps = map ( - dep: dep.override { - resolvedDeps = resolvedDeps // { "${name}" = self; }; - } - ) (attrValues requiredDeps); + sources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv $(find . -type d -mindepth 1 -maxdepth 1) $out + ''; + + platforms = if os == [] then nodejs.meta.platforms else + fold (entry: platforms: + let + filterPlatforms = + stdenv.lib.platforms.${removePrefix "!" entry} or []; + in + # Ignore unknown platforms + if filterPlatforms == [] then platforms + else + if hasPrefix "!" entry then + subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms + else + platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) + ) [] os; + + mapDependencies = deps: f: rec { + # Convert deps to attribute set + attrDeps = if isAttrs deps then deps else + (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); + + # All required node modules, without already resolved dependencies + # Also override with already resolved dependencies + requiredDeps = mapAttrs (name: dep: + dep.override { + resolvedDeps = resolvedDeps // { "${name}" = self; }; + } + ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps))); + + # Recursive dependencies that we want to avoid with shim creation + recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps)); + }; + + _dependencies = mapDependencies deps (name: dep: + dep.pkgName != pkgName); + _optionalDependencies = mapDependencies optionalDependencies (name: dep: + (builtins.tryEval dep).success && + !(elem dep.pkgName skipOptionalDependencies) + ); + _peerDependencies = mapDependencies peerDependencies (name: dep: + dep.pkgName != pkgName); + + requiredDependencies = + _dependencies.requiredDeps // + _optionalDependencies.requiredDeps // + _peerDependencies.requiredDeps; + + recursiveDependencies = + _dependencies.recursiveDeps // + _optionalDependencies.recursiveDeps // + _peerDependencies.recursiveDeps; patchShebangs = dir: '' - node=`type -p node` - coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ - xargs sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' || true + node=`type -p node` + coffee=`type -p coffee || true` + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' || true ''; in stdenv.mkDerivation ({ @@ -150,9 +194,9 @@ let # We do not handle shrinkwraps yet rm npm-shrinkwrap.json 2>/dev/null || true - mkdir build-dir + mkdir ../build-dir ( - cd build-dir + cd ../build-dir mkdir node_modules # Symlink or copy dependencies for node modules @@ -164,12 +208,7 @@ let '' else '' cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/ '' - ) deps} - - # Symlink peer dependencies - ${concatMapStrings (dep: '' - ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') peerDeps} + ) (attrValues requiredDependencies)} # Create shims for recursive dependenceies ${concatMapStrings (dep: '' @@ -180,10 +219,10 @@ let "version": "${getVersion dep}" } EOF - '') (attrValues recursiveDeps)} + '') (attrValues recursiveDependencies)} ) - export HOME=$PWD/build-dir + export HOME=$PWD/../build-dir runHook postConfigure ''; @@ -192,14 +231,14 @@ let # If source was a file, repackage it, so npm pre/post publish hooks are not triggered, if [[ -f $src ]]; then - tar --exclude='build-dir' -czf build-dir/package.tgz ./ + GZIP=-1 tar -czf ../build-dir/package.tgz ./ export src=$HOME/package.tgz else export src=$PWD fi # Install package - (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}) + (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags}) runHook postBuild ''; @@ -214,7 +253,7 @@ let ${concatMapStrings (dep: '' rm node_modules/${dep.pkgName}/package.json rmdir node_modules/${dep.pkgName} - '') (attrValues recursiveDeps)} + '') (attrValues recursiveDependencies)} mkdir -p $out/lib/node_modules @@ -233,10 +272,10 @@ let done fi - # Symlink dependencies + # Move peer dependencies to node_modules ${concatMapStrings (dep: '' mv node_modules/${dep.pkgName} $out/lib/node_modules - '') peerDeps} + '') (attrValues _peerDependencies.requiredDeps)} # Install binaries and patch shebangs mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true @@ -259,23 +298,36 @@ let mkdir -p node_modules ${concatMapStrings (dep: '' ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') deps} + '') (attrValues requiredDependencies)} ${postShellHook} ''; + # Stipping does not make a lot of sense in node packages + dontStrip = true; + + meta = { + inherit platforms; + maintainers = [ stdenv.lib.maintainers.offline ]; + }; + passthru.pkgName = pkgName; -} // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args)// { + } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // { name = namePrefix + name; # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; - # Make buildNodePackage useful with --run-env - nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; + nativeBuildInputs = + (args.nativeBuildInputs or []) ++ neededNatives ++ + (attrValues requiredDependencies); # Expose list of recursive dependencies upstream, up to the package that # caused recursive dependency - recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); + recursiveDeps = + (flatten ( + map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies) + )) ++ + (attrNames recursiveDependencies); }); in self From 19a4fc2b46a8bdcd36e8348d188434bb1572b870 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 12:32:12 -0500 Subject: [PATCH 314/947] add jsoncpp-1.6.0 dependency of cmake-3.2 --- pkgs/development/libraries/jsoncpp/1.6.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/jsoncpp/1.6.nix diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix new file mode 100644 index 00000000000..69dfc217573 --- /dev/null +++ b/pkgs/development/libraries/jsoncpp/1.6.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, python }: + +let + basename = "jsoncpp"; + version = "1.6.0"; +in +stdenv.mkDerivation rec { + name = "${basename}-${version}"; + src = fetchurl { + url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz"; + sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; + }; + + nativeBuildInputs = [ cmake python ]; + + meta = { + inherit version; + homepage = https://github.com/open-source-parsers/jsoncpp; + description = "A simple API to manipulate JSON data in C++"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = with stdenv.lib.licenses; [ mit ]; + branch = "1.6"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c91c1625196..e9dcac1c133 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6074,6 +6074,7 @@ let json_c = callPackage ../development/libraries/json-c { }; jsoncpp = callPackage ../development/libraries/jsoncpp { }; + jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { }; libjson = callPackage ../development/libraries/libjson { }; From 7e21c519ba746931c1056fcf62065057ecb1860a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 12:32:38 -0500 Subject: [PATCH 315/947] add cmake-3.2.1 Earlier versions of CMake have a bug in their OpenSSL version detection code. --- .../tools/build-managers/cmake/3.2.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/tools/build-managers/cmake/3.2.nix diff --git a/pkgs/development/tools/build-managers/cmake/3.2.nix b/pkgs/development/tools/build-managers/cmake/3.2.nix new file mode 100644 index 00000000000..dd16b649cd1 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.2.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl +, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +}: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "3.2"; + minorVersion = "1"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm"; + }; + + enableParallelBuilding = true; + + patches = + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path-3.0.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = + [ bzip2 curl expat jsoncpp libarchive xz zlib ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake \ + --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9dcac1c133..41c172476c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4913,6 +4913,9 @@ let ps = if stdenv.isDarwin then darwin.ps else null; }; + cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix { + jsoncpp = jsoncpp-1_6; + }; cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; From a17535822a68582d04c8b49d1ecf53c4ccaa5b91 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 12:33:31 -0500 Subject: [PATCH 316/947] kf57: use cmake-3.2 Build was broken by openssl update because older cmake could not parse openssl's version correctly. --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index c7fdbc060ec..793f1e9111d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -72,8 +72,9 @@ let # packages from the nixpkgs collection (with pkgs; { - inherit cmake epoxy; Boost = boost155; + cmake = cmake-3_2; + inherit epoxy; GIF = giflib; GLIB2 = glib; Gpgme = gpgme; @@ -105,7 +106,7 @@ let extra-cmake-modules = { inherit (super.extra-cmake-modules) name src; - propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ]; + propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; cmakeFlags = ["-DBUILD_TESTING=OFF"]; patches = [ From ea2baa8abfc44ae3b32ec424cd81d035225ae100 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 15 Mar 2015 20:24:54 -0700 Subject: [PATCH 317/947] spectrwm window manager --- lib/maintainers.nix | 1 + .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/spectrwm.nix | 33 +++++++++++ .../window-managers/spectrwm/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 96 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/spectrwm.nix create mode 100644 pkgs/applications/window-managers/spectrwm/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 194aaec5c25..358cbda44e4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -95,6 +95,7 @@ iyzsong = "Song Wenwu "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; + jb55 = "William Casarin "; jcumming = "Jack Cummings "; jgeerds = "Jascha Geerds "; jirkamarsik = "Jirka Marsik "; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 97cc198137c..1912b8aa5a9 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -18,6 +18,7 @@ in ./openbox.nix ./sawfish.nix ./stumpwm.nix + ./spectrwm.nix ./twm.nix ./windowmaker.nix ./wmii.nix diff --git a/nixos/modules/services/x11/window-managers/spectrwm.nix b/nixos/modules/services/x11/window-managers/spectrwm.nix new file mode 100644 index 00000000000..5db6b41ba8f --- /dev/null +++ b/nixos/modules/services/x11/window-managers/spectrwm.nix @@ -0,0 +1,33 @@ + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.spectrwm; +in + +{ + options = { + services.xserver.windowManager.spectrwm = { + enable = mkOption { + default = false; + example = true; + description = "Enable the spectrwm window manager."; + }; + }; + }; + + config = mkIf cfg.enable { + services.xserver.windowManager = { + session = [{ + name = "spectrwm"; + start = '' + ${pkgs.spectrwm}/bin/spectrwm & + waitPID=$! + ''; + }]; + }; + environment.systemPackages = [ pkgs.spectrwm ]; + }; +} diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix new file mode 100644 index 00000000000..ad6fcddf5be --- /dev/null +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -0,0 +1,59 @@ +{ fetchurl +, coreutils +, libX11 +, libXrandr +, libXcursor +, libXft +, libXt +, libxcb +, xcbutil +, xcb-util-cursor +, xcbutilkeysyms +, xcbutilwm +, stdenv +}: + +stdenv.mkDerivation rec { + name = "spectrwm-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_6_2.tar.gz"; + sha256 = "1pc9p3vwa4bsv76myqkqhp4cxspr72s5igi7cs9xrpd4xx6xc90s"; + }; + + buildInputs = [ + libX11 + libxcb + libXrandr + libXcursor + libXft + libXt + xcbutil + xcb-util-cursor + xcbutilkeysyms + xcbutilwm + ]; + + sourceRoot = "spectrwm-SPECTRWM_2_6_2/linux"; + makeFlags="PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "https://github.com/conformal/spectrwm"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.isc; + platforms = platforms.all; + + longDescription = '' + spectrwm is a small dynamic tiling window manager for X11. It + tries to stay out of the way so that valuable screen real estate + can be used for much more important stuff. It has sane defaults + and does not require one to learn a language to do any + configuration. It was written by hackers for hackers and it + strives to be small, compact and fast. + ''; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41c172476c0..8d1b684b673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10732,6 +10732,8 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; From 0d2a00fdeebc82e9b8c0f42df63c63a2e8a13dec Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:22:22 +0300 Subject: [PATCH 318/947] update lush --- pkgs/development/interpreters/lush/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 63cf85bc506..54a043458a3 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -7,7 +7,7 @@ let version="2.0.1"; name="${baseName}-${version}"; hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; - url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; + url="http://softlayer-ams.dl.sourceforge.net/project/lush/lush2/lush-2.0.1.tar.gz"; sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; }; buildInputs = [ From c64b5270fee4be0f34de718d0a3cd001b742688f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:22:36 +0300 Subject: [PATCH 319/947] update luarocks --- pkgs/development/tools/misc/luarocks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 4a38762a3ff..dfd5c2994fd 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.2.0"; + version="2.2.1"; name="${baseName}-${version}"; - hash="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; - url="http://luarocks.org/releases/luarocks-2.2.0-rc1.tar.gz"; - sha256="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; + hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; + url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz"; + sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; }; buildInputs = [ lua curl makeWrapper which From d77a4f17f92e9bb568d0ed4435f758b7c85bbb16 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:22:48 +0300 Subject: [PATCH 320/947] update wine --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index a7b3da80dce..f8a32cb8ff4 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.38"; + version = "1.7.39"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; + sha256 = "0p1kj61hkfyhbxdfgj3z3hlxi5nvcbdknkjqiicbabkpzq3v1zva"; }; gecko = fetchurl { From 15e66fa577c37666ed3d58a9b0c5ac5dba168b2f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:22:56 +0300 Subject: [PATCH 321/947] 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 16eb933e176..e2bcf9837e7 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="2.1.1"; + version = "3.0"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256="0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"; + sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl"; }; buildInputs = [ glib pkgconfig gperf utillinux From d5b558c613d13528356980a9c443307a9d74402b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:23:07 +0300 Subject: [PATCH 322/947] update sysdig --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4f94b407420..5a7d0700004 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.98"; + version = "0.1.99"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0pq27mjvdiq20zjjhvq5fkvbq4xqcyzcrh2nkhx6gdb906h1mj4l"; + sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76"; }; buildInputs = [ cmake zlib luajit From 05265a220c9d31039cca90fcda1981c143c218c9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:23:25 +0300 Subject: [PATCH 323/947] Update Apache Jena --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index d46b87d2dc1..8c4db178e78 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "2.12.1"; + version = "2.13.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "0jvk538hlwab7gy5150av4whfsm54kkx3q8r2ypjf7rwhy5aggav"; + sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d"; }; buildInputs = [ makeWrapper From 3c19c7d23603438f7b9825ad7966ede2b217a6b8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:23:36 +0300 Subject: [PATCH 324/947] update zpaq --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index e7f0b2b9597..5f8a03e2d67 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="702"; + version="704"; name="${baseName}-${version}"; - hash="0ynpz9gnbnhvyz79dxzk7r1n9yz9lbz03p0wy47v14f4cihb11y7"; - url="http://mattmahoney.net/dc/zpaq702.zip"; - sha256="0ynpz9gnbnhvyz79dxzk7r1n9yz9lbz03p0wy47v14f4cihb11y7"; + hash="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; + url="http://mattmahoney.net/dc/zpaq704.zip"; + sha256="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; }; buildInputs = [ unzip From e68b486f6e714578163ff05bf2d1bfa044a9a07f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 21 Mar 2015 21:23:45 +0300 Subject: [PATCH 325/947] update lrzip --- pkgs/tools/compression/lrzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index cf65b7b1e10..3846ec97d3b 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: stdenv.mkDerivation rec { - version = "0.620"; + version = "0.621"; name = "lrzip-${version}"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2"; - sha256 = "11ilyjrpdg0k29yidbxvz9aq54zvcxd4c308fjy578jgmlw8f2sd"; + sha256 = "0szb1habydj9fwwrhgpjfws6v7hdphnqc5527i0vvc5rx2z6zhii"; }; buildInputs = [ zlib lzo bzip2 nasm perl ]; From 5c268bca2e9d28b2739de91f998e7291ba799fb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Mar 2015 11:28:13 +0100 Subject: [PATCH 326/947] haskell-locators test suite is broken. --- 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 14b0e1104d8..032bdf090f7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -640,6 +640,9 @@ self: super: { nehe-tuts = dontDistribute super.nehe-tuts; netwire-input-glfw = dontDistribute super.netwire-input-glfw; + # https://github.com/afcowie/locators/issues/1 + locators = dontCheck super.locators; + } // { # Not on Hackage. From 446f30107849d1b2bf0362aeb3df0df3076f9bfe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Mar 2015 11:29:46 +0100 Subject: [PATCH 327/947] hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 --- .../configuration-ghc-7.6.x.nix | 4 +- .../configuration-ghc-7.8.x.nix | 2 +- .../haskell-modules/hackage-packages.nix | 234 +++++++++++------- 3 files changed, 146 insertions(+), 94 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 24614529329..827ea9895e6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -36,8 +36,8 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # haskeline and terminfo are not core libraries for this compiler. - haskeline = self.haskeline_0_7_1_3; - terminfo = self.terminfo_0_4_0_0; + haskeline = self.haskeline_0_7_2_0; + terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; 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 d865c65d55c..96447d9d90b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -45,7 +45,7 @@ self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_1_3; + haskeline = self.haskeline_0_7_2_0; mtl = super.mtl_2_2_1; })) (drv: { jailbreak = true; # idris is scared of lens 4.7 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b7413ec9aee..d39ea7b700f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2377,8 +2377,8 @@ self: { ({ mkDerivation, base, cmdargs, parsec }: mkDerivation { pname = "ClustalParser"; - version = "1.0.1"; - sha256 = "0rslkg7hr6j414qpsgmjbrw474bhhrv36ns19smysx7lpkn955w4"; + version = "1.0.2"; + sha256 = "0y1w2lp5kqxb9rp9rarhnqpspa64z02mbhnnvkpagi534mgnx93k"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs parsec ]; @@ -2507,12 +2507,16 @@ self: { }) {}; "ConcurrentUtils" = callPackage - ({ mkDerivation, array, base, containers, mtl, parallel }: + ({ mkDerivation, array, base, binary, bytestring, containers + , network, parallel, process + }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.3.0.0"; - sha256 = "0m3dy21xlmr17aig5mia160rbz9y8ly8mhxvld61jlxhchgdlfrc"; - buildDepends = [ array base containers mtl parallel ]; + version = "0.4.1.0"; + sha256 = "05a5v9g95by4v05zxvjma8hvn5rrvwz0c3r8q0iqqchglljs39xr"; + buildDepends = [ + array base binary bytestring containers network parallel process + ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; license = stdenv.lib.licenses.gpl2; @@ -11509,8 +11513,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.2"; - sha256 = "0i55milm63y0djnni3sg40pydxw5ls4gjsj18g8f5rbbdjx6y95q"; + version = "0.5.0.3"; + sha256 = "17zn4sqyfl48fp25wicp5vd518wn26g5qn071zhb989imiqbnvmq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -12191,14 +12195,14 @@ self: { }) {}; "Random123" = callPackage - ({ mkDerivation, array, base, HUnit, QuickCheck, random + ({ mkDerivation, array, base, data-dword, HUnit, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "Random123"; - version = "0.1.2"; - sha256 = "1y58rj2c80fv1qv9v0dcrfp8n6n03njr5fkkm4wdb18rp92dydxi"; - buildDepends = [ array base random ]; + version = "0.2.0"; + sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4"; + buildDepends = [ array base data-dword random ]; testDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 @@ -14566,6 +14570,18 @@ self: { license = "unknown"; }) {}; + "ViennaRNAParser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "ViennaRNAParser"; + version = "1.0.1"; + sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0"; + editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0"; + buildDepends = [ base parsec ]; + description = "Libary for parsing ViennaRNA package output"; + license = "GPL"; + }) {}; + "WAVE" = callPackage ({ mkDerivation, base, bytestring, containers, parseargs }: mkDerivation { @@ -19742,12 +19758,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "array_0_5_0_0" = callPackage + "array_0_5_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.0.0"; - sha256 = "0rknkp9c6cxf63adx7xam655d509aja9wim1r37j4905ywan0y8a"; + version = "0.5.1.0"; + sha256 = "18hz1jcshdj6c10lsxq86rs6rbx77g91w4ay2s58h9j5rnkchjxq"; buildDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -21960,8 +21976,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text, time }: mkDerivation { pname = "barecheck"; - version = "0.2.0.6"; - sha256 = "0avz5pdnvd3kjgp9swpdfxddp60gqpamwd7j4xl8xdj3b2di5zk0"; + version = "0.2.0.8"; + sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7"; buildDepends = [ base containers QuickCheck text time ]; homepage = "http://github.com/massysett/barecheck"; description = "QuickCheck implementations for common types"; @@ -22249,8 +22265,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.1.0.3"; - sha256 = "1nigmdnfxbzfi2qyih6rz3q8xymk5rglm4772xrsphv6cszifcbd"; + version = "0.1.0.4"; + sha256 = "0gyg6801lwchksd5xvfjy45ygi7ah1z49gq7a485cjn5b7hpbxfh"; buildDepends = [ base deepseq generics-sop QuickCheck text ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -25121,6 +25137,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blunt" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , haskell-src-exts, http-types, transformers, wai, warp + }: + mkDerivation { + pname = "blunt"; + version = "0.0.7"; + sha256 = "01hm0349qzam2ygsdhcg55kgzh6gk22m6hrjb6lk5gqsn6xsdf4w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array base bytestring containers haskell-src-exts http-types + transformers wai warp + ]; + description = "Point-free Haskell as a service"; + license = stdenv.lib.licenses.mit; + }) {}; + "bmp" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -27826,8 +27860,8 @@ self: { }: mkDerivation { pname = "cartel"; - version = "0.14.2.0"; - sha256 = "0pxscg5rcp1b9inbwjqhspb7z18ykwgr026zaqshk3z9rkclwbx7"; + version = "0.14.2.2"; + sha256 = "0ikf0jhiaqagd4ycq9szs4vy7yq7ai31yzcj8f0a6i3j6j4cr8nx"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; @@ -30218,8 +30252,8 @@ self: { }: mkDerivation { pname = "cless"; - version = "0.2.0.0"; - sha256 = "10q68rs85zxk9pqd5rkd1pndp2nsvxxdznil2jf1027r0bqyxjyn"; + version = "0.3.0.0"; + sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30645,12 +30679,12 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, mtl, syb, text }: + ({ mkDerivation, base, mtl, text }: mkDerivation { pname = "cmark"; - version = "0.3"; - sha256 = "0zhhcgcikixgnkblfqpf08did3ykjwb1pfg7dq3zndjic116xasm"; - buildDepends = [ base mtl syb text ]; + version = "0.3.0.1"; + sha256 = "1n73ya2r5dbsadmx9y6l931k7nhppqa69qqyv15pnm3w7823njj8"; + buildDepends = [ base mtl text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; @@ -48753,8 +48787,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.1.1"; - sha256 = "1c87mhfpfx3mrd347g2hp9c1aivsky11jdj7ac1y66kar5s396yw"; + version = "0.1.1.1"; + sha256 = "1g532p1k8df7vfwfh4zwj4s020k4c9ncvc68xy0hniijy61ncc5n"; buildDepends = [ base ghc-prim template-haskell ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -51059,8 +51093,8 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.2.0"; - sha256 = "0lqvdxv500q19xfpp4vcvz0y3s9s2q1iz1n2c01k9kbph4hjd198"; + version = "0.3.0"; + sha256 = "1py0cnmvqnjdf6bwwn8p6c78p9qnmk82932j7j6y2q91yhna6b2d"; buildDepends = [ base containers mtl parsec template-haskell ]; testDepends = [ base containers HUnit mtl parsec ]; homepage = "http://khumba.net/projects/goatee"; @@ -51074,8 +51108,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.2.0"; - sha256 = "03klvlxzmm50n8b1bslqjqvrpisiv7rmhjzhssiyakg1qzjpnjzf"; + version = "0.3.0"; + sha256 = "0wdspqs5pfa4axys87c8bci2s3y475fddjrdwh1kvc9vdsanb7xv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -56210,14 +56244,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_1_3" = callPackage + "haskeline_0_7_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix, utf8-string }: mkDerivation { pname = "haskeline"; - version = "0.7.1.3"; - sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi"; + version = "0.7.2.0"; + sha256 = "1pzvps7r53zwjcw1klc025ll786qzlp6y6k4w37ycz2g44fmd2f2"; buildDepends = [ base bytestring containers directory filepath terminfo transformers unix utf8-string @@ -58492,13 +58526,12 @@ self: { }: mkDerivation { pname = "hblock"; - version = "0.1.0.1"; - sha256 = "1ng906bsx1nrn583h768pgghg6sysx560dxrpxbxc7xv7f6g8b1s"; + version = "0.1.0.2"; + sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v"; buildDepends = [ aeson base blaze-markup bytestring cereal containers deepseq hashable path-pieces safecopy text unordered-containers uuid vector ]; - jailbreak = true; description = "A mutable vector that provides indexation on the datatype fields it stores"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -60615,8 +60648,8 @@ self: { }: mkDerivation { pname = "highlighter2"; - version = "0.2.4"; - sha256 = "1gl93z9vfpgqvxdqd8vsl13yz1yspxr6wfwqp4slnr8kpvm153fx"; + version = "0.2.5"; + sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60634,8 +60667,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.11.1"; - sha256 = "1z62wp1a1qlw1l3bkxwq7pd3mi64jl688ib23263bc46zc8z0nkv"; + version = "0.5.12"; + sha256 = "0igcph3icmskf2g861fmxwgjdgrm52r5zazviiv82wck8nvmkh0i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60646,7 +60679,6 @@ self: { base blaze-html containers Diff directory filepath process ]; configureFlags = [ "-fpcre-light" ]; - jailbreak = true; homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; license = "GPL"; @@ -63475,13 +63507,13 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc_0_6_0_1" = callPackage - ({ mkDerivation, base, containers, directory, time }: + "hpc_0_6_0_2" = callPackage + ({ mkDerivation, base, containers, directory, filepath, time }: mkDerivation { pname = "hpc"; - version = "0.6.0.1"; - sha256 = "00fn4kyghf6nqnn24nrjagkgjmwnq40s94jf47v9fbhllvqbq952"; - buildDepends = [ base containers directory time ]; + version = "0.6.0.2"; + sha256 = "1bqa9jmnjqk4jbvx2y90rz717hf2rhzbpmy9xqan97pyrkjz3rlm"; + buildDepends = [ base containers directory filepath time ]; description = "Code Coverage Library for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63544,8 +63576,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.6"; - sha256 = "1ncbq9a3hbg9716msjqr7yfr7ay1ky9xpm5f8ajj1rd94fkbq5ya"; + version = "0.1.2.8"; + sha256 = "1jz82d9z27zci1dl0d33xc1q96dip3b86f8i2dhxyahpi9p7khjm"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -66162,8 +66194,8 @@ self: { }: mkDerivation { pname = "hspec-webdriver"; - version = "1.0.1"; - sha256 = "14fdmlvdpkq2f05kjdwiz48m4mrlzgq3dr7k19ljpv2rvcjv6lr9"; + version = "1.0.2"; + sha256 = "1wkdv129arxbfby1214a93sfqbi1kvkgvqpp4z6qzh45q74hhd9c"; buildDepends = [ base data-default hashable hspec hspec-core HUnit lifted-base stm text transformers unordered-containers webdriver @@ -72524,8 +72556,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.1"; - sha256 = "0j4f0w2v1fwfiylvlwk9l0646wnmjcz36faw9h76j4brzsj0dc23"; + version = "0.4.1.1"; + sha256 = "0myldbliixd45h1fklzjn7r4gdw5nsl1swp3h14wdl1lck4zd7fq"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -84137,8 +84169,8 @@ self: { }: mkDerivation { pname = "multiarg"; - version = "0.30.0.2"; - sha256 = "1c64w53s67m4w9m6jwal6h6529795kw2cnx99v718w2n64slp8n2"; + version = "0.30.0.4"; + sha256 = "0bnzlz5na6fbw870vmvxd4jr71fdkdkxs7dd820p772b1pzfg1g5"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; @@ -91715,17 +91747,18 @@ self: { "pinboard" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either - , HsOpenSSL, http-streams, http-types, io-streams, mtl, old-locale - , random, text, time, transformers, unordered-containers + , HsOpenSSL, http-streams, http-types, io-streams, mtl, network + , old-locale, random, text, time, transformers + , unordered-containers }: mkDerivation { pname = "pinboard"; - version = "0.1"; - sha256 = "1zm2qad94dsdglqb79jphac81cff5sjyya8644nbsz10jl39y508"; + version = "0.2"; + sha256 = "0bvgijrgpv0yc8hkzj9mbm94z6v5s9w8ghjjm9ynh0qrpyf1dlli"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams - http-types io-streams mtl old-locale random text time transformers - unordered-containers + http-types io-streams mtl network old-locale random text time + transformers unordered-containers ]; homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; @@ -92812,6 +92845,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) { inherit (pkgs) poker-eval;}; + "pokitdok" = callPackage + ({ mkDerivation, aeson, base, base64-string, bytestring + , case-insensitive, directory, hex, HTTP, http-client, http-conduit + , http-types, strict, text, time + }: + mkDerivation { + pname = "pokitdok"; + version = "4.1.0.1"; + sha256 = "0cnrda2ahsam07pcn079wvq18hxjpyxik6qnqi5bzrdps9dwgl80"; + buildDepends = [ + aeson base base64-string bytestring case-insensitive directory hex + HTTP http-client http-conduit http-types strict text time + ]; + jailbreak = true; + homepage = "https://platform.pokitdok.com"; + description = "PokitDok Platform API Client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "polar" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96390,8 +96442,8 @@ self: { }: mkDerivation { pname = "quickpull"; - version = "0.4.0.0"; - sha256 = "0qfzl7v7724fwfsxd5iwj3xbfz3isl8hphv6fd5a0c5zw01r54zn"; + version = "0.4.2.2"; + sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4"; isLibrary = true; isExecutable = true; buildDepends = [ barecheck base directory filepath QuickCheck ]; @@ -99812,22 +99864,22 @@ self: { "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hashable, hspec - , hspec-smallcheck, mtl, network, old-locale, scientific - , smallcheck, template-haskell, text, time, unordered-containers - , vector + , hspec-smallcheck, mtl, network, scientific, smallcheck + , template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.13"; - sha256 = "0frbmdz0avary2rwwp9l3k6pdasjw1przi76n89kdfn4dfq5g53s"; + version = "0.0.15"; + sha256 = "0xdd9m2m61pfsn33048hz2cbjyf6rg5qkqwpib50bxdlj07s4w19"; buildDepends = [ - aeson base binary bytestring hashable mtl network old-locale - scientific template-haskell text time unordered-containers vector + aeson base binary bytestring hashable mtl network scientific + template-haskell text time unordered-containers vector ]; testDepends = [ base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; @@ -103541,8 +103593,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.2.2"; - sha256 = "1bn8zml7p17prb3bgdhvkn5yyiw907wir2w6kfngxa78shk0vsbz"; + version = "0.2.2.1"; + sha256 = "0s3c85jpy630bfnzq0wlzv38bkr18cpw5lffn6wh8pjwshd5y8zi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103550,7 +103602,6 @@ self: { warp ]; testDepends = [ base hspec language-ecmascript servant ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -113455,12 +113506,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "terminfo_0_4_0_0" = callPackage + "terminfo_0_4_0_1" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.0.0"; - sha256 = "10y8mhpazcpwwvg1avc0zxq534rwavg82q69l7wm5np24sb5lrv8"; + version = "0.4.0.1"; + sha256 = "1qsspg1kqk68ja217fn3anv1j8arr1pwzzb5m74zpxpjaqb02153"; buildDepends = [ base ]; extraLibraries = [ ncurses ]; homepage = "https://github.com/judah/terminfo"; @@ -113744,8 +113795,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.2"; - sha256 = "0zv9is4gapa06a3iyc505hzcydkia2dm6901m2y6jcav6rmykmk8"; + version = "0.1.3"; + sha256 = "0hkpz3l5b1vpnpgagl150g5rdawwf9mwgb7ai0xilj4d7i55gdwl"; buildDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -114651,8 +114702,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.11.0"; - sha256 = "1z7k0scz08s9c8fxvfsrfb8da5cgvnzr26mzj4cbz8syarygs9dk"; + version = "0.11.1"; + sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -122778,23 +122829,24 @@ self: { , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network , old-locale, QuickCheck, simple-sendfile, streaming-commons, text - , time, transformers, unix, unix-compat, void, wai + , time, transformers, unix, unix-compat, vault, void, wai }: mkDerivation { pname = "warp"; - version = "3.0.9.3"; - sha256 = "1v4h60d5sbqmam17jnx4hvmvdsw5hd97bj8h9c5961d2xjgpzi6d"; + version = "3.0.10"; + sha256 = "07xzc8m662zp14pqfmygjzpkafdklf776xc5ihsnqaxym7wpajds"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network - simple-sendfile streaming-commons text unix unix-compat void wai + simple-sendfile streaming-commons text unix unix-compat vault void + wai ]; testDepends = [ array async auto-update base blaze-builder bytestring case-insensitive doctest ghc-prim hashable hspec HTTP http-date http-types HUnit iproute lifted-base network old-locale QuickCheck simple-sendfile streaming-commons text time transformers unix - unix-compat void wai + unix-compat vault void wai ]; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; @@ -124180,8 +124232,8 @@ self: { }: mkDerivation { pname = "wordpass"; - version = "1.0.0.2"; - sha256 = "1r1h8x3c7knvqvbv56riaig7hd91x12ymz0hc1wpk9h4zgwjgq15"; + version = "1.0.0.3"; + sha256 = "1nbgzrc3g3kcc8462sqskdywk0n1m54810r0jsw8ip2xllvkxx9b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -127108,8 +127160,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.2"; - sha256 = "0syfgwyj5cgs2rl26g8mz2sz3vr39g813ljz441asrqv80mz4xww"; + version = "1.4.8.3"; + sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit From 61b1ef496f48cd69d42987455a530fe2dc475428 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Mar 2015 11:29:59 +0100 Subject: [PATCH 328/947] haskell-bindings-GLFW has been fixed upstream. --- .../haskell-modules/configuration-common.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 032bdf090f7..a59be57182f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -292,6 +292,7 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; @@ -324,6 +325,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; + GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -628,18 +630,6 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; - # https://github.com/bsl/bindings-GLFW/issues/25 - bindings-GLFW = markBroken super.bindings-GLFW; - dynamic-graph = dontDistribute super.dynamic-graph; - fwgl-glfw = dontDistribute super.fwgl-glfw; - glapp = dontDistribute super.glapp; - GLFW-b-demo = dontDistribute super.GLFW-b-demo; - GLFW-b = dontDistribute super.GLFW-b; - GLFW = dontDistribute super.GLFW; - lambdacube-samples = dontDistribute super.lambdacube-samples; - nehe-tuts = dontDistribute super.nehe-tuts; - netwire-input-glfw = dontDistribute super.netwire-input-glfw; - # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; From 16b9fd71f9a2b7bdde243d2b1afad694f3e58559 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Mar 2015 11:37:06 +0100 Subject: [PATCH 329/947] haskell-ansi-wl-pprint: fix the build with ghc-7.10.x --- .../haskell-modules/configuration-ghc-7.10.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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 a70597e6ee5..34204d6462f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -125,4 +125,10 @@ self: super: { sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; stripLen = 1; }); + + # https://github.com/batterseapower/ansi-wl-pprint/issues/13 + ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { + url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; + sha256 = "111aasm6pb55prldzwzgfffd5zz1npl7akdzcwh2hsri865i1806"; + }); } From fddc2fa8bc338796d3839e64cffa737db605c51a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Mar 2015 11:40:11 +0100 Subject: [PATCH 330/947] haskell-hydrogen-syntax does not compile. --- 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 a59be57182f..6471225d5fc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -633,6 +633,10 @@ self: super: { # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; + # https://github.com/scravy/hydrogen-syntax/issues/1 + hydrogen-syntax = markBroken super.hydrogen-syntax; + hydrogen-cli = dontDistribute super.hydrogen-cli; + } // { # Not on Hackage. From d242b5220ae607437037db1b73b296f72f742f33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Mar 2015 19:47:53 +0100 Subject: [PATCH 331/947] haskell-bytestring-arbitrary: fix build by passing an older LLVM version --- 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 6471225d5fc..a339166fd2d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -428,7 +428,7 @@ self: super: { snappy = dontCheck super.snappy; # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm; + bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34; # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; From acd7515a634c9bf94332467437077d39ee2811ee Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 13:53:19 -0500 Subject: [PATCH 332/947] kde4: build with cmake-3.2 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa75d0e4028..1ee38835626 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12835,9 +12835,9 @@ let }) ../desktops/kde-4.14; kdePackagesFor = self: dir: - let callPackageOrig = callPackage; in + let callPackageOrig = newScope { cmake = cmake-3_2; }; in let - callPackage = newScope self; + callPackage = newScope (self // { cmake = cmake-3_2; }); kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; From f73ff9c5a4907751650faf314dd1dd06f9631dcb Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 Mar 2015 20:38:58 +0100 Subject: [PATCH 333/947] nodePackages: do not build on hydra --- pkgs/top-level/all-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ee38835626..1ffbffc82d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1788,16 +1788,12 @@ let nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; - nodePackages = recurseIntoAttrs ( - callPackage ./node-packages.nix { self = nodePackages; } - ); + nodePackages = callPackage ./node-packages.nix { self = nodePackages; }; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; }; - iojsPackages = recurseIntoAttrs ( - callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; } - ); + iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; ldapvi = callPackage ../tools/misc/ldapvi { }; @@ -8422,6 +8418,10 @@ let boost = boost155; }; + ripple-data-api = callPackage ../servers/rippled/data-api.nix { + buildNodePackage = nodePackages.buildNodePackage; + }; + s6 = callPackage ../servers/s6 { }; spamassassin = callPackage ../servers/mail/spamassassin { @@ -8506,7 +8506,7 @@ let thttpd = callPackage ../servers/http/thttpd { }; storm = callPackage ../servers/computing/storm { }; - + slurm-llnl = callPackage ../servers/computing/slurm { }; tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; From ffaabcd62257d5d8150c94a78b00edb7cb4e7489 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 Mar 2015 20:49:04 +0100 Subject: [PATCH 334/947] remove unintentional code --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffbffc82d7..8e7cdb4765b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8418,10 +8418,6 @@ let boost = boost155; }; - ripple-data-api = callPackage ../servers/rippled/data-api.nix { - buildNodePackage = nodePackages.buildNodePackage; - }; - s6 = callPackage ../servers/s6 { }; spamassassin = callPackage ../servers/mail/spamassassin { From e2e4c1182e837e02deaa41e93e85fc818d316295 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sat, 21 Mar 2015 17:49:42 -0400 Subject: [PATCH 335/947] Update OpenSSL dependency of bitcoin to be the latest OpenSSL. Purge OpenSSL version 1.0.1j. --- pkgs/applications/altcoins/default.nix | 4 +- pkgs/development/libraries/openssl/1.0.1j.nix | 114 ------------------ .../libraries/openssl/cert-file-1.0.1j.patch | 41 ------- .../openssl/no-date-in-library.patch | 12 -- pkgs/top-level/all-packages.nix | 9 -- 5 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.0.1j.nix delete mode 100644 pkgs/development/libraries/openssl/cert-file-1.0.1j.patch delete mode 100644 pkgs/development/libraries/openssl/no-date-in-library.patch diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index dbf9ac3940c..1196e6d5ebd 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -2,8 +2,8 @@ rec { - bitcoin = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = false; }; + bitcoin = callPackage ./bitcoin.nix { withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { withGui = false; }; darkcoin = callPackage ./darkcoin.nix { withGui = true; }; darkcoind = callPackage ./darkcoin.nix { withGui = false; }; diff --git a/pkgs/development/libraries/openssl/1.0.1j.nix b/pkgs/development/libraries/openssl/1.0.1j.nix deleted file mode 100644 index 541561b0b70..00000000000 --- a/pkgs/development/libraries/openssl/1.0.1j.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl, perl -, withCryptodev ? false, cryptodevHeaders }: - -let - name = "openssl-1.0.1j"; - - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; - - patchesCross = isCross: let - isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem"); - in - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - ./cert-file-1.0.1j.patch - # Remove the compilation time from the library - ./no-date-in-library.patch - ] - - ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") - [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually - ./gnu.patch # submitted upstream - ] - - ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") - [ ./gnu.patch - ./kfreebsd-gnu.patch - ] - - ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; - -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - urls = [ - "http://www.openssl.org/source/${name}.tar.gz" - "http://openssl.linux-mirror.org/source/${name}.tar.gz" - ]; - sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; - }; - - patches = patchesCross false; - - buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - - nativeBuildInputs = [ perl ]; - - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" - else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" - else "./config"; - - configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + - stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + - stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm"; - - preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") '' - sed -i -e "s|-march=i486|-march=x86-64|g" Makefile - ''; - - makeFlags = "MANDIR=$(out)/share/man"; - - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; - - postInstall = - '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then - rm $out/lib/*.a - fi - ''; # */ - - crossAttrs = { - patches = patchesCross true; - - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" - ''; - - postInstall = '' - # Openssl installs readonly files, which otherwise we can't strip. - # This could at some stdenv hash change be put out of crossAttrs, too - chmod -R +w $out - - # Remove references to perl, to avoid depending on it at runtime - rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget - ''; - configureScript = "./Configure"; - } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") { - CC = "gcc"; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - priority = 10; # resolves collision with ‘man-pages’ - }; -} diff --git a/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch b/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch deleted file mode 100644 index 26b51c0295e..00000000000 --- a/pkgs/development/libraries/openssl/cert-file-1.0.1j.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c ---- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200 -+++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200 -@@ -57,6 +57,10 @@ - */ - - #include -+#include -+#include -+#include -+#include - #include "cryptlib.h" - #include - #include -@@ -71,7 +75,25 @@ - { return(X509_CERT_DIR); } - - const char *X509_get_default_cert_file(void) -- { return(X509_CERT_FILE); } -+ { -+ static char buf[PATH_MAX] = X509_CERT_FILE; -+ static int init = 0; -+ if (!init) { -+ init = 1; -+ char * s = getenv("OPENSSL_X509_CERT_FILE"); -+ if (s) { -+#ifndef OPENSSL_SYS_WINDOWS -+ if (getuid() == geteuid()) { -+#endif -+ strncpy(buf, s, sizeof(buf)); -+ buf[sizeof(buf) - 1] = 0; -+#ifndef OPENSSL_SYS_WINDOWS -+ } -+#endif -+ } -+ } -+ return buf; -+ } - - const char *X509_get_default_cert_dir_env(void) - { return(X509_CERT_DIR_EVP); } diff --git a/pkgs/development/libraries/openssl/no-date-in-library.patch b/pkgs/development/libraries/openssl/no-date-in-library.patch deleted file mode 100644 index 3eb501dfa02..00000000000 --- a/pkgs/development/libraries/openssl/no-date-in-library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur openssl-1.0.1f.orig/crypto/Makefile openssl-1.0.1f/crypto/Makefile ---- openssl-1.0.1f.orig/crypto/Makefile 2014-01-06 15:35:56.000000000 +0100 -+++ openssl-1.0.1f/crypto/Makefile 2014-04-09 13:05:28.071346204 +0200 -@@ -57,7 +57,7 @@ - echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ - echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ - echo ' #define PLATFORM "$(PLATFORM)"'; \ -- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ -+ echo " #define DATE \"Thu Jan 1 00:00:01 UTC 1970\""; \ - echo '#endif' ) >buildinf.h - - x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ebe98e8ab7..90325f9b38f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7109,15 +7109,6 @@ let }; }; - # bitcoin 0.9.3 requires openssl 1.0.1j - openssl_1_0_1j = callPackage ../development/libraries/openssl/1.0.1j.nix { - fetchurl = fetchurlBoot; - cryptodevHeaders = linuxPackages.cryptodev.override { - fetchurl = fetchurlBoot; - onlyHeaders = true; - }; - }; - ortp = callPackage ../development/libraries/ortp { srtp = srtp_linphone; }; From 701251e43580388fc185f4d6554d27b6448e9baf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Mar 2015 20:01:17 +0100 Subject: [PATCH 336/947] r-modules: update from CRAN state at 2015-03-21T20:01:16+0100) --- pkgs/development/r-modules/cran-packages.nix | 444 ++++++++++--------- 1 file changed, 235 insertions(+), 209 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 1084ee65724..1661152664f 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -83,14 +83,14 @@ BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j 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]; }; -BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; }; +BAMMtools = derive { name="BAMMtools"; version="2.0.4"; sha256="1cy7lplw2i8dabipmjnclywh36agj37hmqcwsk0x99dl6k3mb3d7"; depends=[ape]; }; BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; }; BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; }; BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; -BBEST = derive { name="BBEST"; version="0.1-2"; sha256="1zfnd379xgj29g8cld19w8ali1ny30l1q7ca47ykf07myj62ckv0"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; +BBEST = derive { name="BBEST"; version="0.1-3"; sha256="0ys314bbic4yvgfsbpdhy918z3zjpg2km96v9z6vipcm4vnmsj6a"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; }; BBmisc = derive { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; }; @@ -100,13 +100,13 @@ BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mh BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; }; BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; -BDgraph = derive { name="BDgraph"; version="2.16"; sha256="0vwygz464wbawamjnkclp9kqlb42s993fc0kp6aql413dhsqmg74"; depends=[Matrix igraph]; }; +BDgraph = derive { name="BDgraph"; version="2.17"; sha256="03r44x6wvnirw46hq1kjvj12n83l8d9wzdxxivxw6rdi7pvv51yz"; depends=[Matrix igraph]; }; BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; }; BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; }; BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; }; BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; }; -BGPhazard = derive { name="BGPhazard"; version="1.1"; sha256="0wfwc97fakhv63wgjln5fdz558z1890zmi0m5ai46bjhda1rbx3f"; depends=[survival]; }; +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=[]; }; BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; }; @@ -140,8 +140,8 @@ BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45m BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; }; BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; }; BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp Rcpp]; }; -BatchExperiments = derive { name="BatchExperiments"; version="1.4"; sha256="1px1id2jd34vknlygljqd3cwq6bwch8jfb2npq59cvvwlxxx4qpc"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; -BatchJobs = derive { name="BatchJobs"; version="1.5"; sha256="1aa41rlj0n0mw03kb5n645shfrm18y5snpmlm5hm6fmlvrykqn4p"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; +BatchExperiments = derive { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; +BatchJobs = derive { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; BayClone2 = derive { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; }; BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; @@ -150,9 +150,8 @@ BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lh BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mvtnorm Rlab truncdist mnormt rootSolve]; }; 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.10-2"; sha256="1kb7dbxnjsn7nppwqrn3znb6j7zfldn9xy4f6jfyq9n411zbf8xy"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; }; +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.2"; sha256="1mbi4lb7bjpmkwc3ns3mfvmfqr85pfx85rkcq95pl91saxichs4s"; depends=[truncdist GIGrvg normalp Formula]; }; -BayesLCA = derive { name="BayesLCA"; version="1.6"; sha256="1f7xmq3pni68s112k0hvdhag7nqgmm84hhycbm88cyvkdjd0kfba"; 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]; }; BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; }; @@ -222,6 +221,7 @@ CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih9 CARBayes = derive { name="CARBayes"; version="4.0"; sha256="1v5pl1hfmmmlcnl324g45playkki20n33w4p5g536260kva74zly"; depends=[MASS Rcpp truncdist spam coda sp Rcpp]; }; CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; }; CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; +CARLIT = derive { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; }; CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; }; CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; }; @@ -240,12 +240,13 @@ CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; }; CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; }; +CFC = derive { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58zraj2h51riacch2iyxl1ygspq"; depends=[abind]; }; 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=[]; }; CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; }; -CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6zqza435fd11kaqkdspl4mlnjjjca8j0gcfvdjxgc"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; }; +CIDnetworks = derive { name="CIDnetworks"; version="0.8.0"; sha256="183mv0jq2l2zvqywxkdnmkclm7wix96fll9m4ypdp782i0qil2rr"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; }; CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; }; CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; }; @@ -301,7 +302,7 @@ CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256 ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[systemfit statmod Matrix actuar Hmisc reshape2 MASS lattice tweedie]; }; ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; -ChemoSpec = derive { name="ChemoSpec"; version="3.0-1"; sha256="1c8ark711hy4a48pvn8n6c76ibxz8dbpymh3vykpx85a2csjzslv"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation clusterCrit speaq]; }; +ChemoSpec = derive { name="ChemoSpec"; version="4.0.1"; sha256="08z85g0r38xh57h3f4hdcg8wlaklpqmxvjla1562f3lxbqm1r9k1"; depends=[plyr rgl]; }; ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; }; ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; @@ -314,7 +315,7 @@ ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; }; ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; }; ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; -ClustVarLV = derive { name="ClustVarLV"; version="1.3.1"; sha256="0ilfpiah8jw11n4bnr7chgycldjkqp3xgq3majisiqfqn2ankxl3"; depends=[Rcpp Rcpp]; }; +ClustVarLV = derive { name="ClustVarLV"; version="1.3.2"; sha256="0lnrpvfkhsmjjaimxqjrvwv4wrh6mxl6ifr9dj1kfkmnparyp6fp"; depends=[Rcpp Rcpp]; }; CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; 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]; }; @@ -351,6 +352,7 @@ CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnn CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; }; CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; }; CoxRidge = derive { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; +Coxnet = derive { name="Coxnet"; version="0.1"; sha256="1q5si53hjgf3w10km3f0185ffhw57y96356vykfmdz8gm26w4sky"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; }; Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; }; @@ -374,8 +376,8 @@ DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwr DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[minpack_lm SDD TSA lattice]; }; DCGL = derive { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph]; }; DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; -DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; }; -DDD = derive { name="DDD"; version="2.6"; sha256="002i6256mm41cy7c6vac62dbjwch4bvz6z8w7vxk1qlj7zvnkifx"; depends=[deSolve ape ade4]; }; +DCluster = derive { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot spdep MASS]; }; +DDD = derive { name="DDD"; version="2.7"; sha256="06nnfn84vhfix8ks08y3kar2cpm63fqghf9y2dhgrnb4midpk5ig"; depends=[deSolve ape ade4]; }; DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; }; DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[XML foreign]; }; DECIDE = derive { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; @@ -427,17 +429,17 @@ DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbx 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.0"; sha256="025410mhhk085z2in30s765imgzs9rwp8ki1kgdfvyi2bcp6y2v3"; depends=[]; }; -DescTools = derive { name="DescTools"; version="0.99.9"; sha256="19zz8jnhs87klzh6c6kxaq34kacfb80zrm54qywkj9627gv4ngn6"; depends=[boot mvtnorm]; }; +DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; }; 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.4"; sha256="0lzfhg9pxcv3qrm71sgbmra69b1yjjl6xvf82xsnd7d0k9sk3yn3"; depends=[htmlwidgets rstudioapi]; }; +DiagrammeR = derive { name="DiagrammeR"; version="0.5"; sha256="1h8j4yahn7w7lf0fsv3rb4zlm3806106n7x23m673cmczqyq7m32"; depends=[htmlwidgets rstudioapi V8]; }; 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.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; }; -DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; }; +DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; }; DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula rgl maxLik]; }; @@ -463,7 +465,7 @@ DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3j DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; }; 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"; sha256="1lccwg3yvv2i5xhqaws0ja7xbi66g728s7p2s037r6i3dahi86w4"; depends=[ggplot2 stargazer shiny compare]; }; +DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[ggplot2 stargazer shiny compare]; }; 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]; }; @@ -473,7 +475,7 @@ EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; EFDR = derive { name="EFDR"; version="0.1.0"; sha256="086vk3nff3mcpmh1js2b8wqzpjzdjvlh34fsk3l6sl066gfz49j7"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; }; EGRET = derive { name="EGRET"; version="2.1.1"; sha256="140hijnwrksi658fn9bfsgrvfkpsix7zhwl4zf4flayrkmbs5i5f"; depends=[dataRetrieval survival fields lubridate]; }; -EIAdata = derive { name="EIAdata"; version="0.0.2"; sha256="1zh2nvr11l0ip7q84pzmn36q5d5zrgh0h8zwy7bnsxv5am6z27p2"; depends=[XML plyr xts zoo]; }; +EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[XML plyr xts zoo]; }; EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; }; @@ -529,8 +531,9 @@ 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=[]; }; EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; -EnvStats = derive { name="EnvStats"; version="1.0.3"; sha256="03wcqv4v14wkrrfi68qinaza3fbspw2a1pv1rm5nshcp8hw38qga"; 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]; }; 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]; }; @@ -558,9 +561,9 @@ FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8 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]; }; -FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; }; +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.2"; sha256="15xp2sdzz4ipp4h89xjws47vn7iwrkgqgcwbj5957hz038gdkam1"; depends=[mvtnorm]; }; +FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; }; FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; }; FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; @@ -601,7 +604,7 @@ FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqq FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1mrcgdm13xqrca63xhpyarkq5fg7hv0ncs68s1h"; depends=[MASS ellipse lattice cluster scatterplot3d leaps flashClust]; }; 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.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; }; +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]; }; FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; }; @@ -646,10 +649,10 @@ Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mf FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; }; FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; -FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; +FuzzyStatProb = derive { name="FuzzyStatProb"; version="2.0"; sha256="06s45w18airrrs5ppy325idv4yi6nf69nrs18gha55kb2xvjq3km"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; }; -G2Sd = derive { name="G2Sd"; version="2.1.2"; sha256="16rivywmax264vvhfk1liid4g87k4b07y0imv4nz01rscxc7lv9h"; depends=[shiny xlsx rJava xlsxjars]; }; +G2Sd = derive { name="G2Sd"; version="2.1.3"; sha256="02j30mfrzi4q3a387i0cr4khj2hzf7jrlyj06qc8bwlhz0f4l35m"; depends=[shiny xlsx rJava xlsxjars reshape2 ggplot2]; }; GA = derive { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; }; GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; }; GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; @@ -658,6 +661,7 @@ GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifz GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; 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]; }; GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; @@ -666,7 +670,7 @@ GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fiz GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; }; GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; -GENLIB = derive { name="GENLIB"; version="1.0.2"; sha256="0zqzx5rx8x87j0x5628r29lga0smh79h26jbgczd3l7kx9dh18rr"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; +GENLIB = derive { name="GENLIB"; version="1.0.3"; sha256="0c1x9kjff1071d0jkzjhj9j6syb442r0a4d929daq6j9jcbly4q6"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; }; GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; }; GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; }; @@ -710,7 +714,7 @@ GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; }; GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp Rcpp BH]; }; GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; }; -GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; }; +GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; }; GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; @@ -787,7 +791,7 @@ HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp2 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; }; HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; }; HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; }; -HSAUR3 = derive { name="HSAUR3"; version="1.0-3"; sha256="0v7nvgybfkwzii1019p8yxnbny5y1y1nrqaa81xagi8a1f1klrzl"; depends=[]; }; +HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; }; HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[lattice coda MASS MCMCpack]; }; HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; }; HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; }; @@ -812,12 +816,12 @@ HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; }; HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; }; HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; }; -HistDAWass = derive { name="HistDAWass"; version="0.1.1"; sha256="19nc5wggpii6fpzw6ggcq66s84ydvy50aa7dgwgr2p55j2lqig9b"; depends=[FactoMineR class]; }; +HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[FactoMineR class ggplot2 histogram]; }; HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; }; HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; }; Hmisc = derive { name="Hmisc"; version="3.15-0"; sha256="0i2k64yji4c3sicfa89af220hz48hz74dqjfqdjs0417nzs5sn8q"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign]; }; -Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1n6rarygdfqi7rjdqxi5j3xn1pzakvyfp5q9h9173vypxbmrk5p7"; depends=[TimeWarp]; }; +Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; }; HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; }; HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; }; Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; @@ -872,6 +876,7 @@ IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99 InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; }; Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; +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.1-4"; sha256="01yjkqj1k7haa75avcqhkxjm6569c2ds8fydz3spcmx37l2xafdp"; depends=[glmnet mboost]; }; @@ -889,7 +894,7 @@ JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqac 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]; }; -JMbayes = derive { name="JMbayes"; version="0.6-1"; sha256="1zshy4v7jj3r1vcp9yrw1jj5abmc8wkglsxdb5v6rpmk4xwhvvcq"; depends=[MASS nlme survival]; }; +JMbayes = derive { name="JMbayes"; version="0.7-0"; sha256="03cm3h2f4m96bhpgk53c4g5mpypc3b6s63srlyrx8ndwgx0aqzf3"; depends=[MASS nlme survival]; }; JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; }; JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; @@ -937,9 +942,9 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; }; LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; -LLSR = derive { name="LLSR"; version="0.0.1.9000"; sha256="06n9zhrd4y38azqa4i8plgkzi8y3l7hlhxgqgmdjqck50gvd5s9d"; depends=[rootSolve]; }; +LLSR = derive { name="LLSR"; version="0.0.1.9015"; sha256="1dmk7km1qbc9m90qh8dp95g44jxqhvama9svzyh7vqxpww2hs9sb"; depends=[rootSolve]; }; LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; }; -LMest = derive { name="LMest"; version="2.0"; sha256="0fv38rb9hwlbay632hhb58vga48sq89chm5qn61l6mf3wfkx2rcg"; depends=[MASS MultiLCIRT]; }; +LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; }; LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; }; LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; @@ -997,7 +1002,7 @@ MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; }; MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; }; -MASS = derive { name="MASS"; version="7.3-39"; sha256="08h94j5zcf8sgg2bynnhq2wcysw3rvzdw4hcp1il3y38i6d31zgm"; depends=[]; }; +MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; }; MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; }; MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; }; @@ -1016,6 +1021,7 @@ MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrm MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; }; MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; }; 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.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; }; MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; @@ -1069,6 +1075,7 @@ MPV = derive { name="MPV"; version="1.35"; sha256="0mfg05w7zx5my7g60yvbk2fiakrds 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.0"; sha256="17p3syy1n00vanisc0r8l8g5v7f3xdbvqbg9p6zsxirdpm9mq075"; depends=[Rcpp RANN spam Matrix ROCR fields mritc oro_dicom oro_nifti 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]; }; @@ -1086,7 +1093,7 @@ MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2 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.8"; sha256="0n33bp8iqj4dmm4p5vgj32dcaqxqrscv4wy9471hh3wwq938cnag"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; +MVN = derive { name="MVN"; version="3.9"; sha256="1l6bib1gl5nj7p1dk6mbmflp9p5sgm405q3l53pqmq09jm55flh6"; 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]; }; @@ -1149,7 +1156,7 @@ Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla56 ModelGood = derive { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; }; Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; }; -MonetDB_R = derive { name="MonetDB.R"; version="0.9.5"; sha256="0j5b2i1yyk4d6mqm2i3fijmmgp1fzi37rilxcikbc517mzsk4f7p"; depends=[DBI digest]; }; +MonetDB_R = derive { name="MonetDB.R"; version="0.9.6"; sha256="0mi7sxiqdih3lh0ki70cmr1qp62cqr2s88s0jjqcbigxsc1n7gg6"; depends=[DBI digest]; }; MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; }; Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; }; MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; @@ -1171,18 +1178,17 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; -NAM = derive { name="NAM"; version="1.0.2.2"; sha256="1p2c95fiv1mb5ja3l6d8scnvlbmiwwgbln24z7nqwpmskc5d6dbd"; depends=[Rcpp Matrix missForest Rcpp]; }; +NAM = derive { name="NAM"; version="1.1"; sha256="1iiwbfwdjsv8mdgqn7819x36675mz345djf1dbyni0h46dpc1q4w"; depends=[Rcpp Matrix missForest Rcpp]; }; NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; }; NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; -NCBI2R = derive { name="NCBI2R"; version="1.4.7"; sha256="1hjjnkwv5dxisa6amd9bb9l4g4c4525ykg1vnjr31csg5vmzvyfx"; depends=[]; }; NCmisc = derive { name="NCmisc"; version="1.1.3"; sha256="051qbqsvqb5wivba8msdhswfg0cxyxnyp601zgb1zvzcnbrffimg"; depends=[proftools]; }; NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; 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]; }; -NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; }; +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-6"; sha256="19ynrfzj70swlk6z1r8bh23dzdk2qk8z0bk3xn39vpv0wplyc9i3"; depends=[]; }; @@ -1192,8 +1198,8 @@ NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hvb932wf9vp0r5992g3wbfnphs29g"; depends=[]; }; NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; +NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; }; NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; -NPBayesImpute = derive { name="NPBayesImpute"; version="0.4"; sha256="0r2b878xs2vjvskhz63cyizaa7qfw06sq120m8xnm5ra4r55c0fc"; depends=[Rcpp Rcpp]; }; NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; }; NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; }; @@ -1202,12 +1208,11 @@ NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby01 NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; -NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; }; NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; }; -NSM3 = derive { name="NSM3"; version="1.1"; sha256="0xyx06pc9690akdm02597pgcchn29gvc4kzcgyc3ihsjj71xryi2"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; }; +NSM3 = derive { name="NSM3"; version="1.3"; sha256="0vmv7r499ig2fq2gwx78jdrflk5i55jy3vgjh87ygwlyhwj9cm8p"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; }; NSUM = derive { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; }; -NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; }; +NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.19"; sha256="0nrhsg32f6381snsxivcnznl752y9jmdscrcn1j8xylwmwc0r4hj"; depends=[gdata]; }; NbClust = derive { name="NbClust"; version="2.0.4"; sha256="01r76gfg1lyajkh5x18pcqzp8iw0g3kfq5q8liv351l9wgykj34g"; depends=[]; }; NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; }; @@ -1324,11 +1329,11 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; 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]; }; -PRISMA = derive { name="PRISMA"; version="0.2-3"; sha256="0fzisdr08r8dvdjlljsspvc0sqcnn8cqlb75lkccw0dfkc43snpg"; depends=[Matrix gplots ggplot2]; }; +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=[]; }; PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; }; -PReMiuM = derive { name="PReMiuM"; version="3.0.32"; sha256="03hs56vhl2xxxy2mza6cp0zivr1p596x5jj4y8f63jy0mygk62x8"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; }; +PReMiuM = derive { name="PReMiuM"; version="3.1.0"; sha256="0k8fffsbbdknmv1vshb72mdh7qfdqkrrh41s0ld64ziwnmp3gz23"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; }; PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[MASS Formula rms sandwich actuar]; }; PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; }; PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; @@ -1354,7 +1359,7 @@ PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf7 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.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; }; -PerFit = derive { name="PerFit"; version="1.2"; sha256="1m0s51k497ks4y5253sw1aq5cdkhfkr70mz31xk01c50v11mb268"; depends=[ltm irtoys]; }; +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=[]; }; PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; @@ -1377,7 +1382,7 @@ PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; }; PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; }; Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; }; -PopED = derive { name="PopED"; version="0.1.2"; sha256="1rwmpbs3zhkhhfg19n23i3821i2vdn1w4fqqvyqsfjdmnasxsg91"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; +PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; }; PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; }; @@ -1501,7 +1506,7 @@ RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0z 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]; }; RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; -RGA = derive { name="RGA"; version="0.2"; sha256="0swldzk7q8drjs8ca7ibbkrrgi4mbwf6hvc1jdq4aswqay783vl4"; depends=[httr httpuv RCurl jsonlite shiny]; }; +RGA = derive { name="RGA"; version="0.2.1"; sha256="14fyd65n75m4xjdp019xdp3sa6h6j3ip6yr42b4nn1cxgkjplbnm"; depends=[httr httpuv RCurl jsonlite shiny]; }; RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; }; RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[copula RGENERATE blockmatrix Matrix stringr RMAWGEN]; }; @@ -1539,7 +1544,7 @@ 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.9"; sha256="1z7hh9fwaaiwa2s27vrc3yckqc0vhimazqj71601ibsqs3pljzh8"; depends=[snowfall matrixcalc msm coda]; }; +RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; 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.2"; sha256="1yzlldgnncbd8aqkhphnwb8bk164ds4ql3hq1h2qdlicf6x806kz"; depends=[DBI]; }; @@ -1553,6 +1558,7 @@ RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjs ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; }; ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; }; ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; }; +ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; }; ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; }; ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive { name="RODBC"; version="1.3-11"; sha256="1j6qv7w4klgwzdx9jf6h4l1x1idn3rka70ql37pbnzga1h5dr9yy"; depends=[]; }; @@ -1612,8 +1618,8 @@ RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax5 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; RUnit = derive { name="RUnit"; version="0.4.28"; sha256="0p631cg014m7linml2770g260ml0jj74d5w82ddl1p2zs5yq57hx"; depends=[]; }; -RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-41"; sha256="039263c10wlj4xyb696mcidndm1vkxwrghramvvgyivd7ybk3flw"; depends=[ade4 boot car lme4 MASS mixOmics statmod]; }; -RVFam = derive { name="RVFam"; version="1.0"; sha256="1r09k5cdm2ajxdg6p78yl43b9sn2vzsfzkmjn0p3mm6z1s7kpw1k"; depends=[coxme survival lme4 kinship2 MASS Matrix]; }; +RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hmkc34qgi942i4pnw61lk0z6kd4j9424zqqscm77zscfmrmcw"; depends=[ade4 boot cramer car lme4 MASS mixOmics multcompView nnet pspearman statmod vegan]; }; +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]; }; @@ -1639,7 +1645,7 @@ RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l2 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.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; }; +Rarity = derive { name="Rarity"; version="1.3-1"; sha256="0l2sz254s5jydv5f15ilrnna2mih06ipsy9lbdi2si3j221vq9k3"; 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]; }; Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; @@ -1662,7 +1668,7 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256=" RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; }; RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; -RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.1"; sha256="1xc7vfir941v65awq2glawbcwq28s5h73ffh41hb5aaazaism1m5"; depends=[mixlm MASS pls xtable Rcmdr]; }; +RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[mixlm MASS pls xtable Rcmdr]; }; RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; }; RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[Rcmdr ROCR pROC ResourceSelection]; }; RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; }; @@ -1705,7 +1711,7 @@ RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5 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.4"; sha256="05qqp64ci499qnd121a3hz8fwirw01p4rwldw9saq3v3pfkw2fam"; depends=[]; }; +RcppParallel = derive { name="RcppParallel"; version="4.3.6"; sha256="007jbx16kixnk4b3081iplwa3qjdaqr4jbikhw0fsfdg2ws1ps2s"; 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.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; @@ -1777,7 +1783,7 @@ Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; }; Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; }; RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; -RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; }; +RoughSets = derive { name="RoughSets"; version="1.2-0"; sha256="04z47dsws39rg34fisr0favl0ar1vqhvzmafb5sf4d62h2r6rvdl"; 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]; }; Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; @@ -1803,6 +1809,7 @@ Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5l Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; }; Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; +RxnSim = derive { name="RxnSim"; version="1.0"; sha256="0693kl58jipgnsdrh9rim5w6mb3b4wvxh7glzy1ahnxv648brlwz"; depends=[rJava fingerprint 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]; }; @@ -1814,7 +1821,7 @@ SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mv 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="0.9.3.9.2"; sha256="1faky3155vh54r450r4dndn5749kp09bilyq8n7n7rls0dl5k34m"; depends=[coda DiceKriging]; }; +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]; }; SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; @@ -1851,7 +1858,7 @@ SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6 SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[survival MASS glmnet]; }; SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; -SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; }; +SIS = derive { name="SIS"; version="0.7-5"; sha256="197zf4s4f5wm8sl9h5vxwywmml7n05fwqlxbldn6wkpxix7gx0xm"; depends=[glmnet ncvreg survival]; }; SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; }; SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; @@ -1933,6 +1940,7 @@ SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9x SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; }; +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=[]; }; @@ -2033,7 +2041,7 @@ TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; }; TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; }; -TDboost = derive { name="TDboost"; version="1.0"; sha256="1qiwz35i89lv95v3x5s28q0mkrvcfs1cfn4l0a5spvnyhy4kcacc"; depends=[lattice]; }; +TDboost = derive { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; }; TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; }; TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; }; TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; }; @@ -2056,7 +2064,7 @@ 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="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; -TSP = derive { name="TSP"; version="1.0-10"; sha256="1bwafpbg1w8wbn4ww4zq042n5dcs9lmrhbhkpmra0v5jhjgfvi3i"; depends=[]; }; +TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; }; TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; @@ -2117,6 +2125,7 @@ TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwb TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; }; UBCRM = derive { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; +UNF = derive { name="UNF"; version="2.0"; sha256="0pdk43d6cspmh1p7172fzr7082yqjk7gxq6n4a59388amwgdg0f2"; depends=[base64enc digest]; }; UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; }; USAboundaries = derive { name="USAboundaries"; version="0.1.1"; sha256="18bk37lhrlp5j0496n956881zl88inliylmgh1p2nlkv4f195yd0"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; }; UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; @@ -2132,7 +2141,7 @@ VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb2 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; }; VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19b67jvw0lzxz7pzffzdbv9mj806"; depends=[]; }; -VGAMdata = derive { name="VGAMdata"; version="0.9-5"; sha256="0cmb0zy2sbwsn4rpc6w4885gvamyjvyp53wn9934mwdvigm63wj9"; depends=[]; }; +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=[]; }; VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; }; @@ -2143,6 +2152,7 @@ VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgsln 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]; }; VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; +VarSelLCM = derive { name="VarSelLCM"; version="1.0"; sha256="1i0s4kdqgfh79bk5ipd9fn6m3yl1qgn9gzn62kxx7vfiy683x0a2"; depends=[Rcpp mclust 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]; }; @@ -2211,7 +2221,7 @@ abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfj abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; 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-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; 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]; }; @@ -2273,8 +2283,8 @@ allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpj alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; }; 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.3.1"; sha256="02k4jc1s7qc6l3h9s9w7714bh606593mvhsbqk5vm9ga3320m48k"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; -alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; }; +alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; +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]; }; alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; @@ -2354,13 +2364,14 @@ aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gs aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; 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.3.1"; sha256="0anm8k31kgvbdkzid2f9mg7ivdrihwb6g1i82jqpljbwvmkp0fmw"; depends=[baseline multitaper fields]; }; +astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[multitaper IDPmisc fields]; }; astrodatR = derive { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; astsa = derive { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; }; asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; }; atmcmc = derive { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; +atsd = derive { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[RCurl httr]; }; attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[survival boot]; }; audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; }; @@ -2383,10 +2394,10 @@ bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iy bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; }; bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; -bartMachine = derive { name="bartMachine"; version="1.1.1"; sha256="1gc98s5inp5ka9ax6rykac9ij0cymp7bjwl3vxrmwmfsghvx4rc5"; depends=[rJava car randomForest missForest]; }; +bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[rJava car randomForest missForest]; }; base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; }; base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; }; -baseline = derive { name="baseline"; version="1.1-4"; sha256="1xwkbrqwcf1q6s65inzczgzbknwlqq7m84lph5rkwncjxid2h4lz"; depends=[SparseM]; }; +baseline = derive { name="baseline"; version="1.2-0"; sha256="12gjirk9jyq7lmfkp10kcli84bld9n9m6yhcj5z6y4iaq6d8hazq"; depends=[SparseM]; }; basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; }; batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; @@ -2395,7 +2406,7 @@ bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0w 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.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; }; -bayesLife = derive { name="bayesLife"; version="2.1-3"; sha256="1ashgfzjjnvj8h4896y4maj3gfx9v4fginjli1wdkcgcgi1d6gkr"; depends=[bayesTFR wpp2012 hett car coda]; }; +bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR wpp2012 hett car coda]; }; bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; }; bayesPop = derive { name="bayesPop"; version="5.2-2"; sha256="1m1vvbipf903s7a5vm7pad3l8ykj74ilrkpyc4ydqzpyqg4k4npj"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; @@ -2436,7 +2447,6 @@ beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8v benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; }; benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; -bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; }; ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; }; bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; }; @@ -2444,7 +2454,7 @@ betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1w betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; }; betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; }; betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; }; -betas = derive { name="betas"; version="0.1.0"; sha256="0a8z8c4i2pbnmpylggdr7bv5iw5jmcjwfqlykdj7pfjkjadb8nj4"; depends=[robust]; }; +betas = derive { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; betategarch = derive { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; }; bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; @@ -2456,7 +2466,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.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; }; +biclust = derive { name="biclust"; version="1.1.0"; sha256="0ffsgjg7dvr5nh238abhawz9k775szh8lxl75bqjvxgqiv07f3hc"; 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]; }; @@ -2470,7 +2480,7 @@ bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilw 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]; }; -bigsplines = derive { name="bigsplines"; version="1.0-5"; sha256="0dmm7q7cznhpqy5j955q4mlwrjfiinxlh17g9xlpqjncrzbivxh6"; depends=[]; }; +bigsplines = derive { name="bigsplines"; version="1.0-6"; sha256="03gan2wrsi2hfxhn3l05qd0x04x8ymkab9aqpfbfn59m296xhd3m"; depends=[]; }; bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; }; bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; }; bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; @@ -2486,7 +2496,7 @@ binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3y binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; -binr = derive { name="binr"; version="1.0"; sha256="0wgc78kx51qfn5wfzll5nz8iwanixkyb5sbqwi40fak93bvycklm"; depends=[]; }; +binr = derive { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; }; bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; }; @@ -2498,20 +2508,21 @@ biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl25 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; +biosignalEMG = derive { name="biosignalEMG"; version="1.0"; sha256="0rvicx851vmlc15s9jzj4vmwq2f3qwlz3j1wjb0i2lznkzwyzxnw"; depends=[]; }; biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; }; bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; }; biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; }; bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; -bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; }; +bisoreg = derive { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap monreg R2WinBUGS coda]; }; bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; }; bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; }; biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; -bizdays = derive { name="bizdays"; version="0.2.1"; sha256="1n8dv2damcfbxs0bq7icbw74invai2799al5vipp1mr09qlwsg02"; depends=[]; }; +bizdays = derive { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; }; blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; 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]; }; @@ -2551,7 +2562,7 @@ bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; }; -boottol = derive { name="boottol"; version="1.0"; sha256="16nmi1x0057rl9gwx5sz5vk4rzzzh2zfifzs09rl92vcc77c3y2z"; depends=[boot plyr sqldf]; }; +boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda R2jags mvtnorm fishMod MASS]; }; 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=[]; }; @@ -2608,8 +2619,8 @@ capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapkl capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; }; -cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; }; -care = derive { name="care"; version="1.1.7"; sha256="0lgas00qp1cvn3cbimxlli99czvkh6b9hxahzif5fgbnfik4d47y"; depends=[corpcor]; }; +cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot pastecs lattice]; }; +care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; }; caret = derive { name="caret"; version="6.0-41"; sha256="0dwh6j1gvyd34my88kykrpifmnj3slp8q1if5vi428hp1p151cz7"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; }; caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; @@ -2661,8 +2672,8 @@ 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.1"; sha256="014wpncs7j488wm0b0ibvz9160mbz8n383wksqp7xk1cp7kpp0qg"; depends=[]; }; -checkpoint = derive { name="checkpoint"; version="0.3.3"; sha256="1pxmaxbm6x1k3c82z2lng869jg9szxi3yn8kxni5w52whihb67xj"; depends=[knitr]; }; +checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; }; +checkpoint = derive { name="checkpoint"; version="0.3.9"; sha256="1qgjma8nbg4gixzj44q4zr24kca1bnznrnksqpjjy58vxi69s61n"; depends=[]; }; cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; }; chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; }; @@ -2670,21 +2681,21 @@ chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6 cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; }; childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; }; chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; }; -chipPCR = derive { name="chipPCR"; version="0.0.8-6"; sha256="1cn5ky1grdsipgldwxz8b3xcmr9djyx7bk9xnpgm2f3x68vvsr7y"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; +chipPCR = derive { name="chipPCR"; version="0.0.8-8"; sha256="1wvk16maj5i8wla8djbrdk3bdkirq2jz115gg7cpkfyxg5ig4la9"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chngpt = derive { name="chngpt"; version="2014.12-2"; sha256="1bg2hm5clvq1rj1mnj5fasbwmq0xayj327kwclajami4zcwjwqj5"; depends=[kyotil MASS]; }; choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; }; -choroplethr = derive { name="choroplethr"; version="2.1.1"; sha256="1d7i5lk3j37n4fs4k41jdh829n4qyx85h0sr7h3fb313an3aqhd2"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; +choroplethr = derive { name="choroplethr"; version="3.0.0"; sha256="1fj0gklqcr884l42c78crn6f7s5rk336ywlnqqm5ba7kxjs464k5"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; }; choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; }; chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; }; chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; }; chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; }; cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; -circlize = derive { name="circlize"; version="0.2.3"; sha256="1ypb0bv63n89ydsx44jzjpbb382cy1cvdxfm6arv68san85fd1is"; depends=[GlobalOptions]; }; +circlize = derive { name="circlize"; version="0.2.4"; sha256="0zxd8jcim03cg77zxq9dvwlki51s9jhyaycdif7q6qc598lwwjx1"; depends=[GlobalOptions shape]; }; circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; -cit = derive { name="cit"; version="1.3"; sha256="05gr9pb01l4rs79rpgcj8mds61n3kv50fgcw2bcibzs1d1za33ig"; depends=[]; }; +cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; }; citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[sandwich lmtest ggplot2]; }; @@ -2700,7 +2711,7 @@ clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v 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]; }; 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"; sha256="0r6y3ylxdfkbhrx4vbzs1f7y86gdfny3dxzskc48l3qv75q5276m"; depends=[PCICt caTools Rcpp]; }; +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=[]; }; @@ -2719,8 +2730,8 @@ clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256=" clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; -clusterSEs = derive { name="clusterSEs"; version="1.1"; sha256="1dbc7177mx6g0ds1biy6kwhlj0maqdb65zqlrdn6086d4i3s3xng"; depends=[sandwich lmtest mlogit]; }; -clusterSim = derive { name="clusterSim"; version="0.44-1"; sha256="18l643w3zps3bhldc5z9zqa5sy1c459r0hrzb26ykydnh8xbahdy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; +clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62xrdj4cr6w63gig3dyjmdq8m937g8qsmhd74lz"; depends=[sandwich lmtest mlogit]; }; +clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; 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]; }; clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; }; @@ -2746,7 +2757,7 @@ cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; }; 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-10"; sha256="0giqf14kmqps181jfb78mgii1852rp4kz0k96pabm4h0yv02b49j"; 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]; }; 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=[]; }; @@ -2757,7 +2768,7 @@ coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; -colorspace = derive { name="colorspace"; version="1.2-5"; sha256="1215nn2gczbxpvpwl1szbs0ibxihycfqc74wk6c166ni6515zi1z"; depends=[]; }; +colorspace = derive { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; }; colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[XML RJSONIO png]; }; comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; }; @@ -2794,7 +2805,7 @@ conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9p conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; }; contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; -conting = derive { name="conting"; version="1.4"; sha256="0ykyyzal2pcyrh8q65d4pab8a8nal9x276q2624jb9nhbb65vz4k"; depends=[mvtnorm BMS gtools tseries coda]; }; +conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[mvtnorm BMS gtools tseries coda]; }; contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; }; convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape geiger MASS phytools cluster]; }; cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; }; @@ -2838,7 +2849,6 @@ cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhf 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]; }; -cqrReg = derive { name="cqrReg"; version="1.1"; sha256="0apgkb9lkqgl5a10m80m3i9zly0k9v45y1y689dsjbdlvmqhdan6"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; }; cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; 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]; }; @@ -2924,7 +2934,7 @@ dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; }; dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; -dbmss = derive { name="dbmss"; version="2.1.2"; sha256="0rvmxlpy3745y4zfcf6wi6z2nb3vwd92cliyvh6k0ppgq6r7l2q0"; depends=[spatstat Rcpp cubature Rcpp]; }; +dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[spatstat Rcpp cubature Rcpp]; }; dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; }; dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; }; dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; }; @@ -2940,7 +2950,7 @@ deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmab 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]; }; -decode = derive { name="decode"; version="1.0"; sha256="03r0b3igk687n8xh2p7c7ii87bj8ihny2h0qcrciql9cjwvxkala"; depends=[]; }; +decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; }; decompr = derive { name="decompr"; version="2.1.0"; sha256="0b24wb2n2g1qf5v60hrazfzy211y1f2v9mkx013msb0a89a7bi45"; depends=[]; }; decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; @@ -3004,7 +3014,7 @@ digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5j 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=[]; }; -directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wxfkad7vxzfqwdmhcxfa5jml4hlvkhgv1r"; 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=[]; }; disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; @@ -3015,7 +3025,7 @@ discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2q discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; diseasemapping = derive { name="diseasemapping"; version="1.1.7"; sha256="1sxvvs7sprjqzd8h51xk6i7jw8081bxzqxllqqhlz105g8czqpwi"; depends=[sp]; }; diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; }; -dismo = derive { name="dismo"; version="1.0-5"; sha256="1zzzj4r96a35ghngszym1dg1wbr8mvinn7cvmqwnnjn3c2zq4w0g"; depends=[raster sp]; }; +dismo = derive { name="dismo"; version="1.0-12"; sha256="1zm3z9z2ramsp85x96rrnmj5zabm8r7f0wfxrxg2sgddwwqvxpsv"; depends=[raster sp]; }; disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; disparityfilter = derive { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; }; displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; @@ -3047,6 +3057,7 @@ dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; }; +dmm = derive { name="dmm"; version="1.5-1"; sha256="0rblwhlr0gms7zlxgfc6wajf9mphzk2xlg9dk1agd5pdnffljxb9"; depends=[MASS Matrix nadiv robustbase pls]; }; dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; }; dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; }; @@ -3112,7 +3123,7 @@ dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1m e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; }; eHOF = derive { name="eHOF"; version="1.5.7"; sha256="05xvhnq0c8ddpq4x7mncspwy2lh54pl76yz6y38ibw5p8c0gazbs"; depends=[mgcv lattice]; }; eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; }; -eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; }; +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.2.0"; sha256="11fkjl8bvzsalrwc0v6vmk2xkzd1np7z2frygckpy5kyr9zs9l5l"; depends=[plotmo plotrix]; }; @@ -3124,8 +3135,9 @@ ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; }; ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; }; ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; +eco = derive { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; }; ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; }; -ecoengine = derive { name="ecoengine"; version="1.6"; sha256="1dbg9y8hz7z385ml102y3akfffphg0llnyqg5iqblqann7nrzpsn"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; }; +ecoengine = derive { name="ecoengine"; version="1.9"; sha256="0a04zhq1qla55dg8k895slh4sz3h55qgd173q2vm9p9f2gi51w9i"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; }; ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[rootSolve shape diagram deSolve]; }; ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; }; ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; }; @@ -3165,7 +3177,6 @@ elliptic = derive { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; }; -embryogrowth = derive { name="embryogrowth"; version="5.1"; sha256="1irdx1zkp1k4hqi9c9hrckiy647nld2n9mgw9kx8gp771963n5rq"; depends=[deSolve phenology Hmisc]; }; emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; }; emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; }; emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; @@ -3186,7 +3197,7 @@ 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"; sha256="12xssw8vwbiv296khig0dhbz30swglqi1m9m3j97gzpc4fi8s4lv"; depends=[chron]; }; +ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; }; ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; }; entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; @@ -3223,6 +3234,7 @@ etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbns etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; 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.15"; sha256="01g8lc32i441cylwda5jf872gp1w1d6yx4zi2irybb9xmhha5zi2"; depends=[plyr tidyr]; }; evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; }; evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; }; evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; @@ -3299,7 +3311,7 @@ faisalconjoint = derive { name="faisalconjoint"; version="1.15"; sha256="08sb4za falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; }; falsy = derive { name="falsy"; version="1.0"; sha256="16j6j7kf5xlqg6m2sfdfgpcjf9grrcfh9ij0282hnirgl7a4cvjd"; depends=[]; }; fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; }; -fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; }; +fanc = derive { name="fanc"; version="1.22"; sha256="10j6nggwg76qaycmwi7n6nd7y660c46af82bni2g4jj3fhgkl7ks"; depends=[Matrix]; }; fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; }; faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; @@ -3327,12 +3339,12 @@ fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya 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.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; }; +fdakma = derive { name="fdakma"; version="1.2"; sha256="17nbaal3m2rz423fq34fia8pb75dzdzsj5d8w6g2iwckqbapszn0"; 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]; }; fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; -fdrtool = derive { name="fdrtool"; version="1.2.13"; sha256="0308w4cycapddmv7cg6i65j6wbdckdgnl4n63v06bi4j9dcznksj"; depends=[]; }; +fdrtool = derive { name="fdrtool"; version="1.2.14"; sha256="0q4mxm3vxhvxxbkgl9vxs3q93icipg9hz7qcr4vas8cks1hmzbdw"; depends=[]; }; fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; }; feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks rgl misc3d]; }; @@ -3343,7 +3355,7 @@ ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2 ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; }; 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-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; }; +fftwtools = derive { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; }; fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; @@ -3375,7 +3387,7 @@ flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; }; flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; }; -flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; }; +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=[]; }; flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; @@ -3393,7 +3405,7 @@ forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6 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]; }; -forestplot = derive { name="forestplot"; version="1.0"; sha256="1sv50zqsszkldwq87c2am4547lqqm8fp29ql1z0bdqi6j6mzjkc6"; depends=[]; }; +forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; }; formatR = derive { name="formatR"; version="1.0"; sha256="18wv05ijdymipnyxy5h34y3nbx42ifk79qiapfgx5fjjzpspq6q5"; depends=[]; }; formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; @@ -3430,17 +3442,17 @@ fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40k 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]; }; -ftsa = derive { name="ftsa"; version="4.1"; sha256="02m4w7yb26gcg9226h118jj75pwcc6r23p96c1kbsg5fccrfw8ff"; depends=[forecast rainbow colorspace MASS pcaPP]; }; +ftsa = derive { name="ftsa"; version="4.2"; sha256="0yph80a51lphv7kqrpcm01rga8pq3ngfimzada7lghycac9ab4rf"; depends=[forecast rainbow colorspace MASS pcaPP R2jags]; }; fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; }; fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; -funFEM = derive { name="funFEM"; version="1.0"; sha256="1jvax3ch21391f34gdd4yp8cbnrhl3sj9hny7slj2v0iq9iiz2wj"; depends=[MASS fda elasticnet]; }; +funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[MASS fda elasticnet]; }; 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]; }; futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; -futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; }; +futile_logger = derive { name="futile.logger"; version="1.4"; sha256="1sn28kmphjxxq1bqyjbsv75bnh71pwngcfar5l18jr8x9ymjq4zk"; 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]; }; futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; @@ -3498,12 +3510,13 @@ gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmb gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; 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]; }; gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; }; gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; -gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; }; +gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; }; gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; }; 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]; }; @@ -3514,7 +3527,7 @@ gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8la gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; }; -gdistance = derive { name="gdistance"; version="1.1-6"; sha256="1cla8gc6ffx0cd25w8v8wi3w306wld4kj6bcar0q6d7hd018kpir"; depends=[raster igraph Matrix sp]; }; +gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; }; gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; }; geeM = derive { name="geeM"; version="0.7.2"; sha256="0qxamrkmiy70g9kkncrwgh3gx8dq5ixfwbcl8k4dgf5i5051giw9"; depends=[Matrix]; }; geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; @@ -3522,13 +3535,13 @@ geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g 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=[]; }; -gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; }; +gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; }; gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; }; gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; }; -genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; }; +genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; }; @@ -3574,11 +3587,11 @@ ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzf ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj jpeg geosphere digest]; }; ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; }; ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; }; -ggplot2 = derive { name="ggplot2"; version="1.0.0"; sha256="138rxp8zr0x945ajmhg35x35xs0ci743iqhffqy90c7hcn0gpvz6"; depends=[plyr digest gtable reshape2 scales proto MASS]; }; +ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[plyr digest gtable reshape2 scales proto MASS]; }; ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; }; ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; }; ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; }; -ggvis = derive { name="ggvis"; version="0.4"; sha256="09q7ccg5lsj0qqixpiq4xccpqckr7g4ws7ysr5mac3sgl8hm9r87"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; +ggvis = derive { name="ggvis"; version="0.4.1"; sha256="1sl6ygglgsg7xhzzkxaap8pzb2zmfw0y481w7r7s1nyg7pdgr0r2"; 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=[]; }; @@ -3598,8 +3611,9 @@ gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2i glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; }; glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; +glmgraph = derive { name="glmgraph"; version="1.0.0"; sha256="1q3j2djw0v5187agnrfabhgwm6yh0i05yzxdaba3kgbcsdrdr8mn"; depends=[Rcpp Rcpp RcppArmadillo]; }; glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; -glmm = derive { name="glmm"; version="1.0.1"; sha256="1xsfxrc2lc3p0c2lwrrrw5y3yfxmmfjyqi3zwsad5l6bg08d6b6i"; depends=[trust mvtnorm Matrix]; }; +glmm = derive { name="glmm"; version="1.0.2"; sha256="0qlsqg1sp4p4qy95k52dc7c58lfmlxh0vk0jdpqzpi4rrh7ngpan"; depends=[trust mvtnorm Matrix]; }; glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; }; @@ -3619,7 +3633,7 @@ glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k 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-1"; sha256="14rm73h0kg7kb3dsd08mxbcp41y6a730nmpfnpndh4lsgkk6d5jb"; depends=[sandwich]; }; +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]; }; 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=[]; }; @@ -3650,6 +3664,7 @@ grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9j gramEvol = derive { name="gramEvol"; version="2.0-2"; sha256="1xrn5gkr9rxw53i5l2sqcgai9q0w4kyrychf0nq17cvcynw1y1lx"; depends=[]; }; granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; }; +graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[Rcpp Matrix glasso glmnet mvtnorm qgraph Rcpp RcppArmadillo]; }; 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-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; @@ -3677,12 +3692,13 @@ gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxx gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; }; gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc mvtnorm MCMCpack]; }; gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[mgcv mvtnorm boot numDeriv]; }; +gsheet = derive { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; }; gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; }; 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-21"; sha256="0zxai0r9hmmdy7xvf5f6hzlyw9rmy90ddkfckdapsw88pr10ww1n"; depends=[lattice sp zoo spacetime FNN]; }; +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]; }; gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; @@ -3693,7 +3709,7 @@ gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74a 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=[]; }; -gvcm_cat = derive { name="gvcm.cat"; version="1.8"; sha256="05bl9ikgv1h5rm6lg2qz4g22d5ir8x2gs3wk58lnvvpdvksd8l7s"; depends=[Matrix MASS]; }; +gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[Matrix MASS mgcv]; }; gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; @@ -3735,7 +3751,7 @@ helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3 heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; }; heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; -hermite = derive { name="hermite"; version="1.0.1"; sha256="0y49dj905y9x4pjrx6iki3mk5kkppbd1c6dk0yvvh7sisapnphjx"; depends=[]; }; +hermite = derive { name="hermite"; version="1.0.2"; sha256="0hmh3vpla3xjr4gasv9jsq4ldpchzip8hqbz31c2a77kkhbmrg22"; depends=[maxLik]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; }; @@ -3749,6 +3765,7 @@ hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4a hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive { name="hiddenf"; version="1.1"; sha256="04pl3glvg3m1xzvxnc5lwjz839zrpc8zhnsxcswvvaqpgzip5f1p"; depends=[]; }; hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; +hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; }; hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; }; @@ -3761,6 +3778,7 @@ hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; }; hisse = derive { name="hisse"; version="1.0"; sha256="0vbwc006ypn9jcaw86dcvmg2hyjwb88h45zx8kjr5w506818phjp"; depends=[ape deSolve GenSA subplex]; }; +histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; }; histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; hitandrun = derive { name="hitandrun"; version="0.5"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; }; @@ -3787,7 +3805,6 @@ hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250c 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.2"; sha256="06hbc3wvymksr83cxy9rjkfw860sfg513ylipgdnxzr5h986hfad"; depends=[stringr knitr magrittr]; }; -htmltab = derive { name="htmltab"; version="0.5.0"; sha256="1c5bcx00wgh2xvghg91jyv7086y5ya0bil4igfsqjqsn0lfcjxpg"; depends=[XML]; }; 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]; }; hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; @@ -3813,7 +3830,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"; sha256="0ww2i04rvgpy2wfszjxhqaylix1s65nw46psw4w96l6jzf113x5w"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; +hypervolume = derive { name="hypervolume"; version="1.2.2"; sha256="1nc5hybw5aa5pdrf9j1jv6d69q1im7whz0d05rmyskcayy2x3pyi"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; depends=[]; }; hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; }; @@ -3844,7 +3861,7 @@ icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha2 icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; }; 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.0"; sha256="1imayxcg58dg56wakwn7qcqm5r9xw0idzvh942rl0ir9xgz7dp7m"; depends=[Rcpp checkmate Rcpp]; }; +icd9 = derive { name="icd9"; version="1.1"; sha256="10swy0zhzip412icc9nf324za3czcjfpby6d9ha480504073fakm"; depends=[Rcpp checkmate Rcpp]; }; 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=[]; }; @@ -3860,11 +3877,11 @@ ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq1757 iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[zoo lubridate climdex_pcic PCICt]; }; ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; }; imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; }; +import = derive { name="import"; version="1.0.1"; sha256="14frkzjll9jj7cxlsvvcrrzpicx25mn90zz4rbm568ai5k9gsa5g"; depends=[]; }; imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[tmvtnorm norm]; }; imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; }; -imputeYn = derive { name="imputeYn"; version="1.2"; sha256="08i3bwzmd4cn3cbwbrcjh3b75m7xms9m3dpmym99g08282cmljwx"; depends=[quadprog emplik mvtnorm survival]; }; in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; }; inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; }; inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; }; @@ -3878,7 +3895,7 @@ inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgp 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]; }; infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; -informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; }; +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=[]; }; infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; @@ -3908,7 +3925,7 @@ io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmn ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; }; iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; }; ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; -ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; }; +ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance sp raster]; }; ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; }; iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; }; ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[rpart MASS survival nnet class prodlim]; }; @@ -3949,11 +3966,12 @@ ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; 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]; }; -jackknifeKME = derive { name="jackknifeKME"; version="1.1"; sha256="1bzwgyyc2zcm27qahbbf5iqx24q0ddwlzwg7h4h866rlwzb4xf1b"; depends=[imputeYn]; }; 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]; }; +james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; }; jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; 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=[]; }; jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; @@ -3962,7 +3980,7 @@ jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwi jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; }; jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; }; -jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; +jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; }; kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; }; @@ -3975,6 +3993,7 @@ kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53 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]; }; kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; 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]; }; kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; }; @@ -4030,8 +4049,8 @@ 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]; }; -lambda_r = derive { name="lambda.r"; version="1.1.6"; sha256="03f3945f9kqj7in1mxk23ai56x68rdyd10c3ki4nqqysshyjr4d4"; depends=[]; }; -lambda_tools = derive { name="lambda.tools"; version="1.0.3"; sha256="1vd1ms8yzy01wvg4baj2ypyiyy27ck3na9awlmvhdvxc1s459sr7"; depends=[lambda_r]; }; +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]; }; 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=[]; }; @@ -4074,10 +4093,10 @@ leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j6 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; }; leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; -lessR = derive { name="lessR"; version="3.2"; sha256="05d8xsf9n52l0hsvww4yk8wl14sw02yc0w4ajrzrjwb68sp75qf8"; depends=[car leaps MBESS foreign gdata triangle]; }; +lessR = derive { name="lessR"; version="3.3"; sha256="0hzvf85x81p5lcszrpf897azh4fgpij2zyk0z5icma67aifdf5bf"; depends=[car leaps MBESS foreign gdata triangle]; }; lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; -lfe = derive { name="lfe"; version="2.1-1629"; sha256="1f79m3ck9anfimhkksb6nwc8ppwaard4bqc441xk2ch2vv6ap5p9"; depends=[Matrix Formula xtable]; }; +lfe = derive { name="lfe"; version="2.1-1640"; sha256="1l0y64rk58x40nrz7xl17cc672hf4q7yz77r2f5blgmxjg769pj5"; depends=[Matrix Formula xtable]; }; lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; 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]; }; @@ -4087,7 +4106,7 @@ lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypd lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; }; -likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; +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]; }; likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; }; limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[quadprog lpSolve MASS]; }; @@ -4120,6 +4139,7 @@ lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlm lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; }; lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; }; lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; +lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[nlme MASS]; }; lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; }; lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; @@ -4156,7 +4176,7 @@ logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp9 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; }; lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; -longitudinal = derive { name="longitudinal"; version="1.1.10"; sha256="1mnviq4v040kbcsca04gzfx2lfz2ipv3nbmqgkbp9v45w96qymq9"; depends=[corpcor]; }; +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]; }; 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]; }; @@ -4174,11 +4194,11 @@ lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxx lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; }; lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; -lsbclust = derive { name="lsbclust"; version="1.0.1"; sha256="13vp6jz4py8ljp6sa1swpcw2j7lg7qfj3xk1qbi0kbw0krswg959"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; +lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; 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.15"; sha256="14fl0nfqypbnqqdl7q0gvjn9880j6wkdk48jbf0xq953l11qw4sh"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; +lsmeans = derive { name="lsmeans"; version="2.16"; sha256="1cmxg4cxf7snmpnargdwvgr061acpbish934pcdmnhslr1k2sj9j"; depends=[estimability multcomp plyr Matrix 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]; }; @@ -4221,6 +4241,7 @@ manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; }; mapStats = derive { name="mapStats"; version="2.3"; sha256="0kws795f8s6rgbwyzjz90vzlh2ipp0c0mwdbsry5aasg4qj97ns0"; 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.6"; sha256="1mfw4ihshf3lc3xfdyh2rawaqly7kynncda4j35si080ygk23aj5"; depends=[Matrix]; }; mapmisc = derive { name="mapmisc"; version="1.1.3"; sha256="10i99rd6ds1dr0b741sin43kkj6v7d4mky653kcz3mqq5904wnns"; 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]; }; @@ -4232,7 +4253,7 @@ mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0 marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; }; marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; }; -marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; }; +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.1.1"; sha256="1y4f4xf8557jq20yd8n2sl4sjhx2pkdjyr6fqikrfh1m4cydrz73"; depends=[igraph Matrix matlab expm]; }; 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=[]; }; @@ -4267,7 +4288,7 @@ mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52c mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; }; mclust = derive { name="mclust"; version="4.4"; sha256="1xwk5w3nzwmwavn1ni53bnhf3klvy65c05819j1aqa6dna1j1jkq"; depends=[]; }; mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; }; -mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; }; +mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; }; mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; }; mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; }; @@ -4299,7 +4320,7 @@ metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6i meta = derive { name="meta"; version="4.1-0"; sha256="0zf2917ljzpbc8izprzx7a78wc37q2k23lzdk8rmm5chml16mb3f"; depends=[]; }; metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; }; -metaMix = derive { name="metaMix"; version="0.1"; sha256="15vw8cwsy56fhq0q9w99799bnkj2ji2ns0ljfkg1p7wwhfrj689f"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; +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=[]; }; metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; }; metacom = derive { name="metacom"; version="1.4.2"; sha256="1vb8qyilwvqb6b5sxqlmbw25r12q8f5h0mqbh3mbcmr0zarb35ql"; depends=[devtools vegan lattice]; }; @@ -4325,7 +4346,6 @@ mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdk mht = derive { name="mht"; version="3.0.11"; sha256="1d1ca3jp5q9xmnlnjsqi247vz6gm25bb8x5lzwd6z0n87lv26n1k"; depends=[glmnet]; }; mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; }; mi = derive { name="mi"; version="0.09-19"; sha256="1r3b6mm3pr95lb52m2vynmg0l2wy80hznjq2rff1qwplbq1pl04n"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; }; -miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; }; miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; }; micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; @@ -4338,7 +4358,7 @@ microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvd 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]; }; micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; }; -midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; }; +midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[sandwich optimx MASS numDeriv Matrix forecast]; }; migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; @@ -4374,15 +4394,15 @@ mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; -mixexp = derive { name="mixexp"; version="1.1.9"; sha256="1qr6gad3fjwxjngjb7iqhspkkwzj1c77v140ap2vdrcygsd6ncd1"; depends=[gdata lattice daewr]; }; -mixlm = derive { name="mixlm"; version="1.0.8.3"; sha256="0959mqxiakjpl0yniq2nd5jj6bfm1prslpnv6kijg0lwx7w7x4hf"; depends=[multcomp pls pracma leaps lme4 car]; }; +mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[gdata lattice daewr]; }; +mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[multcomp pls pracma leaps lme4 car]; }; mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; }; mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; }; mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; }; mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; }; -mixture = derive { name="mixture"; version="1.3"; sha256="0shjr6ia148lrhx2y61zl4bq2mf70z0pgrp3q6c01k52wg7wgp77"; 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]; }; @@ -4445,7 +4465,7 @@ moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1g mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; }; mousetrack = derive { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; }; -move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; }; +move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a59yn152jfnwh6sw48sg8cc9wp24k3"; depends=[geosphere sp raster rgdal]; }; 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]; }; @@ -4483,7 +4503,7 @@ muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9w muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; }; multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; -multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; }; +multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; }; multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; }; multiPIM = derive { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; @@ -4492,7 +4512,7 @@ multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn8 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; }; multicool = derive { name="multicool"; version="0.1-5"; sha256="01a429hyizqjg3dglnm0b3gl1lclp1az40cr3wr9qcx12jn30fbz"; depends=[Rcpp Rcpp]; }; -multigroup = derive { name="multigroup"; version="0.4.3"; sha256="153pg27dz61igagn1yq4xl7m7vjb5vfc9ps1xhgzvmbvmnbcr004"; depends=[MASS]; }; +multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; }; multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; @@ -4513,9 +4533,9 @@ munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; -mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; }; +mutoss = derive { name="mutoss"; version="0.1-9"; sha256="170a9ibz6p9w7jkvv03003glrzk6z8jy1z9r4j7481qvrlyrgp6w"; depends=[mvtnorm plotrix multcomp]; }; mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; }; -mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; }; +mvMORPH = derive { name="mvMORPH"; version="1.0.3"; sha256="14z5bjkljna81hqp06d2jmincspflcb65z4gs5wklgzz3nz0sidm"; depends=[phytools ape corpcor subplex spam]; }; 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=[]; }; @@ -4572,7 +4592,7 @@ ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky 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=[]; }; ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; -ncvreg = derive { name="ncvreg"; version="3.2-0"; sha256="0j53aj71lxz3pxh6a4vlgw0f9zk4gjh4xf5c7qsm5cp8nfpkplm5"; depends=[]; }; +ncvreg = derive { name="ncvreg"; version="3.3-0"; sha256="0kwqfk9sp01x1k708qqr99cd8gkhr0jqjkfz1l7g0b6w6wm0yavb"; depends=[]; }; ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; }; ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; }; neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; @@ -4582,7 +4602,7 @@ neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12s nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; }; netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; -netassoc = derive { name="netassoc"; version="0.4.1"; sha256="1rwswa70n6j3s779cq3ddg8kgj17bx5iqya1rrspqd7rjj95k1bk"; depends=[igraph]; }; +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]; }; 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]; }; @@ -4618,13 +4638,14 @@ nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrb nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; -nlsem = derive { name="nlsem"; version="0.2"; sha256="0hq4ffkbrp6v6y5hr26hm2g110vjx3xy01y5kznigza0v9wcpzqq"; depends=[gaussquad mvtnorm nlme]; }; +nlsem = derive { name="nlsem"; version="0.3"; sha256="1lpp6f6nby1rzxv7hrqnm4qbwj406g9ls9jmidb8rqgy177sk4w6"; depends=[gaussquad mvtnorm nlme]; }; nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; }; nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; }; nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; }; nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; }; +nnlasso = derive { name="nnlasso"; version="0.1"; sha256="0pqpkq8vb18qm8rj16wx3z6fb7mgkb8ddw00c701d5mi9gqhaf5c"; depends=[]; }; nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; nodiv = derive { name="nodiv"; version="1.0.2"; sha256="0a8p5q1r68gmwv73557xgwxp9xwh8yw287yr71lplc1dx8fxjjny"; depends=[picante raster ape sp vegan]; }; @@ -4648,9 +4669,8 @@ notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqn 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]; }; -npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; }; nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; -nparcomp = derive { name="nparcomp"; version="2.5"; sha256="0s865cqy29m5wiwndbmw3sl6m86f3zjbjr41924zd4alxkhm1wbi"; depends=[multcomp mvtnorm]; }; +nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; }; npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; }; npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; }; npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; @@ -4670,7 +4690,7 @@ nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; }; numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; }; -numbers = derive { name="numbers"; version="0.5-2"; sha256="0papfbpar9imkh0ahr809zaxgsi3ch7flypxyap4r2x1clgrx0p1"; depends=[gmp]; }; +numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; }; nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; @@ -4726,7 +4746,7 @@ optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c3 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme Rcpp]; }; ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; -orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; }; +orca = derive { name="orca"; version="1.1"; sha256="138qqjklwd3g4dfg9j2438kzpsdc7sf8qdl8ha4kd276n71vkfrh"; depends=[]; }; 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]; }; @@ -4790,7 +4810,6 @@ pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3 pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; 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.5-0"; sha256="1j366644scrsq2sjl9vip0ids97y9m6c8fyx16qlismrfcfbapyz"; 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]; }; parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; @@ -4842,9 +4861,9 @@ pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707 pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; }; pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; }; pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; }; -pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp Rcpp RcppArmadillo BH]; }; +pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; }; pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; -pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; }; +pcnetmeta = derive { name="pcnetmeta"; version="2.0"; sha256="0ayk9dvll321ndpbzqhvswhd7gbngmdhvzak5mn74w76wz9d4ylv"; 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=[]; }; @@ -4895,13 +4914,12 @@ phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q7 phangorn = derive { name="phangorn"; version="1.99-12"; sha256="0yp2ih3f15xx1vd4vk1hdg3gl7l1a9y2j88cd6b6z2x1d6waj1yv"; depends=[ape quadprog igraph Matrix fastmatch nnls]; }; phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; -pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; }; +pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[RColorBrewer scales gtable]; }; phenability = derive { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; }; phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; }; -phenology = derive { name="phenology"; version="4.0.4"; sha256="1h40dr3347nisf61nnrfi23a6951zxnf5ibmnb5k80fwkhmw81f0"; depends=[fields zoo coda shiny]; }; phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; }; phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; }; phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; }; @@ -4914,6 +4932,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]; }; 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]; }; @@ -4926,6 +4945,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]; }; pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; }; pitchRx = derive { name="pitchRx"; version="1.6"; sha256="16x152xz7vs4bwi4xh05sbj38xgqzk8g95vfm0vm5mf94qnnaa6c"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; @@ -4949,7 +4969,7 @@ plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3h plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; }; plotKML = derive { name="plotKML"; version="0.5-0"; sha256="0sx48z27a34bc8gw7m66w52q36llbm2wm15l6kvd6zzlyzvj8cda"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; -plotROC = derive { name="plotROC"; version="1.3"; sha256="1scb2mkz1b74kmai6fhliva9ghhrl1036kk6v3ll5xk16ffjpgg3"; depends=[ggplot2 gridSVG shiny]; }; +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="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; }; plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; }; @@ -4981,7 +5001,7 @@ poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqii pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; }; 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.1"; sha256="08mqsx45k5y43yc5g0kfr2jsxpjjsprjcii1p9i1pf0k7r8igglb"; depends=[ggplot2 gridExtra plyr TripleR]; }; +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=[]; }; 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=[]; }; @@ -5017,7 +5037,7 @@ portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5ink 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=[]; }; -poweRlaw = derive { name="poweRlaw"; version="0.30.0"; sha256="087817n01x0rlvm6hizmlm74hd0vkw0zy57i9n9yjkb9zlnsz7lm"; depends=[VGAM]; }; +poweRlaw = derive { name="poweRlaw"; version="0.30.1"; sha256="078yrr4fsg0isl45j887y62jzhvdv4krd3drg420wx5a0mqj7np1"; depends=[VGAM]; }; powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; }; @@ -5034,6 +5054,7 @@ prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqy prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; }; pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; +prais = derive { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; }; praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; }; precintcon = derive { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; }; @@ -5042,7 +5063,7 @@ 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.0.1"; sha256="0plwhgs6fgvra2w5xcjrr260fra0nl2cpsn5r1z701q7b8nbm257"; depends=[]; }; +preseqR = derive { name="preseqR"; version="1.1"; sha256="10xmybkhyn88p7aa3wa753lykzlcm4md3ai03nlx6wisnqh6dd55"; depends=[]; }; prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; }; prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; }; @@ -5081,7 +5102,7 @@ pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmv 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.8"; sha256="1isgj3gsazpl2l69162n0xrgbsrsybwg18rz58amdq0h023c5dbz"; depends=[MASS lattice]; }; -psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; }; +psd = derive { name="psd"; version="1.0-0"; sha256="17mp995yrw3pspavvf2s0fsqqdx7nbxw9k4hqph42052bpy3a54s"; depends=[Rcpp RColorBrewer signal zoo Rcpp RcppArmadillo]; }; 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]; }; @@ -5127,7 +5148,7 @@ qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s qdapRegex = derive { name="qdapRegex"; version="0.2.0"; sha256="0hypa3xax02k61kwh59wb4r7y8s0g6hfhaih0kj9n442xqvrym5h"; 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=[]; }; -qgraph = derive { name="qgraph"; version="1.3"; sha256="08arc3f3rici1r1r0nm42fv7g01fn3xixfh6y3lg8q3mr53fqhdm"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool sendplot d3Network ggm gtools]; }; +qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; }; qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; }; qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; }; qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; }; @@ -5136,7 +5157,6 @@ qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; qmethod = derive { name="qmethod"; version="1.2.4"; sha256="0s3s1vasppbnzq78xf7klqppg91c4qvq59dka9dj7zl8zlr6hx3r"; depends=[psych GPArotation]; }; qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; -qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; }; qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; }; @@ -5158,7 +5178,7 @@ quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabz quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales Rcpp RcppArmadillo]; }; qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; -qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; }; +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]; }; quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; @@ -5206,7 +5226,7 @@ rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwy 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]; }; rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; -rPref = derive { name="rPref"; version="0.4"; sha256="0w1cfcqngyympp8xh72rc2w7njjf0y4bilvmfiamp90ykv1yd0vn"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; +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]; }; rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; @@ -5218,6 +5238,7 @@ rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4 rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; }; race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; radar = derive { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; +radiant = derive { name="radiant"; version="0.1.75"; sha256="0rk971rr15w87b50rhf8vdr6vhs3lfd08vdrp1f7h9higrwk0as8"; depends=[lubridate ggplot2 dplyr magrittr car MASS gridExtra AlgDesign GPArotation psych wordcloud markdown knitr ggdendro broom tidyr pryr shiny shinyAce]; }; radir = derive { name="radir"; version="1.0"; sha256="1aiy92r854h1l9fsa8j65w495hj7hll7k1csfnvb92h0wh0bxyzy"; depends=[hermite]; }; rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; }; rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; @@ -5235,7 +5256,7 @@ randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; }; randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[permute matrixStats]; }; randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; }; -randomizr = derive { name="randomizr"; version="0.2.0"; sha256="040278biy0a3drcl5z79cd74psix1dnfg0a5gzv101jyhbnjp4ml"; depends=[]; }; +randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; }; 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]; }; @@ -5246,7 +5267,7 @@ rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12a rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; }; -raster = derive { name="raster"; version="2.3-24"; sha256="0397brw7fmfzc55p3v8isc22hksh2bzq64a2iwac52hf0bvl0fzn"; depends=[sp]; }; +raster = derive { name="raster"; version="2.3-33"; sha256="1mjsy36r2rflsnl0y0n805mq536jqvsba20xdhpl1iv2sknmxz2a"; depends=[sp]; }; rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[raster lattice latticeExtra sp zoo hexbin RColorBrewer]; }; rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; @@ -5264,7 +5285,7 @@ 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.2"; sha256="0880bvzbnq9gak2n70iwdk6n86bn1glg67lb7fby6fhipkgfxcp2"; depends=[MASS plyr]; }; +rcbalance = derive { name="rcbalance"; version="1.3"; sha256="1s38rfn44wmllwpqzxm0w2bjl649i7qfadwdnn0mnp1q86vsmi3q"; 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]; }; @@ -5276,7 +5297,7 @@ rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvw rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[zoo RCurl RJSONIO]; }; rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; }; rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; -rdrobust = derive { name="rdrobust"; version="0.70"; sha256="1zfsgzyi648v5zzbjjw01vvznws6yv30n981ljn996g4y2qy7gp4"; depends=[]; }; +rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; }; rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; }; readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; }; readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; }; @@ -5298,7 +5319,7 @@ recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0d 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]; }; -redcapAPI = derive { name="redcapAPI"; version="1.2"; sha256="10d4pjcap1pcabzb2jjp0c9n0k8zpcz8cb0fmsqwfisjsyda7slk"; depends=[chron DBI Hmisc httr stringr]; }; +redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; }; 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]; }; @@ -5322,7 +5343,7 @@ relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5n relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfxkfwhpxppqrpq5h3b22cjif5qjqz3kk8f"; depends=[mgcv]; }; -relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; }; +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]; }; @@ -5366,18 +5387,18 @@ rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4 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.7.7"; sha256="074psvcpnyaqf4dhwlr9gylc9a70ksfhszpknyw52axgh3wq758c"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr assertthat whisker magrittr jsonlite]; }; +rgbif = derive { name="rgbif"; version="0.8.0"; sha256="1sdjlymymfc5chnrc5if0fvf64mjz6sc4071xsw2ja7zcdasxb40"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr whisker magrittr jsonlite]; }; rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; -rgdal = derive { name="rgdal"; version="0.9-1"; sha256="1jq6z4z0q00djfmm2nsr5cn7idall5pfqp2p88ah9g24k928v3gf"; depends=[sp sp]; }; +rgdal = derive { name="rgdal"; version="0.9-2"; sha256="0jzhjy3qnb9aimmwyssinbyxz49hzcfksmxhsqyz3g8868k946g5"; 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]; }; rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; }; -rglobi = derive { name="rglobi"; version="0.2.5"; sha256="1dym9h5lcmzz3378cxy5yq8ps8fygmz614hw4bpfmjpx6whscada"; depends=[rjson RCurl]; }; +rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; 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.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; }; -rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; }; +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=[]; }; rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; @@ -5403,7 +5424,7 @@ rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95z 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]; }; -rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; }; +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=[]; }; rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; }; @@ -5435,7 +5456,7 @@ robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kpl robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; }; -robumeta = derive { name="robumeta"; version="1.5"; sha256="0c3mpzgm5y9bzjb50gp3l32xph6b6xinjdj4phxrkwaclvxx13yz"; depends=[]; }; +robumeta = derive { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; }; robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; }; 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]; }; @@ -5469,7 +5490,7 @@ rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16x rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; 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="0.12.1"; sha256="13n5xysa1pi5pcbq80w268ybqc414i56d4hpln0yl6zva6dgpsqd"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; }; +rplexos = derive { name="rplexos"; version="0.13"; sha256="149y0y0qb18igg4pc0i27vfpwcvfvg24ixqrqcya5xvdrm1h63aj"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; }; rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; 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=[]; }; @@ -5477,19 +5498,18 @@ rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hm 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]; }; rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; }; -rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; }; -rr = derive { name="rr"; version="1.1"; sha256="1xdr0440gzv3xpllqxk6g9hny5njrbn4fdcg1hr4fqhagp18ziac"; depends=[MASS arm coda]; }; +rqPen = derive { name="rqPen"; version="1.1"; sha256="0da6pbzx2my052v8s9nyw0j5ljy4pfigyy82n72zp0jzhdzmq479"; depends=[quantreg]; }; +rr = derive { name="rr"; version="1.2"; sha256="0p3h15sbn2896ygxyvf4farys363r2p5jg41h07dzrcaif8i331l"; depends=[MASS arm coda]; }; rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; }; rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[robustbase mvtnorm lattice cluster pcaPP]; }; 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.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; 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.9122"; sha256="100098c5v8s3xcwvgx63fqi1ngyq5hc7l4wwklhw5zm7h30fcr7z"; depends=[foreign]; }; +rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; rscala = derive { name="rscala"; version="1.0.2"; sha256="13l1cmmj28kjrmxnvgi5zpxi8ak9956bzmsn1b3v7a3xb6glchij"; depends=[]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; @@ -5516,7 +5536,7 @@ rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; }; rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; }; rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; }; -rtkpp = derive { name="rtkpp"; version="0.8.4"; sha256="0v1n16hi1zvbdn6p737ryw8baflyw7aqjpnnzqr7rgwc518zhd1f"; depends=[Rcpp Rcpp]; }; +rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp Rcpp]; }; rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; }; rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; }; rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; @@ -5545,7 +5565,7 @@ sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94 sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; }; 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"; sha256="0bmwqfhdqf4j0xpyfzzgl6h35r3wgjmkrmnwn9l17648f236d7c8"; depends=[zoom]; }; +saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; sadists = derive { name="sadists"; version="0.1.0"; sha256="1qx0ki0w8i9w92phzcz57mm1kp4p2i5fznqvwa4amdqym66ky48c"; 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-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; }; @@ -5594,11 +5614,11 @@ scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0 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-9"; sha256="03jv5hgzs4hvkpvjr9073nncmwj20cwispzwrbvxjdnvm5hnjg3y"; depends=[]; }; +scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; }; scrm = derive { name="scrm"; version="1.3-3"; sha256="0if338nkbfiakb82wrvy25xsnf337gm4xz5b9027s5yblwwxngf1"; 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.5"; sha256="0i5dxqc47d32b860qz9ipyy6h4mszx0vmg8xd5mz9lxz2if9k2gm"; depends=[entropy corpcor fdrtool]; }; +sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; }; sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; }; sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; @@ -5627,6 +5647,7 @@ 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=[]; }; +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]; }; @@ -5649,7 +5670,7 @@ sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256=" sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; }; -separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; }; +separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2r96y6wgjf2aww98k06rk3lpr4cz1yp5x3gvx"; depends=[survival xtable]; }; seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; }; @@ -5672,7 +5693,7 @@ severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; }; sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; -sgPLS = derive { name="sgPLS"; version="1.0"; sha256="0n2apx74pcfqw1wakck1pnnahf3lxs5qzzki1j5w2vlp38f312k9"; depends=[mixOmics]; }; +sgPLS = derive { name="sgPLS"; version="1.1"; sha256="09nf9qqhlddcgp2y44lxgva9vy3dgbmw1hbl0phw95wb8b9p1m0s"; depends=[mixOmics]; }; 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.1-0"; sha256="1iyj8clk2ibj94nxh1xi1wr50y2l53fxcivc2jdnilcqmscwbf1x"; depends=[Matrix]; }; @@ -5695,7 +5716,8 @@ shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="1763 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.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; }; +showtext = derive { name="showtext"; version="0.3"; sha256="1spbrzjasd0ljipbf45iar7b0vksla93iajypfbq2ndwyid3yzj4"; 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]; }; shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; }; @@ -5718,7 +5740,7 @@ simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly 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]; }; simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; }; -simecol = derive { name="simecol"; version="0.8-4"; sha256="0k83zcnvxq89m60d9157w3sn2gwyl6m7812qy1bgn260ac2nqv10"; depends=[deSolve]; }; +simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9d0z8mkh6lc8qm4zivyk5af79mr5s0bn5"; depends=[deSolve]; }; simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; @@ -5734,7 +5756,7 @@ sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh 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.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; -sjPlot = derive { name="sjPlot"; version="1.6.9"; sha256="1nf2ndwd6y5szvvycz2sdr572d3c4zc79frvhxh3iajb071awral"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; }; +sjPlot = derive { name="sjPlot"; version="1.7"; sha256="0kk9isz105y6m83vk6x6c7i55kch51w2a4l8nlc44ffbm8zwqqa1"; depends=[ggplot2 MASS car foreign psych scales dplyr tidyr]; }; sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; 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=[]; }; @@ -5792,7 +5814,7 @@ softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95 softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; }; soilDB = derive { name="soilDB"; version="1.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; }; -soilphysics = derive { name="soilphysics"; version="2.0"; sha256="0gsxpndin79n8ygwjzdaf8njkqrf6y805m3gd19cyyz9iz6g9yfb"; depends=[rpanel MASS]; }; +soilphysics = derive { name="soilphysics"; version="2.1"; sha256="0j2jqdzkm5clqsn0z01ldzx138yf37gvyrk79yqhmwiigvp5b728"; 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]; }; soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; @@ -5869,7 +5891,7 @@ spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yf spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; }; spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; }; -spdep = derive { name="spdep"; version="0.5-83"; sha256="14j2sr6c225pmfclq2v8d3dfkib0vy3y8cawdilybd8s96zlbd8f"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; +spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; }; spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; }; @@ -5890,7 +5912,7 @@ spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9 spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; }; spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; -splancs = derive { name="splancs"; version="2.01-36"; sha256="0m29zh91jyz69nh2a9iigzcaxd1mlhq3b7z40vgqib4jnbzkbyg5"; depends=[sp]; }; +splancs = derive { name="splancs"; version="2.01-37"; sha256="0q548i76107laa9yrsjxqvwhl8zyhlib557qqr8aa7kjg6j0p5fn"; depends=[sp]; }; splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; splm = derive { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[spdep plm maxLik MASS bdsmatrix ibdreg nlme Matrix spam]; }; spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; @@ -5929,7 +5951,8 @@ sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d 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]; }; -st = derive { name="st"; version="1.2.3"; sha256="10wq705vyzarkgmfn3sblac979p20xv02hq01g75yp2krm1v8h3x"; depends=[sda fdrtool corpcor]; }; +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.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; }; @@ -5996,7 +6019,7 @@ subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; }; -summarytools = derive { name="summarytools"; version="0.2"; sha256="056fah6526j9y63aksq43qj29jn233lkj45ql68sv08g0vbv28qs"; depends=[pander rapportools]; }; +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]; }; superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; }; @@ -6012,7 +6035,7 @@ survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afn survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; survMisc = derive { name="survMisc"; version="0.4.5"; sha256="137k453v6jsl07s0qks0wf452lxx3klbqqic52jj9yzgr6ic3xig"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; }; survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; -survRM2 = derive { name="survRM2"; version="1.0"; sha256="19lfs66x2zh7cd4s04ry3sd75q4fm8a3xmpl1b0jzvldhnq2yrgz"; depends=[survival]; }; +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]; }; survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; @@ -6053,7 +6076,7 @@ sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; }; sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; }; sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; }; -symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; }; +symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; }; 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]; }; synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; @@ -6064,11 +6087,11 @@ synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9ba 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.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; }; systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; +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]; }; -tRakt = derive { name="tRakt"; version="0.9.0"; sha256="16ikqzqz78f6bw00ir465d30qzqq0znl9ynh49wmz6cmyr7s8i66"; depends=[httr jsonlite lubridate plyr stringr]; }; taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; }; taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; }; -tab = derive { name="tab"; version="2.1.3"; sha256="0ypb11gvasx7mdkpysfjvxb61660sdaggp6l43iyp2grfrilkm7y"; depends=[survey survival gee]; }; +tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[survey survival gee]; }; table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; }; tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; }; tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; @@ -6083,7 +6106,7 @@ 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.1"; sha256="0z5v42yalza10bizl6kw54saiawj9y33g0jwzsqzzaxfdvsxd2gz"; depends=[ggplot2 dplyr gridExtra reshape2 Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; +tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqryd6jzjsxdyhdxvj2w83qcxa"; 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]; }; @@ -6100,6 +6123,7 @@ testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfh testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; }; 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.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; }; textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; }; textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; }; @@ -6159,6 +6183,7 @@ tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99w tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat 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=[]; }; tolerance = derive { name="tolerance"; version="1.0.0"; sha256="1anim3rq60fscylnz066fddihrxzy0j0d09ni262fqhbc2fla0xy"; depends=[rgl]; }; topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; }; topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; @@ -6170,7 +6195,7 @@ tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; -track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; }; +track = derive { name="track"; version="1.1.7"; sha256="1l3465h7dxyh6myf40jv05985w6z9yfpwkxalf51540gvz1jjm67"; depends=[]; }; 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]; }; @@ -6181,7 +6206,7 @@ transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1li trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; }; tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; }; -treeClust = derive { name="treeClust"; version="0.2-2"; sha256="18i9n5zg1468y42pnn35h3gdqhv65lrlsgc8h1vp221blkv2i1dc"; depends=[rpart cluster]; }; +treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[rpart cluster]; }; treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; }; treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; @@ -6207,6 +6232,7 @@ trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8s trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; }; tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; +tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; }; tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; @@ -6276,7 +6302,7 @@ vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; vcdExtra = derive { name="vcdExtra"; version="0.6-5"; sha256="0z2xyvmxka1awx0bnqvp6d16zj8gb6jhj0q4xil7r8ya4hqqmmac"; depends=[vcd gnm MASS]; }; -vcrpart = derive { name="vcrpart"; version="0.3-2"; sha256="1mvhashafvc7ssg60np1g6i9bjvc00dniwilw6x54gnlpczq1qrp"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; +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.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; }; vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; @@ -6299,6 +6325,7 @@ visreg = derive { name="visreg"; version="2.1-1"; sha256="16ghi7p809mcb3jfw1c9ib 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=[]; }; vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; }; +vmsbase = derive { name="vmsbase"; version="2.0"; sha256="04j6zibwcn1ywckbdqw5p6da5qpgpll7a96x5a1kyimiwk408j1r"; depends=[sqldf ggmap mapdata maps marmap intervals plotrix sp foreign cluster cairoDevice ggplot2 DBI RSQLite fields gsubfn AMORE ecodist gWidgets gWidgetsRGtk2 chron maptools outliers PBSmapping R6 VennDiagram gmt]; }; vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; vows = derive { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 rpanel mgcv RLRsim oro_nifti shape stringr]; }; vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; @@ -6366,7 +6393,6 @@ x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319 x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; }; xergm = derive { name="xergm"; version="1.4.1"; sha256="1lcqa2vxdg4ljk2p0m8cqw68bqxycxql57nr3n4ggic2ys0sbrxa"; depends=[statnet statnet_common network sna ergm texreg Matrix boot coda ROCR igraph vegan lme4 Rcpp speedglm Rcpp]; }; -xgboost = derive { name="xgboost"; version="0.3-3"; sha256="1cxwzarppxwh9hdbkxcg74bjazxgr5977ssngkj4h91wk6ij3rnk"; depends=[Matrix data_table magrittr stringr DiagrammeR ggplot2 Ckmeans_1d_dp vcd]; }; xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; }; @@ -6393,9 +6419,9 @@ zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; zoib = derive { name="zoib"; version="1.2"; sha256="15rki5w21r7q0af9w5pyzq9x55gwmgs35pqgdqxmjnpsp8v135k7"; depends=[rjags coda matrixcalc Formula]; }; -zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; }; +zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; }; zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; -zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; +zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } From 5238bfb73f7286b744a5f8873144b4ae5a688375 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Mar 2015 21:59:31 +0100 Subject: [PATCH 337/947] r-modules: fix evaluation errors --- pkgs/development/r-modules/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9aa6af66ccf..f662c26fe42 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -242,7 +242,6 @@ let ncdf4 = [ pkgs.netcdf ]; ncdf = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; - npRmpi = [ pkgs.openmpi ]; openssl = [ pkgs.openssl ]; outbreaker = [ pkgs.gsl ]; pbdMPI = [ pkgs.openmpi ]; @@ -607,7 +606,6 @@ let "ripa" "rite" "rnbn" - "rriskDistributions" "rsgcc" "sdcMicroGUI" "sharpshootR" @@ -642,7 +640,6 @@ let packagesToSkipCheck = [ "Rmpi" # tries to run MPI processes "gmatrix" # requires CUDA runtime - "npRmpi" # tries to run MPI processes "sprint" # tries to run MPI processes "pbdMPI" # tries to run MPI processes ]; @@ -687,7 +684,6 @@ let "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX - "cqrReg" # requires Rmosek "crmn" # requires pcaMethods, and Biobase "CrypticIBDcheck" # requires rJPSGCS "cudaBayesreg" # requres Rmath @@ -702,6 +698,7 @@ let "dcGOR" # requires dnet "demi" # requires affy, affxparser, and oligo "DepthProc" # requires samr + "DiagrammeR" # requires V8 to build "Digiroo2" # requires spatstat "dixon" # requires spatstat "dnet" # requires supraHex, graph, Rgraphviz, and Biobase @@ -983,12 +980,6 @@ let ]; }); - npRmpi = old.npRmpi.overrideDerivation (attrs: { - configureFlags = [ - "--with-Rmpi-type=OPENMPI" - ]; - }); - Rmpfr = old.Rmpfr.overrideDerivation (attrs: { configureFlags = [ "--with-mpfr-include=${pkgs.mpfr}/include" From 262a3ac3c4707aaf9876041a4b44a459619bfaff Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 21 Mar 2015 23:49:38 +0100 Subject: [PATCH 338/947] picolisp: bump to 3.1.9 --- pkgs/development/interpreters/picolisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index adc0261eddb..ddb2a26bab2 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -12,12 +12,12 @@ let sourceInfo = rec { baseName="picolisp"; tarballBaseName="picoLisp"; - version="3.1.8"; + version="3.1.9"; name="${baseName}-${version}"; tarballName="${tarballBaseName}-${version}"; extension="tgz"; url="http://www.software-lab.de/${tarballName}.${extension}"; - sha256="0bkr1ck157871bv4a8dp9dmcvxigjsikm5rr2khylxc3l6il7s1i"; + sha256="1rhfd743ga9qsgn4h2aw1xcgrc7amsllli2zqg8cgm408vxkr6j1"; }; in rec { From 2c4c712a7017e32d04622233450e183fe30ffea7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 18:46:54 -0500 Subject: [PATCH 339/947] kde4: use kdelibs from kdeApps_stable Upstream is releasing bugfixes to kdelibs only through KDE Applications releases, so this is the correct way to get updates until we discontinue KDE 4. This also ensures that kdeApps and kde4 are using the same version of kdelibs; different versions appear to be causing integration issues. --- pkgs/applications/kde-apps-14.12/default.nix | 4 ++-- pkgs/desktops/kde-4.14/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 555d4d472bc..b34418401a0 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -281,10 +281,10 @@ let buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst]; }; - krfb = with pkgs; super.krfb // { + krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; }; libkdcraw = with pkgs; super.libkdcraw // { diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 2b8e5d313cc..f11a139aec7 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }: let branch = "4.14"; @@ -27,6 +27,8 @@ kde.modules // kde.individual // { inherit (kde) manifest modules individual splittedModuleList; + inherit kdelibs; + akonadi = callPackage ./support/akonadi { }; qt4 = qt48; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ee38835626..3e1f78f2929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10841,6 +10841,10 @@ let kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kf5 = kf57; qt5 = qt54; + pkgs = pkgs // { + cmake = cmake-3_2; + }; + kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; }); kdeApps_stable = kdeApps_14_12; kdeApps_latest = kdeApps_14_12; @@ -12840,6 +12844,7 @@ let callPackage = newScope (self // { cmake = cmake-3_2; }); kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; + kdelibs = kdeApps_stable.kdelibs; }; in kde4 // { inherit kde4; From c918f57ebbd732dccc6bda88dda1b08ee7ae72ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Mar 2015 18:54:29 -0500 Subject: [PATCH 340/947] kde4: remove obsolete kdelibs derivation --- pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 1 - pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix | 48 ------------------- 2 files changed, 49 deletions(-) delete mode 100644 pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index d29840735ab..74d520415f3 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -48,7 +48,6 @@ hashes=builtins.listToAttrs[ {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";} {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";} {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";} - {name="kdelibs";value="17pxihhcbinr3jpwvi1iwfnqs2wiqh0jgf1is05yz13122hns87q";} {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";} {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";} {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";} diff --git a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix deleted file mode 100644 index 52e0ebf2062..00000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi -, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver -, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee -, docbook_xml_dtd_42, docbook_xsl, polkit_qt4, acl, attr, libXtst -, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt -, pkgconfig -}: - -kde { - -# TODO: media-player-info - - buildInputs = - [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq - libdbusmenu_qt libXScrnSaver polkit_qt4 qca2 acl jasper libxslt - shared_desktop_ontologies xz udev libjpeg kerberos openexr - libXtst attr - ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Split plugins from libs? - - patches = [ - ../files/polkit-install.patch - ]; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" - "-DWITH_SOLID_UDISKS2=ON" - ]; - - passthru.wantsUdisks2 = true; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} From 29808a11b6beb1263dcb2873e9cd107d94ea30cd Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 19 Mar 2015 12:03:09 +0300 Subject: [PATCH 341/947] startkde: Qt 5.4 is here --- pkgs/desktops/plasma-5.2/startkde/startkde.in | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in index ff67ed769e2..0693f102781 100644 --- a/pkgs/desktops/plasma-5.2/startkde/startkde.in +++ b/pkgs/desktops/plasma-5.2/startkde/startkde.in @@ -63,15 +63,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else - # This is the default - # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - configDir=${HOME}/.config; -fi - -mkdir -p $configDir +configDir=$(@qt5@/bin/qtpaths --writable-path GenericConfigLocation) +mkdir -p "$configDir" # This is basically setting defaults so we can use them with kstartupconfig5 cat @startupconfigkeys@ >$configDir/startupconfigkeys @@ -177,8 +170,7 @@ fi # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. -# TODO: Use GenericConfigLocation once we depend on Qt 5.4 -scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'` +scriptpath=$(@qt5@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') # Add /env/ to the directory to locate the scripts to be sourced for prefix in `echo $scriptpath`; do From 370e40aef5386316c78c84339d9c487ebd51c499 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 19 Mar 2015 14:01:20 +0300 Subject: [PATCH 342/947] startkde: Fix `kdostartupconfig5` path --- pkgs/desktops/plasma-5.2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 3b4aa652735..dfaafa06a77 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -132,6 +132,10 @@ let plasma-workspace = with pkgs; super.plasma-workspace // { buildInputs = with xlibs; super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + postPatch = '' + substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + ''; postInstall = '' # We use a custom startkde script rm $out/bin/startkde From efb4fe269e68a0624b265ea4de55c392b53b2e08 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Mon, 16 Mar 2015 21:54:06 +0300 Subject: [PATCH 343/947] Yakuake: hardcode path to konsole --- pkgs/applications/misc/yakuake/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index c781a5619ae..323782d60fe 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext }: +{ stdenv, fetchurl, kdelibs, gettext, konsole }: let pname = "yakuake"; @@ -16,6 +16,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext ]; + patchPhase = '' + substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" + ''; + meta = { homepage = http://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; From f0a6d09bf06948a5dc703584e4591a339c1eaada Mon Sep 17 00:00:00 2001 From: William Roe Date: Sun, 22 Mar 2015 01:13:15 +0000 Subject: [PATCH 344/947] Haskell llvm-general 3.4.4.0 requires LLVM==3.4.* --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cc936d77608..e6c49c1aad8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1638,7 +1638,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvm; }; + llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvmPackages_34.llvm; }; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; From ad7bb0d129fef341b3923b9a7d0e171da7b1b8d3 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sun, 22 Mar 2015 13:44:27 +0800 Subject: [PATCH 345/947] simplify convoluted path to autojump.zsh --- pkgs/tools/misc/autojump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 5f5baa17d42..3bd44fb07b7 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -24,7 +24,7 @@ in # FIXME: What's the right place for `autojump.zsh'? # This can be used as a workaround in .zshrc: - # . $(dirname $(readlink -f $HOME/.nix-profile/bin/autojump))/../share/autojump/autojump.zsh + # . $HOME/.nix-profile/share/autojump/autojump.zsh ''; meta = { From 412379223947b4c18203085cff583be9495eb233 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sat, 21 Mar 2015 19:06:35 +0100 Subject: [PATCH 346/947] Update to latest org-trello stable (0.6.9.3) --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index fd536bb3181..a5a087e16ad 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -746,12 +746,12 @@ let self = _self // overrides; org-trello = melpaBuild rec { pname = "org-trello"; - version = "0.6.9.2"; + version = "0.6.9.3"; src = fetchFromGitHub { owner = "org-trello"; repo = pname; - rev = "5656f32d3624b3c82014658aef88ffa47c0fca7b"; - sha256 = "0781prmxbx3lmylma63vw80rix7dmhy8861jz4cbqmkfid6d3x73"; + rev = "f1e1401a373dd492eee49fb131b1cd66b3a9ac37"; + sha256 = "003gdh8rgdl3k8h20wgbciqyacyqr64w1wfdqvwm9qdz414q5yj3"; }; packageRequires = [ request-deferred deferred dash s ]; files = [ "org-trello-*.el" ]; From c44c3d21ba9541df65df70385819cd5419660bb6 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Sun, 22 Mar 2015 11:09:33 +0100 Subject: [PATCH 347/947] a2jmidid: wrap python path for a2j_control, fixes #6916 a2j_control fails because dbus is not in the python path. The exact error message is: Traceback (most recent call last): File ".nix-profile/bin/a2j_control", line 11, in import dbus ImportError: No module named dbus The fix is to add the python dbus module to the build inputs and wrap the python path for a2j_control. --- pkgs/applications/audio/a2jmidid/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 38192311ccf..218a0f8c6d9 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, jack2 +, python, pythonDBus }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; + buildInputs = [ makeWrapper pkgconfig alsaLib dbus jack2 python pythonDBus ]; configurePhase = "python waf configure --prefix=$out"; buildPhase = "python waf"; - installPhase = "python waf install"; + installPhase = '' + python waf install + wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH + ''; meta = with stdenv.lib; { homepage = http://home.gna.org/a2jmidid; From 166614ee4137d4f765d378931e75ff29f0147162 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 22 Mar 2015 13:22:41 +0300 Subject: [PATCH 348/947] Update Firefox. Second take. --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 19e549d9da4..ec7c6047ae4 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "36.0.3"; in +let version = "36.0.4"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "4719e77cfd6da66c4308eaae6b3ad54bff0bf332"; + sha1 = "ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea"; }; buildInputs = From 5cac50b3bfa1a452b44304a13a65564b1d7fb479 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 22 Mar 2015 13:45:44 +0100 Subject: [PATCH 349/947] kernel: add support for experimental Realtek2800 models tested with AVM Fritz wlan Stick N --- 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 e7199fee67a..e6d45af7c59 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -275,6 +275,7 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices ''} + RT2800USB_RT55XX y SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 627e2bf90c74cb986b96bc430a46234d96000bce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Mar 2015 13:33:10 +0100 Subject: [PATCH 350/947] nx-libs 3.5.0.30 -> 3.5.0.31 --- pkgs/development/libraries/libxcomp/default.nix | 4 ++-- pkgs/tools/admin/nxproxy/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 09888035b81..f2a903a21da 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: -let version = "3.5.0.30"; in +let version = "3.5.0.31"; in stdenv.mkDerivation { name = "libxcomp-${version}"; src = fetchurl { url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; - sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; + sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 098dd82eec7..8c973f0e53a 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoconf, libxcomp }: -let version = "3.5.0.30"; in +let version = "3.5.0.31"; in stdenv.mkDerivation { name = "nxproxy-${version}"; src = fetchurl { url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; - sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; + sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; }; meta = with stdenv.lib; { From 70f2112231f5e8603dd3656a2447301ea9f7f3ab Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 09:01:13 -0500 Subject: [PATCH 351/947] libgit2: build with cmake-3.2 --- 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 3e1f78f2929..9aa82e9dd73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5728,7 +5728,7 @@ let giblib = callPackage ../development/libraries/giblib { }; - libgit2 = callPackage ../development/libraries/git2 { }; + libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; }; glew = callPackage ../development/libraries/glew { }; From f4f340e833e771bfb9a31f2c1161d6246b96f667 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 22 Mar 2015 23:00:43 +0900 Subject: [PATCH 352/947] firefox-bin: update to version 36.0.4 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 47d3a7ceda4..de69560338f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "36.0.1"; + version = "36.0.4"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "c707c75b403d7e8f93fd1a362e65032a97d000a4"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "dd11e37acea4ee400b80fbdcfa98f4acbc7d73f6"; } - { locale = "af"; arch = "linux-i686"; sha1 = "f3df56046427ebee3f2510e6b0b1d5214f9e8682"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "0c064022ffe3fda103e69b03f06a50bab8a496d8"; } - { locale = "an"; arch = "linux-i686"; sha1 = "d165d0545866ce3326df5b6246e3e7817025050e"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "8ed6d2374b44037e8efe1252025303987f5a5b8c"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "ebd74e1c924e935a68e18bc1de78a8525b7a4fe0"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "a72295a576621e6305aa4bfecf444a114c2e6955"; } - { locale = "as"; arch = "linux-i686"; sha1 = "1bfea721c70265683682fa004522e1518094313f"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "42144c126408a5450b80e7e5be4aca96b2a88149"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "1bb9a1dbd4acffed0e2b31a81062b466f929a498"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "ec53f1640289f5866f9c2c136610725a5524ff1e"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c1396f03ba25ca4a9acf8b6998ce94d422984c68"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "ec7368e145b3f7d5e8dc2659fd97bb1008619a42"; } - { locale = "be"; arch = "linux-i686"; sha1 = "3ecc92fdbd51bd5b2a4d4e3744a9e4b6b1bd119f"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "e8dc491a4d045a9fb3ad251a59acaffa12b8aac4"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "3fab78887d35fac20483c168b05a45cd646d16ab"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "03035db9fc8f6439d29ac396ae91888dfa2e127d"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "20eb295ef81b17f5427014b1234b6bca5ba34605"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "85b1af82364dbfbd5c614f2d524f455ab45e3681"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e9745b0f3d7392a10706c8668faf598b0f9daec4"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "0f54e8f852a4af3fc8567f3b3b383e1dff3c23bd"; } - { locale = "br"; arch = "linux-i686"; sha1 = "5ae670b00b932f1732fddde8d8c804501ddd27d3"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "2569214acecc2fed7c087b27d047b82ccf42e3be"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "76fe2cc09da9f87f2178b686787cf55794ec233e"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "d2f70787cc36fceda857fad3c9552d1c4fa1b812"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "ca2f3dc2369c2c2757ef8d8e6258f0b2b192e00d"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "771d59990ef2c7199a6a1a7e4a83448df03fc665"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "4acce7f304ff6ac5b07389fbe91e97cf7599b821"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "a764135d7f7301d1f08b767f7f51a99348d5b2f0"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "731b053f99eef029580eec90730a8b2b20624f47"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "636b964015a4a2ac2e45092e726c0e64d404582c"; } - { locale = "da"; arch = "linux-i686"; sha1 = "611b1290d147af331aa193380758cc3dfa3cafdf"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "ea7d77e511b4165c7b889113b46389d4998dd50d"; } - { locale = "de"; arch = "linux-i686"; sha1 = "ca3425c8264c4d9db53a2cbce52519912de7ecf9"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "2d9b99842a185c4063166de5926db46182b258e5"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "1ee0b0d3e599b98e5b190f8c7cd5d04a1141203a"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "24f840a1ff2d00a74c617af81584f6d2907f7b7e"; } - { locale = "el"; arch = "linux-i686"; sha1 = "5ecb3ea1cdc9211270239b6ec4a9d29bc1b68409"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "fa81057327b718264e82cf6aad2c0e756ab709dc"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "8f2d51fd2f4fc43c766fa4d8db4180f8129d1a89"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "4395202bd676e8b6ff41ca946c885f1898fac1cc"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "7f54347e1929c20c1ccbcf3fa9e07749b2fbf0d3"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "3906fdb4f0fdb0e4e1f21e577099f106e90f02a5"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "5dd5a1e54e72962714dc443677069cd65d5f4f85"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2d1c15b66760419f33e67450c51785567d33a1b7"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "ab2c3c65b723795c9e5335c3efda8406dd660ff5"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc35c1ddb53482cdb147a4b8ef5d18b1533f859a"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "b2e4991dff339369d07d6e1b7c9c57807010f1e6"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "08358b68d518478ab3e177dc25e44bcc22d6a10b"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "dbadd2dd873009d49015d9ba73ff8399c3c923b3"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "22d995b08052750addcb06801b5ea46757de48c8"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "705524e182679992eb6cf943ac6768b7732ae4fb"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "24f1558fe278c92abf89d046dc2ca8b947d878fb"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "69333c9937dd4430facc52f05e35059433b0c78d"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "2e28497f7e6aeacf54a4b88ce91338260d5191b0"; } - { locale = "et"; arch = "linux-i686"; sha1 = "fb262e3020715e921b9408b8e661e14e8de226b1"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "d49430fa7328566369046efb6d92da24445b00af"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "56de1040fda96ccd59b010578c91303c57bf7a53"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "04c6e7f3430da79450eb3a96238c11c997feb2fb"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "6ab145b3e85c6b001d49004b99c53fd71444646a"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "fbe27589194dae4d63c7b9f8a45f3abffba42449"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "adaed8878d757ed6b74bd334b138a1c46c438de7"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "91a9fecbcb65067c420b0338dbcbf37d4bc4ed20"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "3e31d26155648b3148f8e0340db84e5725435b58"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "17a8e273c9dbf82d4f86b81426f07af62a49ee6a"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "8fa301bb3c7f8bd713c2bfa6768b73bd02a38de4"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "ddd0bf1ce6a6fc70eb48e9bd72a52b20b78f2256"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "264d6237f00cbacbdfc3d47385c349422394cdd7"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "7f9dfde56e776f16d30df9e3fc6853f8001d9837"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c032daf124507e56be02d15df8b651c814ec105b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "2032c9e8c23fcf3ecc1db6eccfff921f6a49d734"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "4ba7388a13dedc7ad7d1d83742d9f7f8c211aa76"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "96ff03ffc0495ae4042dd6d37cd7aa2c9748b7c2"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "43c4c6e2dcc364711f5368ad1efe223df5fda4d5"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "bbd0443d6ed8598ae78a71b834c3b4c4e2d599cc"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6ee1707123bb560fe7b1dc39165c4a4250565cc4"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "6254300eddc173e888cfb70db612ef7fa41aa2e7"; } - { locale = "he"; arch = "linux-i686"; sha1 = "de203188d6b68e8a7c24bf0bea40342535897a9b"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "598d0d0d1eb22ed7378c8aaced43ebe91f0ab305"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "809126d150b1fbd42e7bcdd14c032bfb11797f46"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "c940ec3a10d61d47a891fc538c9076af90cda65b"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "a85b937eac26926f8f69d5181d27504b06284b63"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "288262d030c80308e725de8ad39914509a538526"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "9b084622ae514854bf01c6977c31d77f5d83de59"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "249f387302c44f79eef12d336af81eab07ea6463"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "c646b79ba6c74823caad11aca9ddc2ca8051117e"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "f1436bd0c5ca9ba23eb50caef9a6cc4c5dad74d8"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "9523c995e785efda19bf0cfd08fa7399b37138b3"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2992ebd3a86bbca04e443d1f55d73a876a8b4505"; } - { locale = "id"; arch = "linux-i686"; sha1 = "0bd17d152d738ba6a57da12f333fa9d942fbd274"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "1bbed6d2d3ffc2ed91c6f4badd5243af17fe63ca"; } - { locale = "is"; arch = "linux-i686"; sha1 = "90c33bf3896565df30b104d271cf4aa1d09d67d1"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "05e1f66bc84dd2ce1b142ee64b420eae3321f172"; } - { locale = "it"; arch = "linux-i686"; sha1 = "b11e6172e8040fe0c6749a684e0073fdb5a19402"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "5c47ffa4b944c71576017c684ab8ebd78fc52d08"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "acae3c28497f4ae7937f4bd38174e5a30b009475"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3610648b5a7f1bc223fb36ca94ee4d8f25060f7"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "0d4185c11d9a4ed7f2c554fd322b6a5a0fdacf53"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "189ee9cb3c88809dc9dc4c7dbde2ccafa333a432"; } - { locale = "km"; arch = "linux-i686"; sha1 = "8e39eb920380bcb87aaf48a69ea53bbf6abba2c7"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "8770649702e38783e3e2841ce0ce66f068a4b23d"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "e0407f7df92240aa866ba981c9054760cdc07cd9"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "f4558f7edab4f85612d8280cf8ab131492854ba8"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "373b7ef465500dcc7bbe9a48e113f26bc4a6a27b"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "8c8b0fe42a644c29ebafd1aa7b82733b7c5d6bb4"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "a22f113cde99557fa8973776e19f6bf4cfff1114"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "dd7917fb9c1e8bbd1db503829c8bdf1d5a935769"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "8887a493a938d10ee63630cda8ef9b3a03f01a1e"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "8fca22b9076082e859f0dff2afe7ccb245ee0fad"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "a5e4a7c95f336ca6664fee8b16e002a44561effb"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "e69bdda0ae0b3782a10e64ed3fd85ab19c7630a2"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "1efb4b5f649f219cf66f148297b5f669fb4dc16f"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "7ad1e9472c812e71e358e67021aa0a07a0d97062"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "bb96c1a1d5f371ecbed4b9c6e3ae1d244e582f6f"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "a4d18deaa48a23f588b7d8db4973a37764e97449"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "961f1ca920469c5f95ec875fbc33a913ae2a1986"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "c662ac25845f9f83cee846a3b02f41186ed7c83e"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "7b01dc5ce1dd97f5b2c3b39783eaa06556dd03da"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "2940bacdbc3f021ad421097e94017627cf59d655"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "624edc402de71fec31b63e01a9a1f2b79b3c5db3"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "30dceab395c15909d55ede343071a1fcea21af7b"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "958f0e5ffa8911eee58883b22fbf6db18d1fe1a0"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b0bc728560beb154ca2b9bd8e5c607458afa88f2"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "77976787dfa2464cd859bb3c3245fddd6cfd5c02"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "ba47a63624bd64597dde61dfbf04c94eaada4900"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "d35fdb72fd1afee6310ab4e8a764e75804822226"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "848c8d69a53ad6841ecb38d7ea93b37a70b182d8"; } - { locale = "or"; arch = "linux-i686"; sha1 = "f7b83449922833f438acd3ee9b3bdbd1ceb8d578"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "a9f255e2fdcdd8b5d95026af2dfc6b90da7eed64"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "1a1552f9ae38db0314550831711a674c50a3c9d1"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "eea36a9355b0d0e3477a51d7ea8cbe46745fbbf2"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "6f7c3ea9d43bae1d9177c41a60b6e568081c33f2"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b6b7b6ae8391ff342bcc0f3fd3b14e7189f9ea02"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d474f48517529dbeb5bc12ad57b28cc1bdd3cf28"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a8906806231ecb44c6368eb22dfa01a21c05bf89"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "4910bd75b9566ba8fb1392c69610c6db527cc87c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "9205b1556359844144275f2a768f7ab74edc5519"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "27b825a7eae976a53579cf1fed1509cd4f817023"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "03362ade5b3b5a030611cbb03767421bae1a2fe4"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "75be442bb19172111ad2189bad0232839db53dfa"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "4879b5f99852b7bf8f36237e121c6f3f58db395c"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "2d447694af3e95669be993235eb239ff74c75aef"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "227e369a35018d43d1ae6eb1b7859d289df15362"; } - { locale = "si"; arch = "linux-i686"; sha1 = "5c8ac234d851c0860b5f79f33b07c80f710776a2"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "703b7a9557e43d196b34a498e5d08a0d582edf9b"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "5b8ac9ead4f2886b21af1512b6942fb5e1acefa1"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "ffee2ee4d0e47dfe252868f602a0d4c991cc890f"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "836295228c78541efe1a21e5b64671dd8b9ec00c"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "4109e25e578d7af567f37062a753bdfcee394092"; } - { locale = "son"; arch = "linux-i686"; sha1 = "34427023f9eeaa0c9924672fc59a58890b35635d"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "12cda45700a294b72f94560e421c88dbf04ceb4b"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "1d3970aaa293e06b6a430cb73ccfafaf043a2364"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "0a49d2f6fed69ef22698e1ba98b8cbb008debc84"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "ed6796f73a3e34db680414a5f7b17c4d326be884"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "f22376834d160c165534f2e8ecbdad3273f46334"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "24140ca9e8acbc64ad553a528acb057c67240c00"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "875c60949b97edf2a951f470139153eafad03c9d"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "4adc26d74d6a0ec3fc80e5979750ed19ac93e290"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "24b6a6f4a16b5a19b340949d326203e1d1cdd2cc"; } - { locale = "te"; arch = "linux-i686"; sha1 = "4584c8b93624af4f630c759178d8857103ce6fca"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "4b810afe09e317593e3fe269c5d686336cd3524f"; } - { locale = "th"; arch = "linux-i686"; sha1 = "c7b00a159fee121e5ff8f9e2248d6ae1a511647f"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "4c0e26054226ccea1093a809a272cfd12d8af2ed"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "b0844d25d0c9307675559a52e7c6a097615c403d"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "67dfc61732853e99be82054344f59768b831d6d0"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "d9a640765b27e192948e8b485ef4a7005513de29"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "c619fd93d8e9650482e3e1d639310b470f1c914b"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "561a2c6d943908d4b3bcd2c80895d43b141d1a2b"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "c287e06e19fb45f265d314fb5199af5c449464a0"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "469cb11ded0712ad3fe9c3cc01df74e6b566c845"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "4d9e3f2ea7ab3ee76bf7d41fc6936915b18d45db"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "f48a638f685a7754ae23626a4d2e8209d5272b9c"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "a1bbf7e645291eaa7ccece17b13461d7f239f334"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "ca839f0034807715d7bccb0f97e4ffd7dbcf8e17"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6dd09c5d50ce206931d1e1f6310fe4a55d8eddd4"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1265d89ca47aa9f9f4f3a7825cef622a9ac2b18a"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "2464e2c81407987ff9bb2b682b71f3b8f94aa455"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "07c101a98019482c61d81f08bd27219a96bd1f25"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "f8c6b9d816c22c70f8241f8b8f508eb1e521c5e7"; } + { locale = "af"; arch = "linux-i686"; sha1 = "6933a5a4e5320f54cf5d8f17f1b0905d6ca54736"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "f0cc0f14a46abc0d56a25e4dcd128d0fa60619a0"; } + { locale = "an"; arch = "linux-i686"; sha1 = "1d931bef5349e885d847d31a80d9b432e61c5a22"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6d6bf623959c0f24e0f0b81b7c99672083a31f3e"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "96a1f898449c62dec9e9970972d78d42484d4c4b"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "3e10f2aef47f239c4fef828b1d72f2f7f549d94a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "6ede4616158426d22adc49daf86cce9411215e3c"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "71c7d80f995fd1afe4b345d32ed10faa95a52ca2"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "17ccfe25f83845281827df64c046ee26b694ef6c"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "f10c7b5ec1f803bec50156b179bb688747772ff1"; } + { locale = "az"; arch = "linux-i686"; sha1 = "5439ded3fc618d45fdcc8e817b54b6da62f4a9f4"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "74f9d283000d7b7fe7524ed06c335447346908c7"; } + { locale = "be"; arch = "linux-i686"; sha1 = "c1279eeaac489b432a8f1068c7bc1d4d9a8550c9"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "d22bba42c1ffe3d4a5c70d06aa71bdf5904c9d18"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "0cc9b6b3f9a8b6caea713e4e42dd3a0a95a204e4"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6d2f2971545a6e669b0ecb970d774ac45cb84e9"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a1d3d7909152be32058f3f1e9c180daf96656a13"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "2df28cf71cd712fd95afbbe86c4f4fb5166c8a34"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "ebc9f6b69bc497dc5419b3bd6d67c42ca2c8de8a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "c2db141bfb5627439344126edd4e93353329aab7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "1b77d4806267e153d1f6d1d4b90076d47edba8db"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "9901af094c845b9ca9a4759d2a0ba4a241aa663a"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "ce38623e0307c94a6b78f7387862c9cb0541ced7"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "08040f7ed45174a53d8f46384781b940c41cee1c"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3e167560bc466dc24e450cff886d4041495a7064"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "e312e2005d302cb390a72062d6314b9243d77b51"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "8ece365b6670826bd8bed8285c0e4d518c7fc97e"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "8bbf5abd8b43213c2b07ef0541c004c88483876a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "84be0b6dc586bec5a05e43f349cf37c6bd9c0b41"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "3dc843146b4bd9d938a84ac5d4543c68e2674003"; } + { locale = "da"; arch = "linux-i686"; sha1 = "35dc75cdca3b923d3ea55ad31ecc896546b1a311"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "d7fb80133739c30a474d380542b8d66ed0e0cb03"; } + { locale = "de"; arch = "linux-i686"; sha1 = "11ef8ef607250e8fc7ffb490499d42ee78985f97"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "51ed94bb05e362453390e43b67a58b3ca5caed26"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "31360bcbb170b748bb0e56b9487988c1b620a7c0"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "9876f83cd680a8a9a1c7b30254f49cc81cfe0f96"; } + { locale = "el"; arch = "linux-i686"; sha1 = "1a25c11af8adc49ddacf23373ef227b4a7a54024"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "ac44f6191a4f78a4e390b7733d7333e026580155"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "2d9b564832107409a064620cbeccbffb4cd417fb"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "e9732da9758c7cb443d9b23a1e816042828a9719"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b814bab9571355758dc55c2b1322f09ad2877a71"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "ca70cafbc9ab89704ef2b6b786b9c8c0bba3ff83"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "7317e2078b969d0c8af60d756a1e9c622e6a059b"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "5011dfbf020af2ed2a8986bd6976c9964b91fdbc"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "035f427d83e0d847c7a08e33d73f2c28d73bf533"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "3dfd3dbbde050591dbee842e64f7bab497028a05"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "f84fff5f42c0ab50a50ea561fdcd998846255812"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "31c485c5aebe893fbf4a1ece7ed0f4eda7c300e3"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "efa700b585a9e0e04a8fc01dd465288dc1b9caca"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "8a55a229924d71c602019382209eb78f972018ae"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "8f467c3603088f757f46d37b8138b70c63cfd514"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "a82f3188718c8166ec4cc7ac6c4e84c7f63e670b"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "5d767c2e65390380ed49e76634f5a4e2fd37ebde"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "a84e26d375d15f9d019187eed28b5c9cb3f60fbd"; } + { locale = "et"; arch = "linux-i686"; sha1 = "5b2eb8e425c30563f59293a1eba56215938eb161"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "fc63eb3f960c2b2ddd6f12e387976e08fe78209b"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "0969053a42449e957e8d05fc8526b92c5a49a5da"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "64a9c961b0246333d6fd55026d547ec77befab2e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "f00fc446dc3aca2d50cced0a13ff0aaaa54f1716"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "afd6a5aba5c1e48eb8ec6909797214b87f755764"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "88daf24a927723587904c76bfe30b93086adfc02"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "21459a4cf6827fce2fe9476a8100ac19457dd052"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "31035303cd31cdeb9b73a308b913292ca8923ea9"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "af8e942824f8f2a64b1930ff1cfb96b070551288"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a55bcd868b5f485e6ed0a999337e3b7e2b27838c"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "633a8328de12be374378b9193e3008ef0fde6dcc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "21e9e6619ed54ce1cc0eefe694e5ef2880f9169a"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "28746f0b1ea9cf0368a130329d37731ebfe3bf92"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6699599d8a79991422c64d7fee39bce0af33cfff"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "efd72597e9dd9857484bf46ca286985871a32852"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "35fe3bd410d244245e5d4a89afa3b72e5cd2664a"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "db0722b10c92ae4e7645df6b331abf420d6b6c8f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "6abe5f9d2d275f3fea7dfdf7398dae5dfc8cbdb9"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "dd401355463f06e85de467310f6585ab1136df9f"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e101f80e3df8558e017361aadfafc26071122200"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "030047ebd6f2b9a320ed552d199cacc83800b4d7"; } + { locale = "he"; arch = "linux-i686"; sha1 = "d6a94c95668245aa92616fd93ea31890a9f7dc02"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "304be29ae0cdf623f8d87b841551bacb8b3fe496"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "a4dbb31547c675102173d8e52e27cce6546a1946"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "a92c5e441bccb6f35e77d1e35f1943637a47c26b"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "743ba73288965b960b7f7db5ee14437515548811"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "1bc8197e674e9e0839ebad4d1eca03fef450566f"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "26bc907a7d9c084732885711c90b63790ad4f094"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1da9080e67ccfd687a132c42bbbe431610928cf9"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "9693b4971de85ff12953d726af2c28333461460c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "27fa6940ba4244f4c78a6463b1b6f8e744dcf64d"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "2af42b9776d43d688af74d749fede31ac33b09b0"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4a75e6a1ca0c1f2f4901a37196e1da6af13d755a"; } + { locale = "id"; arch = "linux-i686"; sha1 = "2807b1f819c9cefb9375595ceb435897d7e4a7dd"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "3825a6b08fe710871c7a2a20faf8386a1b30d3c2"; } + { locale = "is"; arch = "linux-i686"; sha1 = "0c19a8f1e80e3acccfdcd9b3dde86580e39238c6"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "5684deb431acf6e18fdc7f025ed5f323484ad120"; } + { locale = "it"; arch = "linux-i686"; sha1 = "abbaeb2915f098098fe94976dfad17aab7e48775"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "3a2be07826e851625c02623a04e80cb5bcc8a7b4"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "303f525a2f3c0afa28cdeecb3648813dff77e40b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3ef3b46ad3530fa0a748dbf76d306984f834192"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "7d9edcbef8effbcb2b542a86dc5f6efd961fdddc"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "29bf7048bf23a698484e56f62e2293e9defc1abe"; } + { locale = "km"; arch = "linux-i686"; sha1 = "1df85a1ff74b55096b6386e931c0a3ce6013496b"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "a8ed53f03435c971b4d1fca8d41cf0ec2b55c83a"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "46ce48f57d28b04c7dbe888a8d0faa1bb7f1630e"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "264d2ec87d2e46d9116e4ddb8cbb7fddf2ef9f75"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "3972269f7fadcf92938bf3f3819360839dd8307b"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "b8c0ddad810850fbbb0acab1ec2ecf983cdabfa8"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "5bcf38287b5a350539b169b5069a608bd6d53fd4"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "bc86889a61e7252a2d9951a39e371d237990c7fb"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9bffa4628d1c79013abf94d9d123a93435fc3dd3"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "eaf685b6e1147679b6b27f11bcbd6f0458e9998c"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "fe874c7d3c26858585a8e9abe8a8acf1d0a642f0"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "e730200d162c2bc46a307389243a444577390c55"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "f91a082128370d7eb067cef5fa32cf3d15269f75"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "a7c6a211c87e7acc48a6a33db9350f735356c9c4"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "58d107b05fd47300dca824f93ba04635ed75d98d"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "bb7523230a97e5952451cfe47c25bd4103fb3acf"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "e26a244f689f9a0f2cf95fb47851bb00f66180c6"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "9a6e38907666c610d5a9e4b9af50d3997e83b088"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "9fa8d90c58006c70a8454457dc321c01dce0aa3a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "39ccd12f257d5a1d87bdb63afc9a9f02a9b5b957"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "e81c3b825aa74e8e15de274b3b5b39aa1a271968"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "1ffd3e73c3ee6952d34fe857395027e54fa8e99f"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6e0a18d5eb0f460d3d81e75c682e8d49efe681c1"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "24eb88d2caeeb1ed129f5fbf4b5d2eadb1453717"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "d69104fca536e2ecf71cd8899ee93057c2c968e4"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "85cb1c316bb3379fd2a5ff90e50d9a310b8dea8d"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca64cdb415adbaf5e91bb5b4e18b35a61444246e"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "ecaa3bda5e705e30b00af9d2cf04dd919dfff50e"; } + { locale = "or"; arch = "linux-i686"; sha1 = "7c733f7d65346eb9e6ecc6ac6d3e3645a1eb9bd2"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7c4d1d5ff0473892cff420e5737f746591cb1de7"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "f797a2fbb789ee586d7a9aa3288caa982be4dee5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b06d4dc6e42eacf8d8c5960d208230b3ff1f95e1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "f479e63503d3d6513a18059ced2aeb56266da49b"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "87ea570c3ceb3d7e79ce24789dfc1702dbe387ea"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1c023fe72c192df118c727ab6646a5882650ef32"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d69ef0da3084fc4c12c057fa2892dbeb83d666dd"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fca9b7f61c1e1d19358805bf1a31b81a9d246df9"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "896626a8269084cfa35080cde367ba20d38a7e06"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "c4fcdb7fe19362d0dc68bf89f3ecc5c5de5f7f7f"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "69e7381d36c187ad7823cebdbd0d1f7df49c049a"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "a45f1f9858e0bcff7e071d3e92173283c8038417"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a0bb823fc0a0d4891b71edc4c2cc2fc315d56617"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "daaee48142a463180a9b94468039d5231e315a4c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "886417d5f361a57af0209de6731e3d6f7e8cb437"; } + { locale = "si"; arch = "linux-i686"; sha1 = "eb1a0a28d8c5fe6f789340b5d53da63c3f67ff87"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "e63f4b81e21f3a9c1b706afcf28410dd0b469205"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "edad04ac1d8afc92190b78567d79fa745854306b"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "56cda6a10e26f2f958f24ab09e1b34c1591da0c5"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "78e28912b586b922821faf76785df8d56fc85460"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "92ee5a8d02c6bada618b309c1fab09fc764716c4"; } + { locale = "son"; arch = "linux-i686"; sha1 = "a8f48e23c63143fdfa4dba4b569e45f06f50ccca"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f6e52004d060f268fdfc25d4de1fad68ebd4b250"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "597cf559e7466f9b40cd93f125fde29636a414c1"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "8d2d5ed7a8b4abc67d3dc96456a3625ba9b8ae2e"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "1ac71db3fdc95942e58e93038c606b8f4156db16"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "956cd3579ad1e000e3519050122443424c691e46"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "df0651f4d830d1127db54b34accb6b7e61da4c07"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "ad21f011767c133b8f9fb6270e79405f96aea7ae"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "37453def3951e2ce5d8cd242d0513fbe0b081f90"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "e09dfe3e79e85f3a37150df79f64e3285a73db10"; } + { locale = "te"; arch = "linux-i686"; sha1 = "5d329ecfe87772d85e4f57329cd1505e73ea1d09"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "83ade2a74e54204a7155d52695f6bd41f350c627"; } + { locale = "th"; arch = "linux-i686"; sha1 = "9e435d3a244f6602546549fd3a64e8229fcc8b17"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "0ba7a20912068fad8224d59b70c44f124e876199"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "5be128415171825123bfd6c09affd5adbd65fc0a"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "2803083c7c064ec5b6f2810fa56f86cfa884171a"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "eb94ca07d84bdcc4f2609b87a9742ed7007d5136"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9167b85241f15911c42d4310961b80659ffb1989"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "216554e565e0527c1aff13a2abb733093b1aa0f6"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c89dca50e3d2fb3d1340791b7932d8ef6008333a"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "6893ef973ead9bd97d0e98bfa71bd5fe7fb4c7b6"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "8f521aa6ef56fa26d97d751391b94a9e648a3727"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c5ecc1b8aa8dfe3ea5611e3194e719c79012cab0"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "346e508474653a9493936995e3ad224a94d2fcad"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5e50c358a8a38d1fa106373d0ab71b716ad75915"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "8c170bf247a667ea513306b2d79b95c066c4c6d4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ea4bd309c940d87433d96e8d5c77e7578fbd4fd7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "26f3b0500593e6a8aae3ab7f415f929d39466911"; } ]; } From 7472f7f023a45ecbb8fa25676e2eed13fc85d541 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sun, 22 Mar 2015 15:06:54 +0000 Subject: [PATCH 353/947] profile-cleaner: Add package This commit adds `profile-cleaner`. Use profile-cleaner to reduce the size of browser profiles by organizing their sqlite databases using sqlite3's vacuum and reindex functions. The term "browser" is used loosely since profile-cleaner happily works on some email clients and newsreaders too. Supported browsers include: * Aurora * Chromium (stable, beta, and dev) * Conkeror * Firefox (stable, beta, and aurora) * Google-chrome (stable, beta, and dev) * Heftig's version of Aurora * Icedove * Midori * Newsbeuter * Palemoon * Qupzilla * Seamonkey * Thunderbird * Tor-browser --- pkgs/tools/misc/profile-cleaner/default.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/profile-cleaner/default.nix diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix new file mode 100644 index 00000000000..903c8617128 --- /dev/null +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }: + +stdenv.mkDerivation rec { + version = "2.34"; + name = "profile-cleaner-${version}"; + + src = fetchFromGitHub { + owner = "graysky2"; + repo = "profile-cleaner"; + rev = "v${version}"; + sha256 = "17z73xyn31668f7vmbj7xs659fcrm0m0mnzja7hz6lipfaviqxrs"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + PREFIX=\"\" DESTDIR=$out make install + wrapProgram $out/bin/profile-cleaner \ + --prefix PATH : "${parallel}/bin:${sqlite}/bin" + ''; + + meta = { + description = "Reduces browser profile sizes by cleaning their sqlite databases"; + longDescription = '' + Use profile-cleaner to reduce the size of browser profiles by organizing + their sqlite databases using sqlite3's vacuum and reindex functions. The + term "browser" is used loosely since profile-cleaner happily works on + some email clients and newsreaders too. + ''; + homepage = https://github.com/graysky2/profile-cleaner; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90325f9b38f..520d58bb530 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2415,6 +2415,8 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; projectm = callPackage ../applications/audio/projectm { }; From a94891c31519a1c0d65181f51b51992a1d3384af Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 22 Mar 2015 17:16:55 +0100 Subject: [PATCH 354/947] Update syncthing 0.6.2 -> 0.6.3 --- 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 2956c2d4110..34e18b87cdb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10916,13 +10916,13 @@ let }; syncthing-gtk = buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; name = "syncthing-gtk-${version}"; src = pkgs.fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "0dfs5kzdj9ld20i23w6ldj7z761rwnnbqkr0l12wkgcxi58jcqds"; + sha256 = "1qa5bw2qizjiqvkms8i31wsjf8cw9p0ciamxgfgq6n37wcalv6ms"; }; disabled = isPy3k; From acd999e4bd3bd7ae5c297589d29cf69f2a6bd8b4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Mar 2015 09:23:25 +0100 Subject: [PATCH 355/947] syncthing 0.10.26 -> 0.10.29 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b7f4c8abde3..cb8d168c7db 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.10.26"; + version = "0.10.29"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "023vnns8ns2pgvqjisw466mw7323rv61cbl1indpfai412y7xjbk"; + sha256 = "0zpjcl4gr0r8c0qygvks58ly1k7gp2ngd4dn2d85ci4dddvmmxvj"; }; subPackages = [ "cmd/syncthing" ]; From 75c4f136caedf2d5d2cd0af0e50df40b639d587a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 22 Mar 2015 18:09:41 +0100 Subject: [PATCH 356/947] dropbox-cli: make `dropbox start` work --- pkgs/applications/networking/dropbox-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 51f3ae2ac8d..9f472f5ad33 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - + sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* patchShebangs "$out/bin" ''; From 7ed4beec5564430f171b8dfa66c1f85c3fc73f9b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 22 Mar 2015 18:10:28 +0100 Subject: [PATCH 357/947] Update dropbox[-cli] to latest --- pkgs/applications/networking/dropbox-cli/default.nix | 5 +++-- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 9f472f5ad33..1a9c7e0aa2f 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,13 +1,14 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "1.6.2"; + version = "2.10.0"; + dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { name = "dropbox-cli-${version}"; src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3"; + sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg"; }; buildInputs = [ pkgconfig python ]; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ad6dac31dec..bd557a27ec0 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -26,9 +26,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "3.2.6"; - sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry" - else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz" + version = "3.2.9"; + sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049" + else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored From 2ecf9aad4a2d2b9e72e72aa9d7911e1b565dc3af Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 20 Mar 2015 15:50:34 +0200 Subject: [PATCH 358/947] myEnvFun: use stderr instead of stdout for messages Close #6910. --- pkgs/misc/my-env/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index b9b29cdabe3..ce7813b237c 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -141,7 +141,7 @@ mkDerivation { } export PATH - echo $name loaded + echo $name loaded >&2 trap nix_cleanup EXIT EOF From e8d85753cf94ffbf00b6091f51c745f8f07b06fd Mon Sep 17 00:00:00 2001 From: "Luis G. Torres" Date: Sun, 15 Mar 2015 00:04:24 -0400 Subject: [PATCH 359/947] Added Darwin case for java.swt. This still can't be built on Darwin, but at least this derivation won't cause nix-env -qas to crash on Darwin. --- .../libraries/java/swt/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 795062f12d5..e2870de05bc 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -6,11 +6,23 @@ , libsoup }: -let metadata = if stdenv.system == "i686-linux" - then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } - else if stdenv.system == "x86_64-linux" - then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } - else { }; +let + metadata = + if stdenv.isLinux then + if stdenv.isx86_64 then + { platform = "gtk-linux-x86_64"; + sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } + else if stdenv.isi686 then + { platform = "gtk-linux-x86"; + sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } + else { } + else if stdenv.isDarwin then + if stdenv.isx86_64 then + { platform = "cocoa-macosx-x86_64"; + sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; } + else { } + else { }; + in stdenv.mkDerivation rec { version = "3.7.2"; fullVersion = "${version}-201202080800"; @@ -22,7 +34,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; From d1cf37eeb76dd1eb2ec731cc09aef3f8ce84f7db Mon Sep 17 00:00:00 2001 From: "Luis G. Torres" Date: Tue, 17 Mar 2015 19:22:38 -0400 Subject: [PATCH 360/947] Cleaned up swt derivation --- .../libraries/java/swt/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index e2870de05bc..d942dd7b692 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -7,21 +7,19 @@ }: let - metadata = - if stdenv.isLinux then - if stdenv.isx86_64 then - { platform = "gtk-linux-x86_64"; - sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } - else if stdenv.isi686 then - { platform = "gtk-linux-x86"; - sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } - else { } - else if stdenv.isDarwin then - if stdenv.isx86_64 then - { platform = "cocoa-macosx-x86_64"; - sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; } - else { } - else { }; + platformMap = { + "x86_64-linux" = + { platform = "gtk-linux-x86_64"; + sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }; + "i686-linux" = + { platform = "gtk-linux-x86"; + sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; + "x86_64-darwin" = + { platform = "cocoa-macosx-x86_64"; + sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }; + }; + + metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; in stdenv.mkDerivation rec { version = "3.7.2"; From 07774208507ad34ad8b279006c5b7227afd0db95 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 13:10:24 -0500 Subject: [PATCH 361/947] kf57: don't set obsolete KDE_DEFAULT_HOME --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 793f1e9111d..b2d59246bc2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -27,10 +27,7 @@ let enableParallelBuilding = drv.enableParallelBuilding or true; cmakeFlags = (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" - "-DKDE_DEFAULT_HOME=.kde5" - "-DKDE4_DEFAULT_HOME=.kde" - ] + ++ [ "-DBUILD_TESTING=OFF" ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = From b4352e73df9551add3a20fe20e16ea0eb65edf88 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 13:10:57 -0500 Subject: [PATCH 362/947] kdeApps.kdelibs: set KDE_DEFAULT_HOME=.kde --- pkgs/applications/kde-apps-14.12/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index b34418401a0..00f84896a0b 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -241,6 +241,7 @@ let "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" ]; }; From de9e7bc5f1cd881a94c6c3372b75b16f1008a15c Mon Sep 17 00:00:00 2001 From: j-keck Date: Sun, 22 Mar 2015 19:58:01 +0100 Subject: [PATCH 363/947] sbt: bump to 0.13.8 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 72beb092bb0..01a3b740e6e 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "9673ca4611e6367955ae068d5888f7ae665ab013c3e8435ffe2ca94318c6d607"; + sha256 = "0n4ivla8s8ygfnf95dj624nhcyganigf7fy0gamgyf31vw1vnw35"; }; phases = [ "installPhase" ]; From d0715630067d8f555e23bbd262170238d953ec46 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 22 Mar 2015 12:20:38 -0700 Subject: [PATCH 364/947] spl_git: 2015-03-03 -> 2015-03-20 --- pkgs/os-specific/linux/spl/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 0a4e79b41a4..5c3ccd86120 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-03"; + version = "2015-03-20"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "6ab08667a44458f775da9f0ecceddbcea1275746"; - sha256 = "1n168kgagc6fkm9pqfwvlbqgw85z8ksjfy3bff69pi0cn1g9d739"; + rev = "79a0056e137c9cc540eb9ff7327c85ac8d094e6c"; + sha256 = "0xj132x0q76h9anjh7km2blqnr19yx7szwifj02x5h6xa07vq6fd"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; From 786f3216bc132a2e6d0848ff7e9dd18bde481493 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 22 Mar 2015 12:20:53 -0700 Subject: [PATCH 365/947] zfs_git: 2015-03-12 -> 2015-03-20 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 680ac295cff..62600886fa6 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-12"; + version = "2015-03-20"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "4c7b7eedcde7fababf457ca04445e6d9d1617e29"; - sha256 = "1v0rb4rfs48c66wihfmigc6cmqk6j5r5xlkv5d03shb9h5ypff84"; + rev = "bc88866657979c5658441e201e19df365c67ddfe"; + sha256 = "1d97xw7cak64f0ywwskjssnryljidf4hpngmqv0mmz4lk4hwirm9"; }; patches = [ From dc1ea2e968c78ad978c71ddfc3b4faf66de5ae86 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 17 Mar 2015 10:18:14 -0600 Subject: [PATCH 366/947] tigerVNC: fix by updating (close #6852) The default xorgserver is now on 1.16 and so the patch needs to change. The 116 patch is not in 1.3.1 so we also need to upgrade. I don't know how to compute this filename since the xorgserver derivation doesn't have a version attribute. --- pkgs/tools/admin/tigervnc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a7ec73f55d7..cc341922ddb 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4.3"; name = "tigervnc-${version}"; src = fetchurl { url = "https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz"; - sha256 = "161bhibic777g47lbjgdnvjhkkdzxrzmxz9rw9sim3q0gcbp0vz3"; + sha256 = "0938fmlll1vxccc65hdhzdxii7c1v65n2nbgizjddprj5gdh69hb"; }; inherit fontDirectories; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { tar xf ${xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver - for a in $xorgPatches ../xserver114.patch + for a in $xorgPatches ../xserver116.patch do patch -p1 < $a done From cea1f1b770a7c52c44122188a75f3d777602a304 Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Fri, 13 Feb 2015 16:12:59 +0100 Subject: [PATCH 367/947] remove x-scheme-handler/mailto from .desktop file; change icon to follow xdg scheme --- .../networking/browsers/firefox/wrapper.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 02bb6a55b42..b43f22cafb6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = icon; + icon = "$out/icons/firefox.png"; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -19,13 +19,10 @@ stdenv.mkDerivation { "text/html" "text/xml" "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" ]; }; @@ -61,6 +58,9 @@ stdenv.mkDerivation { '' } + mkdir -p $out/share/icons + ln -s "$out/lib/firefox-35.0.1/browser/icons/mozicon128.png" "$out/share/icons/firefox.png" + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications From bacf3be4fca69785c31c59b39762c382c534f46f Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Fri, 13 Feb 2015 18:07:01 +0100 Subject: [PATCH 368/947] change firefox's hardcoded paths to variables --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b43f22cafb6..20d2ca962a4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = "$out/icons/firefox.png"; + icon = "$out/icons/${browserName}.png"; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -59,7 +59,7 @@ stdenv.mkDerivation { } mkdir -p $out/share/icons - ln -s "$out/lib/firefox-35.0.1/browser/icons/mozicon128.png" "$out/share/icons/firefox.png" + ln -s $out/lib/${browserName}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications From 6a6470b79386c6c8710380fbbe7a665b5f1beee3 Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Fri, 13 Feb 2015 20:12:17 +0100 Subject: [PATCH 369/947] change icon name to var --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 20d2ca962a4..c8457427945 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = "$out/icons/${browserName}.png"; + icon = browserName; comment = ""; desktopName = desktopName; genericName = "Web Browser"; From a5fb20d65a0a2644bb3283f65b8a12e23b6c2320 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Sun, 22 Mar 2015 16:31:25 -0400 Subject: [PATCH 370/947] opam: update to 1.2.1 --- .../ocaml/opam/1.2.0-src_ext-Makefile.patch | 11 ------- .../ocaml/opam/{1.2.0.nix => default.nix} | 31 ++++++++++--------- pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch rename pkgs/development/tools/ocaml/opam/{1.2.0.nix => default.nix} (75%) diff --git a/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch b/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch deleted file mode 100644 index 523d0f6524e..00000000000 --- a/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opam-1.2.0/src_ext/Makefile 2014-10-15 21:32:13.000000000 -0400 -+++ opam-1.2.0/src_ext/Makefile.new 2014-10-29 17:37:00.785365601 -0400 -@@ -51,7 +51,7 @@ archives: $(SRC_EXTS:=.download) - [ -e $(notdir $(URL_$*)) ] || $(FETCH) $(URL_$*) - $(MD5CHECK) $(notdir $(URL_$*)) $(MD5_$*) - --%.stamp: %.download -+%.stamp: - mkdir -p tmp - cd tmp && tar xf$(if $(patsubst %.tar.gz,,$(URL_$*)),j,z) ../$(notdir $(URL_$*)) - rm -rf $* diff --git a/pkgs/development/tools/ocaml/opam/1.2.0.nix b/pkgs/development/tools/ocaml/opam/default.nix similarity index 75% rename from pkgs/development/tools/ocaml/opam/1.2.0.nix rename to pkgs/development/tools/ocaml/opam/default.nix index 9081bcbcb09..b6dce132868 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.0.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: -# Opam 1.2.0 only works with ocaml >= 3.12.1 according to ./configure assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; let @@ -22,12 +21,12 @@ let sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; }; dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33677/dose3-3.2.2.tar.gz"; - sha256 = "a30a189f9f298ed1de96d7098440c951f3df2c8da626f7f37f38cbfddefc909c"; + url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; + sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; }; cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.4.tbz"; - sha256 = "ecb65e2cfd984ec07e97a78f334a80cda41fb8f8bb5e37c41fd33e6a0e2e69ef"; + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; + sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; }; uutf = fetchurl { url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; @@ -38,13 +37,13 @@ let sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.0.zip"; - sha256 = "b78bb9570fbd1dae50583792525a3dd612f8f90db367771fabd7bf4571ba25f7"; + url = "https://github.com/ocaml/opam/archive/1.2.1.zip"; + sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4"; }; }; -in -stdenv.mkDerivation rec { - name = "opam-1.2.0"; +in stdenv.mkDerivation rec { + name = "opam-${version}"; + version = "1.2.1"; buildInputs = [ unzip curl ncurses ocaml ]; @@ -61,7 +60,9 @@ stdenv.mkDerivation rec { ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} ''; - patches = [ ./1.2.0-src_ext-Makefile.patch ]; + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + ''; postConfigure = "make lib-ext"; @@ -70,10 +71,10 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { - maintainers = [ stdenv.lib.maintainers.henrytill ]; + meta = with stdenv.lib; { description = "A package manager for OCaml"; - homepage = "http://opam.ocamlpro.com/"; - platforms = stdenv.lib.platforms.all; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0f408b73f..3a91dfe5fa2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4252,8 +4252,7 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { inherit (ocamlPackages_4_01_0) ocaml; }; - opam_1_2_0 = callPackage ../development/tools/ocaml/opam/1.2.0.nix { }; - opam = opam_1_2_0; + opam = callPackage ../development/tools/ocaml/opam { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; From 3c7a9194317aa68e64baaab78dd6fb3ff4309495 Mon Sep 17 00:00:00 2001 From: Aistis Raulinaitis Date: Sat, 21 Mar 2015 22:01:54 -0700 Subject: [PATCH 371/947] ansi-wl-pprint hash correction --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 34204d6462f..df44501aadd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -129,6 +129,6 @@ self: super: { # https://github.com/batterseapower/ansi-wl-pprint/issues/13 ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; - sha256 = "111aasm6pb55prldzwzgfffd5zz1npl7akdzcwh2hsri865i1806"; + sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj"; }); } From 9255f6c0afeb2d9538eb96700e7f7ecb55b52b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 22 Mar 2015 23:02:42 +0100 Subject: [PATCH 372/947] keychain: 2.7.1 -> 2.8.0 --- pkgs/tools/misc/keychain/default.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2eb63f09216..1ed6be071a5 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, openssh, gnupg +{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg , procps, gnugrep, gawk, findutils, gnused }: -stdenv.mkDerivation { - name = "keychain-2.7.1"; +stdenv.mkDerivation rec { + name = "keychain-${version}"; + version = "2.8.0"; - src = fetchurl { - url = mirror://gentoo/distfiles/keychain-2.7.1.tar.bz2; - sha256 = "14ai6wjwnj09xnl81ar2dlr5kwb8y1k5ck6nc549shpng0zzw1qi"; + src = fetchFromGitHub { + owner = "funtoo"; + repo = "keychain"; + rev = "1c8eaba53a7788d12d086b66ac3929810510f73a"; + sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; }; - phases = [ "unpackPhase" "buildPhase" ]; + phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; buildInputs = [ makeWrapper ]; + patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; + buildPhase = '' mkdir -p $out/bin - cp keychain $out/bin + cp keychain.sh $out/bin/keychain wrapProgram $out/bin/keychain \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${openssh}/bin" \ @@ -27,9 +32,9 @@ stdenv.mkDerivation { --prefix PATH ":" "${procps}/bin" ''; - meta = { + meta = { description = "Keychain management tool"; - homepage = "http://www.gentoo.org/proj/en/keychain/"; + homepage = "http://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; }; } From 624fcfce6426d54b40b37443ce5c78fc6d5cb7ff Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Mar 2015 18:29:57 -0500 Subject: [PATCH 373/947] nixpkgs: afl 1.56b -> 1.57b Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index dd2bcd7b61e..b1c37331042 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.56b"; + version = "1.57b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1nagd9ycj0i1h7kx2pz07fpwy4b528inmc9hj7226qiid0bynsh4"; + sha256 = "05dwh2kgz31702y339bvbs0b3ffadxgxk8cqqhs2i0ggx5bnl5p4"; }; buildPhase = "make PREFIX=$out"; From aea93670d12e90115b30ba97453c45df9e7ec390 Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Sun, 22 Mar 2015 22:06:23 -0400 Subject: [PATCH 374/947] wrap long lines in sound-juicer --- pkgs/applications/audio/sound-juicer/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index d53d059e7a7..2dfbfe8cc3f 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero +, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, makeWrapper }: let major = "3.15"; From a11078a78c246aa26ddeb8918e4975eb886b1047 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Mar 2015 21:57:55 -0500 Subject: [PATCH 375/947] nixpkgs: afl - add QEMU support This adds support for `afl-fuzz -Q`, which can be used to instrument arbitrary black-box binary code for fuzz testing using American Fuzzy Lop through QEMU emulation. This requires a custom QEMU 2.2.0 build of the Linux userspace emulators (system emulators aren't required) with some custom patches. Furthermore we have to patch the patches a little to make the build more sane (there are some notes in the README about this). Overall, the addition of this feature by default doesn't significantly impact build times (since building QEMU for only one target builds only a fraction of the source code, and many features are disabled), so it's enabled by default. Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/README.md | 19 + pkgs/tools/security/afl/default.nix | 26 +- .../security/afl/qemu-patches/afl-config.h | 329 ++++++++++++++++++ .../afl/qemu-patches/afl-qemu-cpu-inl.h | 287 +++++++++++++++ .../security/afl/qemu-patches/afl-types.h | 79 +++++ .../security/afl/qemu-patches/cpu-exec.patch | 33 ++ .../security/afl/qemu-patches/elfload.patch | 32 ++ .../afl/qemu-patches/no-etc-install.patch | 14 + .../afl/qemu-patches/translate-all.patch | 18 + pkgs/tools/security/afl/qemu.nix | 72 ++++ 10 files changed, 907 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/security/afl/README.md create mode 100644 pkgs/tools/security/afl/qemu-patches/afl-config.h create mode 100644 pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h create mode 100644 pkgs/tools/security/afl/qemu-patches/afl-types.h create mode 100644 pkgs/tools/security/afl/qemu-patches/cpu-exec.patch create mode 100644 pkgs/tools/security/afl/qemu-patches/elfload.patch create mode 100644 pkgs/tools/security/afl/qemu-patches/no-etc-install.patch create mode 100644 pkgs/tools/security/afl/qemu-patches/translate-all.patch create mode 100644 pkgs/tools/security/afl/qemu.nix diff --git a/pkgs/tools/security/afl/README.md b/pkgs/tools/security/afl/README.md new file mode 100644 index 00000000000..7d954461773 --- /dev/null +++ b/pkgs/tools/security/afl/README.md @@ -0,0 +1,19 @@ +Updating the QEMU patches +========================= + +When updating to the latest American Fuzzy Lop, make sure to check for +any new patches to qemu for binary fuzzing support: + +https://github.com/mirrorer/afl/tree/master/qemu_mode + +Be sure to check the build script and make sure it's also using the +right QEMU version and options in `qemu.nix`: + +https://github.com/mirrorer/afl/blob/master/qemu_mode/build_qemu_support.sh + +`afl-config.h` and `afl-qemu-cpu-inl.h` are part of the afl source +code, and copied from `config.h` and `afl-qemu-cpu-inl.h` +appropriately. The QEMU patches need to be slightly adjusted to +`#include` these files (the patches try to otherwise include files +like `../../config.h` which causes the build to fail). See `qemu.nix` +for details. diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index b1c37331042..ed9b6d56edb 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, bash, callPackage, makeWrapper }: +let + afl-qemu = callPackage ./qemu.nix {}; + qemu-exe-name = if stdenv.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.system == "i686-linux" then "qemu-i386" + else throw "afl: no support for ${stdenv.system}!"; +in stdenv.mkDerivation rec { name = "afl-${version}"; version = "1.57b"; @@ -9,8 +15,24 @@ stdenv.mkDerivation rec { sha256 = "05dwh2kgz31702y339bvbs0b3ffadxgxk8cqqhs2i0ggx5bnl5p4"; }; + buildInputs = [ makeWrapper ]; + buildPhase = "make PREFIX=$out"; - installPhase = "make install PREFIX=$out"; + installPhase = '' + # Do the normal installation + make install PREFIX=$out + + # Install the custom QEMU emulator for binary blob fuzzing. + cp ${afl-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + + # Wrap every program with a custom $AFL_PATH; I believe there is a + # bug in afl which causes it to fail to find `afl-qemu-trace` + # relative to `afl-fuzz` or `afl-showmap`, so we instead set + # $AFL_PATH as a workaround, which allows it to be found. + for x in `ls $out/bin/afl-*`; do + wrapProgram $x --prefix AFL_PATH : "$out/bin" + done + ''; meta = { description = "Powerful fuzzer via genetic algorithms and instrumentation"; diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h new file mode 100644 index 00000000000..051b38ffbca --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h @@ -0,0 +1,329 @@ +/* + american fuzzy lop - vaguely configurable bits + ---------------------------------------------- + + Written and maintained by Michal Zalewski + + Copyright 2013, 2014, 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + */ + +#ifndef _HAVE_CONFIG_H +#define _HAVE_CONFIG_H + +#include "afl-types.h" + +/****************************************************** + * * + * Settings that may be of interest to power users: * + * * + ******************************************************/ + +/* Comment out to disable terminal colors: */ + +#define USE_COLOR + +/* Comment out to disable fancy ANSI boxes and use poor man's 7-bit UI: */ + +#define FANCY_BOXES + +/* Default timeout for fuzzed code (milliseconds): */ + +#define EXEC_TIMEOUT 1000 + +/* Timeout rounding factor when auto-scaling (milliseconds): */ + +#define EXEC_TM_ROUND 20 + +/* Default memory limit for child process (MB): */ + +#ifndef __x86_64__ +# define MEM_LIMIT 25 +#else +# define MEM_LIMIT 50 +#endif /* ^!__x86_64__ */ + +/* Default memory limit when running in QEMU mode (MB): */ + +#define MEM_LIMIT_QEMU 200 + +/* Number of calibration cycles per every new test case (and for test + cases that show variable behavior): */ + +#define CAL_CYCLES 10 +#define CAL_CYCLES_LONG 40 + +/* The same, but when AFL_NO_VAR_CHECK is set in the environment: */ + +#define CAL_CYCLES_NO_VAR 4 + +/* Number of subsequent hangs before abandoning an input file: */ + +#define HANG_LIMIT 250 + +/* Maximum number of unique hangs or crashes to record: */ + +#define KEEP_UNIQUE_HANG 500 +#define KEEP_UNIQUE_CRASH 5000 + +/* Baseline number of random tweaks during a single 'havoc' stage: */ + +#define HAVOC_CYCLES 5000 + +/* Maximum multiplier for the above (should be a power of two, beware + of 32-bit int overflows): */ + +#define HAVOC_MAX_MULT 16 + +/* Absolute minimum number of havoc cycles (after all adjustments): */ + +#define HAVOC_MIN 10 + +/* Maximum stacking for havoc-stage tweaks. The actual value is calculated + like this: + + n = random between 0 and HAVOC_STACK_POW2 + stacking = 2^n + + In other words, the default (n = 7) produces 1, 2, 4, 8, 16, 32, 64, or + 128 stacked tweaks: */ + +#define HAVOC_STACK_POW2 7 + +/* Caps on block sizes for cloning and deletion operations. Each of these + ranges has a 33% probability of getting picked, except for the first + two cycles where smaller blocks are favored: */ + +#define HAVOC_BLK_SMALL 32 +#define HAVOC_BLK_MEDIUM 128 +#define HAVOC_BLK_LARGE 1500 + +/* Probabilities of skipping non-favored entries in the queue, expressed as + percentages: */ + +#define SKIP_TO_NEW_PROB 99 /* ...when there are new, pending favorites */ +#define SKIP_NFAV_OLD_PROB 95 /* ...no new favs, cur entry already fuzzed */ +#define SKIP_NFAV_NEW_PROB 75 /* ...no new favs, cur entry not fuzzed yet */ + +/* Splicing cycle count: */ + +#define SPLICE_CYCLES 20 + +/* Nominal per-splice havoc cycle length: */ + +#define SPLICE_HAVOC 500 + +/* Maximum offset for integer addition / subtraction stages: */ + +#define ARITH_MAX 35 + +/* Limits for the test case trimmer. The absolute minimum chunk size; and + the starting and ending divisors for chopping up the input file: */ + +#define TRIM_MIN_BYTES 4 +#define TRIM_START_STEPS 16 +#define TRIM_END_STEPS 1024 + +/* Maximum size of input file, in bytes (keep under 100MB): */ + +#define MAX_FILE (1 * 1024 * 1024) + +/* The same, for the test case minimizer: */ + +#define TMIN_MAX_FILE (10 * 1024 * 1024) + +/* Maximum dictionary token size (-x), in bytes: */ + +#define MAX_DICT_FILE 128 + +/* Length limits for auto-detected dictionary tokens: */ + +#define MIN_AUTO_EXTRA 3 +#define MAX_AUTO_EXTRA 32 + +/* Maximum number of user-specified dictionary tokens to use in deterministic + steps; past this point, the "extras/user" step will be still carried out, + but with proportionally lower odds: */ + +#define MAX_DET_EXTRAS 200 + +/* Maximum number of auto-extracted dictionary tokens to actually use in fuzzing + (first value), and to keep in memory as candidates. The latter should be much + higher than the former. */ + +#define USE_AUTO_EXTRAS 50 +#define MAX_AUTO_EXTRAS (USE_AUTO_EXTRAS * 10) + +/* Scaling factor for the effector map used to skip some of the more + expensive deterministic steps. The actual divisor is set to + 2^EFF_MAP_SCALE2 bytes: */ + +#define EFF_MAP_SCALE2 3 + +/* Minimum input file length at which the effector logic kicks in: */ + +#define EFF_MIN_LEN 128 + +/* Maximum effector density past which everything is just fuzzed + unconditionally (%): */ + +#define EFF_MAX_PERC 90 + +/* UI refresh frequency (Hz): */ + +#define UI_TARGET_HZ 5 + +/* Fuzzer stats file and plot update intervals (sec): */ + +#define STATS_UPDATE_SEC 60 +#define PLOT_UPDATE_SEC 5 + +/* Smoothing divisor for CPU load and exec speed stats (1 - no smoothing). */ + +#define AVG_SMOOTHING 16 + +/* Sync interval (every n havoc cycles): */ + +#define SYNC_INTERVAL 5 + +/* Output directory reuse grace period (minutes): */ + +#define OUTPUT_GRACE 25 + +/* Uncomment to use simple file names (id_NNNNNN): */ + +// #define SIMPLE_FILES + +/* List of interesting values to use in fuzzing. */ + +#define INTERESTING_8 \ + -128, /* Overflow signed 8-bit when decremented */ \ + -1, /* */ \ + 0, /* */ \ + 1, /* */ \ + 16, /* One-off with common buffer size */ \ + 32, /* One-off with common buffer size */ \ + 64, /* One-off with common buffer size */ \ + 100, /* One-off with common buffer size */ \ + 127 /* Overflow signed 8-bit when incremented */ + +#define INTERESTING_16 \ + -32768, /* Overflow signed 16-bit when decremented */ \ + -129, /* Overflow signed 8-bit */ \ + 128, /* Overflow signed 8-bit */ \ + 255, /* Overflow unsig 8-bit when incremented */ \ + 256, /* Overflow unsig 8-bit */ \ + 512, /* One-off with common buffer size */ \ + 1000, /* One-off with common buffer size */ \ + 1024, /* One-off with common buffer size */ \ + 4096, /* One-off with common buffer size */ \ + 32767 /* Overflow signed 16-bit when incremented */ + +#define INTERESTING_32 \ + -2147483648LL, /* Overflow signed 32-bit when decremented */ \ + -100663046, /* Large negative number (endian-agnostic) */ \ + -32769, /* Overflow signed 16-bit */ \ + 32768, /* Overflow signed 16-bit */ \ + 65535, /* Overflow unsig 16-bit when incremented */ \ + 65536, /* Overflow unsig 16 bit */ \ + 100663045, /* Large positive number (endian-agnostic) */ \ + 2147483647 /* Overflow signed 32-bit when incremented */ + +/*********************************************************** + * * + * Really exotic stuff you probably don't want to touch: * + * * + ***********************************************************/ + +/* Call count interval between reseeding the libc PRNG from /dev/urandom: */ + +#define RESEED_RNG 10000 + +/* Maximum line length passed from GCC to 'as': */ + +#define MAX_AS_LINE 8192 + +/* Environment variable used to pass SHM ID to the called program. */ + +#define SHM_ENV_VAR "__AFL_SHM_ID" + +/* Other less interesting, internal-only variables. */ + +#define CLANG_ENV_VAR "__AFL_CLANG_MODE" +#define AS_LOOP_ENV_VAR "__AFL_AS_LOOPCHECK" + +/* Distinctive bitmap signature used to indicate failed execution: */ + +#define EXEC_FAIL_SIG 0xfee1dead + +/* Distinctive exit code used to indicate MSAN trip condition: */ + +#define MSAN_ERROR 86 + +/* Designated file descriptors for forkserver commands (the application will + use FORKSRV_FD and FORKSRV_FD + 1): */ + +#define FORKSRV_FD 198 + +/* Fork server init timeout multiplier: we'll wait the user-selected + timeout plus this much for the fork server to spin up. */ + +#define FORK_WAIT_MULT 10 + +/* Calibration timeout adjustments, to be a bit more generous when resuming + fuzzing sessions or trying to calibrate already-added internal finds. + The first value is a percentage, the other is in milliseconds: */ + +#define CAL_TMOUT_PERC 125 +#define CAL_TMOUT_ADD 50 + +/* Number of chances to calibrate a case before giving up: */ + +#define CAL_CHANCES 3 + +/* Map size for the traced binary (2^MAP_SIZE_POW2). Must be greater than + 2; you probably want to keep it under 18 or so for performance reasons + (adjusting AFL_INST_RATIO when compiling is probably a better way to solve + problems with complex programs). You need to recompile the target binary + after changing this - otherwise, SEGVs may ensue. */ + +#define MAP_SIZE_POW2 16 +#define MAP_SIZE (1 << MAP_SIZE_POW2) + +/* Maximum allocator request size (keep well under INT_MAX): */ + +#define MAX_ALLOC 0x40000000 + +/* A made-up hashing seed: */ + +#define HASH_CONST 0xa5b35705 + +/* Constants for afl-gotcpu to control busy loop timing: */ + +#define CTEST_TARGET_MS 5000 +#define CTEST_BUSY_CYCLES (10 * 1000 * 1000) + +/* Uncomment this to use inferior block-coverage-based instrumentation. Note + that you need to recompile the target binary for this to have any effect: */ + +// #define COVERAGE_ONLY + +/* Uncomment this to ignore hit counts and output just one bit per tuple. + As with the previous setting, you will need to recompile the target + binary: */ + +// #define SKIP_COUNTS + +/* Uncomment this to use instrumentation data to record newly discovered paths, + but do not use them as seeds for fuzzing. This is useful for conveniently + measuring coverage that could be attained by a "dumb" fuzzing algorithm: */ + +// #define IGNORE_FINDS + +#endif /* ! _HAVE_CONFIG_H */ diff --git a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h new file mode 100644 index 00000000000..7d5a47669e4 --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h @@ -0,0 +1,287 @@ +/* + american fuzzy lop - high-performance binary-only instrumentation + ----------------------------------------------------------------- + + Written by Andrew Griffiths and + Michal Zalewski + + Idea & design very much by Andrew Griffiths. + + Copyright 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + This code is a shim patched into the separately-distributed source + code of QEMU 2.2.0. It leverages the built-in QEMU tracing functionality + to implement AFL-style instrumentation and to take care of the remaining + parts of the AFL fork server logic. + + The resulting QEMU binary is essentially a standalone instrumentation + tool; for an example of how to leverage it for other purposes, you can + have a look at afl-showmap.c. + + */ + +#include +#include "afl-config.h" + +/*************************** + * VARIOUS AUXILIARY STUFF * + ***************************/ + +/* A snippet patched into tb_find_slow to inform the parent process that + we have hit a new block that hasn't been translated yet, and to tell + it to translate within its own context, too (this avoids translation + overhead in the next forked-off copy). */ + +#define AFL_QEMU_CPU_SNIPPET1 do { \ + afl_request_tsl(pc, cs_base, flags); \ + } while (0) + +/* This snippet kicks in when the instruction pointer is positioned at + _start and does the usual forkserver stuff, not very different from + regular instrumentation injected via afl-as.h. */ + +#define AFL_QEMU_CPU_SNIPPET2 do { \ + if(tb->pc == afl_entry_point) { \ + afl_setup(); \ + afl_forkserver(env); \ + } \ + afl_maybe_log(tb->pc); \ + } while (0) + +/* We use one additional file descriptor to relay "needs translation" + messages between the child and the fork server. */ + +#define TSL_FD (FORKSRV_FD - 1) + +/* This is equivalent to afl-as.h: */ + +static unsigned char *afl_area_ptr; + +/* Exported variables populated by the code patched into elfload.c: */ + +abi_ulong afl_entry_point, /* ELF entry point (_start) */ + afl_start_code, /* .text start pointer */ + afl_end_code; /* .text end pointer */ + +/* Set on the child in forkserver mode: */ + +static unsigned char afl_fork_child; + +/* Instrumentation ratio: */ + +static unsigned int afl_inst_rms = MAP_SIZE; + +/* Function declarations. */ + +static void afl_setup(void); +static void afl_forkserver(CPUArchState*); +static inline void afl_maybe_log(abi_ulong); + +static void afl_wait_tsl(CPUArchState*, int); +static void afl_request_tsl(target_ulong, target_ulong, uint64_t); + +static TranslationBlock *tb_find_slow(CPUArchState*, target_ulong, + target_ulong, uint64_t); + + +/* Data structure passed around by the translate handlers: */ + +struct afl_tsl { + target_ulong pc; + target_ulong cs_base; + uint64_t flags; +}; + + +/************************* + * ACTUAL IMPLEMENTATION * + *************************/ + + +/* Set up SHM region and initialize other stuff. */ + +static void afl_setup(void) { + + char *id_str = getenv(SHM_ENV_VAR), + *inst_r = getenv("AFL_INST_RATIO"); + + int shm_id; + + if (inst_r) { + + unsigned int r; + + r = atoi(inst_r); + + if (r > 100) r = 100; + if (!r) r = 1; + + afl_inst_rms = MAP_SIZE * r / 100; + + } + + if (id_str) { + + shm_id = atoi(id_str); + afl_area_ptr = shmat(shm_id, NULL, 0); + + if (afl_area_ptr == (void*)-1) exit(1); + + } + + if (getenv("AFL_INST_LIBS")) { + + afl_start_code = 0; + afl_end_code = (abi_ulong)-1; + + } + +} + + +/* Fork server logic, invoked once we hit _start. */ + +static void afl_forkserver(CPUArchState *env) { + + static unsigned char tmp[4]; + + if (!afl_area_ptr) return; + + /* Tell the parent that we're alive. If the parent doesn't want + to talk, assume that we're not running in forkserver mode. */ + + if (write(FORKSRV_FD + 1, tmp, 4) != 4) return; + + /* All right, let's await orders... */ + + while (1) { + + pid_t child_pid; + int status, t_fd[2]; + + /* Whoops, parent dead? */ + + if (read(FORKSRV_FD, tmp, 4) != 4) exit(2); + + /* Establish a channel with child to grab translation commands. We'll + read from t_fd[0], child will write to TSL_FD. */ + + if (pipe(t_fd) || dup2(t_fd[1], TSL_FD) < 0) exit(3); + close(t_fd[1]); + + child_pid = fork(); + if (child_pid < 0) exit(4); + + if (!child_pid) { + + /* Child process. Close descriptors and run free. */ + + afl_fork_child = 1; + close(FORKSRV_FD); + close(FORKSRV_FD + 1); + close(t_fd[0]); + return; + + } + + /* Parent. */ + + close(TSL_FD); + + if (write(FORKSRV_FD + 1, &child_pid, 4) != 4) exit(5); + + /* Collect translation requests until child dies and closes the pipe. */ + + afl_wait_tsl(env, t_fd[0]); + + /* Get and relay exit status to parent. */ + + if (waitpid(child_pid, &status, WUNTRACED) < 0) exit(6); + if (write(FORKSRV_FD + 1, &status, 4) != 4) exit(7); + + } + +} + + +/* The equivalent of the tuple logging routine from afl-as.h. */ + +static inline void afl_maybe_log(abi_ulong cur_loc) { + + static abi_ulong prev_loc; + + /* Optimize for cur_loc > afl_end_code, which is the most likely case on + Linux systems. */ + + if (cur_loc > afl_end_code || cur_loc < afl_start_code || !afl_area_ptr) + return; + + /* Looks like QEMU always maps to fixed locations, so we can skip this: + cur_loc -= afl_start_code; */ + + /* Instruction addresses may be aligned. Let's mangle the value to get + something quasi-uniform. */ + + cur_loc = (cur_loc >> 4) ^ (cur_loc << 8); + cur_loc &= MAP_SIZE - 1; + + /* Implement probabilistic instrumentation by looking at scrambled block + address. This keeps the instrumented locations stable across runs. */ + + if (cur_loc >= afl_inst_rms) return; + + afl_area_ptr[cur_loc ^ prev_loc]++; + prev_loc = cur_loc >> 1; + +} + + +/* This code is invoked whenever QEMU decides that it doesn't have a + translation of a particular block and needs to compute it. When this happens, + we tell the parent to mirror the operation, so that the next fork() has a + cached copy. */ + +static void afl_request_tsl(target_ulong pc, target_ulong cb, uint64_t flags) { + + struct afl_tsl t; + + if (!afl_fork_child) return; + + t.pc = pc; + t.cs_base = cb; + t.flags = flags; + + if (write(TSL_FD, &t, sizeof(struct afl_tsl)) != sizeof(struct afl_tsl)) + return; + +} + + +/* This is the other side of the same channel. Since timeouts are handled by + afl-fuzz simply killing the child, we can just wait until the pipe breaks. */ + +static void afl_wait_tsl(CPUArchState *env, int fd) { + + struct afl_tsl t; + + while (1) { + + /* Broken pipe means it's time to return to the fork server routine. */ + + if (read(fd, &t, sizeof(struct afl_tsl)) != sizeof(struct afl_tsl)) + break; + + tb_find_slow(env, t.pc, t.cs_base, t.flags); + + } + + close(fd); + +} + diff --git a/pkgs/tools/security/afl/qemu-patches/afl-types.h b/pkgs/tools/security/afl/qemu-patches/afl-types.h new file mode 100644 index 00000000000..58d6be51e2d --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-types.h @@ -0,0 +1,79 @@ +/* + american fuzzy lop - type definitions and minor macros + ------------------------------------------------------ + + Written and maintained by Michal Zalewski + + Copyright 2013, 2014, 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + */ + +#ifndef _HAVE_TYPES_H +#define _HAVE_TYPES_H + +#include +#include + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; + +/* + + Ugh. There is an unintended compiler / glibc #include glitch caused by + combining the u64 type an %llu in format strings, necessitating a workaround. + + In essence, the compiler is always looking for 'unsigned long long' for %llu. + On 32-bit systems, the u64 type (aliased to uint64_t) is expanded to + 'unsigned long long' in , so everything checks out. + + But on 64-bit systems, it is #ifdef'ed in the same file as 'unsigned long'. + Now, it only happens in circumstances where the type happens to have the + expected bit width, *but* the compiler does not know that... and complains + about 'unsigned long' being unsafe to pass to %llu. + + */ + +#ifdef __x86_64__ +typedef unsigned long long u64; +#else +typedef uint64_t u64; +#endif /* ^sizeof(...) */ + +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef int64_t s64; + +#ifndef MIN +# define MIN(_a,_b) ((_a) > (_b) ? (_b) : (_a)) +# define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b)) +#endif /* !MIN */ + +#define SWAP16(_x) ({ \ + u16 _ret = (_x); \ + (u16)((_ret << 8) | (_ret >> 8)); \ + }) + +#define SWAP32(_x) ({ \ + u32 _ret = (_x); \ + (u32)((_ret << 24) | (_ret >> 24) | \ + ((_ret << 8) & 0x00FF0000) | \ + ((_ret >> 8) & 0x0000FF00)); \ + }) + +#define R(x) (random() % (x)) + +#define STRINGIFY_INTERNAL(x) #x +#define STRINGIFY(x) STRINGIFY_INTERNAL(x) + +#define MEM_BARRIER() \ + asm volatile("" ::: "memory") + +#endif /* ! _HAVE_TYPES_H */ diff --git a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch new file mode 100644 index 00000000000..29b65e71b9a --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch @@ -0,0 +1,33 @@ +--- qemu-2.2.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 ++++ qemu-2.2.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 +@@ -25,6 +25,8 @@ + #include "sysemu/qtest.h" + #include "qemu/timer.h" + ++#include "afl-qemu-cpu-inl.h" ++ + /* -icount align implementation. */ + + typedef struct SyncClocks { +@@ -262,8 +264,11 @@ + } + not_found: + /* if no translated code available, then translate it now */ ++ + tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + ++ AFL_QEMU_CPU_SNIPPET1; ++ + found: + /* Move the last found TB to the head of the list */ + if (likely(*ptb1)) { +@@ -455,6 +460,9 @@ + next_tb = 0; + tcg_ctx.tb_ctx.tb_invalidated_flag = 0; + } ++ ++ AFL_QEMU_CPU_SNIPPET2; ++ + if (qemu_loglevel_mask(CPU_LOG_EXEC)) { + qemu_log("Trace %p [" TARGET_FMT_lx "] %s\n", + tb->tc_ptr, tb->pc, lookup_symbol(tb->pc)); diff --git a/pkgs/tools/security/afl/qemu-patches/elfload.patch b/pkgs/tools/security/afl/qemu-patches/elfload.patch new file mode 100644 index 00000000000..65f1572e9a7 --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/elfload.patch @@ -0,0 +1,32 @@ +--- qemu-2.2.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 ++++ qemu-2.2.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 +@@ -28,6 +28,8 @@ + + #define ELF_OSABI ELFOSABI_SYSV + ++extern abi_ulong afl_entry_point, afl_start_code, afl_end_code; ++ + /* from personality.h */ + + /* +@@ -1886,6 +1888,8 @@ + info->brk = 0; + info->elf_flags = ehdr->e_flags; + ++ if (!afl_entry_point) afl_entry_point = info->entry; ++ + for (i = 0; i < ehdr->e_phnum; i++) { + struct elf_phdr *eppnt = phdr + i; + if (eppnt->p_type == PT_LOAD) { +@@ -1919,9 +1923,11 @@ + if (elf_prot & PROT_EXEC) { + if (vaddr < info->start_code) { + info->start_code = vaddr; ++ if (!afl_start_code) afl_start_code = vaddr; + } + if (vaddr_ef > info->end_code) { + info->end_code = vaddr_ef; ++ if (!afl_end_code) afl_end_code = vaddr_ef; + } + } + if (elf_prot & PROT_WRITE) { diff --git a/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch b/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch new file mode 100644 index 00000000000..81d29feea3d --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -384,8 +384,7 @@ install-confdir: + install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" + +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ +-install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) + endif diff --git a/pkgs/tools/security/afl/qemu-patches/translate-all.patch b/pkgs/tools/security/afl/qemu-patches/translate-all.patch new file mode 100644 index 00000000000..89163b607fd --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/translate-all.patch @@ -0,0 +1,18 @@ +--- qemu-2.2.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 ++++ qemu-2.2.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 +@@ -387,8 +387,13 @@ + /* We can't use g_malloc because it may recurse into a locked mutex. */ + # define ALLOC(P, SIZE) \ + do { \ +- P = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, \ +- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); \ ++ void* _tmp = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, \ ++ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); \ ++ if (_tmp == (void*)-1) { \ ++ qemu_log(">>> Out of memory for stack, bailing out. <<<\n"); \ ++ exit(1); \ ++ } \ ++ (P) = _tmp; \ + } while (0) + #else + # define ALLOC(P, SIZE) \ diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix new file mode 100644 index 00000000000..929f9fba9a6 --- /dev/null +++ b/pkgs/tools/security/afl/qemu.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl +, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, libaio, libcap_ng, gnutls, pixman, autoconf +, writeText +}: + +with stdenv.lib; + +let + n = "qemu-2.2.0"; + + aflHeaderFile = writeText "afl-qemu-cpu-inl.h" + (builtins.readFile ./qemu-patches/afl-qemu-cpu-inl.h); + aflConfigFile = writeText "afl-config.h" + (builtins.readFile ./qemu-patches/afl-config.h); + aflTypesFile = writeText "afl-types.h" + (builtins.readFile ./qemu-patches/afl-types.h); + + cpuTarget = if stdenv.system == "x86_64-linux" then "x86_64-linux-user" + else if stdenv.system == "i686-linux" then "i386-linux-user" + else throw "afl: no support for ${stdenv.system}!"; +in +stdenv.mkDerivation rec { + name = "afl-${n}"; + + src = fetchurl { + url = "http://wiki.qemu.org/download/${n}.tar.bz2"; + sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + }; + + buildInputs = + [ python zlib pkgconfig glib pixman ncurses perl attr libcap + vde2 texinfo libuuid flex bison lzo snappy autoconf + libcap_ng gnutls + ] + ++ optionals (hasSuffix "linux" stdenv.system) [ libaio ]; + + enableParallelBuilding = true; + + patches = + [ ./qemu-patches/elfload.patch + ./qemu-patches/cpu-exec.patch + ./qemu-patches/no-etc-install.patch + ./qemu-patches/translate-all.patch + ]; + + preConfigure = '' + cp ${aflTypesFile} afl-types.h + cp ${aflConfigFile} afl-config.h + cp ${aflHeaderFile} afl-qemu-cpu-inl.h + ''; + + configureFlags = + [ "--disable-system" + "--enable-linux-user" + "--enable-guest-base" + "--disable-gtk" + "--disable-sdl" + "--disable-vnc" + "--target-list=${cpuTarget}" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + meta = with stdenv.lib; { + homepage = http://www.qemu.org/; + description = "Fork of QEMU with American Fuzzy Lop instrumentation support"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + }; +} From e412105bbb6a7a43e4da7b7f1e8b74322d870777 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Sun, 22 Mar 2015 23:06:38 +0000 Subject: [PATCH 376/947] Update python package requests2 2.5.1 -> 2.6.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 a0490a6f580..bcce660ad3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9359,11 +9359,12 @@ let requests2 = buildPythonPackage rec { - name = "requests-2.5.1"; + name = "requests-${version}"; + version = "2.6.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - sha256 = "0rnyg6164jp7x7slgwnhigqza18d705hdvzwr4yk5qmisgpkaxvv"; + sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw"; }; meta = { From 2aa9da5a063ff25dd4f0e82d4761d24234b16628 Mon Sep 17 00:00:00 2001 From: Bence Fabian Date: Tue, 17 Mar 2015 20:55:19 +0100 Subject: [PATCH 377/947] mplayer: Remove --enable-jack If provided then configure won't use the pkgconfig of jack. --- pkgs/applications/video/mplayer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 86e5d9cb9eb..ac106431240 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { ${if speexSupport then "--enable-speex" else "--disable-speex"} ${if theoraSupport then "--enable-theora" else "--disable-theora"} ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} - ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} + ${if jackaudioSupport then "" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} From 4a1c3760e05e5f62691374f5beb10d2c9048fc01 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 23 Mar 2015 11:24:17 +0100 Subject: [PATCH 378/947] pitivi: cleanup and fix icons on non-nixos --- pkgs/applications/video/pitivi/default.nix | 24 ++++++++-------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7f53aa07db6..5b77ec916b0 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, pythonPackages, gst, clutter-gst, clutter-gtk -, gobjectIntrospection, clutter, gtk3, librsvg -, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3 +, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme +, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify }: let @@ -30,27 +29,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gst clutter-gtk librsvg + gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop + hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ - gst-python gst-editing-services + gstreamer gst-python gst-editing-services gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ (with pythonPackages; [ python pygobject3 pyxdg numpy pycairo sqlite3 ]); - preFixup = with stdenv.lib; with gst; let - libraryPath = makeLibraryPath [ - gstreamer gst-editing-services - clutter-gst clutter-gtk clutter gtk3 - gnome3.gnome_desktop - ]; - in '' + preFixup = '' wrapProgram "$out/bin/pitivi" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LD_LIBRARY_PATH : "${libraryPath}" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 979bc9e0e4c..146ad6f71c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2293,7 +2293,6 @@ let pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1; clutter-gtk = clutter_gtk; - inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic; }; p0f = callPackage ../tools/security/p0f { }; From 8d685306c5a0fa49e1752118bee71e368452670f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Mar 2015 11:51:59 +0100 Subject: [PATCH 379/947] jwhois: Add missing meta.platforms --- pkgs/tools/networking/jwhois/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 54d8acd3213..67b93a1fa90 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } From 8470b03db2f7e59f05312974b3aba21c20c63dbe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Mar 2015 11:59:51 +0100 Subject: [PATCH 380/947] Remove unused file --- pkgs/stdenv/darwin/prehook.nix | 9 --------- pkgs/stdenv/native/default.nix | 8 -------- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/stdenv/darwin/prehook.nix diff --git a/pkgs/stdenv/darwin/prehook.nix b/pkgs/stdenv/darwin/prehook.nix deleted file mode 100644 index f38cd517f00..00000000000 --- a/pkgs/stdenv/darwin/prehook.nix +++ /dev/null @@ -1,9 +0,0 @@ -'' - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - export MACOSX_DEPLOYMENT_TARGET=10.9 - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || true) - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" -'' diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 925b90c964f..935af7d4c36 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -18,13 +18,6 @@ rec { export NIX_ENFORCE_PURITY= ''; - prehookDarwin = '' - ${prehookBase} - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - ${import ../darwin/prehook.nix} - ''; - prehookFreeBSD = '' ${prehookBase} @@ -77,7 +70,6 @@ rec { import ../generic { preHook = - if system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else if system == "x86_64-freebsd" then prehookFreeBSD else if system == "i686-openbsd" then prehookOpenBSD else From f5176f4b581303b15df2804b7bca729724f7db5b Mon Sep 17 00:00:00 2001 From: koral Date: Mon, 23 Mar 2015 11:54:34 +0000 Subject: [PATCH 381/947] mtr: 0.85 -> 0.86 --- pkgs/tools/networking/mtr/default.nix | 58 +++++++++------------------ 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c463c94d610..af5155695f4 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,49 +1,29 @@ -x@{builderDefsPackage, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{stdenv, fetchurl, ncurses, autoconf +, withGtk ? false, gtk ? null}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="mtr"; - version="0.85"; - name="${baseName}-${version}"; +assert withGtk -> gtk != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + baseName="mtr"; + version="0.86"; + name="${baseName}-${version}"; + + src = fetchurl { url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz"; - hash="1jqrz8mil3lraaqgc87dyvx8d4bf3vq232pfx9mksxnkbphp4qvd"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "01lcy89q3i9g4kz4liy6m7kcq1zyvmbc63rqidgw67341f94inf5"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + configureFlags = optionalString (!withGtk) "--without-gtk"; - patches = [ ./edd425.patch ]; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doPatch" "doMakeInstall"]; + buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk; meta = { + homepage = http://www.bitwizard.nl/mtr/; description = "A network diagnostics tool"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - license = a.lib.licenses.gpl2; + maintainers = [ maintainers.koral maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.gpl2; }; - passthru = { - updateInfo = { - downloadPage = "ftp://ftp.bitwizard.nl/mtr/"; - }; - }; -}) x +} From 433d30b87728313556d8f4d61728e0b9a51063d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Mar 2015 13:25:20 +0100 Subject: [PATCH 382/947] libguestfs: Don't build on Hydra It produces a package over 4 GB large, and takes several hours to build (probably because of the overhead of copying that 4 GB image). --- pkgs/development/libraries/libguestfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 27e1c6adc00..313934c6657 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = with platforms; linux; + hydraPlatforms = []; }; } From e9c6f6b171914b29550c12961d90d3a0df617c25 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Mon, 23 Mar 2015 13:47:53 +0000 Subject: [PATCH 383/947] Add gspread 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 bcce660ad3c..b4715e8e366 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5139,6 +5139,23 @@ let }; }; + gspread = buildPythonPackage rec { + version = "0.2.3"; + name = "gspread-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/gspread/${name}.tar.gz"; + md5 = "5a71e4e3fc509dc1c4d34722f102dec1"; + sha256 = "01kihhnzp60694hib6bvqzy1ikbfpmlmbrhsav7xip2jwvwmx96v"; + }; + + meta = { + description = "Google Spreadsheets client library"; + homepage = "https://github.com/burnash/gspread"; + license = licenses.mit; + }; + }; + gyp = buildPythonPackage rec { rev = "1977"; name = "gyp-r${rev}"; From b04f31f801cbdfa39e07a4c7b875d041f2acf60f Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Mon, 23 Mar 2015 13:55:16 +0000 Subject: [PATCH 384/947] gspread: remove accidental sha256 value --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4715e8e366..3cad790b348 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5146,7 +5146,6 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gspread/${name}.tar.gz"; md5 = "5a71e4e3fc509dc1c4d34722f102dec1"; - sha256 = "01kihhnzp60694hib6bvqzy1ikbfpmlmbrhsav7xip2jwvwmx96v"; }; meta = { From afcb9be79e15c501a9dfb3257b268cdbf30ba2e6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Mar 2015 15:18:28 +0100 Subject: [PATCH 385/947] calibre: update from 2.21.0 to 2.22.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 9f5c9e3c107..b96dfaf5397 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.21.0"; + name = "calibre-2.22.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1adig2jxwbmsxcs36jaybhc8zdb8mnkc23kabw0c72izrsg4c5gb"; + sha256 = "19hpm5xzhjr0nfjm6xyqxjx2iwm3iw7y6bbs11337arfrxn16ly0"; }; inherit python; From 5e3a99e7d69da14cbe6dfcc848108a16a094e2f1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Mar 2015 15:28:58 +0100 Subject: [PATCH 386/947] groovy: update from 2.4.1 to 2.4.2 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 0c93625026a..354a4d970ba 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "1bhsv804iik497gflgp0wfhj6j4ylrladp1xndcszlfg576r1zch"; + sha256 = "02vbg9ywn76rslkinjk1dw3wrj76p5bahbhvz71drlp30cs1r28w"; }; installPhase = '' From 7811c40974b81619fbf26d0c982cab13f8addd30 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Mar 2015 15:55:30 +0100 Subject: [PATCH 387/947] abduco: update from 0.3 to 0.4 --- pkgs/tools/misc/abduco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index dc5d469dc87..c4515fde5fc 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.3"; + name = "abduco-0.4"; meta = { homepage = http://brain-dump.org/projects/abduco; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "1m4hafwvpnzz53n15757zrsx3xqv51gpnf3mnxqkzyr5mswz0jwk"; + sha256 = "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); From 6fe142639328f8f5eb48382a38fcea90ae9aa27d Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Mon, 23 Mar 2015 17:24:54 +0100 Subject: [PATCH 388/947] searx: update 0.3.0 -> 0.7.0 + fetchgit -> fetchurl --- pkgs/top-level/python-packages.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcce660ad3c..b3add8e1e74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13422,17 +13422,15 @@ let }; searx = buildPythonPackage rec { - name = "searx-${rev}"; - rev = "44d3af9fb2482cd0df1a8ababbe2fdf27ab33172"; + name = "searx-0.7.0"; - src = pkgs.fetchgit { - url = "git://github.com/asciimoo/searx"; - inherit rev; - sha256 = "1w505pzdkkcglq782wg7f5fxrw9i5jzp7px20c2xz18pps2m3rsm"; + src = pkgs.fetchurl { + url = "https://github.com/asciimoo/searx/archive/v0.7.0.tar.gz"; + sha256 = "0vq2zjdr1c8mr3zkycqq3732zf4pybbbrs3kzplqgf851k9zfpbw"; }; propagatedBuildInputs = with self; [ pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil ]; + gevent speaklater Babel pytz dateutil pygments ]; meta = { homepage = https://github.com/asciimoo/searx; From e8df73e5080c63319c158cba09c72a75ff393e07 Mon Sep 17 00:00:00 2001 From: Alexander Flatter Date: Mon, 23 Mar 2015 18:41:55 +0100 Subject: [PATCH 389/947] Compile postgresql with openssl --- pkgs/servers/sql/postgresql/8.4.x.nix | 6 ++++-- pkgs/servers/sql/postgresql/9.0.x.nix | 6 ++++-- pkgs/servers/sql/postgresql/9.1.x.nix | 6 ++++-- pkgs/servers/sql/postgresql/9.2.x.nix | 6 ++++-- pkgs/servers/sql/postgresql/9.3.x.nix | 11 +++++------ pkgs/servers/sql/postgresql/9.4.x.nix | 11 +++++------ 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index b4611a4bb10..d77a539cb5d 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses, readline }: +{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: let version = "8.4.22"; in @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - buildInputs = [ zlib ncurses readline ]; + buildInputs = [ zlib ncurses readline openssl ]; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; passthru = { inherit readline; }; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 72d7f7a816f..340307c01f9 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: let version = "9.0.19"; in @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; passthru = { diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index fd1c9395d5a..5b0774d6229 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: let version = "9.1.15"; in @@ -10,12 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; enableParallelBuilding = true; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; postInstall = diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8528871d302..d09cde5b995 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: let version = "9.2.10"; in @@ -10,12 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; enableParallelBuilding = true; makeFlags = [ "world" ]; + configureFlags = [ "--with-openssl" ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index d9644506eea..6467ce80af1 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}: with stdenv.lib; @@ -12,16 +12,15 @@ stdenv.mkDerivation rec { sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; }; - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 6cf59b21356..6649975d790 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: with stdenv.lib; @@ -12,16 +12,15 @@ stdenv.mkDerivation rec { sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; }; - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; From 460ea0a8a52e28fd39952af8fb5b10b3d9fc79e7 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 23 Mar 2015 21:52:30 +0300 Subject: [PATCH 390/947] slurm: update pkg --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 74701dc6dbe..25f3fbb5a64 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-llnl-${version}"; - version = "14.11.4"; + version = "14.11.5"; src = fetchurl { url = "http://www.schedmd.com/download/latest/slurm-${version}.tar.bz2"; - sha256 = "1w454j92j2fnh7xmg63275qcszq8ywiq51sm2rpyf175jrxv6ina"; + sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2"; }; buildInputs = [ python munge perl pam openssl mysql ]; From 55bbb4fb0b8e0a803588be418fc749a97780a7f7 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 22 Mar 2015 16:23:48 -0700 Subject: [PATCH 391/947] goPackages.protobuf: transition to new github import path --- pkgs/top-level/go-packages.nix | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 94ef8a4ae07..890239f35a6 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -45,13 +45,14 @@ let self = _self // overrides; _self = with self; { }; protobuf = buildGoPackage rec { - rev = "36be16571e14"; - name = "goprotobuf-${rev}"; - goPackagePath = "code.google.com/p/goprotobuf"; - src = fetchhg { + rev = "5677a0e3d5e89854c9974e1256839ee23f8233ca"; + name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/golang/protobuf"; + src = fetchFromGitHub { inherit rev; - url = "https://code.google.com/p/goprotobuf"; - sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + owner = "golang"; + repo = "protobuf"; + sha256 = "18dzxmy0gfjnwa9x8k3hv9calvmydv0dnz1iibykkzd20gw4l85v"; }; subPackages = [ "proto" "protoc-gen-go" ]; }; @@ -254,6 +255,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # please check again }; + govers = buildGoPackage rec { + rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + name = "govers-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/rogpeppe/govers"; + src = fetchFromGitHub { + inherit rev; + owner = "rogpeppe"; + repo = "govers"; + sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; + }; + }; + gox = buildGoPackage rec { rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; name = "gox-${stdenv.lib.strings.substring 0 7 rev}"; @@ -513,17 +526,22 @@ let self = _self // overrides; _self = with self; { }; preBuild = '' cd "go/src/$goPackagePath" + + govers -d -m code.google.com/p/goprotobuf github.com/golang/protobuf + # Work around `go install` assuming containing directory is the executable name we want for i in */bin; do mv "$i" "$(dirname "$i")/$(dirname "$i")" done # Generate protobuf definitions and static assets + sed -i '1s|^|SHELL = ${stdenv.shell}\n|' Makefile make protocol/hologram.pb.go make transport/remote/bindata.go ''; - buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; + buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata + go-homedir ldap g2s gox govers ]; }; influxdb-go = buildGoPackage rec { From 9c1f0b33a3dd4e7d374c9cfcdf0b6c67efd0a09d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Feb 2015 14:28:56 -0800 Subject: [PATCH 392/947] New package: Prometheus monitoring system --- .../servers/monitoring/prometheus/default.nix | 56 +++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/go-packages.nix | 118 ++++++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/default.nix diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix new file mode 100644 index 00000000000..4c05a859f01 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-${version}"; + version = "0.10.0"; + goPackagePath = "github.com/prometheus/prometheus"; + rev = "f5a0f7fa185dae2c772a5847a7aac9ba33b545f9"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "1wagmr4bca8fbvi48n9p4hdnx1m4chyaa1bzman6dhqfmkiikf5q"; + }; + + buildInputs = [ + dns glog goleveldb prometheus.client_golang + goPackages.protobuf + protobuf # the non-golang package, for protoc + vim # for xxd, used in embed-static.sh + ]; + + # Metadata that gets embedded into the binary + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildRevision ${builtins.substring 0 6 rev} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + protoc --proto_path=./config \ + --go_out=./config/generated/ \ + ./config/config.proto + + cd web + ${stdenv.shell} ../utility/embed-static.sh static templates \ + | gofmt > blob/files.go + ) + ''; + + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = http://prometheus.github.io; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0f408b73f..19d4131a773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8382,6 +8382,8 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prometheus = callPackage ../servers/monitoring/prometheus { }; + psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 890239f35a6..e07cebdae1e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -21,6 +21,18 @@ let self = _self // overrides; _self = with self; { }; }; + glog = buildGoPackage rec { + rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + name = "glog-${rev}"; + goPackagePath = "github.com/golang/glog"; + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "glog"; + sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + }; + }; + image = buildGoPackage rec { rev = "490b1ad139b3"; name = "go.image-${rev}"; @@ -215,6 +227,19 @@ let self = _self // overrides; _self = with self; { }; }; + ginkgo = buildGoPackage rec { + rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2"; + name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/onsi/ginkgo"; + src = fetchFromGitHub { + inherit rev; + owner = "onsi"; + repo = "ginkgo"; + sha256 = "0ghrx5qmgvgb8cbvsj53v1ir4j9agilg4wyhpk5ikqdv6mmqly4h"; + }; + subPackages = [ "./" ]; # don't try to build test fixtures + }; + goamz = buildGoPackage rec { rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; name = "goamz-${rev}"; @@ -267,6 +292,56 @@ let self = _self // overrides; _self = with self; { }; }; + golang_protobuf_extensions = buildGoPackage rec { + rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; + name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchFromGitHub { + inherit rev; + owner = "matttproud"; + repo = "golang_protobuf_extensions"; + sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; + }; + buildInputs = [ protobuf ]; + }; + + goleveldb = buildGoPackage rec { + rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04"; + name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/syndtr/goleveldb"; + src = fetchFromGitHub { + inherit rev; + owner = "syndtr"; + repo = "goleveldb"; + sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv"; + }; + propagatedBuildInputs = [ ginkgo gomega gosnappy ]; + }; + + gomega = buildGoPackage rec { + rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2"; + name = "gomega-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/onsi/gomega"; + src = fetchFromGitHub { + inherit rev; + owner = "onsi"; + repo = "gomega"; + sha256 = "1rf6cxn50d1pji3pv4q372s395r5nxwcgp405z2r2mfdkri4v3w4"; + }; + }; + + gosnappy = buildGoPackage rec { + rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; + name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/syndtr/gosnappy"; + src = fetchFromGitHub { + inherit rev; + owner = "syndtr"; + repo = "gosnappy"; + sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; + }; + }; + gox = buildGoPackage rec { rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; name = "gox-${stdenv.lib.strings.substring 0 7 rev}"; @@ -783,6 +858,49 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ kr.text ]; }; + prometheus.client_golang = buildGoPackage rec { + rev = "4627d59e8a09c330c5ccfe7414baca28d8df847d"; + name = "prometheus-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "client_golang"; + sha256 = "1mmj1r8xfi1gwb5f0l6sxjj804dhavp3pjmrqpbaa1g82bmz1hr1"; + }; + propagatedBuildInputs = [ + protobuf + golang_protobuf_extensions + prometheus.client_model + prometheus.procfs + ]; + }; + + prometheus.client_model = buildGoPackage rec { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/prometheus/client_model"; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "client_model"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + buildInputs = [ protobuf ]; + }; + + prometheus.procfs = buildGoPackage rec { + rev = "92faa308558161acab0ada1db048e9996ecec160"; + name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/prometheus/procfs"; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "procfs"; + sha256 = "0kaw81z2yi45f6ll6n2clr2zz60bdgdxzqnxvd74flynz4sr0p1v"; + }; + }; + pty = buildGoPackage rec { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; name = "pty-${stdenv.lib.strings.substring 0 7 rev}"; From 92b08cd406964c0503c6ee757624230131207329 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 19 Feb 2015 15:20:22 -0800 Subject: [PATCH 393/947] New package: prometheus-alertmanager --- .../prometheus/alertmanager/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/go-packages.nix | 36 ++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/alertmanager/default.nix diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix new file mode 100644 index 00000000000..4ef870bfcf9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-alertmanager-${version}"; + version = "0.1.0"; + goPackagePath = "github.com/prometheus/alertmanager"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "alertmanager"; + rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5"; + sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i"; + }; + + buildInputs = [ + goPackages.glog + goPackages.protobuf + goPackages.fsnotify + goPackages.httprouter + goPackages.prometheus.client_golang + goPackages.pushover + protobuf + vim + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + protoc --proto_path=./config \ + --go_out=./config/generated/ \ + ./config/config.proto + cd web + ${stdenv.shell} blob/embed-static.sh static templates \ + | gofmt > blob/files.go + ) + ''; + + meta = with lib; { + description = "Alerting dispather for the Prometheus monitoring system"; + homepage = "https://github.com/prometheus/alertmanager"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19d4131a773..fce9cca6b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8383,6 +8383,8 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus-alertmanager = + callPackage ../servers/monitoring/prometheus/alertmanager { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index e07cebdae1e..a9705d972bd 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -215,6 +215,18 @@ let self = _self // overrides; _self = with self; { }; }; + fsnotify = buildGoPackage rec { + rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; + name = "fsnotify-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + inherit rev; + owner = "howeyc"; + repo = "fsnotify"; + sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + }; + }; + g2s = buildGoPackage rec { rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; name = "g2s-${stdenv.lib.strings.substring 0 7 rev}"; @@ -619,6 +631,18 @@ let self = _self // overrides; _self = with self; { go-homedir ldap g2s gox govers ]; }; + httprouter = buildGoPackage rec { + rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1"; + name = "httprouter-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/julienschmidt/httprouter"; + src = fetchFromGitHub { + inherit rev; + owner = "julienschmidt"; + repo = "httprouter"; + sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9"; + }; + }; + influxdb-go = buildGoPackage rec { rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -913,6 +937,18 @@ let self = _self // overrides; _self = with self; { }; }; + pushover = buildGoPackage rec { + rev = "a8420a1935479cc266bda685cee558e86dad4b9f"; + name = "pushover-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/thorduri/pushover"; + src = fetchFromGitHub { + inherit rev; + owner = "thorduri"; + repo = "pushover"; + sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq"; + }; + }; + raw = buildGoPackage rec { rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4"; name = "raw-${stdenv.lib.strings.substring 0 7 rev}"; From b2d17977beef86cc92c4b6ea626397b865c8f1ad Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 19 Feb 2015 16:38:40 -0800 Subject: [PATCH 394/947] New package: prometheus-haproxy-exporter --- .../prometheus/haproxy_exporter/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix new file mode 100644 index 00000000000..63c421cd8a2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, }: + +goPackages.buildGoPackage rec { + name = "prometheus-haproxy-exporter-0.4.0"; + goPackagePath = "github.com/prometheus/haproxy_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "haproxy_exporter"; + rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d"; + sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr"; + }; + + buildInputs = [ goPackages.prometheus.client_golang ]; + + meta = with lib; { + description = "HAProxy Exporter for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/haproxy_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce9cca6b5b..74930f357e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8385,6 +8385,8 @@ let prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager { }; + prometheus-haproxy-exporter = + callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; From 6564dd81992f948c64dea1c02d0f7f488365f703 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 19 Feb 2015 17:28:13 -0800 Subject: [PATCH 395/947] New package: prometheus-pushgateway --- .../prometheus/pushgateway/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/pushgateway/default.nix diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix new file mode 100644 index 00000000000..db66e963208 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-pushgateway-${version}"; + version = "0.1.0"; + goPackagePath = "github.com/prometheus/pushgateway"; + rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "pushgateway"; + sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4"; + }; + + buildInputs = [ + go-bindata + protobuf + httprouter + golang_protobuf_extensions + prometheus.client_golang + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildRev ${rev} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + go-bindata ./resources/ + ) + ''; + + meta = with lib; { + description = + "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + homepage = https://github.com/prometheus/pushgateway; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74930f357e8..c56340229fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8387,6 +8387,8 @@ let callPackage ../servers/monitoring/prometheus/alertmanager { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; + prometheus-pushgateway = + callPackage ../servers/monitoring/prometheus/pushgateway { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; From d11bb482348a2343c32d3ddab04a3687a8406179 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 19 Feb 2015 19:02:13 -0800 Subject: [PATCH 396/947] New package: prometheus-cli --- .../monitoring/prometheus/cli/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/cli/default.nix diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix new file mode 100644 index 00000000000..f1f5ef9975c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-cli-0.2.0"; + goPackagePath = "github.com/prometheus/prometheus_cli"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "prometheus_cli"; + rev = "b36c21d2301cf686bff81953573a29a6d5a0a883"; + sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk"; + }; + + buildInputs = [ + goPackages.prometheus.client_model + goPackages.prometheus.client_golang + ]; + + meta = with lib; { + description = "Command line tool for querying the Prometheus HTTP API"; + homepage = https://github.com/prometheus/prometheus_cli; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c56340229fe..bff75e5131c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8385,6 +8385,8 @@ let prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager { }; + prometheus-cli = + callPackage ../servers/monitoring/prometheus/cli { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; prometheus-pushgateway = From 5b3254a8d155c555f758a04aa6546219f22ffa80 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 19 Feb 2015 19:36:25 -0800 Subject: [PATCH 397/947] New package: prometheus-node-exporter --- .../prometheus/node_exporter/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 24 ++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/node_exporter/default.nix diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix new file mode 100644 index 00000000000..136a1e05851 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-node-exporter-0.7.1"; + goPackagePath = "github.com/prometheus/node_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "node_exporter"; + rev = "0c8bfba04df87b90e69a79b2d25a5f627ebde1bb"; + sha256 = "12aj65hl9wql24rlpadd6mibf7sp8593xr1vljgyd5xdf7wjkxn9"; + }; + + buildInputs = [ + glog + go-runit + ntp + prometheus.client_golang + prometheus.client_model + protobuf + ]; + + meta = with lib; { + description = "Prometheus exporter for machine metrics"; + homepage = https://github.com/prometheus/node_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff75e5131c..d23623d1a6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8389,6 +8389,8 @@ let callPackage ../servers/monitoring/prometheus/cli { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; + prometheus-node-exporter = + callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a9705d972bd..53c9d2d7068 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -537,6 +537,18 @@ let self = _self // overrides; _self = with self; { }; }; + go-runit = buildGoPackage rec { + rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; + name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/soundcloud/go-runit"; + src = fetchFromGitHub { + inherit rev; + owner = "soundcloud"; + repo = "go-runit"; + sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v"; + }; + }; + go-simplejson = buildGoPackage rec { rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; name = "go-simplejson-${stdenv.lib.strings.substring 0 7 rev}"; @@ -793,6 +805,18 @@ let self = _self // overrides; _self = with self; { }; }; + ntp = buildGoPackage rec { + rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; + name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/beevik/ntp"; + src = fetchFromGitHub { + inherit rev; + owner = "beevik"; + repo = "ntp"; + sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24"; + }; + }; + oglematchers = buildGoPackage rec { rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e"; name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}"; From 95be71cf91fbde933781a1c731dc2564c323644d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 21 Mar 2015 16:31:18 -0700 Subject: [PATCH 398/947] Prometheus: update to 0.12.0 --- .../servers/monitoring/prometheus/default.nix | 6 ++-- pkgs/top-level/go-packages.nix | 34 ++++++++++++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 4c05a859f01..6e181c6ec9e 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -4,15 +4,15 @@ with goPackages; buildGoPackage rec { name = "prometheus-${version}"; - version = "0.10.0"; + version = "0.12.0"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "f5a0f7fa185dae2c772a5847a7aac9ba33b545f9"; + rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1wagmr4bca8fbvi48n9p4hdnx1m4chyaa1bzman6dhqfmkiikf5q"; + sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; }; buildInputs = [ diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 53c9d2d7068..42917a99c06 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -268,6 +268,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ sets go-simplejson check-v1 ]; }; + goautoneg = buildGoPackage rec { + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + name = "goautoneg-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "bitbucket.org/ww/goautoneg"; + + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; @@ -880,6 +892,18 @@ let self = _self // overrides; _self = with self; { }; }; + beorn7.perks = buildGoPackage rec { + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/beorn7/perks"; + src = fetchFromGitHub { + inherit rev; + owner = "beorn7"; + repo = "perks"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + }; + pflag = buildGoPackage rec { date = "20131112"; rev = "94e98a55fb412fcbcfc302555cb990f5e1590627"; @@ -907,20 +931,22 @@ let self = _self // overrides; _self = with self; { }; prometheus.client_golang = buildGoPackage rec { - rev = "4627d59e8a09c330c5ccfe7414baca28d8df847d"; - name = "prometheus-client-${stdenv.lib.strings.substring 0 7 rev}"; + name = "prometheus-client-${version}"; + version = "0.3.2"; goPackagePath = "github.com/prometheus/client_golang"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "client_golang"; - sha256 = "1mmj1r8xfi1gwb5f0l6sxjj804dhavp3pjmrqpbaa1g82bmz1hr1"; + rev = "${version}"; + sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4"; }; propagatedBuildInputs = [ protobuf golang_protobuf_extensions prometheus.client_model prometheus.procfs + beorn7.perks + goautoneg ]; }; From d8c2cebf01953eebd77ea8084ebcff2cadd3cd7b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 21 Mar 2015 16:34:53 -0700 Subject: [PATCH 399/947] prometheus-node-exporter: update to 0.8.0 --- .../servers/monitoring/prometheus/node_exporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index 136a1e05851..97169a0e298 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - name = "prometheus-node-exporter-0.7.1"; + name = "prometheus-node-exporter-0.8.0"; goPackagePath = "github.com/prometheus/node_exporter"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; - rev = "0c8bfba04df87b90e69a79b2d25a5f627ebde1bb"; - sha256 = "12aj65hl9wql24rlpadd6mibf7sp8593xr1vljgyd5xdf7wjkxn9"; + rev = "aaf01e52e25883671fd67234b415df7abd0e4eac"; + sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya"; }; buildInputs = [ From 781dbfb9b8bde12798b29c10db1af20c426bc0c2 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 21 Mar 2015 16:53:04 -0700 Subject: [PATCH 400/947] New package: prometheus-mesos-exporter --- .../prometheus/mesos_exporter/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 14 +++++++++++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix new file mode 100644 index 00000000000..c8793e17abb --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a"; + goPackagePath = "github.com/prometheus/mesos_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "mesos_exporter"; + sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q"; + }; + + buildInputs = [ goPackages.mesos-stats ]; + + meta = with lib; { + description = "Export Mesos metrics to Prometheus"; + homepage = https://github.com/prometheus/mesos_exporter; + licenses = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d23623d1a6d..921288ab8cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8389,6 +8389,8 @@ let callPackage ../servers/monitoring/prometheus/cli { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; + prometheus-mesos-exporter = + callPackage ../servers/monitoring/prometheus/mesos_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 42917a99c06..4f9f6947c98 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -782,6 +782,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ go-codec armon.go-metrics ]; }; + mesos-stats = buildGoPackage rec { + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + src = fetchFromGitHub { + inherit rev; + owner = "antonlindstrom"; + repo = "mesos_stats"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + + propagatedBuildInputs = [ prometheus.client_golang glog ]; + }; + mgo = buildGoPackage rec { rev = "2"; name = "mgo-${rev}"; From bcc8293cba6757a3d58719502a404bfb7a95d29b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 21 Mar 2015 17:08:48 -0700 Subject: [PATCH 401/947] New package: prometheus-statsd-bridge --- .../prometheus/statsd_bridge/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix new file mode 100644 index 00000000000..231aa31802c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "9715b183150c7bed8a10affb23d33fb55c597180"; + goPackagePath = "github.com/prometheus/statsd_bridge"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "statsd_bridge"; + sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz"; + }; + + buildInputs = with goPackages; [ + fsnotify + prometheus.client_golang + ]; + + meta = with lib; { + description = "Receives StatsD-style metrics and exports them to Prometheus"; + homepage = https://github.com/prometheus/statsd_bridge; + licenses = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 921288ab8cc..ecc5a4b7e46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8395,6 +8395,8 @@ let callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway { }; + prometheus-statsd-bridge = + callPackage ../servers/monitoring/prometheus/statsd_bridge { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; From 56e21d05e874a29ad0d51aea18e8c982c7c826f3 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 23 Mar 2015 16:26:13 -0400 Subject: [PATCH 402/947] RStudio: initial commit at version 0.98.110 --- pkgs/applications/editors/rstudio/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/editors/rstudio/default.nix diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix new file mode 100644 index 00000000000..c3ecbf0a60f --- /dev/null +++ b/pkgs/applications/editors/rstudio/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: + +let + version = "0.98.110"; + ginVer = "1.5"; + gwtVer = "2.5.1"; +in +stdenv.mkDerivation { + name = "RStudio-${version}"; + + buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; + + src = fetchurl { + url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; + sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; + }; + + # Hack RStudio to only use the input R. + patches = [ ./r-location.patch ]; + postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + + inherit ginVer; + ginSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; + sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + }; + + inherit gwtVer; + gwtSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; + sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; + }; + + hunspellDicts = builtins.attrValues hunspellDicts; + + mathJaxSrc = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; + sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; + }; + + preConfigure = + '' + GWT_LIB_DIR=src/gwt/lib + + mkdir -p $GWT_LIB_DIR/gin/$ginVer + unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + + unzip $gwtSrc + mkdir -p $GWT_LIB_DIR/gwt + mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + + mkdir dependencies/common/dictionaries + for dict in $hunspellDicts; do + for i in $dict/share/hunspell/* + do ln -sv $i dependencies/common/dictionaries/ + done + done + + unzip $mathJaxSrc -d dependencies/common/mathjax + ''; + + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + + meta = with stdenv.lib; + { description = "Set of integrated tools for the R language"; + homepage = http://www.rstudio.com/; + license = licenses.agpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75d0cf80130..2a4a29b1742 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11502,6 +11502,8 @@ let automake = automake114x; }; + rstudio = callPackage ../applications/editors/rstudio { }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); From 2d8434d90b78ad788ce138f802139a14663c2160 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Mar 2015 23:04:34 +0100 Subject: [PATCH 403/947] Add python basemap package --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcce660ad3c..addb3ff92a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14007,4 +14007,41 @@ let }; }; + basemap = buildPythonPackage rec { + name = "basemap-1.0.7"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; + sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; + }; + + propagatedBuildInputs = with self; [ numpy matplotlib pillow ]; + buildInputs = with self; with pkgs ; [ setuptools geos proj ]; + + # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script + configurePhase = '' + export GEOS_DIR=${pkgs.geos} + ''; + + # The installer does not support the '--old-and-unmanageable' option + installPhase = '' + ${python.interpreter} setup.py install --prefix $out + ''; + + # The 'check' target is not supported by the `setup.py` script. + # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) + doCheck = false; + + meta = { + homepage = "http://matplotlib.org/basemap/"; + description = "Plot data on map projections with matplotlib"; + longDescription = '' + An add-on toolkit for matplotlib that lets you plot data on map projections with + coastlines, lakes, rivers and political boundaries. See + http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. + ''; + licences = [ licenses.mit licenses.gpl2 ]; + }; + }; + }); in pythonPackages From 7f728ae2e1ff3f2a25148cc830f86a46eb30cace Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 23 Mar 2015 15:52:34 -0500 Subject: [PATCH 404/947] libdevil: patch to build on darwin On a OSX 10.10 system: libtool: compile: clang++ -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -fgnu89-inline -msse -msse2 -msse3 -D_THREAD_SAFE -I/nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR -I/nix/store/3jxslxa37wmfdnyfj1hckpxl0skscgj0-ilmbase-2.2.0/include/OpenEXR -O3 -c ./../src-IL/src/il_exr.cpp -fno-common -DPIC -o .libs/libIL_la-il_exr.o In file included from ./../src-IL/src/il_exr.cpp:22: In file included from ./../src-IL/include/il_exr.h:18: In file included from /nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR/ImfIO.h:49: In file included from /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/string:434: /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:32:22: error: expected value in expression #if __LITTLE_ENDIAN__ ^ /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:110:11: fatal error: 'endian.h' file not found # include ^ 2 errors generated. make[1]: *** [libIL_la-il_exr.lo] Error 1 make[1]: Leaving directory `/private/var/folders/1g/yfm550_10sb76p0z469bq9mr5zsthm/T/nix-build-libdevil-1.7.8.drv-1/devil-1.7.8/lib' make: *** [all-recursive] Error 1 See http://sourceforge.net/p/resil/tickets/8/ --- .../libraries/libdevil/default.nix | 1 + .../libraries/libdevil/il_endian.h.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/libdevil/il_endian.h.patch diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 6cbbddfdba8..abc7dd3af40 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch + ./il_endian.h.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch new file mode 100644 index 00000000000..c220e6802fd --- /dev/null +++ b/pkgs/development/libraries/libdevil/il_endian.h.patch @@ -0,0 +1,27 @@ +Source: http://sourceforge.net/p/resil/tickets/8/ +--- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 ++++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 +@@ -19,9 +19,13 @@ + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++ #ifndef __LITTLE_ENDIAN__ ++ #define __LITTLE_ENDIAN__ 1 ++ #endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +@@ -39,8 +43,6 @@ + #define BigDouble(d) + #else + #undef __BIG_ENDIAN__ +- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... +- #define __LITTLE_ENDIAN__ + #define Short(s) + #define UShort(s) + #define Int(i) From 232b434bc4ad4dfbb32367a5180b9ad6c07b9e14 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 23 Mar 2015 19:32:28 +0100 Subject: [PATCH 405/947] gradm: Update from 3.1-201502222102 -> 3.1-201503211320 --- pkgs/os-specific/linux/gradm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 718a9672c90..d34a028220c 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gradm-${version}"; - version = "3.1-201502222102"; + version = "3.1-201503211320"; src = fetchurl { url = "http://grsecurity.net/stable/${name}.tar.gz"; - sha256 = "1dvzjjyq8phhjcm425j9hw0m0azg34lm02p0yn058jiipx731xrp"; + sha256 = "17yd307jqva8jqib2xr3i9kmp58f2cb4jd7an5rbk5zr1k48ap9j"; }; buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; From c3bc040128da089d897340ed9f365c08828d7b97 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 24 Mar 2015 04:00:21 +0100 Subject: [PATCH 406/947] python-packages: pgcli 0.16.1 -> 0.16.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 bcce660ad3c..c01b3b59ee0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7526,10 +7526,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.16.1"; + version = "0.16.2"; src = pkgs.fetchFromGitHub { - sha256 = "1sysx67inf0fcfa4qhqcii97y59zpg98f4kcvz15rlbnsi357css"; + sha256 = "1f30f9v2iz2206aqzwc6jjadlxd7snicazrp9bcy5sizpha3r55i"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; From 172167c937595938871559fafcd083f002c32a22 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 24 Mar 2015 00:54:03 -0400 Subject: [PATCH 407/947] new package: abella 2.0.2 --- .../science/logic/abella/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/science/logic/abella/default.nix diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix new file mode 100644 index 00000000000..1c3e8e412f8 --- /dev/null +++ b/pkgs/applications/science/logic/abella/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, rsync, ocaml }: + +stdenv.mkDerivation rec { + name = "abella-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "http://abella-prover.org/distributions/${name}.tar.gz"; + sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; + }; + + buildInputs = [ rsync ocaml ]; + + installPhase = '' + mkdir -p $out/bin + rsync -av abella $out/bin/ + + mkdir -p $out/share/emacs/site-lisp/abella/ + rsync -av emacs/ $out/share/emacs/site-lisp/abella/ + + mkdir -p $out/share/abella/examples + rsync -av examples/ $out/share/abella/examples/ + ''; + + meta = { + description = "Interactive theorem prover"; + longDescription = '' + Abella is an interactive theorem prover based on lambda-tree syntax. + This means that Abella is well-suited for reasoning about the meta-theory + of programming languages and other logical systems which manipulate + objects with binding. + ''; + homepage = http://abella-prover.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4a29b1742..97498c1e59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13182,6 +13182,8 @@ let abc-verifier = callPackage ../applications/science/logic/abc {}; + abella = callPackage ../applications/science/logic/abella {}; + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; coq = callPackage ../applications/science/logic/coq { From ff9bc819461bd234d8b22f26ccf9784738275c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Mar 2015 07:05:25 +0100 Subject: [PATCH 408/947] lttng-modules: update to latest stable (fixes build) Fixes build against linux 3.14.36+. Also * It works with linux 3.12 now, so remove that assert * Remove unneeded patches (merged upstream) --- ...f2643c40b57280796eaa4fe60ce4f678b6dc.patch | 71 ------------------- .../linux/lttng-modules/build-fix.patch | 30 -------- .../linux/lttng-modules/default.nix | 15 ++-- 3 files changed, 6 insertions(+), 110 deletions(-) delete mode 100644 pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch delete mode 100644 pkgs/os-specific/linux/lttng-modules/build-fix.patch diff --git a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch deleted file mode 100644 index 2c9cb9835d1..00000000000 --- a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6f0af2643c40b57280796eaa4fe60ce4f678b6dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= -Date: Thu, 13 Nov 2014 21:33:02 -0800 -Subject: [PATCH] Fix compilation on Linux kernel >= 3.18.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since kernel commit 8a9522d2fe compilation fails as kvm_age_page -tracepoint had its signature changed, so update it accordingly. - -Tested pointing to kernels: - git reset --hard v3.17; make init/version.o - git reset --hard v3.18-rc1; make init/version.o - -Signed-off-by: André Goddard Rosa -Signed-off-by: Mathieu Desnoyers ---- - instrumentation/events/lttng-module/kvm.h | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - mode change 100644 => 100755 instrumentation/events/lttng-module/kvm.h - -diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h -old mode 100644 -new mode 100755 -index c0d42e2..4f95095 ---- a/instrumentation/events/lttng-module/kvm.h -+++ b/instrumentation/events/lttng-module/kvm.h -@@ -232,6 +232,34 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu, - TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)) -+ -+LTTNG_TRACEPOINT_EVENT(kvm_age_page, -+ TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref), -+ TP_ARGS(gfn, level, slot, ref), -+ -+ TP_STRUCT__entry( -+ __field( u64, hva ) -+ __field( u64, gfn ) -+ __field( u8, level ) -+ __field( u8, referenced ) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(gfn, gfn) -+ tp_assign(level, level) -+ tp_assign(hva, ((gfn - slot->base_gfn) << -+ PAGE_SHIFT) + slot->userspace_addr) -+ tp_assign(referenced, ref) -+ ), -+ -+ TP_printk("hva %llx gfn %llx level %u %s", -+ __entry->hva, __entry->gfn, __entry->level, -+ __entry->referenced ? "YOUNG" : "OLD") -+) -+ -+#else -+ - LTTNG_TRACEPOINT_EVENT(kvm_age_page, - TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref), - TP_ARGS(hva, slot, ref), -@@ -254,6 +282,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, - __entry->referenced ? "YOUNG" : "OLD") - ) - #endif -+#endif - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) - diff --git a/pkgs/os-specific/linux/lttng-modules/build-fix.patch b/pkgs/os-specific/linux/lttng-modules/build-fix.patch deleted file mode 100644 index 76f449b8b2c..00000000000 --- a/pkgs/os-specific/linux/lttng-modules/build-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] Update compaction instrumentation for 3.14.x stable kernels - -Conditional compilation introduced by lttng-modules commit - - 0007344741ef65259bc52dea72259173dfbf96c0 - -needs to be applied to kernels 3.14.25 and up in the 3.14.x branch. - -Signed-off-by: Simon Marchi -Reported-by: Bjørn Forsman ---- - instrumentation/events/lttng-module/compaction.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h -index ee23aa9..773a6ad 100644 ---- a/instrumentation/events/lttng-module/compaction.h -+++ b/instrumentation/events/lttng-module/compaction.h -@@ -46,7 +46,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is - TP_ARGS(nr_scanned, nr_taken) - ) - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) - LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_all, --- -2.1.3 diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 871edf87b7a..5fe065d3cc6 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchgit, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 -assert builtins.substring 0 4 kernel.version != "3.12"; stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.6.0-rc1"; # "git describe bf2ba318fff" + version = "2.6.0-5-g1b2a542"; - src = fetchurl { - url = "https://github.com/lttng/lttng-modules/archive/v${version}.tar.gz"; - sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; + src = fetchgit { + url = "https://github.com/lttng/lttng-modules.git"; + rev = "1b2a5429de815c95643df2eadf91253909708728"; + sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2"; }; - # from upstream ML, should be in the next release - patches = [ ./build-fix.patch ./6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch ]; - preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" From 03912fb435a7284a97d37fea8ffc752e6595614e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 24 Mar 2015 09:45:00 +0300 Subject: [PATCH 409/947] Update libfixposix link --- pkgs/development/libraries/libfixposix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 19c2d2a6b80..078a2ab0733 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -13,7 +13,7 @@ let sourceInfo = rec { method="fetchgit"; baseName="libfixposix"; - url="git://gitorious.org/${baseName}/${baseName}"; + url="https://github.com/sionescu/libfixposix"; rev="30b75609d858588ea00b427015940351896867e9"; version="git-${rev}"; name="${baseName}-${version}"; From 85704cd9d3f9633488469f66240a9aec76066d0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 13:58:08 +0100 Subject: [PATCH 410/947] cabal2nix: update to latest Git version --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a339166fd2d..ffd2e209999 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -642,11 +642,11 @@ self: super: { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "20150310"; + version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "267d0495209822ad819b58cb472a0da54f5a0b72"; - sha256 = "1sdsjwf1cda4bpriiv1vfx0pa26087hzw7vviacvgbmn0xh6wm8g"; + rev = "a8eaadbe6529cabd5088b8ae24fb325fc85a50c1"; + sha256 = "08q6c6g6syf4qgmgmicq8gf3fmp2cvy9mm6wm0vi7wjll3i2dns1"; deepClone = true; }; isLibrary = false; From f80e342e8335912040000a47e19e0151f96e32fe Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Mar 2015 08:59:34 -0400 Subject: [PATCH 411/947] ccache-links is wrapped, so it needs a gcc attribute --- pkgs/development/tools/misc/ccache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 305ccdb8dd0..7c0cfa51cd7 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" { } + links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then From 62a64992438dbecac3b5044b6a4c411d659d2a48 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 13:56:36 +0100 Subject: [PATCH 412/947] j: re-implement using mkDerivation --- pkgs/development/interpreters/j/default.nix | 84 ++++++--------------- 1 file changed, 25 insertions(+), 59 deletions(-) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 3668fedf051..4c064a42ebf 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,42 +1,16 @@ -x@{builderDefsPackage - , readline - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="j"; - version="701_b"; - name="${baseName}-${version}"; - url="http://www.jsoftware.com/download/${baseName}${version}_source.tar.gz"; - hash="1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "j-${version}"; + version = "701_b"; + src = fetchurl { + url = "http://www.jsoftware.com/download/j${version}_source.tar.gz"; + sha256 = "1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys"; }; + buildInputs = [ readline ]; + bits = if stdenv.is64bit then "64" else "32"; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doBuildJ" "doDeploy"]; - - bits = if a.stdenv.is64bit then - "64" - else if a.stdenv.isi686 then - "32" - else - builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; - - doBuildJ = a.fullDepEntry '' + buildPhase = '' sed -i bin/jconfig -e ' s@bits=32@bits=${bits}@g; s@readline=0@readline=1@; @@ -51,36 +25,28 @@ rec { sh -o errexit bin/build_defs sh -o errexit bin/build_tsdll - sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; + sed -i j/bin/profile.ijs -e " + s@userx=[.] *'.j'@userx=. '/.j'@; s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; /install=./ainstall=. install,'/share/j' - " - '' ["doUnpack" "addInputs" "minInit"]; + " + ''; - doDeploy = a.fullDepEntry '' + installPhase = '' mkdir -p "$out" cp -r j/bin "$out/bin" rm "$out/bin/profilex_template.ijs" - + mkdir -p "$out/share/j" cp -r docs j/addons j/system "$out/share/j" - '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"]; - - meta = { - description = "J programming language, an ASCII-based APL successor"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - license = a.lib.licenses.gpl3Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://jsoftware.com/source.htm"; - }; - }; -}) x + ''; + meta = with stdenv.lib; { + description = "J programming language, an ASCII-based APL successor"; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; + license = licenses.gpl3Plus; + homepage = http://jsoftware.com/; + }; +} From 5cc05f6cf23bc90f770f63d67b9ced2dbcdd331e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Mar 2015 14:42:37 +0100 Subject: [PATCH 413/947] nixUnstable: Update to 1.9pre4083_5114a07 --- 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 8a1937933c9..d39a13196a8 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.9pre4074_e659978"; + name = "nix-1.9pre4083_5114a07"; src = fetchurl { - url = "http://hydra.nixos.org/build/20175576/download/4/${name}.tar.xz"; - sha256 = "51cafd9428cce907a735e37e5dd46f36218351175e458d0834b306d257760204"; + url = "http://hydra.nixos.org/build/20650421/download/4/${name}.tar.xz"; + sha256 = "971fdd36bcf39c7e6ce9ef12dbfe09c98d2be3275e482ca2dbacb2e668f0dff9"; }; nativeBuildInputs = [ perl pkgconfig ]; From 93228a08630c1e815334c854555636645d0f814a Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Tue, 24 Mar 2015 10:30:00 -0400 Subject: [PATCH 414/947] add dconf dependencies to sound-juicer and brasero If you have services.gnome3.enabled = true, you shouldn't need this, but if you don't, you'll need this dconf env var to be able to save settings in these apps. --- pkgs/applications/audio/sound-juicer/default.nix | 3 ++- pkgs/tools/cd-dvd/brasero/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 2dfbfe8cc3f..f7f5998846b 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes - makeWrapper + makeWrapper gnome3.dconf gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { wrapProgram "$f" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" done ''; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index f180e7f5ecb..d7773b0ba0c 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 itstool libxml2 libnotify libcanberra_gtk3 intltool gnome3.gsettings_desktop_schemas makeWrapper libdvdcss - gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.dconf gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; # brasero checks that the applications it uses aren't symlinks, but this @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ --prefix LD_LIBRARY_PATH : ${libdvdcss}/lib done rm $out/share/icons/hicolor/icon-theme.cache From 253f3d72c2f4ceeb03e348c64de446e31cd6502b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Mar 2015 15:59:05 +0100 Subject: [PATCH 415/947] fix-darwin-dylib-names: Fix all outputs This fixes the install names of the Boost dylibs on Darwin. --- pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 2b64fbf8f09..8fe66102677 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -10,7 +10,7 @@ # their absolute path (using "install_name_tool -id"). It also # rewrites references in other dylibs to absolute paths. -postFixupHooks+=('fixDarwinDylibNamesIn $prefix') +fixupOutputHooks+=('fixDarwinDylibNamesIn $prefix') fixDarwinDylibNames() { local flags=() From b4830add94405945b674f5a2d3998c24a8bfab9a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Mar 2015 16:27:54 +0100 Subject: [PATCH 416/947] Revert "fix-darwin-dylib-names: Fix all outputs" This reverts commit 253f3d72c2f4ceeb03e348c64de446e31cd6502b. --- pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 8fe66102677..2b64fbf8f09 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -10,7 +10,7 @@ # their absolute path (using "install_name_tool -id"). It also # rewrites references in other dylibs to absolute paths. -fixupOutputHooks+=('fixDarwinDylibNamesIn $prefix') +postFixupHooks+=('fixDarwinDylibNamesIn $prefix') fixDarwinDylibNames() { local flags=() From 7b7ab0cdaa8539738cb1be5f6005b086af6f419e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 24 Mar 2015 17:01:41 +0100 Subject: [PATCH 417/947] idea-{community,ultimate}: 14.0.3 -> 14.1 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index ba4a4173da7..61d508936b8 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -218,25 +218,25 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.0.3"; - build = "IC-139.1117"; + version = "14.1"; + build = "IC-141.177.4"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "01wcpzdahkh3li2l3k2bgirnlp7hdxk9y1kyrxc3d9d1nazq8wqn"; + sha256 = "05irkxhmx6pisvghjalw8hcf9v3n4wn0n0zc92ahivzxlicylpr6"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.0.3"; - build = "IU-139.1117"; + version = "14.1"; + build = "IU-141.177.4"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1zkqigdh9l1f3mjjvxsp7b7vc93v5ylvxa1dfpclzmfbzna7h69s"; + sha256 = "10zv3m44ci7gl7163yp4wxnjy7c0g5zl34c2ibnx4c6ds6l4di2p"; }; }; From de4fdcc7e700cae44f1a0c38358c4a7a38d3d4c0 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Tue, 24 Mar 2015 10:27:47 +0100 Subject: [PATCH 418/947] spotify: 0.9.11.27 -> 0.9.17.1 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2a56e109540..d66029199ce 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.11.27.g2b1a638.81"; + else "0.9.17.1.g9b85d43.7"; deps = [ alsaLib @@ -55,7 +55,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; + sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki"; } else throw "Spotify not supported on this platform."; @@ -90,8 +90,8 @@ stdenv.mkDerivation { ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d ''} - # Work around Spotify trying to open libudev.so.0 (which we don't have) - ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.0 + # Work around Spotify trying to open libudev.so.1 (which we don't have) + ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1 mkdir -p $out/bin @@ -128,6 +128,6 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx ]; }; } From f4cd5a68f765f4efe8282db92a40a6407746a44e Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Tue, 24 Mar 2015 18:27:42 +0100 Subject: [PATCH 419/947] pcalc: 20120812 -> 20141224 --- pkgs/applications/science/math/pcalc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 8e68e455ef1..c291c0ce6e5 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pcalc-${version}"; - version = "20120812"; + version = "20141224"; src = fetchgit { url = git://git.code.sf.net/p/pcalc/code; - rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618"; - sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92"; + rev = "181d60d3c880da4344fef7138065943eb3b9255f"; + sha256 = "0n60m3p4kkqvvswjf50mnfaaacmzi1lss8vgy63mrgzwi9v6yb4l"; }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; From be7ef555f26ae8d1fc45898f02a7d26b478c9c3c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 19:44:00 +0100 Subject: [PATCH 420/947] libev: port to mkDerivation --- pkgs/development/libraries/libev/default.nix | 28 +++++++------------ .../libraries/libev/src-for-default.nix | 9 ------ .../libraries/libev/src-info-for-default.nix | 5 ---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/libraries/libev/src-for-default.nix delete mode 100644 pkgs/development/libraries/libev/src-info-for-default.nix diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 6b070c170c7..e96c69f2138 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,25 +1,17 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - +stdenv.mkDerivation rec { + name = "libev-${version}"; + version="4.15"; + src = fetchurl { + url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; + sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; + }; meta = { description = "An event loop library remotely similar to libevent"; maintainers = [ - a.lib.maintainers.raskin + stdenv.lib.maintainers.raskin ]; - platforms = a.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix deleted file mode 100644 index 3e4f58a5ce0..00000000000 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="4.15"; - name="libev-4.15"; - hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; - url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz"; - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz"; - - -} diff --git a/pkgs/development/libraries/libev/src-info-for-default.nix b/pkgs/development/libraries/libev/src-info-for-default.nix deleted file mode 100644 index e14ca419550..00000000000 --- a/pkgs/development/libraries/libev/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D"; - sourceRegexp = "(^|/)libev-.*[.]tar[.]gz"; - baseName = "libev"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad..00c7e4863fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6193,7 +6193,7 @@ let libechonest = callPackage ../development/libraries/libechonest { }; - libev = builderDefsPackage ../development/libraries/libev { }; + libev = callPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; libevent = callPackage ../development/libraries/libevent { }; From d3500f67c901c1f0bfca6cce7af4e7a5ff3d4749 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 24 Mar 2015 13:52:47 -0500 Subject: [PATCH 421/947] kde4: fix override --- pkgs/top-level/all-packages.nix | 252 +++++++++++++++++--------------- 1 file changed, 133 insertions(+), 119 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bffb5aeb6e..e22a53d8e29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12851,187 +12851,201 @@ let kde4 = recurseIntoAttrs pkgs.kde414; - kde414 = kdePackagesFor (pkgs.kde414 // { - libusb = libusb1; - libcanberra = libcanberra_kde; - boost = boost156; - }) ../desktops/kde-4.14; - - kdePackagesFor = self: dir: - let callPackageOrig = newScope { cmake = cmake-3_2; }; in - let - callPackage = newScope (self // { cmake = cmake-3_2; }); - kde4 = callPackageOrig dir { - inherit callPackage callPackageOrig; + kde414 = + kdePackagesFor + { + libusb = libusb1; + libcanberra = libcanberra_kde; + boost = boost156; kdelibs = kdeApps_stable.kdelibs; - }; - in kde4 // { - inherit kde4; + } + ../desktops/kde-4.14; - wrapper = callPackage ../build-support/kdewrapper {}; - recurseForRelease = true; + kdePackagesFor = extra: dir: + let + # list of extra packages not included in KDE + # the real work in this function is done below this list + extraPackages = callPackage: + rec { + amarok = callPackage ../applications/audio/amarok { }; - amarok = callPackage ../applications/audio/amarok { }; + bangarang = callPackage ../applications/video/bangarang { }; - bangarang = callPackage ../applications/video/bangarang { }; + basket = callPackage ../applications/office/basket { }; - basket = callPackage ../applications/office/basket { }; + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; - calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + choqok = callPackage ../applications/networking/instant-messengers/choqok { }; - choqok = callPackage ../applications/networking/instant-messengers/choqok { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; - colord-kde = callPackage ../tools/misc/colord-kde { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then + callPackage ../applications/graphics/digikam/2.nix { } + else + callPackage ../applications/graphics/digikam { }; - digikam = if builtins.compareVersions "4.9" kde4.release == 1 then - callPackage ../applications/graphics/digikam/2.nix { } - else - callPackage ../applications/graphics/digikam { }; + eventlist = callPackage ../applications/office/eventlist {}; - eventlist = callPackage ../applications/office/eventlist {}; + k3b = callPackage ../applications/misc/k3b { + cdrtools = cdrkit; + }; - k3b = callPackage ../applications/misc/k3b { - cdrtools = cdrkit; - }; + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; - kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + kbibtex = callPackage ../applications/office/kbibtex { }; - kbibtex = callPackage ../applications/office/kbibtex { }; + kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; - kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; - kdeconnect = callPackage ../applications/misc/kdeconnect { }; + kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; - kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; + kdesvn = callPackage ../applications/version-management/kdesvn { }; - kdesvn = callPackage ../applications/version-management/kdesvn { }; + kdevelop = callPackage ../applications/editors/kdevelop { }; - kdevelop = callPackage ../applications/editors/kdevelop { }; + kdevplatform = callPackage ../development/libraries/kdevplatform { + boost = boost156; + }; - kdevplatform = callPackage ../development/libraries/kdevplatform { - boost = boost156; - }; + kdiff3 = callPackage ../tools/text/kdiff3 { }; - kdiff3 = callPackage ../tools/text/kdiff3 { }; + kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; - kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; + kile = callPackage ../applications/editors/kile { }; - kile = callPackage ../applications/editors/kile { }; + kmplayer = callPackage ../applications/video/kmplayer { }; - kmplayer = callPackage ../applications/video/kmplayer { }; + kmymoney = callPackage ../applications/office/kmymoney { }; - kmymoney = callPackage ../applications/office/kmymoney { }; + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; - kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; + konversation = callPackage ../applications/networking/irc/konversation { }; - konversation = callPackage ../applications/networking/irc/konversation { }; + kvirc = callPackage ../applications/networking/irc/kvirc { }; - kvirc = callPackage ../applications/networking/irc/kvirc { }; + krename = callPackage ../applications/misc/krename { }; - krename = callPackage ../applications/misc/krename { }; + krusader = callPackage ../applications/misc/krusader { }; - krusader = callPackage ../applications/misc/krusader { }; + ksshaskpass = callPackage ../tools/security/ksshaskpass {}; - ksshaskpass = callPackage ../tools/security/ksshaskpass {}; + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; - ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; + kuickshow = callPackage ../applications/graphics/kuickshow { }; - kuickshow = callPackage ../applications/graphics/kuickshow { }; + libalkimia = callPackage ../development/libraries/libalkimia { }; - libalkimia = callPackage ../development/libraries/libalkimia { }; + libktorrent = callPackage ../development/libraries/libktorrent { + boost = boost156; + }; - libktorrent = callPackage ../development/libraries/libktorrent { - boost = boost156; - }; + libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; - libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; + liblikeback = callPackage ../development/libraries/liblikeback { }; - liblikeback = callPackage ../development/libraries/liblikeback { }; + libmm-qt = callPackage ../development/libraries/libmm-qt { }; - libmm-qt = callPackage ../development/libraries/libmm-qt { }; + libnm-qt = callPackage ../development/libraries/libnm-qt { }; - libnm-qt = callPackage ../development/libraries/libnm-qt { }; + massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; - massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; + networkmanagement = callPackage ../tools/networking/networkmanagement { }; - networkmanagement = callPackage ../tools/networking/networkmanagement { }; + partitionManager = callPackage ../tools/misc/partition-manager { }; - partitionManager = callPackage ../tools/misc/partition-manager { }; + plasma-nm = callPackage ../tools/networking/plasma-nm { }; - plasma-nm = callPackage ../tools/networking/plasma-nm { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; + qtcurve = callPackage ../misc/themes/qtcurve { }; - qtcurve = callPackage ../misc/themes/qtcurve { }; + quassel = callPackage ../applications/networking/irc/quassel rec { + monolithic = true; + daemon = false; + client = false; + withKDE = stdenv.isLinux; + qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0) + dconf = gnome3.dconf; + }; - quassel = callPackage ../applications/networking/irc/quassel rec { - monolithic = true; - daemon = false; - client = false; - withKDE = stdenv.isLinux; - qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0) - dconf = gnome3.dconf; - }; + quasselWithoutKDE = (quassel.override { + monolithic = true; + daemon = false; + client = false; + withKDE = false; + #qt = qt5; + tag = "-without-kde"; + }); - quasselWithoutKDE = (self.quassel.override { - monolithic = true; - daemon = false; - client = false; - withKDE = false; - #qt = qt5; - tag = "-without-kde"; - }); + quasselDaemon = (quassel.override { + monolithic = false; + daemon = true; + client = false; + withKDE = false; + #qt = qt5; + tag = "-daemon"; + }); - quasselDaemon = (self.quassel.override { - monolithic = false; - daemon = true; - client = false; - withKDE = false; - #qt = qt5; - tag = "-daemon"; - }); + quasselClient = (quassel.override { + monolithic = false; + daemon = false; + client = true; + tag = "-client"; + }); - quasselClient = (self.quassel.override { - monolithic = false; - daemon = false; - client = true; - tag = "-client"; - }); + quasselClientWithoutKDE = (quasselClient.override { + monolithic = false; + daemon = false; + client = true; + withKDE = false; + #qt = qt5; + tag = "-client-without-kde"; + }); - quasselClientWithoutKDE = (self.quasselClient.override { - monolithic = false; - daemon = false; - client = true; - withKDE = false; - #qt = qt5; - tag = "-client-without-kde"; - }); + rekonq = callPackage ../applications/networking/browsers/rekonq { }; - rekonq = callPackage ../applications/networking/browsers/rekonq { }; + kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; - kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; + rsibreak = callPackage ../applications/misc/rsibreak { }; - rsibreak = callPackage ../applications/misc/rsibreak { }; + semnotes = callPackage ../applications/misc/semnotes { }; - semnotes = callPackage ../applications/misc/semnotes { }; + skrooge = callPackage ../applications/office/skrooge { }; - skrooge = callPackage ../applications/office/skrooge { }; + telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; + yakuake = callPackage ../applications/misc/yakuake { }; - yakuake = callPackage ../applications/misc/yakuake { }; + zanshin = callPackage ../applications/office/zanshin { }; - zanshin = callPackage ../applications/office/zanshin { }; + kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; + }; - kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; - }; + callPackageOrig = newScope (extra // { cmake = cmake-3_2; }); + + makePackages = extra: + let + callPackage = newScope (extra // { cmake = cmake-3_2; } // self); + kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; + self = + kde4 + // extraPackages callPackage + // { + inherit kde4; + wrapper = callPackage ../build-support/kdewrapper {}; + recurseForRelease = true; + }; + in self; + + in makeOverridable makePackages extra; pantheon = recurseIntoAttrs rec { callPackage = newScope pkgs.pantheon; From a64d43b96de66a24f48d7f45d03d796996035560 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 20:37:28 +0100 Subject: [PATCH 422/947] Delete redundant clppcre expression The top-level name clppcre has no reverse dependencies, is out-of-date, and appears to have been superceded by lispPackages.cl-ppcre. --- .../libraries/cl-ppcre/default.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/libraries/cl-ppcre/default.nix diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix deleted file mode 100644 index b81896d8894..00000000000 --- a/pkgs/development/libraries/cl-ppcre/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - simplyShare = args.simplyShare; - - version = lib.attrByPath ["version"] "2.0.0" args; - buildInputs = with args; [ ]; -in -rec { - src = fetchurl { - url = http://weitz.de/files/cl-ppcre.tar.gz; - sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = [(simplyShare "cl-ppcre")]; - - name = "cl-ppcre-" + version; - meta = { - description = "Common Lisp Portable Perl Compatible RegExp library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad..a0714a635ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5341,8 +5341,6 @@ let cln = callPackage ../development/libraries/cln { }; - clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; clucene_core_1 = callPackage ../development/libraries/clucene-core { }; From f7e4be5011795dab79b1c0f6cb5d3eebaed16b8b Mon Sep 17 00:00:00 2001 From: "Luis G. Torres" Date: Mon, 23 Mar 2015 08:36:24 -0400 Subject: [PATCH 423/947] flann: make it build on Darwin (close #6946) --- pkgs/development/libraries/flann/default.nix | 7 +++++-- pkgs/development/libraries/flann/no-examples.patch | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/flann/no-examples.patch diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index bffb124dc68..145d2b42a9d 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "flann-1.8.4"; - + src = fetchurl { url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; @@ -10,11 +10,14 @@ stdenv.mkDerivation { buildInputs = [ unzip cmake python ]; + # patch out examples in Darwin because they do not compile. + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ]; + meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch new file mode 100644 index 00000000000..95a6f0eed8e --- /dev/null +++ b/pkgs/development/libraries/flann/no-examples.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,7 @@ + + add_subdirectory( cmake ) + add_subdirectory( src ) +-add_subdirectory( examples ) ++#add_subdirectory( examples ) + add_subdirectory( test ) + add_subdirectory( doc ) From 9a75c1d7c8ee19046ce67f2dc725821d2d5452fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Mar 2015 21:06:19 +0100 Subject: [PATCH 424/947] lensfun: fix build by using older make --- pkgs/development/libraries/lensfun/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 94dfe871240..ebb90f79663 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: +{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }: stdenv.mkDerivation rec { name = "lensfun-0.2.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; - buildInputs = [ pkgconfig glib zlib libpng ]; + buildInputs = [ pkgconfig glib zlib libpng gnumake3 ]; configureFlags = "-v"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e22a53d8e29..eb83bcc8996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5037,6 +5037,7 @@ let gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake = gnumake41; @@ -6116,7 +6117,9 @@ let python = python2; }; - lensfun = callPackage ../development/libraries/lensfun { }; + lensfun = callPackage ../development/libraries/lensfun { + inherit gnumake3; + }; lesstif = callPackage ../development/libraries/lesstif { }; From 8d092270d28d82aa5623bcde55a2ee85129ac1f1 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 26 Oct 2014 21:29:04 +0100 Subject: [PATCH 425/947] nixos: iso-image: use syslinux bootloader for USB booting support This changes the bootloader for iso generation from Grub to syslinux. In addition this adds USB booting support, so that "dd" can be used to burn the generated ISO to USB thumbdrives instead of needing applications like UnetBootin. --- nixos/lib/make-iso9660-image.nix | 13 +- nixos/lib/make-iso9660-image.sh | 48 +++++-- .../installer/cd-dvd/installation-cd-base.nix | 3 + nixos/modules/installer/cd-dvd/iso-image.nix | 124 +++++++++--------- 4 files changed, 112 insertions(+), 76 deletions(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 5ad546e9534..b2409c6006b 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, cdrkit, pathsFromGraph +{ stdenv, perl, pathsFromGraph, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -22,12 +22,18 @@ , # Whether this should be an efi-bootable El-Torito CD. efiBootable ? false +, # Wheter this should be an hybrid CD (bootable from USB as well as CD). + usbBootable ? false + , # The path (in the ISO file system) of the boot image. bootImage ? "" , # The path (in the ISO file system) of the efi boot image. efiBootImage ? "" +, # The path (outside the ISO file system) of the isohybrid-mbr image. + isohybridMbrImage ? "" + , # Whether to compress the resulting ISO image with bzip2. compressImage ? false @@ -38,13 +44,14 @@ assert bootable -> bootImage != ""; assert efiBootable -> efiBootImage != ""; +assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = "iso9660-image"; builder = ./make-iso9660-image.sh; - buildInputs = [perl cdrkit]; + buildInputs = [perl xorriso syslinux]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable; + inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; # !!! should use XML. sources = map (x: x.source) contents; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 675b5bb3514..c8522513aa2 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -31,11 +31,20 @@ if test -n "$bootable"; then fi done - bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" + isoBootFlags="-eltorito-boot ${bootImage} + -eltorito-catalog .boot.cat + -no-emul-boot -boot-load-size 4 -boot-info-table" +fi + +if test -n "$usbBootable"; then + usbBootFlags="-isohybrid-mbr ${isohybridMbrImage}" fi if test -n "$efiBootable"; then - bootFlags="$bootFlags -eltorito-alt-boot -e $efiBootImage -no-emul-boot" + efiBootFlags="-eltorito-alt-boot + -e $efiBootImage + -no-emul-boot + -isohybrid-gpt-basdat" fi touch pathlist @@ -74,18 +83,41 @@ for ((n = 0; n < ${#objects[*]}; n++)); do fi done -# !!! what does this do? +# Escape filenames that contain '='. +# TODO: Handle this properly. This fails for filenames +# that contain multiple '=' symbols. cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer mkdir -p $out/iso -genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}" -if test -z "$compressImage"; then - $genCommand -o $out/iso/$isoName -else - $genCommand | bzip2 > $out/iso/$isoName.bz2 + +xorriso="xorriso + -as mkisofs + -iso-level 3 + -volid ${volumeID} + -appid nixos + -publisher nixos + -graft-points + -full-iso9660-filenames + ${isoBootFlags} + ${usbBootFlags} + ${efiBootFlags} + -r + -path-list pathlist.safer + --sort-weight 0 / + --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO + +$xorriso -output $out/iso/$isoName + +if test -n "$usbBootable"; then + echo "Making image hybrid..." + isohybrid --uefi $out/iso/$isoName fi +if test -n "$compressImage"; then + echo "Compressing image..." + bzip2 $out/iso/$isoName +fi mkdir -p $out/nix-support echo $system > $out/nix-support/system diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index b723a91e4f3..4896eee2908 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -36,6 +36,9 @@ with lib; # EFI booting isoImage.makeEfiBootable = true; + # USB booting + isoImage.makeUsbBootable = true; + # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 39db7d9b8f7..57e1601a87b 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -8,45 +8,39 @@ with lib; let - # The Grub image. - grubImage = pkgs.runCommand "grub_eltorito" {} + # The configuration file for syslinux. + baseIsolinuxCfg = '' - ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot - cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out - ''; # */ + SERIAL 0 38400 + UI vesamenu.c32 + MENU TITLE NixOS + MENU BACKGROUND /isolinux/background.png + LABEL boot + MENU LABEL Boot NixOS + LINUX /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + INITRD /boot/initrd - # The configuration file for Grub. - grubCfg = - '' - set default=${builtins.toString config.boot.loader.grub.default} - set timeout=${builtins.toString config.boot.loader.grub.timeout} + LABEL chain + MENU LABEL Boot existing OS + COM32 chain.c32 + APPEND hd0 0 - if loadfont /boot/grub/unicode.pf2; then - set gfxmode=640x480 - insmod gfxterm - insmod vbe - terminal_output gfxterm + LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 - insmod png - if background_image /boot/grub/splash.png; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi - - fi - - ${config.boot.loader.grub.extraEntries} + LABEL poweroff + MENU LABEL Power Off + COM32 poweroff.c32 ''; + isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The efi boot image efiDir = pkgs.runCommand "efi-directory" {} '' - mkdir -p $out/efi/boot - cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/efi/boot/boot${targetArch}.efi + mkdir -p $out/EFI/boot + cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi mkdir -p $out/loader/entries echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf @@ -152,6 +146,22 @@ in ''; }; + isoImage.makeUsbBootable = mkOption { + default = false; + description = '' + Whether the ISO image should be bootable from CD as well as USB. + ''; + }; + + isoImage.splashImage = mkOption { + default = pkgs.fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/5729ab16c6a5793c10a2913b5a1b3f59b91c36ee/ideas/grub-splash/grub-nixos-1.png; + sha256 = "43fd8ad5decf6c23c87e9026170a13588c2eba249d9013cb9f888da5e2002217"; + }; + description = '' + The splash image to use in the bootloader. + ''; + }; }; @@ -166,7 +176,7 @@ in # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 ]; + environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ]; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -216,7 +226,7 @@ in options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; boot.initrd.kernelModules = [ "loop" ]; @@ -236,15 +246,12 @@ in # Individual files to be included on the CD, outside of the Nix # store on the CD. isoImage.contents = - [ { source = grubImage; - target = "/boot/grub/grub_eltorito"; - } - { source = pkgs.substituteAll { - name = "grub.cfg"; - src = pkgs.writeText "grub.cfg-in" grubCfg; + [ { source = pkgs.substituteAll { + name = "isolinux.cfg"; + src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; bootRoot = "/boot"; }; - target = "/boot/grub/grub.cfg"; + target = "/isolinux/isolinux.cfg"; } { source = config.boot.kernelPackages.kernel + "/bzImage"; target = "/boot/bzImage"; @@ -252,51 +259,38 @@ in { source = config.system.build.initialRamdisk + "/initrd"; target = "/boot/initrd"; } - { source = "${pkgs.grub2}/share/grub/unicode.pf2"; - target = "/boot/grub/unicode.pf2"; - } - { source = config.boot.loader.grub.splashImage; - target = "/boot/grub/splash.png"; - } { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } + { source = "${pkgs.syslinux}/share/syslinux"; + target = "/isolinux"; + } + { source = config.isoImage.splashImage; + target = "/isolinux/background.png"; + } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; } - { source = "${efiDir}/efi"; - target = "/efi"; + { source = "${efiDir}/EFI"; + target = "/EFI"; } { source = "${efiDir}/loader"; target = "/loader"; } - ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles; - - # The Grub menu. - boot.loader.grub.extraEntries = - '' - menuentry "NixOS ${config.system.nixosVersion} Installer" { - linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - initrd /boot/initrd - } - - menuentry "Boot from hard disk" { - set root=(hd0) - chainloader +1 - } - ''; - - boot.loader.grub.timeout = 10; + ]; # Create the ISO image. system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl cdrkit pathsFromGraph; + inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; inherit (config.isoImage) isoName compressImage volumeID contents; bootable = true; - bootImage = "/boot/grub/grub_eltorito"; + bootImage = "/isolinux/isolinux.bin"; + } // optionalAttrs config.isoImage.makeUsbBootable { + usbBootable = true; + isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; } // optionalAttrs config.isoImage.makeEfiBootable { efiBootable = true; efiBootImage = "boot/efi.img"; From 16a936be90ee442a00b397a8f62060d5e4c062c9 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 26 Oct 2014 22:47:15 +0100 Subject: [PATCH 426/947] nixos: iso-image: filename escaping in xorriso --- nixos/lib/make-iso9660-image.sh | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c8522513aa2..c9a37379469 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -13,6 +13,20 @@ stripSlash() { if test "${res:0:1}" = /; then res=${res:1}; fi } +# Escape potential equal signs (=) with backslash (\=) +escapeEquals() { + echo "$1" | sed -e 's/\\/\\\\/g' -e 's/=/\\=/g' +} + +# Queues an file/directory to be placed on the ISO. +# An entry consists of a local source path (2) and +# a destination path on the ISO (1). +addPath() { + target="$1" + source="$2" + echo "$(escapeEquals "$target")=$(escapeEquals "$source")" >> pathlist +} + stripSlash "$bootImage"; bootImage="$res" @@ -53,14 +67,14 @@ touch pathlist # Add the individual files. for ((i = 0; i < ${#targets_[@]}; i++)); do stripSlash "${targets_[$i]}" - echo "$res=${sources_[$i]}" >> pathlist + addPath "$res" "${sources_[$i]}" done # Add the closures of the top-level store objects. storePaths=$(perl $pathsFromGraph closure-*) for i in $storePaths; do - echo "${i:1}=$i" >> pathlist + addPath "${i:1}" "$i" done @@ -68,7 +82,7 @@ done # nix-store --load-db. if [ -n "$object" ]; then printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration - echo "nix-path-registration=nix-path-registration" >> pathlist + addPath "nix-path-registration" "nix-path-registration" fi @@ -79,16 +93,10 @@ for ((n = 0; n < ${#objects[*]}; n++)); do if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) ln -s $object ./$symlink - echo "$symlink=./$symlink" >> pathlist + addPath "$symlink" "./$symlink" fi done -# Escape filenames that contain '='. -# TODO: Handle this properly. This fails for filenames -# that contain multiple '=' symbols. -cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer - - mkdir -p $out/iso xorriso="xorriso @@ -103,7 +111,7 @@ xorriso="xorriso ${usbBootFlags} ${efiBootFlags} -r - -path-list pathlist.safer + -path-list pathlist --sort-weight 0 / --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO From a12ddc1964d0c66d81e9e5f05aedaec55bd3a1cd Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 16 Nov 2014 20:11:56 +0100 Subject: [PATCH 427/947] nixos: iso-image: use generic boot-loader timeout Syslinux uses different values than grub for timeout. It uses 1/10 seconds as its unit and it uses 0 to disable timeouts. In response to PR #5772. --- nixos/modules/installer/cd-dvd/iso-image.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 57e1601a87b..8db7ae366f1 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -7,14 +7,25 @@ with lib; let + # Timeout in syslinux is in units of 1/10 of a second. + # 0 is used to disable timeouts. + syslinuxTimeout = if config.boot.loader.timeout == null then + 0 + else + max (config.boot.loader.timeout * 10) 1; + + + max = x: y: if x > y then x else y; # The configuration file for syslinux. baseIsolinuxCfg = '' SERIAL 0 38400 + TIMEOUT ${builtins.toString syslinuxTimeout} UI vesamenu.c32 MENU TITLE NixOS MENU BACKGROUND /isolinux/background.png + DEFAULT boot LABEL boot MENU LABEL Boot NixOS @@ -47,7 +58,7 @@ let echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf echo "default nixos-livecd" > $out/loader/loader.conf - echo "timeout 5" >> $out/loader/loader.conf + echo "timeout ${builtins.toString config.boot.loader.gummiboot.timeout}" >> $out/loader/loader.conf ''; efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools ]; } @@ -280,6 +291,8 @@ in } ]; + boot.loader.timeout = 10; + # Create the ISO image. system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; From af68f2400365d830131acf5fb0f3e2c8cbad65a7 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 16 Nov 2014 20:13:11 +0100 Subject: [PATCH 428/947] nixos: iso-image: solve UNetbootin compatiblity There are a number of hidden restrictions on the syslinux configuration file that come into play when UNetbootin compatiblity is desired. With this commit these are documented. --- nixos/modules/installer/cd-dvd/iso-image.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 8db7ae366f1..2b125fa8bc1 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -18,6 +18,18 @@ let max = x: y: if x > y then x else y; # The configuration file for syslinux. + + # Notes on syslinux configuration and UNetbootin compatiblity: + # * Do not use '/syslinux/syslinux.cfg' as the path for this + # configuration. UNetbootin will not parse the file and use it as-is. + # This results in a broken configuration if the partition label does + # not match the specified config.isoImage.volumeID. For this reason + # we're using '/isolinux/isolinux.cfg'. + # * Use APPEND instead of adding command-line arguments directly after + # the LINUX entries. + # * COM32 entries (chainload, reboot, poweroff) are not recognized. They + # result in incorrect boot entries. + baseIsolinuxCfg = '' SERIAL 0 38400 @@ -28,8 +40,9 @@ let DEFAULT boot LABEL boot - MENU LABEL Boot NixOS - LINUX /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + MENU LABEL NixOS ${config.system.nixosVersion} Installer + LINUX /boot/bzImage + APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} INITRD /boot/initrd LABEL chain From 9ff9949896c7ff0307ea60dc8d25de340860bfc4 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 16 Nov 2014 20:13:49 +0100 Subject: [PATCH 429/947] nixos: iso-image: removed com32 entries from syslinux menu These entries result in incorrect entries when UNetbootin writes the image to an USB disk. --- nixos/modules/installer/cd-dvd/iso-image.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 2b125fa8bc1..c41d22ffd0d 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -44,19 +44,6 @@ let LINUX /boot/bzImage APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} INITRD /boot/initrd - - LABEL chain - MENU LABEL Boot existing OS - COM32 chain.c32 - APPEND hd0 0 - - LABEL reboot - MENU LABEL Reboot - COM32 reboot.c32 - - LABEL poweroff - MENU LABEL Power Off - COM32 poweroff.c32 ''; isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); From c57a912016025f66d666f0da26bc998b49ae55a7 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 19 Nov 2014 23:18:44 +0100 Subject: [PATCH 430/947] nixos: test: add tests for booting installation iso in various ways --- nixos/lib/test-driver/Machine.pm | 4 ++ nixos/release.nix | 4 ++ nixos/tests/boot.nix | 63 ++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 nixos/tests/boot.nix diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 85c2bfa88e1..e0791692d3e 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -37,6 +37,10 @@ sub new { if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; + $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " + if defined $args->{usb}; + $startCommand .= "-bios $args->{bios} " + if defined $args->{bios}; $startCommand .= $args->{qemuFlags} || ""; } else { $startCommand = Cwd::abs_path $startCommand; diff --git a/nixos/release.nix b/nixos/release.nix index 1712c90ad33..90824d45994 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -310,6 +310,10 @@ in rec { tests.udisks2 = callTest tests/udisks2.nix {}; tests.virtualbox = callTest tests/virtualbox.nix {}; tests.xfce = callTest tests/xfce.nix {}; + tests.bootBiosCdrom = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootBiosCdrom); + tests.bootBiosUsb = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootBiosUsb); + tests.bootUefiCdrom = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootUefiCdrom); + tests.bootUefiUsb = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootUefiUsb); /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix new file mode 100644 index 00000000000..2fdbb0c00b8 --- /dev/null +++ b/nixos/tests/boot.nix @@ -0,0 +1,63 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with import ../lib/qemu-flags.nix; +with pkgs.lib; + +let + + 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.grub + pkgs.perlPackages.XMLLibXML + pkgs.unionfs-fuse + pkgs.gummiboot + ]; + } + ]; + }).config.system.build.isoImage; + + makeBootTest = name: machineConfig: + makeTest { + inherit iso; + name = "boot-" + name; + nodes = { }; + testScript = + '' + my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' }); + $machine->start; + $machine->waitForUnit("multi-user.target"); + $machine->shutdown; + ''; + }; +in { + bootBiosCdrom = makeBootTest "bios-cdrom" '' + cdrom => glob("${iso}/iso/*.iso") + ''; + bootBiosUsb = makeBootTest "bios-usb" '' + usb => glob("${iso}/iso/*.iso") + ''; + bootUefiCdrom = makeBootTest "uefi-cdrom" '' + cdrom => glob("${iso}/iso/*.iso"), + bios => '${pkgs.OVMF}/FV/OVMF.fd' + ''; + bootUefiUsb = makeBootTest "uefi-usb" '' + usb => glob("${iso}/iso/*.iso"), + bios => '${pkgs.OVMF}/FV/OVMF.fd' + ''; + } + From f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 21 Jan 2015 14:00:18 +0100 Subject: [PATCH 431/947] nixos: iso-image: use memtest86 params in syslinux See also #6593. --- nixos/modules/installer/cd-dvd/iso-image.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index c41d22ffd0d..87e8fabe273 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -46,6 +46,13 @@ let INITRD /boot/initrd ''; + isolinuxMemtest86Entry = '' + LABEL memtest + MENU LABEL Memtest86+ + LINUX /boot/memtest.bin + APPEND ${toString config.boot.loader.grub.memtest86.params} + ''; + isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The efi boot image @@ -289,6 +296,10 @@ in { source = "${efiDir}/loader"; target = "/loader"; } + ] ++ optionals config.boot.loader.grub.memtest86.enable [ + { source = "${pkgs.memtest86plus}/memtest.bin"; + target = "/boot/memtest.bin"; + } ]; boot.loader.timeout = 10; From 58112832a795337dfb3c205307ab9fe2c9280759 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 3 Feb 2015 23:23:41 +0100 Subject: [PATCH 432/947] nixos: iso-image: use label "EFIBOOT" for efi.img --- nixos/modules/installer/cd-dvd/iso-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 87e8fabe273..4fa2a2f6d52 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -73,6 +73,7 @@ let #Let's hope 15M is enough dd bs=2048 count=7680 if=/dev/zero of="$out" ${pkgs.dosfstools}/sbin/mkfs.vfat "$out" + mlabel -i "$out" ::EFIBOOT mcopy -svi "$out" ${efiDir}/* :: mmd -i "$out" boot mcopy -v -i "$out" \ From 2284a1ab8ea2bb6b1eddf4189e1da955dfc81b63 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 23:45:49 +0100 Subject: [PATCH 433/947] libev: set license and description Use upstream's description --- pkgs/development/libraries/libev/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index e96c69f2138..57e6f98fe72 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; }; meta = { - description = "An event loop library remotely similar to libevent"; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; + description = "A high-performance event loop/event model with lots of features"; + maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd2; # or GPL2+ }; } From b71865b1bb4a16b86651f7c19010b74247d14b13 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Mar 2015 00:07:22 +0100 Subject: [PATCH 434/947] libev: bump to 4.19 --- pkgs/development/libraries/libev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 57e6f98fe72..90cab2cc687 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.15"; + version="4.19"; src = fetchurl { - url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; + url = "http://dist.schmorp.de/libev/${name}.tar.gz"; + sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; }; meta = { description = "A high-performance event loop/event model with lots of features"; From 7f5367c69df3095eb3890bb116092486b099e7c6 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 24 Mar 2015 17:32:27 -0700 Subject: [PATCH 435/947] darwin: add apple cli-tools to initialPath so we can handle overrideCC fixes #6934 --- pkgs/stdenv/darwin/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index c415a297d84..d4ffc81c033 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -64,7 +64,9 @@ rec { name = "stdenv-darwin-boot-1"; inherit system config; - inherit (stage0.stdenv) shell initialPath fetchurlBoot; + inherit (stage0.stdenv) shell fetchurlBoot; + + initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ]; preHook = preHook + "\n" + '' export NIX_LDFLAGS_AFTER+=" -L/usr/lib" @@ -82,7 +84,7 @@ rec { cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "${buildTools.tools}/Library/Developer/CommandLineTools/usr"; + outPath = nativePrefix; }; }; }; @@ -126,7 +128,7 @@ rec { nativeTools = false; nativeLibc = true; binutils = pkgs.darwin.cctools; - cc = pkgs.llvmPackages.clang; + cc = pkgs.llvmPackages.clang-unwrapped; coreutils = pkgs.coreutils; shell = "${pkgs.bash}/bin/bash"; extraPackages = [ pkgs.libcxx ]; From 9549f1c88f3f8d4c36c10260a3bb77caa13e1b43 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 25 Mar 2015 10:22:06 +1300 Subject: [PATCH 436/947] Update tor to 0.2.5.11 --- 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 54a76280a1c..db3fe3197fa 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.5.10"; + name = "tor-0.2.5.11"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk"; + sha256 = "0sb7ai8r9c0nvdagjrbfqpri6x4njfxv954fxrjv46rzkkpgmq5f"; }; # Note: torsocks is specified as a dependency, as the distributed From 9369daf1343d499242d120f89901db78ce007a5e Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 25 Mar 2015 13:33:36 +1300 Subject: [PATCH 437/947] Update tor-browser to 4.0.5 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 750ab370872..3e6e5028111 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else - "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; + "0w1vq2fvk0ik503vz02znk80ywpnsybx0sc6906q7sbk3i7ggxp1" else + "1yljz43kyl6pmri1xnxmfxh6nphczvwgbrdgdsimc05zsfbrh363"; }; patchPhase = '' From 66b72cf5d63d988c0e137ca73f970fc0ab1d59f9 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 24 Mar 2015 22:31:09 +0000 Subject: [PATCH 438/947] glm: update from 0.9.6.0 to 0.9.6.1 --- pkgs/development/libraries/glm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index c688e42edea..0841990fa95 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.6.0"; + name = "glm-0.9.6.1"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0gq79gxjm449ryi8l94rahrqy2cjccnrvivxgbwp10xdlfdyc4ha"; + sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs"; }; buildInputs = [ unzip ]; From 0a6eb7f8d5b650ca44e8c24ab56c69a6e357e1e3 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 24 Mar 2015 22:33:46 +0000 Subject: [PATCH 439/947] gloox: update from 1.0.12 to 1.0.13 --- pkgs/development/libraries/gloox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9d06f4b1c5d..9723bf90eb0 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.12"; + version = "1.0.13"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1aa3pkg8yz6glg2273yl7310nkx1q31wkwbmmxwk3059k0p5l4k7"; + sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd"; }; buildInputs = [ ] From 25eee1c8659c5301841aec8e0340ba9bdb465cc5 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 24 Mar 2015 22:46:35 +0000 Subject: [PATCH 440/947] gtkspell3: update from 3.0.6 to 3.0.7 --- pkgs/development/libraries/gtkspell/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index c9098fc0850..b9f2f3c77e5 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1"; + sha256 = "1hiwzajf18v9ik4nai3s7frps4ccn9s20nggad1c4k2mwb9ydwhk"; }; buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; From 105c06ae4efd5b9cbd848669373c8d927e800c81 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 24 Mar 2015 23:13:29 +0000 Subject: [PATCH 441/947] snd: update from 15.2 to 15.4 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8f2e9e787b3..6048ff88c35 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.2"; + name = "snd-15.4"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0v2r7a6363aai726cywi7ai0qlwdc20bqdprs5fmyz8sbmksbqzr"; + sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh"; }; nativeBuildInputs = [ pkgconfig ]; From 69e9d228cbe6fa0c0257aa1cd6589358bade383c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 25 Mar 2015 00:41:29 +0000 Subject: [PATCH 442/947] youtube-dl: update from 2015.03.09 to 2015.03.24 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f6332874b3a..70618fafddf 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip, pandoc }: let - version = "2015.03.09"; + version = "2015.03.24"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz"; + sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv"; }; buildInputs = [ python ]; From e104a7870fcdfd76198477605d54cdfa00240fb8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 25 Mar 2015 00:46:26 +0000 Subject: [PATCH 443/947] sxiv: update to latest git --- pkgs/applications/graphics/sxiv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index d3caed5abe8..45813bbdb20 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, libX11, imlib2, giflib, libexif }: stdenv.mkDerivation { - name = "sxiv-1.3-git"; + name = "sxiv-2015.03.25"; src = fetchgit { url = "https://github.com/muennich/sxiv.git"; - rev = "92e3b57816e999b46f8d0778984719227631e9a7"; - sha256 = "0jbswh0k1xq5hgrv1pyvk7lpwbbj66p7gjsdm8zh6ah324apjr2b"; + rev = "01ed483b50f506fcba928af43e2ca017897e7c77"; + sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k"; }; postUnpack = '' From 6e3c9d5ce46990618f36f0e98934ed1cfaf20535 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Mar 2015 22:13:43 -0400 Subject: [PATCH 444/947] Fix fallout of recent cc-wrapper changes Fixes tarball except for 56e21d05e874a29ad0d51aea18e8c982c7c826f3 --- pkgs/development/compilers/gcc/3.4/default.nix | 2 +- pkgs/development/compilers/gcc/4.3/default.nix | 2 ++ pkgs/development/compilers/gcc/4.4/default.nix | 2 +- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/llvm/3.3/clang.nix | 2 +- pkgs/development/compilers/llvm/3.4/clang.nix | 3 +++ pkgs/development/tools/misc/distcc/default.nix | 2 +- 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 1595b7f336f..1be771ac705 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { } "; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langF77; isGNU = true; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 45040c2f375..3db8ee5f3ea 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -171,6 +171,8 @@ stdenv.mkDerivation ({ rm -Rf ghdl-* ''; + passthru.isGNU = true; + meta = { homepage = "http://ghdl.free.fr/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index c78de2265f3..47c8c86a95d 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; # ghdl does not build fine with parallel building # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173 diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 931c5c413de..c4be4f266dd 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -358,7 +358,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 78666c8cdce..0f65a89bd20 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -427,7 +427,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; }; + langGo version; isGNU = true; }; enableParallelBuilding = false; diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index aeaa476df12..0e8fd29dc9e 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { cc = stdenv.cc.cc; }; + passthru = { cc = stdenv.cc.cc; gcc = gccReal; }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 612e63eafd4..4c962cb2d26 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { ''; passthru.cc = stdenv.cc.cc; + # GCC_INSTALL_PREFIX points here, so just use it even though it may not + # actually be a gcc + passthru.gcc = stdenv.cc.cc; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index f73f47ab87b..0b42b88ef7a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,7 +41,7 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" { } + links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then From 69d02b71a062d8850c0679cacb607318503807c9 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 24 Mar 2015 20:37:01 -0700 Subject: [PATCH 445/947] clang: add isClang passthru attribute to mirror isGNU --- pkgs/development/compilers/llvm/3.3/clang.nix | 6 +++++- pkgs/development/compilers/llvm/3.4/clang.nix | 11 +++++++---- pkgs/development/compilers/llvm/3.5/clang.nix | 4 +++- pkgs/development/compilers/llvm/3.6/clang/default.nix | 4 +++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index 0e8fd29dc9e..316730fe3ba 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { cc = stdenv.cc.cc; gcc = gccReal; }; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + gcc = gccReal; + }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 4c962cb2d26..cd060e3a65d 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -34,10 +34,13 @@ stdenv.mkDerivation { ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; - passthru.cc = stdenv.cc.cc; - # GCC_INSTALL_PREFIX points here, so just use it even though it may not - # actually be a gcc - passthru.gcc = stdenv.cc.cc; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + # GCC_INSTALL_PREFIX points here, so just use it even though it may not + # actually be a gcc + gcc = stdenv.cc.cc; + }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 93e0056fb92..2398b0c59ac 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -39,7 +39,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 2216dad3ef8..7be535ada1e 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -40,7 +40,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; From 0bfce5bb4a61de3df465b6fc4ca37c88c622ab3d Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 24 Mar 2015 20:54:05 -0700 Subject: [PATCH 446/947] pixman: patch for clang36 --- pkgs/development/libraries/pixman/default.nix | 2 ++ pkgs/development/libraries/pixman/fix-clang36.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/pixman/fix-clang36.patch diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d93341b81ff..14529c6c643 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; + patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch; + meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch new file mode 100644 index 00000000000..7db3c7ecaba --- /dev/null +++ b/pkgs/development/libraries/pixman/fix-clang36.patch @@ -0,0 +1,11 @@ +--- a/pixman/pixman-mmx.c 2014-04-24 08:34:14.000000000 +0400 ++++ b/pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300 +@@ -89,7 +89,7 @@ + return __A; + } + +-# ifdef __OPTIMIZE__ ++# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6) + extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_shuffle_pi16 (__m64 __A, int8_t const __N) + { From 13dae62ec2621a2c28e131ac59adabe71f0de2ec Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 24 Mar 2015 20:54:47 -0700 Subject: [PATCH 447/947] libxkbfile: patch for clang36 --- pkgs/servers/x11/xorg/libxkbfile-clang36.patch | 11 +++++++++++ pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/servers/x11/xorg/libxkbfile-clang36.patch diff --git a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch new file mode 100644 index 00000000000..65bf2ea7437 --- /dev/null +++ b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch @@ -0,0 +1,11 @@ +--- libxkbfile-1.0.8/src/cout.c 2012-03-07 20:37:23.000000000 -0800 ++++ libxkbfile-1.0.8/src/cout.c 2015-03-24 20:51:11.000000000 -0700 +@@ -45,7 +45,7 @@ + { + register int i,nOut; + +- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods)) ++ if ((!xkb)||(!xkb->names)) + return False; + for (i=nOut=0;inames->vmods[i]!=None) { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bf124282876..61c1391ae09 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -79,6 +79,10 @@ in nativeBuildInputs = [ args.python ]; }; + libxkbfile = attrs: attrs // { + patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch; + }; + libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; }; From 58b4f112426a487f1c579b7ffb37871cb71fe442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 25 Mar 2015 10:02:08 +0100 Subject: [PATCH 448/947] Revert "RStudio: initial commit at version 0.98.110" This reverts commit 56e21d05e874a29ad0d51aea18e8c982c7c826f3. It's missing a file, see https://github.com/NixOS/nixpkgs/pull/6957 --- pkgs/applications/editors/rstudio/default.nix | 71 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/applications/editors/rstudio/default.nix diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix deleted file mode 100644 index c3ecbf0a60f..00000000000 --- a/pkgs/applications/editors/rstudio/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: - -let - version = "0.98.110"; - ginVer = "1.5"; - gwtVer = "2.5.1"; -in -stdenv.mkDerivation { - name = "RStudio-${version}"; - - buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; - - src = fetchurl { - url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; - }; - - # Hack RStudio to only use the input R. - patches = [ ./r-location.patch ]; - postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; - - inherit ginVer; - ginSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; - }; - - inherit gwtVer; - gwtSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; - }; - - hunspellDicts = builtins.attrValues hunspellDicts; - - mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; - sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; - }; - - preConfigure = - '' - GWT_LIB_DIR=src/gwt/lib - - mkdir -p $GWT_LIB_DIR/gin/$ginVer - unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer - - unzip $gwtSrc - mkdir -p $GWT_LIB_DIR/gwt - mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer - - mkdir dependencies/common/dictionaries - for dict in $hunspellDicts; do - for i in $dict/share/hunspell/* - do ln -sv $i dependencies/common/dictionaries/ - done - done - - unzip $mathJaxSrc -d dependencies/common/mathjax - ''; - - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; - - meta = with stdenv.lib; - { description = "Set of integrated tools for the R language"; - homepage = http://www.rstudio.com/; - license = licenses.agpl3; - maintainers = [ maintainers.emery ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80158f1c72a..0b6c95a557c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11519,8 +11519,6 @@ let automake = automake114x; }; - rstudio = callPackage ../applications/editors/rstudio { }; - rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); From 164dbfff80e7d314a68b845ca4183dd485a26685 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 25 Mar 2015 13:26:37 +0100 Subject: [PATCH 449/947] nixos/tests/printing: Fix CUPS service name (#6767) --- nixos/tests/printing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 3e5ee680c7a..ba10f23582d 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -31,8 +31,8 @@ import ./make-test.nix ({pkgs, ... }: { startAll; # Make sure that cups is up on both sides. - $server->waitForUnit("cupsd.service"); - $client->waitForUnit("cupsd.service"); + $server->waitForUnit("cups.service"); + $client->waitForUnit("cups.service"); $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("curl --fail http://localhost:631/"); From bd3e18d60fdb1c828bd6482a93a4dc5a04e030c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 25 Mar 2015 13:37:19 +0100 Subject: [PATCH 450/947] rebase mutt-kz on master, as requested in: https://github.com/NixOS/nixpkgs/pull/6836 --- .../mailreaders/mutt-kz/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/mutt-kz/default.nix diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix new file mode 100644 index 00000000000..a162df9f33b --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch +, sslSupport ? true +, imapSupport ? true +, headerCache ? true +, saslSupport ? true +, gpgmeSupport ? true +, gdbm ? null +, openssl ? null +, cyrus_sasl ? null +, gpgme ? null +}: + +assert headerCache -> gdbm != null; +assert sslSupport -> openssl != null; +assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; + +let + version = "1.5.23.1-rc1"; +in +stdenv.mkDerivation rec { + name = "mutt-kz-${version}"; + + src = fetchurl { + url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz"; + sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny"; + }; + + buildInputs = with stdenv.lib; + [ ncurses which perl autoreconfHook autoconf automake notmuch] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + +configureFlags = [ + "--with-mailpath=" "--enable-smtp" + + # This allows calls with "-d N", that output debug info into ~/.muttdebug* + "--enable-debug" + + "--enable-pop" "--enable-imap" + + "--enable-notmuch" + + # The next allows building mutt without having anything setgid + # set by the installer, and removing the need for the group 'mail' + # I set the value 'mailbox' because it is a default in the configure script + "--with-homespool=mailbox" + (if headerCache then "--enable-hcache" else "--disable-hcache") + (if sslSupport then "--with-ssl" else "--without-ssl") + (if imapSupport then "--enable-imap" else "--disable-imap") + (if saslSupport then "--with-sasl" else "--without-sasl") + (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") + ]; + + meta = with stdenv.lib; { + description = "A small but very powerful text-based mail client, forked to support notmuch"; + homepage = https://github.com/karelzak/mutt-kz/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b6c95a557c..1a49c126c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11194,6 +11194,8 @@ let withSidebar = true; }; + mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { ruby = ruby_2_1; }; From 3f0097fc4bb7330f0a8f70bbe86bed0e5fde0117 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 13:42:07 +0100 Subject: [PATCH 451/947] hackage-packages.nix: re-generate from Hackage 2015-03-24T13:42:07+0100 --- .../haskell-modules/hackage-packages.nix | 1251 +++++++++++------ 1 file changed, 848 insertions(+), 403 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d39ea7b700f..82857a43fa6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2038,23 +2038,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Cabal_1_22_1_1" = callPackage + "Cabal_1_22_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, extensible-exceptions, filepath, HUnit - , pretty, process, QuickCheck, regex-posix, test-framework - , test-framework-hunit, test-framework-quickcheck2, time, unix + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix }: mkDerivation { pname = "Cabal"; - version = "1.22.1.1"; - sha256 = "1m9yyan2f6l2r00f0sibikcj2kdrk313r5lhr20dyiyw2dlm33iy"; + version = "1.22.2.0"; + sha256 = "0q46wx1nvpi0cjbs9fw0kwmbyclkkvv5zp7dcssbdl3sqg216k6z"; buildDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix ]; testDepends = [ base bytestring containers directory extensible-exceptions filepath - HUnit process QuickCheck regex-posix test-framework + HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP"; @@ -3298,9 +3299,8 @@ self: { ({ mkDerivation, array, base, pretty }: mkDerivation { pname = "Diff"; - version = "0.3.0"; - sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; - editedCabalFile = "f016d6dd8604572ffa07922b2790658b0b869290c5eaf210018bca921e943d47"; + version = "0.3.1"; + sha256 = "10saybbmd3qa4k11g0nqjfja7c87vi540y53j59778y0hhvykfif"; buildDepends = [ array base pretty ]; description = "O(ND) diff algorithm in haskell"; license = stdenv.lib.licenses.bsd3; @@ -6901,20 +6901,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "HStringTemplate_0_8_1" = callPackage + "HStringTemplate_0_8_3" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers - , deepseq, directory, filepath, mtl, parsec, pretty, syb - , template-haskell, text, time, void + , deepseq, directory, filepath, mtl, old-locale, parsec, pretty + , syb, template-haskell, text, time, void }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.1"; - sha256 = "1ccdr1ihlm6m5nb04wkqhksj77hhghag47zkxbmdc1d1qf5z5vzy"; + version = "0.8.3"; + sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3"; buildDepends = [ array base blaze-builder bytestring containers deepseq directory - filepath mtl parsec pretty syb template-haskell text time void + filepath mtl old-locale parsec pretty syb template-haskell text + time void ]; - jailbreak = true; description = "StringTemplate implementation in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6958,8 +6958,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.12.2.3"; - sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm"; + version = "0.12.2.4"; + sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -11922,8 +11922,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.1.3"; - sha256 = "16zxmq0y8ayq9dgmgyfdm3fnjjhv452cymfam1zjmaabrayllkpp"; + version = "0.1.4"; + sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x"; buildDepends = [ base mtl QuickCheck random ]; jailbreak = true; homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; @@ -20326,8 +20326,8 @@ self: { }: mkDerivation { pname = "async-pool"; - version = "0.8.0"; - sha256 = "13c3b8ggry476hp83bq0450j5y9990flq62jj6mjpjapyn1w283z"; + version = "0.9.0"; + sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh"; buildDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -20545,17 +20545,17 @@ self: { "atomic-write" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix + , temporary, text, unix-compat }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.0"; - sha256 = "0kga6zwgpsz3zc3yq12a815ywwyqd18czzmi8ra7vrgfn5l2bcb0"; + version = "0.2.0.3"; + sha256 = "0hs157shwaqhqbd063wmfb8amkf2kppg7k4j0lhfflq1gzjbsprm"; buildDepends = [ - base bytestring directory filepath temporary text unix + base bytestring directory filepath temporary text unix-compat ]; testDepends = [ - base bytestring directory filepath hspec temporary text unix + base bytestring directory filepath hspec temporary text unix-compat ]; description = "Atomically write to a file"; license = stdenv.lib.licenses.mit; @@ -20798,6 +20798,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "audiovisual" = callPackage + ({ mkDerivation, base, boundingboxes, colors, deepseq, directory + , filepath, free, freetype2, hashable, JuicyPixels + , JuicyPixels-util, lens, linear, mtl, objective, random + , template-haskell, transformers, vector, void, WAVE + }: + mkDerivation { + pname = "audiovisual"; + version = "0.0"; + sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h"; + buildDepends = [ + base boundingboxes colors deepseq directory filepath free freetype2 + hashable JuicyPixels JuicyPixels-util lens linear mtl objective + random template-haskell transformers vector void WAVE + ]; + homepage = "https://github.com/fumieval/audiovisual"; + description = "A battery-included audiovisual framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "augeas" = callPackage ({ mkDerivation, augeas, base, bytestring, directory, HUnit, unix }: @@ -20906,8 +20926,8 @@ self: { }: mkDerivation { pname = "authenticate-oauth"; - version = "1.5.1"; - sha256 = "1swqrqz3idc6zghwsx3yd1rpphgi74r5yp31rkvcik6dwzrgdn1f"; + version = "1.5.1.1"; + sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb"; buildDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -20952,15 +20972,16 @@ self: { "auto" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , profunctors, random, semigroups, transformers + , MonadRandom, profunctors, random, semigroups, transformers }: mkDerivation { pname = "auto"; - version = "0.2.0.4"; - sha256 = "1a2sz8snlxc7jgqs33vgczi1k4m4ssixq5xxgzclv0sz050cigh9"; + version = "0.2.0.5"; + sha256 = "1c6n5yc24g3chm18c5jaspidgi064pbzbd9gnakxj6q0npwwmp1h"; + editedCabalFile = "d157149714040ab304b3cc808a27ac914576f0c7cbf73e399f2fb9eb0cd7f7cb"; buildDepends = [ - base bytestring cereal containers deepseq profunctors random - semigroups transformers + base bytestring cereal containers deepseq MonadRandom profunctors + random semigroups transformers ]; jailbreak = true; homepage = "https://github.com/mstksg/auto"; @@ -21053,6 +21074,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avers" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, containers, cryptohash, inflections, influxdb + , MonadRandom, mtl, network, resource-pool, rethinkdb-client-driver + , scrypt, stm, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "avers"; + version = "0.0.2"; + sha256 = "1wbsxr15jqq6fn158qglpzhx98ybgba8xxahlqjmi845iq3qys63"; + buildDepends = [ + aeson attoparsec base base16-bytestring bytestring containers + cryptohash inflections influxdb MonadRandom mtl network + resource-pool rethinkdb-client-driver scrypt stm template-haskell + text time unordered-containers vector + ]; + description = "empty"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -21137,8 +21179,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.11.2"; - sha256 = "15qn5fwaqzf6mqs6bahcddqhnhgbjbprw321yf2g68qq2h6dzqzi"; + version = "0.11.3"; + sha256 = "02p3dn380qj8wg6alm7yqw4svwwkw9ln9rjd6shbk4jz8gsaka8l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21259,8 +21301,8 @@ self: { }: mkDerivation { pname = "aws-general"; - version = "0.2.0"; - sha256 = "1cizkj7f8l57g95drhgnaylv0yzp7mblwh92z2syfqfkvg5m5fwa"; + version = "0.2.1"; + sha256 = "11wfg657za7mbr7fkgwhv4nag2m6j245rj3rldy2fj4s0vhpi6l3"; buildDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable bytestring case-insensitive cryptohash hashable http-types @@ -21286,8 +21328,8 @@ self: { }: mkDerivation { pname = "aws-kinesis"; - version = "0.1.3"; - sha256 = "0ka5hqrin7hhr1vavl1ky35gnhil2r6ajbxdl11dbdnhm11sllvq"; + version = "0.1.4"; + sha256 = "0k0p7ivs6z6zqm45yjhlwcmrhqz83a66fi2f6i6p1a5r7c107dji"; buildDepends = [ aeson aws aws-general base base64-bytestring blaze-builder bytestring conduit conduit-extra http-conduit http-types parsers @@ -21313,8 +21355,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.3.0.1"; - sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w"; + version = "0.3.0.2"; + sha256 = "0p1544yq9cs9qz9za2gcsdvd8wkq66sa0kzzv3i2c6xjbqy0wpgr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22035,6 +22077,7 @@ self: { testDepends = [ base bytestring lens-family-core tasty tasty-golden ]; + jailbreak = true; homepage = "https://github.com/philopon/barrier"; description = "Shield.io style badge generator"; license = stdenv.lib.licenses.mit; @@ -24819,15 +24862,14 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.8.0.0"; - sha256 = "05afa3g9fbr0hnw8x794d7s8vzr0il9lkc2w67ks7hli78wl1y5b"; + version = "0.8.0.2"; + sha256 = "1h3z857kqj9h87zyi84pck2rnykfk7i4amlh0vkv5wws5zn9xs74"; buildDepends = [ base blaze-builder blaze-markup bytestring text ]; testDepends = [ base blaze-builder blaze-markup bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24887,14 +24929,13 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.7.0.0"; - sha256 = "0ifjf6n7hzcc11g3lhwdmzxs2qa3va7snn5m7i948gbffpkkr3pp"; + version = "0.7.0.2"; + sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4"; buildDepends = [ base blaze-builder bytestring text ]; testDepends = [ base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25139,17 +25180,17 @@ self: { "blunt" = callPackage ({ mkDerivation, array, base, bytestring, containers - , haskell-src-exts, http-types, transformers, wai, warp + , haskell-src-exts, http-types, pointful, transformers, wai, warp }: mkDerivation { pname = "blunt"; - version = "0.0.7"; - sha256 = "01hm0349qzam2ygsdhcg55kgzh6gk22m6hrjb6lk5gqsn6xsdf4w"; + version = "0.0.11"; + sha256 = "020g7yn2nrsgr2lpk5q6b2mzj3hh6j7h9vjwxbdr8gq2q13rvq9q"; isLibrary = true; isExecutable = true; buildDepends = [ array base bytestring containers haskell-src-exts http-types - transformers wai warp + pointful transformers wai warp ]; description = "Point-free Haskell as a service"; license = stdenv.lib.licenses.mit; @@ -26047,16 +26088,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_4_1" = callPackage + "bytestring_0_10_6_0" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.4.1"; - sha256 = "1zldh1pifmyrn7m3di6xz9kw9jfm0syr2fpqh1lwfics9il4cjdg"; - editedCabalFile = "4f35a46a32774b82712c560de811bf76ef4e9a8302fe67f2e00129c4b5eface3"; + version = "0.10.6.0"; + sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7"; buildDepends = [ base deepseq ghc-prim integer-gmp ]; testDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -26644,8 +26684,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.24.3"; - sha256 = "0vhsdnjhrh2i78ncn7jmqszr0zha1ib1ja2xxsamgnz0zps0aiwx"; + version = "4.24.6"; + sha256 = "0v7l8pnh8gqcxbqy02635il0di21i82g8p97lydkfvjsj4c1w8sv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26785,9 +26825,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.22.0.1"; - sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7"; - editedCabalFile = "85c5296e1b0aff3717c9ce62e98a8b9b6d5509e55f76cd80ae7179269c46592c"; + version = "1.22.2.0"; + sha256 = "1nvamsklmxc77mivi02li5rijiliajl4x620pwchzgb0iyl2xg15"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -27619,24 +27658,25 @@ self: { }) {}; "call" = callPackage - ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors - , containers, control-bool, deepseq, directory, filepath, free - , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens - , linear, mtl, objective, OpenGL, OpenGLRaw, random - , template-haskell, text, transformers, vector, WAVE + ({ mkDerivation, audiovisual, base, bindings-portaudio + , boundingboxes, colors, containers, control-bool, deepseq + , directory, filepath, free, freetype2, GLFW-b, hashable + , JuicyPixels, JuicyPixels-util, lens, linear, mtl, objective + , OpenGL, OpenGLRaw, random, reflection, template-haskell, text + , transformers, vector, WAVE }: mkDerivation { pname = "call"; - version = "0.1.4.2"; - sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; + version = "0.2"; + sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp"; isLibrary = true; isExecutable = true; buildDepends = [ - base bindings-portaudio boundingboxes colors containers + audiovisual base bindings-portaudio boundingboxes colors containers control-bool deepseq directory filepath free freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util lens linear mtl objective - OpenGL OpenGLRaw random template-haskell text transformers vector - WAVE + OpenGL OpenGLRaw random reflection template-haskell text + transformers vector WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27856,18 +27896,18 @@ self: { "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , quickpull, random, time, transformers + , random, tasty, tasty-quickcheck, tasty-th, time, transformers }: mkDerivation { pname = "cartel"; - version = "0.14.2.2"; - sha256 = "0ikf0jhiaqagd4ycq9szs4vy7yq7ai31yzcj8f0a6i3j6j4cr8nx"; + version = "0.14.2.4"; + sha256 = "14xsvy0s4bz8lfbiwys90iz3bvcd5f6np2pspz3p6camzfl2xdyp"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; testDepends = [ - base directory filepath multiarg QuickCheck quickpull random time - transformers + base directory filepath multiarg QuickCheck random tasty + tasty-quickcheck tasty-th time transformers ]; homepage = "http://www.github.com/massysett/cartel"; description = "Specify Cabal files in Haskell"; @@ -27881,8 +27921,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.8"; - sha256 = "131r3l1psacb3mps02mqc4vjdghn2w5jwz2j6khr7w6bk13qlpj0"; + version = "2.3.0.0"; + sha256 = "0znzn73c6cc7jyj460djlhzydkw9jqxhjm62kiz5pv2j7bvpv7aw"; buildDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -27916,8 +27956,8 @@ self: { ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: mkDerivation { pname = "casadi-bindings-core"; - version = "2.2.0.2"; - sha256 = "1cpz8jzmcn5zx7bqm8920yrydhispgca8kijsq1zk5xnjasm5kva"; + version = "2.3.0.0"; + sha256 = "1n892agqknwjs2paszafp6b1xgiz8zfmlxqb2wm0d99487175lcv"; buildDepends = [ base casadi-bindings-internal vector ]; pkgconfigDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; @@ -27929,8 +27969,8 @@ self: { ({ mkDerivation, base, casadi, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.2.1"; - sha256 = "0sh7j11pgrnmvcrdvvvvld2k0kbvccmh67rmbravshgx95nx7dli"; + version = "0.1.3.0"; + sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00"; buildDepends = [ base vector ]; pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -28316,8 +28356,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.1.0"; - sha256 = "0avwd6mgn3g1avrwb85v4vp598x00v4566iqsxgp857cbrrh5096"; + version = "0.1.2.0"; + sha256 = "14ly2sfdk3gjxv2s4r9pfvaq4fdpz4xir4zglpjnqsik4bhwbk69"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -28325,7 +28365,7 @@ self: { ]; jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "An Haskell client for Cayley graph database"; + description = "A Haskell client for Cayley graph database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -29094,8 +29134,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.1"; - sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr"; + version = "0.4.2"; + sha256 = "0v2qvd0g0k2j3h07003wc2vkrknq6y3ld1qgh69j4r6049x9qhaj"; buildDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; @@ -29662,6 +29702,7 @@ self: { pname = "clafer"; version = "0.3.9"; sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; + editedCabalFile = "7a77fc544dc4aab21ecf747c8d95acd0d94cf9d001824862f859682eca953d22"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29674,6 +29715,7 @@ self: { base containers data-stringmap directory filepath ghc HaXml HUnit lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; + jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -31784,6 +31826,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compstrat" = callPackage + ({ mkDerivation, base, compdata, mtl, template-haskell + , th-expand-syns, transformers + }: + mkDerivation { + pname = "compstrat"; + version = "0.1.0.1"; + sha256 = "1cxc85wi5997zsr948wfsn3yf7mn34cjkih5ndbka3whg5sfbpvq"; + buildDepends = [ + base compdata mtl template-haskell th-expand-syns transformers + ]; + description = "Strategy combinators for compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "comptrans" = callPackage + ({ mkDerivation, base, compdata, containers, deepseq + , deepseq-generics, ghc-prim, lens, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "comptrans"; + version = "0.1.0.4"; + sha256 = "01yv0j405ninkvmfx7r4cwzvxdhcdivncds46086s1v0qmp2zag0"; + buildDepends = [ + base compdata containers deepseq deepseq-generics ghc-prim lens + template-haskell th-expand-syns + ]; + homepage = "https://github.com/jkoppel/comptrans"; + description = "Automatically converting ASTs into compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "computational-algebra" = callPackage ({ mkDerivation, algebra, base, containers, equational-reasoning , heaps, lens, monad-loops, monomorphic, peggy, singletons @@ -32035,8 +32110,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, hashable }: mkDerivation { pname = "concurrent-supply"; - version = "0.1.7"; - sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c"; + version = "0.1.7.1"; + sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y"; buildDepends = [ base ghc-prim hashable ]; testDepends = [ base containers ]; homepage = "http://github.com/ekmett/concurrent-supply/"; @@ -32180,6 +32255,69 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-audio" = callPackage + ({ mkDerivation, base, conduit, vector }: + mkDerivation { + pname = "conduit-audio"; + version = "0.1"; + sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb"; + buildDepends = [ base conduit vector ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "Combinators to efficiently slice and dice audio streams"; + license = "LGPL"; + }) {}; + + "conduit-audio-lame" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-audio, mp3lame + , resourcet, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-lame"; + version = "0.1"; + sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w"; + buildDepends = [ + base bytestring conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ mp3lame ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the LAME MP3 library"; + license = "LGPL"; + }) { mp3lame = null;}; + + "conduit-audio-samplerate" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, resourcet + , samplerate, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-samplerate"; + version = "0.1"; + sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg"; + buildDepends = [ + base conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ samplerate ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsamplerate resampling library"; + license = "LGPL"; + }) { samplerate = null;}; + + "conduit-audio-sndfile" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, hsndfile + , hsndfile-vector, resourcet, transformers + }: + mkDerivation { + pname = "conduit-audio-sndfile"; + version = "0.1"; + sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd"; + buildDepends = [ + base conduit conduit-audio hsndfile hsndfile-vector resourcet + transformers + ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsndfile audio file library"; + license = "LGPL"; + }) {}; + "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -32334,27 +32472,26 @@ self: { "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, containers, hspec, hspec-discover, mtl + , case-insensitive, containers, either, hspec, hspec-discover, mtl , pretty-show, QuickCheck, regex-easy, safe, scientific , string-conversions, text, unordered-containers, vector, yaml }: mkDerivation { pname = "configifier"; - version = "0.0.2"; - sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + version = "0.0.3"; + sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring case-insensitive containers mtl pretty-show - regex-easy safe string-conversions text unordered-containers vector - yaml + aeson base bytestring case-insensitive containers either mtl + pretty-show regex-easy safe string-conversions text + unordered-containers vector yaml ]; testDepends = [ - aeson aeson-pretty base case-insensitive hspec hspec-discover + aeson aeson-pretty base case-insensitive hspec hspec-discover mtl pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; - jailbreak = true; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -34829,22 +34966,22 @@ self: { }) {}; "csv-conduit" = callPackage - ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, bytestring, conduit, conduit-extra, containers - , data-default, directory, ghc-prim, HUnit, mmorph, monad-control - , mtl, primitive, resourcet, test-framework, test-framework-hunit - , text, transformers, unordered-containers, vector + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , ghc-prim, HUnit, mmorph, monad-control, mtl, primitive, resourcet + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.6.3"; - sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + version = "0.6.6"; + sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk"; isLibrary = true; isExecutable = true; buildDepends = [ - array attoparsec attoparsec-conduit base blaze-builder bytestring - conduit conduit-extra containers data-default directory ghc-prim - mmorph monad-control mtl primitive resourcet text transformers + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default directory ghc-prim mmorph + monad-control mtl primitive resourcet text transformers unordered-containers vector ]; testDepends = [ @@ -35000,8 +35137,8 @@ self: { ({ mkDerivation, base, hmatrix, safe }: mkDerivation { pname = "cubicspline"; - version = "0.1"; - sha256 = "0z6gwg8h760jviq2v8m9b5w84f9qrkz3hd1vp5y183i0c2wa97ak"; + version = "0.1.1"; + sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s"; buildDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; @@ -35193,8 +35330,8 @@ self: { }: mkDerivation { pname = "cursedcsv"; - version = "0.1.1"; - sha256 = "1qcld5mg8vla6fb9biriyx3lldn69spq9halg46in6lg5qw45ycz"; + version = "0.1.2"; + sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -37592,15 +37729,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_1_0" = callPackage - ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework + "deepseq_1_4_1_1" = callPackage + ({ mkDerivation, array, base, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.1.0"; - sha256 = "1azyq3vralgqi3sl61xhx0r7q7bwjfjhgk8jrjmziq55ymfkssna"; - buildDepends = [ array base ghc-prim ]; + version = "1.4.1.1"; + sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch"; + buildDepends = [ array base ]; testDepends = [ array base HUnit test-framework test-framework-hunit ]; @@ -37639,6 +37776,7 @@ self: { pname = "deepseq-generics"; version = "0.1.1.2"; sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3"; + editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -38941,8 +39079,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.7.1.4"; - sha256 = "0h2ki8vzfmvzazvzcmngb6ahki3k2zh9pbgn4hj8jaicfxrdv9xb"; + version = "0.7.1.5"; + sha256 = "1rfdxac3cnwa5r5zxic3xhj4n59f7s6l34xmja4q87ylqxfyqmls"; buildDepends = [ base bytestring containers mtl old-locale text time ]; @@ -40494,8 +40632,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.1.0.5"; - sha256 = "1gh1x4dzcrivlb8gnqgb96v6yvi78c1rx52wplbfy3z5pzg9mx1f"; + version = "0.1.0.7"; + sha256 = "0wxzlgh3qz35x3vw5m1xk3f9hq5kpyhccy9h05s0q5012fcd189a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40537,11 +40675,12 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "dotgen"; - version = "0.4.1"; - sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k"; + version = "0.4.2"; + sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; + homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41678,10 +41817,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.4"; - sha256 = "0aji7bnkql6k0b6qa9m7g7y6nvkz8hxwf8w5bk6yzxnzvfg3dxdb"; - isLibrary = true; - isExecutable = true; + version = "0.2.5"; + sha256 = "1nmn5v1y8rhwv9ymxy0x9143h3gch5kf9yazdnnfs84a2k5q60j6"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -41690,7 +41827,6 @@ self: { testDepends = [ aeson base bifunctors bytestring directory tasty tasty-golden text ]; - jailbreak = true; homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; @@ -42052,12 +42188,12 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, bytestring, primitive, vector }: mkDerivation { pname = "eigen"; - version = "2.0.1"; - sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; - buildDepends = [ base primitive vector ]; + version = "2.1.0"; + sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; + buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; @@ -42709,8 +42845,8 @@ self: { }: mkDerivation { pname = "enclosed-exceptions"; - version = "1.0.1"; - sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; + version = "1.0.1.1"; + sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5"; buildDepends = [ async base deepseq lifted-base monad-control transformers transformers-base @@ -43684,8 +43820,8 @@ self: { }: mkDerivation { pname = "euler"; - version = "0.8.0"; - sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; + version = "0.8.2"; + sha256 = "1dw4jsvyv4a736q2q0790qc7b5b4vaw2pwpn0ibdn33h6463a4pf"; buildDepends = [ base ]; testDepends = [ base directory happy hlint hspec process regex-posix xml @@ -43945,16 +44081,17 @@ self: { "executable-hash" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory - , executable-path, file-embed + , executable-path, file-embed, template-haskell }: mkDerivation { pname = "executable-hash"; - version = "0.1.1.1"; - sha256 = "1k01qsd2cfrhmxxs8l84g6xc0wcr2hb4s50k3yiin6r8wzli915r"; + version = "0.2.0.0"; + sha256 = "0g733akm65rjdl5mncfyhnqncan985n02vzn0z02689aq8dnav4p"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cryptohash directory executable-path file-embed + template-haskell ]; testDepends = [ base ]; homepage = "http://github.com/fpco/executable-hash"; @@ -45141,8 +45278,8 @@ self: { }: mkDerivation { pname = "feed-crawl"; - version = "0.1.1.0"; - sha256 = "0137b0bi24cdmwbvpz9cr3iavcyz95xvq48ydqdilazr6gl81m13"; + version = "0.1.2.0"; + sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c"; buildDepends = [ base bytestring conduit connection http-conduit http-types hxt network-uri text transformers @@ -45288,8 +45425,8 @@ self: { ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; - version = "1.0.1"; - sha256 = "180vflhr18kj5vgsy715wrrb0cx9l89xw2g6y2ga4gg6hc71khzl"; + version = "1.0.2"; + sha256 = "08rhkfwh7dq7x42g9mnil5naamvxn5p2mihssmqyhj8g84safrja"; buildDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -54406,8 +54543,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.7.0"; - sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; + version = "4.6.7.1"; + sha256 = "125yp7ng3w91n6gvalbm3g1fj7p4zfx6fzdjcdgil2fsrcsxbcy6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -55437,8 +55574,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.1"; - sha256 = "0y3y4im18vihh4phhb6mx194gdz02z46mxrfgvf8kmg3db5bmqlk"; + version = "7.4.2"; + sha256 = "0fwxc3i0ghv0acasrpzvvbji679wg614kmpdka8p0g3cmhlrpfrg"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -55448,7 +55585,6 @@ self: { utf8-string xhtml zlib ]; testDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -55647,6 +55783,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "har" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, text + }: + mkDerivation { + pname = "har"; + version = "0.1.1.0"; + sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3"; + buildDepends = [ aeson base bytestring directory filepath text ]; + homepage = "https://github.com/freizl/har"; + description = "HAR spec in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "harchive" = callPackage ({ mkDerivation, base, binary, network, openssl, parsec, sqlite , unix, zlib @@ -56244,14 +56393,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_2_0" = callPackage + "haskeline_0_7_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix, utf8-string }: mkDerivation { pname = "haskeline"; - version = "0.7.2.0"; - sha256 = "1pzvps7r53zwjcw1klc025ll786qzlp6y6k4w37ycz2g44fmd2f2"; + version = "0.7.2.1"; + sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf"; buildDepends = [ base bytestring containers directory filepath terminfo transformers unix utf8-string @@ -56960,8 +57109,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.8"; - sha256 = "0xkp413s13gg11xc7x2c9gjxla3hcnk97wxfdj5zqrdvv757vp7x"; + version = "1.2.9"; + sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -58784,8 +58933,8 @@ self: { }: mkDerivation { pname = "hdbc-aeson"; - version = "0.1.3.0"; - sha256 = "1mqcpzp9fw604nab0zs9r8515072pwbkfr4vvdpjhbdny5022naw"; + version = "0.1.3.2"; + sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5"; buildDepends = [ aeson base convertible HDBC scientific text unordered-containers vector @@ -59198,6 +59347,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis-config" = callPackage + ({ mkDerivation, aeson, base, hedis, scientific, text, time }: + mkDerivation { + pname = "hedis-config"; + version = "0.0.1"; + sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b"; + buildDepends = [ aeson base hedis scientific text time ]; + homepage = "https://bitbucket.org/s9gf4ult/hedis-config"; + description = "Easy trivial configuration for Redis"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedis-monadic" = callPackage + ({ mkDerivation, base, hedis, monad-control, mtl, transformers + , transformers-base, transformers-compat + }: + mkDerivation { + pname = "hedis-monadic"; + version = "0.0.3"; + sha256 = "1z80kdm1cs1pk6fpbby20q49ji840zp9xwbynbry2v43g5q18lq6"; + buildDepends = [ + base hedis monad-control mtl transformers transformers-base + transformers-compat + ]; + homepage = "https://bitbucket.org/s9gf4ult/redis-monadic"; + description = "A la MonadReader for Redis connection"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedis-pile" = callPackage ({ mkDerivation, base, binary, bytestring, hedis, hedis-tags, HUnit , lifted-base, string-conversions, test-framework @@ -61383,8 +61561,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.4.0.0"; - sha256 = "0jak4ffjhbpwcmbx5jp6pbba52xr9zyhjjwn9y5gdqjny2scnb67"; + version = "0.5.0.0"; + sha256 = "0a79i7agvkhrc4w6k6g0c2pra4gg99mj11f3jjc8vlzxxwghc6hz"; buildDepends = [ aeson base bytestring file-embed hashable hjsonpointer http-types lens regexpr scientific text unordered-containers vector wreq @@ -61393,9 +61571,8 @@ self: { aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/seagreen/hjsonschema"; - description = "Haskell implementation of JSON Schema Draft 4"; + description = "JSON Schema Draft 4 library"; license = stdenv.lib.licenses.mit; }) {}; @@ -63013,8 +63190,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.14"; - sha256 = "16syq600zgq5b60ghvxnnaskn984bqv60024bvpgzydv41l61lcd"; + version = "0.14.1"; + sha256 = "0ckmz6v6y8lwbpx0aw4a5japxgx1m664p7pgrblsbw9pn5yjrkcw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63576,8 +63753,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.8"; - sha256 = "1jz82d9z27zci1dl0d33xc1q96dip3b86f8i2dhxyahpi9p7khjm"; + version = "0.1.2.9"; + sha256 = "090j08ygfjsmhyfdg0azl0qwfm0i96yyk67xnwyv1as56r2pvn6r"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -65580,6 +65757,23 @@ self: { inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) zlib;}; + "hsmisc" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec + , regex-compat, time + }: + mkDerivation { + pname = "hsmisc"; + version = "1.1"; + sha256 = "1n340agvf103g84xndc9fbhq4rhywx611iykmkk10wxi364dv7wg"; + buildDepends = [ + base containers mtl old-locale parsec regex-compat time + ]; + testDepends = [ base containers HUnit mtl regex-compat ]; + homepage = "http://foo/bar/baz.html"; + description = "A collection of miscellaneous modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -65822,8 +66016,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.4"; - sha256 = "0g0wv0mvc367fi14ibi9pbxclna7kppyxgfl4axhhr5qxvhf686p"; + version = "2.1.5"; + sha256 = "0lj8inhp0lxh23ayc3wcj5c7rslwr4q6s6wqswhda0v3cz3lfmsc"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -65843,8 +66037,8 @@ self: { }: mkDerivation { pname = "hspec-attoparsec"; - version = "0.1.0.1"; - sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v"; + version = "0.1.0.2"; + sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa"; buildDepends = [ attoparsec base bytestring hspec-expectations text ]; @@ -65889,8 +66083,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.4"; - sha256 = "0x2azc1km06f4br2pdnklkz08ali1chysi0wdwwk3j9f0lqp6jj7"; + version = "2.1.5"; + sha256 = "1za9ybkcqrzgrmqvzijvw471yk5kjhp0pr0n47n4f4cy0ha7l0fb"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -65909,8 +66103,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.4"; - sha256 = "1nabyjxjsrh7901bzv88b28gcja1shiznw9n2q2l3gfq6hxfzvqw"; + version = "2.1.5"; + sha256 = "03bs5gxzhn605f8k7wdm629kzsmxy5mjb1v834q69f3w1iczx304"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -67353,25 +67547,25 @@ self: { "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, certificate, conduit, containers, cookie - , data-default, failure, hspec, http-conduit, http-types, HUnit - , lifted-base, monad-control, network, network-conduit, resourcet - , socks, text, time, tls, transformers, wai, warp + , case-insensitive, conduit, containers, cookie, data-default + , exceptions, hspec, http-client, http-conduit, http-types, HUnit + , lifted-base, monad-control, network, network-uri, resourcet, text + , time, transformers, transformers-base, wai, warp }: mkDerivation { pname = "http-conduit-browser"; - version = "1.9.0.2"; - sha256 = "05jbxqigld9bg26gfl37c3axcxjjhm0hwp63yy8rphqp0yr4z5lc"; + version = "2.0.0.0"; + sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q"; buildDepends = [ - base bytestring case-insensitive certificate conduit containers - cookie data-default failure http-conduit http-types lifted-base - monad-control network resourcet socks time tls transformers + base bytestring conduit containers cookie data-default exceptions + http-client http-conduit http-types lifted-base monad-control + network-uri resourcet time transformers transformers-base ]; testDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive - certificate conduit containers cookie data-default failure hspec + conduit containers cookie data-default hspec http-client http-conduit http-types HUnit lifted-base monad-control network - network-conduit resourcet socks text time tls transformers wai warp + resourcet text time transformers wai warp ]; jailbreak = true; homepage = "https://github.com/exbb2/http-conduit-browser"; @@ -68753,8 +68947,8 @@ self: { }: mkDerivation { pname = "hydrogen-cli-args"; - version = "0.14"; - sha256 = "0q72w0bacaqxip26yl1qln8lrskl39wr72nphwirmdk4cxs92mx7"; + version = "0.17"; + sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4"; buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; @@ -68793,8 +68987,8 @@ self: { ({ mkDerivation, base, containers, hydrogen-prelude, parsec }: mkDerivation { pname = "hydrogen-parsing"; - version = "0.14"; - sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; + version = "0.17"; + sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29"; buildDepends = [ base containers hydrogen-prelude parsec ]; jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; @@ -68805,16 +68999,16 @@ self: { "hydrogen-prelude" = callPackage ({ mkDerivation, array, base, cereal, containers, directory , filepath, hashable, hydrogen-multimap, hydrogen-version, network - , nicify, process, random, regex-base, regex-tdfa, strict, time + , process, random, regex-base, regex-tdfa, strict, time , transformers, uuid }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.15"; - sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; + version = "0.18"; + sha256 = "1w1a2hlvsryjd9766b3464nh0facipihdd30jvsargsnkq9g2nb3"; buildDepends = [ array base cereal containers directory filepath hashable - hydrogen-multimap hydrogen-version network nicify process random + hydrogen-multimap hydrogen-version network process random regex-base regex-tdfa strict time transformers uuid ]; jailbreak = true; @@ -68823,14 +69017,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hydrogen-prelude-parsec" = callPackage + ({ mkDerivation, base, hydrogen-prelude, parsec }: + mkDerivation { + pname = "hydrogen-prelude-parsec"; + version = "0.17"; + sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh"; + buildDepends = [ base hydrogen-prelude parsec ]; + jailbreak = true; + homepage = "http://scravy.de/hydrogen-prelude-parsec/"; + description = "Hydrogen Prelude /w Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + "hydrogen-syntax" = callPackage ({ mkDerivation, base, containers, hydrogen-parsing , hydrogen-prelude, nicify, parsec, uuid }: mkDerivation { pname = "hydrogen-syntax"; - version = "0.14"; - sha256 = "1gkhmlxcdvs1px4ffygw11mc23f64dbiwxhhp4fjif632bs7mp1v"; + version = "0.17"; + sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv"; buildDepends = [ base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid @@ -69302,15 +69509,15 @@ self: { , base, base64-bytestring, binary, blaze-html, blaze-markup , boehmgc, bytestring, cheapskate, containers, deepseq, directory , filepath, fingertree, gmp, happy, haskeline, lens, libffi, mtl - , network, optparse-applicative, parsers, pretty, process, split - , text, time, transformers, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , network, optparse-applicative, parsers, pretty, process, safe + , split, text, time, transformers, transformers-compat, trifecta + , uniplate, unix, unordered-containers, utf8-string, vector , vector-binary-instances, xml, zlib }: mkDerivation { pname = "idris"; - version = "0.9.16"; - sha256 = "0mnjq05v145jyj2m2v2a33ibpyf788x63agcnlb33y21684mhvcm"; + version = "0.9.17.1"; + sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69318,9 +69525,9 @@ self: { base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree haskeline lens libffi mtl network optparse-applicative parsers - pretty process split text time transformers trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances xml - zlib + pretty process safe split text time transformers + transformers-compat trifecta uniplate unix unordered-containers + utf8-string vector vector-binary-instances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; @@ -71167,8 +71374,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.3.1"; - sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp"; + version = "1.3.2"; + sha256 = "0zdcpmxyn1acxbdgh0k201ha70yzms1w27s7n6awp67hz7v0n95m"; buildDepends = [ appar base byteorder containers network ]; testDepends = [ appar base byteorder containers doctest hspec network QuickCheck @@ -72138,43 +72345,42 @@ self: { }) {}; "jalla" = callPackage - ({ mkDerivation, base, c2hs, cblas, convertible, f77blas, HUnit - , lapack, lapacke, mtl, QuickCheck, random, test-framework + ({ mkDerivation, base, blas, c2hs, cblas, convertible, HUnit + , lapacke, mtl, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "jalla"; - version = "0.1.0.1"; - sha256 = "18nxlfr59ka4z45a5nn47lyqsbzfjsfgg1wm5irmncj1jmasjpq5"; + version = "0.2"; + sha256 = "02n9dfspn648090d3yhk3ngqzjky82ly770qi13d1h13ixbv2lx0"; buildDepends = [ base convertible mtl QuickCheck random ]; testDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; buildTools = [ c2hs ]; - extraLibraries = [ cblas f77blas lapack lapacke ]; - jailbreak = true; + extraLibraries = [ blas cblas lapacke ]; homepage = "https://github.com/cgo/jalla"; description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { cblas = null; f77blas = null; lapack = null; - lapacke = null;}; + }) { inherit (pkgs) blas; cblas = null; lapacke = null;}; "jammittools" = callPackage - ({ mkDerivation, base, boxes, bytestring, conduit, containers - , directory, filepath, HPDF, JuicyPixels, process, property-list - , temporary, transformers, vector + ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio + , containers, directory, filepath, HPDF, JuicyPixels, process + , property-list, resourcet, temporary, transformers, vector }: mkDerivation { pname = "jammittools"; - version = "0.4"; - sha256 = "1dz03p2449aqf517n03mgydd527lh3pyf9s11a46rwafpwh9wn1d"; + version = "0.4.1"; + sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil"; isLibrary = true; isExecutable = true; buildDepends = [ - base boxes bytestring conduit containers directory filepath HPDF - JuicyPixels process property-list temporary transformers vector + base boxes bytestring conduit conduit-audio containers directory + filepath HPDF JuicyPixels process property-list resourcet temporary + transformers vector ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; @@ -72361,8 +72567,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.9"; - sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6"; + version = "0.6.11"; + sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73801,8 +74007,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "kmeans"; - version = "0.1.2"; - sha256 = "1v9f6yzzb282x30wyk91f68dphxl5g2lnibmsqhvc9m4wznnxjzc"; + version = "0.1.3"; + sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix"; buildDepends = [ base ]; description = "K-means clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -74341,8 +74547,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.0"; - sha256 = "022xrcpjxzs7ac4ssaq1xkmjypvql8bpa1mvmgysskg6z0ix7jr9"; + version = "5.0.1"; + sha256 = "1zf29cqdr71n2bj7idh9v7yygk0ckpadr44f5ghqr74zdpyw6dyi"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -74366,8 +74572,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.0"; - sha256 = "0krsz6a7lgclbwnjy3581lqzcb3y6gf8fav6n7ka5683mp281xa5"; + version = "5.0.1"; + sha256 = "06asm62k2nb32yr0z4sw70z0r4ikakgkph6zqhjw7wj14ic2nxbk"; buildDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -74376,7 +74582,6 @@ self: { template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; @@ -74393,8 +74598,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.0"; - sha256 = "1ls34bqyqxf89dgfcn1frsz6bdxy10dbyk7f7c9lndks8sv8hlvr"; + version = "5.0.1"; + sha256 = "0bzfbaksij0sav93qp2j4k4qlclb9zdz8z8233ziismf9bq4bm16"; buildDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts hoogle HTTP IOSpec @@ -74415,8 +74620,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.0"; - sha256 = "0d0pm06912rc4xwmqrwcwyfnzwmazqc0sdp58nqdpzk4wg5f3lx2"; + version = "5.0.1"; + sha256 = "13ybjyx5x84g0w7l2yyni5yary59j4kpaqc4pl1942bp6y7lbfrp"; buildDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -74428,23 +74633,22 @@ self: { "lambdabot-misc-plugins" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hstatsd - , lambdabot-core, lifted-base, monad-control, mtl, network - , network-uri, parsec, process, random, random-fu, random-source - , regex-tdfa, SafeSemaphore, split, tagsoup, template-haskell, time + , lambdabot-core, lifted-base, mtl, network, network-uri, parsec + , process, random, random-fu, random-source, regex-tdfa + , SafeSemaphore, split, tagsoup, template-haskell, time , transformers, transformers-base, unix, utf8-string, zlib }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.0"; - sha256 = "0i9ax50vxfj312kw8lgxdnqsiriip2ls6zaq3c7ll4f1x6cb634r"; + version = "5.0.1"; + sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp"; buildDepends = [ base bytestring containers filepath hstatsd lambdabot-core - lifted-base monad-control mtl network network-uri parsec process - random random-fu random-source regex-tdfa SafeSemaphore split - tagsoup template-haskell time transformers transformers-base unix + lifted-base mtl network network-uri parsec process random random-fu + random-source regex-tdfa SafeSemaphore split tagsoup + template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; @@ -74457,8 +74661,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.0"; - sha256 = "0nsagim2jzpap2ja7661qycvy0nqrnjq6hx6d8zvisql7g70yji0"; + version = "5.0.1"; + sha256 = "1h9qnxbdqnpwarbvviaqrl18fxd9bs33f6n60b7cdx1p2imzbp25"; buildDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -74475,8 +74679,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.0"; - sha256 = "017zw98mw3mcrxgl489zyfjq605m07wkjs5kcwcjf7071vh358c7"; + version = "5.0.1"; + sha256 = "11hljsbb8kdbf6h4si97c52643w2fxicql1xq743f4gkys2y0x2a"; buildDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -74492,8 +74696,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.0"; - sha256 = "0c5p8pxng6nwn252mi92yrwq67pdrykjmpkkbvw9ajwhg8v5nf08"; + version = "5.0.1"; + sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc"; buildDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -74506,8 +74710,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.0"; - sha256 = "09cz4vr4pxsa25ms336ic80lsqm4d5lrfvra194h5h2hddvhdk5q"; + version = "5.0.1"; + sha256 = "1ijpr8b4vzvyfbry1g8wphk9wn7pxvay2wk6racl5k78kw27jd1c"; buildDepends = [ base oeis QuickCheck ]; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot trusted code"; @@ -75653,8 +75857,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lazysplines"; - version = "0.1"; - sha256 = "08zpr5bsqgfk3f5v8133zgdprl22n09l60b31xzadcdy50zmnif1"; + version = "0.2"; + sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; buildDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -76364,14 +76568,14 @@ self: { }) {}; "lhs2html" = callPackage - ({ mkDerivation, base, directory, filepath, Glob, nicify }: + ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { pname = "lhs2html"; - version = "0.99999"; - sha256 = "1znqqgbg64r790c74ggzdffkgw9i8xg86wf9pk029q02fw67b7nb"; + version = "0.999999"; + sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv"; isLibrary = false; isExecutable = true; - buildDepends = [ base directory filepath Glob nicify ]; + buildDepends = [ base directory filepath Glob ]; description = "Compile lhs in bird style to md, html, hs"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -78500,8 +78704,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.1"; - sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; + version = "0.13.2"; + sha256 = "13kr1gwsrwyvnb5klcvl3h506y0l3sibks6cpszwjnz296i5kpf9"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -80515,6 +80719,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "marquise" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , containers, cryptohash, data-binary-ieee754, directory, either + , errors, fast-logger, filepath, hashable, hslogger, hspec + , lifted-async, mmorph, monad-control, monad-logger, mtl + , old-locale, optparse-applicative, packer, pipes, pipes-attoparsec + , pipes-bytestring, pipes-group, semigroups, siphash, text, time + , transformers, transformers-base, unix, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "marquise"; + version = "4.0.0"; + sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async attoparsec base binary bytestring containers cryptohash + data-binary-ieee754 directory either errors fast-logger filepath + hashable hslogger lifted-async mmorph monad-control monad-logger + mtl old-locale optparse-applicative packer pipes pipes-attoparsec + pipes-bytestring pipes-group semigroups siphash text time + transformers transformers-base unix unordered-containers + vaultaire-common zeromq4-haskell + ]; + testDepends = [ base bytestring hspec ]; + description = "Client library for Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -80797,8 +81031,8 @@ self: { ({ mkDerivation, base, containers, vector }: mkDerivation { pname = "maximal-cliques"; - version = "0.1"; - sha256 = "1kjmjsvxf35sapqq7vhiyd5fc73wj1c0l11hvc41x7pkw87qm83v"; + version = "0.1.1"; + sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh"; buildDepends = [ base containers vector ]; description = "Enumerate all maximal cliques of a graph"; license = stdenv.lib.licenses.bsd3; @@ -81423,8 +81657,8 @@ self: { ({ mkDerivation, base, containers, lens, mtl, template-haskell }: mkDerivation { pname = "mgeneric"; - version = "0.0.0.0"; - sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + version = "0.0.0.2"; + sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3"; buildDepends = [ base containers lens mtl template-haskell ]; homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; description = "Generics with multiple parameters"; @@ -82724,6 +82958,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-open" = callPackage + ({ mkDerivation, base, exceptions, mtl, transformers }: + mkDerivation { + pname = "monad-open"; + version = "0.1.0.0"; + sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx"; + buildDepends = [ base exceptions mtl transformers ]; + jailbreak = true; + description = "Open recursion for when you need it"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-ox" = callPackage ({ mkDerivation, base, containers, mtl, text, vector }: mkDerivation { @@ -83356,22 +83602,22 @@ self: { "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, QuickCheck + , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck , semigroupoids, semigroups, text, transformers , unordered-containers, vector, vector-algorithms, vector-instances }: mkDerivation { pname = "mono-traversable"; - version = "0.9.0.1"; - sha256 = "1wcl2cv16855kg9kn3cz3947jzcb3g2n3mqnhkp0spd42ya3jw83"; + version = "0.9.1"; + sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers vector vector-algorithms vector-instances ]; testDepends = [ - base bytestring containers foldl hspec QuickCheck semigroups text - transformers unordered-containers vector + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector ]; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; @@ -83682,6 +83928,7 @@ self: { pname = "mp"; version = "0.2.2"; sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; + editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -83690,7 +83937,7 @@ self: { unordered-containers utf8-string vty vty-ui ]; jailbreak = true; - homepage = "http://code.google.com/p/linux-music-player"; + homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; license = "GPL"; }) {}; @@ -84164,17 +84411,17 @@ self: { }) {}; "multiarg" = callPackage - ({ mkDerivation, barecheck, base, QuickCheck, quickpull - , utf8-string + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, utf8-string }: mkDerivation { pname = "multiarg"; - version = "0.30.0.4"; - sha256 = "0bnzlz5na6fbw870vmvxd4jr71fdkdkxs7dd820p772b1pzfg1g5"; + version = "0.30.0.6"; + sha256 = "0zikmmspyk9klw44zf39qfg8c72cq9aipsdcxaldim2wzajfxrlx"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; - testDepends = [ barecheck base QuickCheck quickpull ]; + testDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ]; homepage = "https://github.com/massysett/multiarg"; description = "Command lines for options that take multiple arguments"; license = stdenv.lib.licenses.bsd3; @@ -86880,15 +87127,26 @@ self: { }) {}; "nicify" = callPackage - ({ mkDerivation, base, parsec, transformers }: + ({ mkDerivation, base, nicify-lib }: mkDerivation { pname = "nicify"; - version = "1.1"; - sha256 = "0m6cbzd1hjgsb5vhhlcx9kvyn7v8bv3h0zll7wlcyp8yaccvik3k"; - isLibrary = true; + version = "1.2.1"; + sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk"; + isLibrary = false; isExecutable = true; + buildDepends = [ base nicify-lib ]; + description = "Pretty print the standard output of default `Show` instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "nicify-lib" = callPackage + ({ mkDerivation, base, parsec, transformers }: + mkDerivation { + pname = "nicify-lib"; + version = "1.0.1"; + sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx"; buildDepends = [ base parsec transformers ]; - description = "Pretty print the standard output of show for algebraic datatypes"; + description = "Pretty print the standard output of default `Show` instances"; license = stdenv.lib.licenses.mit; }) {}; @@ -87761,8 +88019,8 @@ self: { }: mkDerivation { pname = "objective"; - version = "1.0.2"; - sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; + version = "1.0.3"; + sha256 = "1b6062isdmy5v6diqsgd8bigkmk4xy83hjglqrfns4n1a5c3fgzg"; buildDepends = [ base containers either exceptions free hashable monad-stm profunctors stm transformers unordered-containers void witherable @@ -88143,19 +88401,20 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, attoparsec, base, case-insensitive, contravariant - , old-locale, postgresql-simple, pretty, product-profunctors - , profunctors, semigroups, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , case-insensitive, contravariant, postgresql-simple, pretty + , product-profunctors, profunctors, semigroups, text, time + , time-locale-compat, transformers, uuid }: mkDerivation { pname = "opaleye"; - version = "0.3.1"; - sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; + version = "0.3.1.2"; + sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; buildDepends = [ - attoparsec base case-insensitive contravariant old-locale - postgresql-simple pretty product-profunctors profunctors semigroups - text time transformers uuid + attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid ]; testDepends = [ base postgresql-simple product-profunctors profunctors time @@ -89236,20 +89495,21 @@ self: { ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph - , monad-control, mtl, template-haskell, text, time, transformers - , transformers-base, unordered-containers + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers }: mkDerivation { pname = "pagerduty"; - version = "0.0.1.1"; - sha256 = "0k3jj18vs1mp7k6jdqgrvs1nyzkc6gxcqnqp560nvfxpj18km9cb"; + version = "0.0.3"; + sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types lens lens-aeson mmorph monad-control mtl template-haskell text time - transformers transformers-base unordered-containers + time-locale-compat transformers transformers-base + transformers-compat unordered-containers ]; - jailbreak = true; homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; @@ -89733,11 +89993,11 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.8"; - sha256 = "01vqk7krbhy6bf30ydjdjvbzx5ynjdbc3dwlhzinzq6a69a6brlq"; + version = "3.1.9"; + sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi"; buildDepends = [ base bytestring mtl text ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91068,8 +91328,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.2.1"; - sha256 = "079imqgx7ad6gl8x8drcdqfhw137k4n6rdb3j69sppq9aka9b72b"; + version = "2.1.3"; + sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -91110,8 +91370,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.2.2"; - sha256 = "0hhxhzpivv63rxknrn2rpmxlmza8cd8hq1g7qiap4shn4s58r5nb"; + version = "2.1.3"; + sha256 = "0hgvpfgbwb1q0zkl5g9hxdz1wh4xbl0hx26j5944qcll5f6298is"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -91198,8 +91458,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.1.2"; - sha256 = "0knp5gr7js4i7a7gps10fdn33019h1k1wz6h3bf08ld1sl88sjha"; + version = "2.1.3"; + sha256 = "1vyfhiwahyfgv6xwbfyn42f19dijbmjshlyy6a5rf0bfllc2k7gf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91222,8 +91482,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.0.1"; - sha256 = "14jalq90x6czhasc9d8s7j1nylgjhw96ialdqsxvg7iswdp753qx"; + version = "2.1.1"; + sha256 = "1bvmxpx8dqqsq87v079sw8wy795iykkz0fknrlpxhywja2j40dxc"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -91688,8 +91948,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.1"; - sha256 = "1b2dxms5bdiz2cci488cnar65jwv6mknhnm3qcff49ax4y9w8gi2"; + version = "0.1.2"; + sha256 = "1h6d04h72h4cckxh6b16336v47mn7f3ybslzzimg8nmi2yldn0b9"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -91891,6 +92151,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-cliff" = callPackage + ({ mkDerivation, async, base, bytestring, pipes, pipes-concurrency + , pipes-safe, process + }: + mkDerivation { + pname = "pipes-cliff"; + version = "0.4.0.0"; + sha256 = "04w6izjx49w3lpagdm1jjikhvqmslcdkjyff8573mc6imw05rj4p"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring pipes pipes-concurrency pipes-safe process + ]; + homepage = "http://www.github.com/massysett/pipes-cliff"; + description = "Streaming to and from subprocesses using Pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-concurrency" = callPackage ({ mkDerivation, async, base, pipes, stm }: mkDerivation { @@ -92274,6 +92552,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-zeromq4" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-safe, semigroups + , zeromq4-haskell + }: + mkDerivation { + pname = "pipes-zeromq4"; + version = "0.2.0.0"; + sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring pipes pipes-safe semigroups zeromq4-haskell + ]; + homepage = "https://github.com/peddie/pipes-zeromq4"; + description = "Pipes integration for ZeroMQ messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-zlib" = callPackage ({ mkDerivation, base, bytestring, pipes, transformers, zlib , zlib-bindings @@ -92763,14 +93059,18 @@ self: { }) {}; "pointful" = callPackage - ({ mkDerivation, base, containers, haskell-src, mtl, syb }: + ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb + , transformers + }: mkDerivation { pname = "pointful"; - version = "1.0.2"; - sha256 = "00xlxgdajkbi5d6gv88wdpwm16xdryshszz5qklryi0p65mmp99p"; - isLibrary = false; + version = "1.0.6"; + sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk"; + isLibrary = true; isExecutable = true; - buildDepends = [ base containers haskell-src mtl syb ]; + buildDepends = [ + base containers haskell-src-exts mtl syb transformers + ]; homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; @@ -92852,13 +93152,12 @@ self: { }: mkDerivation { pname = "pokitdok"; - version = "4.1.0.1"; - sha256 = "0cnrda2ahsam07pcn079wvq18hxjpyxik6qnqi5bzrdps9dwgl80"; + version = "4.1.0.2"; + sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w"; buildDepends = [ aeson base base64-string bytestring case-insensitive directory hex HTTP http-client http-conduit http-types strict text time ]; - jailbreak = true; homepage = "https://platform.pokitdok.com"; description = "PokitDok Platform API Client for Haskell"; license = stdenv.lib.licenses.mit; @@ -93904,21 +94203,23 @@ self: { }) {}; "prednote" = callPackage - ({ mkDerivation, base, containers, contravariant, QuickCheck - , quickpull, rainbow, split, text, transformers + ({ mkDerivation, base, bytestring, containers, contravariant + , QuickCheck, rainbow, split, tasty, tasty-quickcheck, tasty-th + , text, transformers }: mkDerivation { pname = "prednote"; - version = "0.32.0.0"; - sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; + version = "0.32.0.4"; + sha256 = "1w7p8f8xqwkqbhf9a59g2y31rkd84290hsprxvhrn6qka6bfxfcf"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers contravariant rainbow split text transformers + base bytestring containers contravariant rainbow split text + transformers ]; testDepends = [ - base containers contravariant QuickCheck quickpull rainbow split - text transformers + base bytestring containers contravariant QuickCheck rainbow split + tasty tasty-quickcheck tasty-th text transformers ]; homepage = "http://www.github.com/massysett/prednote"; description = "Evaluate and display trees of predicates"; @@ -94305,6 +94606,7 @@ self: { pname = "primitive"; version = "0.5.4.0"; sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; + editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; buildDepends = [ base ghc-prim ]; testDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -94525,8 +94827,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.3.2"; - sha256 = "0kv4fpg5qndqf97c1znhibhzqd5z6mdk38ma72yk3ixkp45rvarh"; + version = "0.3.3.4"; + sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -94626,13 +94928,13 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.6.7.0"; - sha256 = "08j6yf2ma7w3nqcv9bslykvm4mp0pws1n538fvsq2j2dnzxq3f1h"; + version = "0.6.9.0"; + sha256 = "12kqsdw0011x1alcsl7y1bycnf3awxlzb9bzyfjw0gz2b1ak9k0c"; buildDepends = [ - base bifunctors conceit containers contravariant foldl free pipes - pipes-bytestring pipes-concurrency pipes-parse pipes-safe - pipes-text process semigroups text transformers transformers-compat - void + base bifunctors bytestring conceit containers contravariant foldl + free pipes pipes-bytestring pipes-concurrency pipes-parse + pipes-safe pipes-text process semigroups text transformers + transformers-compat void ]; testDepends = [ attoparsec base bifunctors bytestring containers directory doctest @@ -96255,8 +96557,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.10"; - sha256 = "02qkpgsr1w0fs2c4q9hrhx6m65lqss4f4qnfhb51ljpcaj8p1v6y"; + version = "0.3.11"; + sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2"; buildDepends = [ array base bytestring containers hashable old-time QuickCheck text time unordered-containers @@ -96660,12 +96962,15 @@ self: { }) {}; "rainbow" = callPackage - ({ mkDerivation, base, terminfo, text }: + ({ mkDerivation, base, bytestring, process, QuickCheck, text }: mkDerivation { pname = "rainbow"; - version = "0.20.4.0"; - sha256 = "1h6rih0dn5ll8sz0j1w1wi9f6b8592fzf7c1mvl1d8bplcgahqhs"; - buildDepends = [ base terminfo text ]; + version = "0.22.0.0"; + sha256 = "0357yn0dqhmcpy6k661xwlyj7a3nfmj3qci55dkc126mdl66ibf1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base bytestring process text ]; + testDepends = [ base bytestring process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -96687,18 +96992,18 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, array, barecheck, base, ChasingBottoms, QuickCheck - , rainbow, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, array, base, bytestring, ChasingBottoms + , QuickCheck, rainbow, tasty, tasty-quickcheck, text, transformers }: mkDerivation { pname = "rainbox"; - version = "0.10.0.0"; - sha256 = "0yq9xk11rckdb72hqis0mwff82qm4hk2nahgns3fr5fxg4c7wrj1"; + version = "0.10.0.2"; + sha256 = "1s08p7ckni17q15p059nccpyq19iw5chfy28m1k8c6vm4fcrkjyw"; isLibrary = true; isExecutable = true; - buildDepends = [ array base rainbow text transformers ]; + buildDepends = [ array base bytestring rainbow text transformers ]; testDepends = [ - array barecheck base ChasingBottoms QuickCheck rainbow tasty + array base bytestring ChasingBottoms QuickCheck rainbow tasty tasty-quickcheck text transformers ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -97656,6 +97961,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "record-gl" = callPackage + ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit + , linear, OpenGL, record, tagged, template-haskell, test-framework + , test-framework-hunit, vector + }: + mkDerivation { + pname = "record-gl"; + version = "0.1.0.0"; + sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq"; + editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85"; + buildDepends = [ + base base-prelude containers GLUtil linear OpenGL record tagged + template-haskell vector + ]; + testDepends = [ + base HUnit linear OpenGL record tagged test-framework + test-framework-hunit + ]; + description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -97868,6 +98195,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reexport-crypto-random" = callPackage + ({ mkDerivation, base, crypto-api }: + mkDerivation { + pname = "reexport-crypto-random"; + version = "0.1.0.0"; + sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; + buildDepends = [ base crypto-api ]; + license = stdenv.lib.licenses.gpl2; + }) {}; + "ref" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -99843,22 +100180,24 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, data-default, doctest, mtl, network + , scientific, text, time, unordered-containers, utf8-string, vector }: mkDerivation { pname = "rethinkdb"; - version = "1.15.2.1"; - sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5"; + version = "1.16.0.0"; + sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector + aeson attoparsec base base64-bytestring binary bytestring + containers data-default mtl network scientific text time + unordered-containers utf8-string vector ]; testDepends = [ base doctest ]; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 1.15"; + description = "A driver for RethinkDB 1.16"; license = stdenv.lib.licenses.asl20; }) {}; @@ -101759,14 +102098,14 @@ self: { "satchmo" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , minisat, mtl, process + , lens, minisat, mtl, process }: mkDerivation { pname = "satchmo"; - version = "2.9.6"; - sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; + version = "2.9.7.1"; + sha256 = "1wrbf5mnk4f1m40dw2pyp66g76rvhqbxv7qwdx6lha2wjx7z1020"; buildDepends = [ - array base bytestring containers directory minisat mtl process + array base bytestring containers directory lens minisat mtl process ]; testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; @@ -102392,6 +102731,7 @@ self: { pname = "scotty"; version = "0.9.1"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; + editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default http-types monad-control mtl regex-compat text transformers @@ -102593,8 +102933,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20150314"; - sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; + version = "1.20150323"; + sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -103384,14 +103724,15 @@ self: { "seqloc-datafiles" = callPackage ({ mkDerivation, attoparsec, base, biocore, bytestring, cmdtheline - , conduit, conduit-extra, filepath, hashable, iteratee, lifted-base - , monads-tf, pretty, QuickCheck, random, resourcet, seqloc - , transformers, transformers-base, unordered-containers, vector + , conduit, conduit-extra, directory, filepath, hashable, iteratee + , lifted-base, monads-tf, pretty, process, QuickCheck, random + , resourcet, seqloc, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "seqloc-datafiles"; - version = "0.4"; - sha256 = "0bmgg41123c1rhq6d1vq8x6ci435smaancm8gcg9iirhxi5wwvp5"; + version = "0.4.2"; + sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103400,6 +103741,11 @@ self: { random resourcet seqloc transformers transformers-base unordered-containers vector ]; + testDepends = [ + attoparsec base biocore bytestring conduit conduit-extra directory + hashable iteratee lifted-base process QuickCheck random seqloc + transformers transformers-base unordered-containers vector + ]; homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html"; description = "Read and write BED and GTF format genome annotations"; license = stdenv.lib.licenses.mit; @@ -107481,9 +107827,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.2.4"; - sha256 = "03zqbdmk44jds6sqaq90rr5zprnrw524c084jndl9hgq4gd4d39c"; - editedCabalFile = "2599e7a2bf2c9f599571acb194625003de1237fe2031a39113a7a83805c2884c"; + version = "0.2.2.5"; + sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7"; buildDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -107493,7 +107838,6 @@ self: { base bytestring hspec HUnit text unordered-containers xml-conduit xml-conduit-writer ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; @@ -107526,13 +107870,12 @@ self: { }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.1"; - sha256 = "1vcmpcq7yw65v90cg1v279mvyvrvibi6zf71vf7d21jzxpldskih"; + version = "0.1.1.2"; + sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; buildDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using tls package)"; license = stdenv.lib.licenses.mit; @@ -109060,6 +109403,57 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-curator" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal + , classy-prelude-conduit, conduit, conduit-extra, containers + , data-default-class, directory, filepath, hspec, http-client + , http-client-tls, http-conduit, mono-traversable, mtl, old-locale + , optparse-applicative, process, QuickCheck, semigroups + , stackage-types, stm, streaming-commons, system-fileio + , system-filepath, tar, temporary, text, time, transformers + , unix-compat, utf8-string, xml-conduit, yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.7.0.1"; + sha256 = "0w1z3h10vwinvjqkgbiq12fslqxd3ix3br004jz54vscs5i81dch"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async base bytestring Cabal classy-prelude-conduit conduit + conduit-extra containers data-default-class directory filepath + http-client http-client-tls http-conduit mono-traversable mtl + old-locale optparse-applicative process semigroups stackage-types + stm streaming-commons system-fileio system-filepath tar temporary + text time transformers unix-compat utf8-string xml-conduit yaml + zlib + ]; + testDepends = [ + base Cabal classy-prelude-conduit containers hspec http-client + http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + }) {}; + + "stackage-types" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, exceptions + , hashable, semigroups, text, unordered-containers, vector + }: + mkDerivation { + pname = "stackage-types"; + version = "1.0.0"; + sha256 = "17077awl2bfrhpdlqsl4dxb7hxq4dr5hxqcviyv1cbxlk6z38a4z"; + buildDepends = [ + aeson base Cabal containers exceptions hashable semigroups text + unordered-containers vector + ]; + homepage = "https://github.com/fpco/stackage-types"; + description = "Shared data types between various Stackage packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "standalone-haddock" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , optparse-applicative @@ -110695,8 +111089,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.5.11.1"; - sha256 = "18d5f25wsjryvh7pzj9wsra5pcna484v4yq8fpdbbic2cp2j3vg1"; + version = "0.5.11.2"; + sha256 = "1rbr1vkrlbvqijhrqq3f1dq8vn0q12832rlkbynmnknn6a682n8x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112793,8 +113187,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.2.2.4"; - sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c"; + version = "2.3"; + sha256 = "0irqf7sx0s937ahjgjxdmxj4afxd4qvnflry538zazikgb9s51pz"; buildDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary-rc @@ -113998,6 +114392,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tex2txt" = callPackage + ({ mkDerivation, base, containers, deepseq, parsec }: + mkDerivation { + pname = "tex2txt"; + version = "0.1.0.0"; + sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers deepseq parsec ]; + homepage = "http://textmining.lt/tex2txt/"; + description = "LaTeX to plain-text conversion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb @@ -114286,21 +114694,22 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, nats - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, transformers - , transformers-compat, void + , QuickCheck, quickcheck-instances, semigroups, silently, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.6.0.1"; - sha256 = "01abl9vah82v8z1a8la57afnvj0hd3ri1lb7bj6w5dmzsv8pjp41"; + version = "0.7"; + sha256 = "088fbm7zg0gvw4w232qfmlv1nbc0wxxrjni7wf39y4dinhd9wkwl"; buildDepends = [ array base bytestring ghc-prim nats semigroups template-haskell text transformers void ]; testDepends = [ - array base bytestring nats quickcheck-instances tasty tasty-hunit - tasty-quickcheck text transformers transformers-compat void + array base bytestring ghc-prim nats QuickCheck quickcheck-instances + silently tasty tasty-hunit tasty-quickcheck text transformers + transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -114317,8 +114726,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "0.2"; - sha256 = "1zmjv5l5a60iir5w6w9jhb22ywid680s7k1xhw6jmd5d0bml27jk"; + version = "0.3"; + sha256 = "13vz9s2q8qahm1d957wzi8yz3dh7wqpgxqsg3b8qaaym59h2brak"; buildDepends = [ base binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups tagged @@ -114602,23 +115011,21 @@ self: { "th-instance-reification" = callPackage ({ mkDerivation, base, containers, HTF, HUnit, list-extras, loch-th - , placeholders, QuickCheck, QuickCheck-GenT, quickcheck-instances - , template-haskell, th-expand-syns + , placeholders, QuickCheck, quickcheck-instances, template-haskell + , th-expand-syns }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.2"; - sha256 = "0r16s7m0yy3siy9nbqvpv66gk7c6xzz8ccdf9abpqap15vkkz7sc"; + version = "0.1.3"; + sha256 = "1aiq4ygxdh9mz59wcnhbjr74sk7l20dvwpjkc4nkj2048axq17h1"; buildDepends = [ base containers list-extras loch-th placeholders template-haskell th-expand-syns ]; testDepends = [ base containers HTF HUnit list-extras loch-th placeholders - QuickCheck QuickCheck-GenT quickcheck-instances template-haskell - th-expand-syns + QuickCheck quickcheck-instances template-haskell th-expand-syns ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; @@ -116296,8 +116703,8 @@ self: { ({ mkDerivation, base, ghc-prim, void }: mkDerivation { pname = "total"; - version = "1.0.1"; - sha256 = "03c7ic8yd6803m7xjpbfwfvds9p251x6biak580q9578a0p664y6"; + version = "1.0.2"; + sha256 = "1di1iblxijdffczv3yni8bj1yjjc2258w7dxf8iwrd5n5h6574d4"; buildDepends = [ base ghc-prim void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -118741,8 +119148,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.8.1"; - sha256 = "0y3y8m271spkmzc3182v8j06kspkzv03yxiscaa1vvhm2sbqp2is"; + version = "0.8.2"; + sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i"; buildDepends = [ base ghc-prim QuickCheck random transformers ]; jailbreak = true; homepage = "https://github.com/sjoerdvisscher/unfoldable"; @@ -119709,6 +120116,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.0.1"; + sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5"; + buildDepends = [ attoparsec base bytestring ]; + testDepends = [ + attoparsec base bytestring derive HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://travis-ci.org/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -120366,17 +120791,18 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash, deepseq - , hashable, HUnit, network-info, QuickCheck, random, test-framework + ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit + , network-info, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, time + , uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.8"; - sha256 = "077q6772xlyhq721r9pxmb458camh5d56wmxv3ankk1j5mv431b6"; + version = "1.3.9"; + sha256 = "1ngajcmg0sxj67qq9h4lfcvgazx1bbzq3y8zhqb6vb3vw6vwmcny"; buildDepends = [ - base binary bytestring cryptohash deepseq hashable network-info - random time + base binary bytestring cryptohash network-info random time + uuid-types ]; testDepends = [ base bytestring HUnit QuickCheck random test-framework @@ -120421,6 +120847,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uuid-types" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.0"; + sha256 = "09djqdbfd7a5fqarw38r4rrm9bq51f5a664g8hvk9190bwlsyvlq"; + buildDepends = [ base binary bytestring deepseq hashable random ]; + testDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/aslatter/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -123587,8 +124032,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.3.0"; - sha256 = "0aq0mbfi1sh55z46pcy3g0n3zjqw176pah4zny0nk8l3gl8ss7v1"; + version = "0.9.3.1"; + sha256 = "0yqq2jj22a17n0cqcd54f0a7vjwwak2zr3wybbh1iq6gz0p5qf76"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text @@ -126811,8 +127256,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.3.1"; - sha256 = "08kyg83alf1z1c5llr5gbfg827ds1fvyz0d7vicmx6fzl1m9nkzb"; + version = "1.4.4"; + sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -127085,8 +127530,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.5"; - sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; + version = "1.4.5.1"; + sha256 = "0q5n2rcwz7qc5gs4r2kfc8dc7xg0khy9khzb1zgbfxl6bv9kvnk5"; isLibrary = false; isExecutable = true; buildDepends = [ From 258bc139660f357ba8145db8501c350731edc247 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 13:42:50 +0100 Subject: [PATCH 452/947] haskell-ng: update Cabal and deepseq to latest versions --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ffd2e209999..ef515bda006 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; }); + Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0; + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 36afb31ffcd..4343970bb00 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -35,7 +35,7 @@ self: super: { binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 23e939853af..9c03b7e469d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -32,7 +32,7 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; @@ -40,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 0188be27a65..383a0318390 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -37,7 +37,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 827ea9895e6..b742f69cc81 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,7 +40,7 @@ self: super: { terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -87,7 +87,7 @@ self: super: { presburger pretty process QuickCheck random smtLib syb text tf-random transformers utf8-string ]; - buildTools = with self; [ alex happy Cabal_1_22_1_1 ]; + buildTools = with self; [ alex happy Cabal_1_22_2_0 ]; patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; description = "Cryptol: The Language of Cryptography"; license = pkgs.stdenv.lib.licenses.bsd3; From adff1a2b354862f36b80bf6b8e46c68049e62026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 13:45:42 +0100 Subject: [PATCH 453/947] haskell-HStringTemplate: update to latest version --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 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 96447d9d90b..e698df7e9b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -53,7 +53,7 @@ self: super: { }); # warning: "Module ‘Control.Monad.Error’ is deprecated" # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_1 = dontDistribute super.HStringTemplate_0_8_1; + HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; From 0533fdb09d205abad3d0e2ea1ffc4204db3035b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 15:11:46 +0100 Subject: [PATCH 454/947] haskell-ng: update haskeline to latest version --- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index b742f69cc81..b7cf7c77e10 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -36,7 +36,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # haskeline and terminfo are not core libraries for this compiler. - haskeline = self.haskeline_0_7_2_0; + haskeline = self.haskeline_0_7_2_1; terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 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 e698df7e9b2..9d4bf40eca6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -45,7 +45,7 @@ self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_2_0; + haskeline = self.haskeline_0_7_2_1; mtl = super.mtl_2_2_1; })) (drv: { jailbreak = true; # idris is scared of lens 4.7 From c8c355941cdc55f19a734f4a5aae8fa0ad4f2683 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 15:13:29 +0100 Subject: [PATCH 455/947] haskell-ng: update bytestring to latest version --- 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 ef515bda006..f17f30ebb13 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -181,7 +181,7 @@ self: super: { lushtags = markBrokenVersion "0.0.1" super.lushtags; # https://github.com/haskell/bytestring/issues/41 - bytestring_0_10_4_1 = dontCheck super.bytestring_0_10_4_1; + bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0; # https://github.com/zmthy/http-media/issues/6 http-media = dontCheck super.http-media; From a4ffd5800eba8d135f2cdc5dad5f4f312a8bc769 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 15:59:16 +0100 Subject: [PATCH 456/947] haskell-directory: version 1.2.2.0 tries to access the network when running the test suite --- 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 f17f30ebb13..faf1412ca35 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -253,6 +253,7 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw + directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); From eaf95037cd1324e0fad3ebc1f817721f74512a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 16:06:35 +0100 Subject: [PATCH 457/947] haskell-Hipmunk: mark broken because it doesn't support recent versions of StateVar --- 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 faf1412ca35..b7a10aa7140 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -638,6 +638,10 @@ self: super: { hydrogen-syntax = markBroken super.hydrogen-syntax; hydrogen-cli = dontDistribute super.hydrogen-cli; + # https://github.com/meteficha/Hipmunk/issues/8 + Hipmunk = markBroken super.Hipmunk; + HipmunkPlayground = dontDistribute super.HipmunkPlayground; + } // { # Not on Hackage. From e77ad8855a29000078c291d9c0d3ee86d1dba015 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 16:10:17 +0100 Subject: [PATCH 458/947] haskell-feldspar-signal exports no modules. --- 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 b7a10aa7140..039a602db86 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -107,6 +107,7 @@ self: super: { deepseq-magic = dontHaddock super.deepseq-magic; diagrams = dontHaddock super.diagrams; either = dontHaddock super.either; + feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 gl = dontHaddock super.gl; groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; From 013b12a54c9781555f69c74ea1cbe5f3b5f1a96e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 20:09:49 +0100 Subject: [PATCH 459/947] haskell-ng: expose Hackage's revision number in hackage-packages.nix and use it to generate stable download URLs for edited Cabal files Fixes https://github.com/NixOS/nixpkgs/issues/6914. --- .../haskell-modules/generic-builder.nix | 6 +- .../haskell-modules/hackage-packages.nix | 188 ++++++++++++++++++ 2 files changed, 192 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf1ce4046e..4b0ddaf991c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -3,7 +3,7 @@ }: { pname -, version +, version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } , buildDepends ? [] @@ -46,6 +46,7 @@ }: assert pkgconfigDepends != [] -> pkgconfig != null; +assert editedCabalFile != null -> revision != null; let @@ -53,8 +54,9 @@ let concatStringsSep enableFeature optionalAttrs; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/${pname}.cabal"; + url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; sha256 = editedCabalFile; + name = "${pname}-${version}-r${revision}.cabal"; }; defaultSetupHs = builtins.toFile "Setup.hs" '' diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 82857a43fa6..6e7d5a239f7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -394,6 +394,7 @@ self: { mkDerivation { pname = "AES"; version = "0.2.9"; + revision = "1"; sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc"; editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f"; buildDepends = [ @@ -1021,6 +1022,7 @@ self: { mkDerivation { pname = "Baggins"; version = "1.0"; + revision = "1"; sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc"; editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098"; buildDepends = [ base cairo containers mtl ]; @@ -1417,6 +1419,7 @@ self: { mkDerivation { pname = "BlastHTTP"; version = "1.0.1"; + revision = "2"; sha256 = "1qxf2lqsbwmfqkzabx8qpavf3da4lq3j1v1rdsv42gl27lqhbayi"; editedCabalFile = "e182e8cb8b1fdcff3f5cd8ba3e46f371f98ac55a3d2738061a6ab78aba52b308"; buildDepends = [ @@ -1457,6 +1460,7 @@ self: { mkDerivation { pname = "BlogLiterately"; version = "0.7.1.7"; + revision = "3"; sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90"; editedCabalFile = "04eff5dba1e60fa191970db5aa7c08f4c95dbc5f425cdea79037c5ee5823074c"; isLibrary = true; @@ -1480,6 +1484,7 @@ self: { mkDerivation { pname = "BlogLiterately-diagrams"; version = "0.1.4.3"; + revision = "1"; sha256 = "0p65nyslcvf4qzgrwsi59xil8i5sgh1xfyz431lf4f00nsqb0s2h"; editedCabalFile = "a9b96a72609bba1d29f628c22171dfb4e49e4c2ed7a8b3f5c2caf1127dff403d"; isLibrary = true; @@ -3834,6 +3839,7 @@ self: { mkDerivation { pname = "EitherT"; version = "0.2.0"; + revision = "1"; sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw"; editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e"; buildDepends = [ @@ -4116,6 +4122,7 @@ self: { mkDerivation { pname = "Euterpea"; version = "1.0.0"; + revision = "1"; sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds"; editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; buildDepends = [ @@ -5224,6 +5231,7 @@ self: { mkDerivation { pname = "Glob"; version = "0.7.5"; + revision = "1"; sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0"; editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b"; buildDepends = [ @@ -5495,6 +5503,7 @@ self: { mkDerivation { pname = "Grow"; version = "1.1.0.3"; + revision = "3"; sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l"; editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a"; buildDepends = [ @@ -6662,6 +6671,7 @@ self: { mkDerivation { pname = "HROOT"; version = "0.8"; + revision = "1"; sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf"; editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917"; buildDepends = [ @@ -6890,6 +6900,7 @@ self: { mkDerivation { pname = "HStringTemplate"; version = "0.7.3"; + revision = "2"; sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8"; editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb"; buildDepends = [ @@ -8224,6 +8235,7 @@ self: { mkDerivation { pname = "Hsmtlib"; version = "2.8.8.8"; + revision = "1"; sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab"; editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89"; buildDepends = [ @@ -9324,6 +9336,7 @@ self: { mkDerivation { pname = "ListLike"; version = "4.1.1"; + revision = "1"; sha256 = "00xap58zfcwndjnmciff8d65pgb7j08pa9gmpk4cqi50vmphaf5i"; editedCabalFile = "390eff2095f519c59ac828108509047f29313ca894bc3355e6d79e943a035b50"; buildDepends = [ @@ -11138,6 +11151,7 @@ self: { mkDerivation { pname = "PBKDF2"; version = "0.3.1.5"; + revision = "1"; sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62"; editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e"; buildDepends = [ base binary bytestring Crypto random ]; @@ -11875,6 +11889,7 @@ self: { mkDerivation { pname = "QuickCheck"; version = "1.2.0.1"; + revision = "2"; sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; buildDepends = [ base random ]; @@ -12908,6 +12923,7 @@ self: { mkDerivation { pname = "SafeSemaphore"; version = "0.10.1"; + revision = "1"; sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91"; editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc"; buildDepends = [ base containers stm ]; @@ -13399,6 +13415,7 @@ self: { mkDerivation { pname = "SpacePrivateers"; version = "0.1.0.0"; + revision = "1"; sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh"; editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf"; isLibrary = false; @@ -13988,6 +14005,7 @@ self: { mkDerivation { pname = "Thrift"; version = "0.6.0.1"; + revision = "1"; sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv"; editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9"; buildDepends = [ base binary bytestring ghc-prim HTTP network ]; @@ -14575,6 +14593,7 @@ self: { mkDerivation { pname = "ViennaRNAParser"; version = "1.0.1"; + revision = "2"; sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0"; editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0"; buildDepends = [ base parsec ]; @@ -15053,6 +15072,7 @@ self: { mkDerivation { pname = "X11-extras"; version = "0.4"; + revision = "1"; sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c"; buildDepends = [ base X11 ]; @@ -15198,6 +15218,7 @@ self: { mkDerivation { pname = "XSaiga"; version = "1.0.0.0"; + revision = "3"; sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z"; editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f"; isLibrary = true; @@ -15708,6 +15729,7 @@ self: { mkDerivation { pname = "accelerate"; version = "0.15.0.0"; + revision = "2"; sha256 = "1hi3zm1swm9fank9w98009pwcgccw6w2j2ilb970sbxyb0xf8nps"; editedCabalFile = "98cea47c7fdb595a54cb06751fe54eb800059e5a2b1f9699a65d4e845b55cd4c"; buildDepends = [ @@ -15768,6 +15790,7 @@ self: { mkDerivation { pname = "accelerate-cuda"; version = "0.15.0.0"; + revision = "2"; sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy"; editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc"; buildDepends = [ @@ -15808,6 +15831,7 @@ self: { mkDerivation { pname = "accelerate-examples"; version = "0.15.0.0"; + revision = "1"; sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq"; editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc"; isLibrary = false; @@ -15825,6 +15849,7 @@ self: { mkDerivation { pname = "accelerate-fft"; version = "0.15.0.0"; + revision = "1"; sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v"; editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca"; buildDepends = [ accelerate accelerate-cuda base cuda cufft ]; @@ -15900,6 +15925,7 @@ self: { mkDerivation { pname = "accelerate-io"; version = "0.15.0.0"; + revision = "1"; sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936"; editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc"; buildDepends = [ @@ -16651,6 +16677,7 @@ self: { mkDerivation { pname = "aeson"; version = "0.7.0.6"; + revision = "1"; sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001"; buildDepends = [ @@ -17327,6 +17354,7 @@ self: { mkDerivation { pname = "algebra"; version = "4.2"; + revision = "1"; sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210"; buildDepends = [ @@ -19733,6 +19761,7 @@ self: { mkDerivation { pname = "arithmoi"; version = "0.4.1.1"; + revision = "2"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ @@ -19917,6 +19946,7 @@ self: { mkDerivation { pname = "arxiv"; version = "0.0.1"; + revision = "1"; sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh"; editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7"; buildDepends = [ base parsec split tagsoup ]; @@ -20068,6 +20098,7 @@ self: { mkDerivation { pname = "asn1-data"; version = "0.7.1"; + revision = "1"; sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f"; isLibrary = true; @@ -20504,6 +20535,7 @@ self: { mkDerivation { pname = "atomic-primops"; version = "0.7"; + revision = "1"; sha256 = "1gd2m7qnyww3dv5vcajh9j5chcwlkfsqgpi299q2x4n9xrp0d50g"; editedCabalFile = "99594a0f7b2fd268f7f68e460218c22bda9da07c559fb5ead6d3c508f01d9cff"; buildDepends = [ base ghc-prim primitive ]; @@ -20977,6 +21009,7 @@ self: { mkDerivation { pname = "auto"; version = "0.2.0.5"; + revision = "1"; sha256 = "1c6n5yc24g3chm18c5jaspidgi064pbzbd9gnakxj6q0npwwmp1h"; editedCabalFile = "d157149714040ab304b3cc808a27ac914576f0c7cbf73e399f2fb9eb0cd7f7cb"; buildDepends = [ @@ -23496,6 +23529,7 @@ self: { mkDerivation { pname = "bindings-codec2"; version = "0.1.1.0"; + revision = "1"; sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn"; editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1"; isLibrary = true; @@ -23656,6 +23690,7 @@ self: { mkDerivation { pname = "bindings-hamlib"; version = "0.1.0.0"; + revision = "1"; sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz"; editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9"; isLibrary = true; @@ -26076,6 +26111,7 @@ self: { mkDerivation { pname = "bytes"; version = "0.15"; + revision = "1"; sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386"; buildDepends = [ @@ -26138,6 +26174,7 @@ self: { mkDerivation { pname = "bytestring-class"; version = "0.0.0.1"; + revision = "1"; sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x"; editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417"; buildDepends = [ base bytestring utf8-string ]; @@ -26756,6 +26793,7 @@ self: { mkDerivation { pname = "cabal-file-th"; version = "0.2.3"; + revision = "1"; sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8"; editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e"; buildDepends = [ base Cabal directory template-haskell ]; @@ -28640,6 +28678,7 @@ self: { mkDerivation { pname = "cf"; version = "0.1"; + revision = "1"; sha256 = "0wwq78b6d6hxaivyxw8rc9dsb0kq4aw0mkp8w0xmnfmz8biymlmg"; editedCabalFile = "6bd39af35810e6a40142d87fdd9fc91754fe85098a63a8087626bf9916bd3362"; buildDepends = [ base ]; @@ -28761,6 +28800,7 @@ self: { mkDerivation { pname = "cgi-utils"; version = "0.2.1"; + revision = "1"; sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p"; editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52"; buildDepends = [ base cgi containers mtl random ]; @@ -29701,6 +29741,7 @@ self: { mkDerivation { pname = "clafer"; version = "0.3.9"; + revision = "1"; sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; editedCabalFile = "7a77fc544dc4aab21ecf747c8d95acd0d94cf9d001824862f859682eca953d22"; isLibrary = true; @@ -30253,6 +30294,7 @@ self: { mkDerivation { pname = "cld2"; version = "0.1.0.1"; + revision = "1"; sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd"; buildDepends = [ base bytestring text ]; @@ -30461,6 +30503,7 @@ self: { mkDerivation { pname = "clock"; version = "0.4.1.3"; + revision = "1"; sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; editedCabalFile = "653fd69fcb84f23fb93241604f83f686921593f7ded7c3bf61ce7cecf1f00440"; buildDepends = [ base ]; @@ -30771,6 +30814,7 @@ self: { mkDerivation { pname = "cmdargs"; version = "0.10.12"; + revision = "1"; sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc"; isLibrary = true; @@ -31000,6 +31044,7 @@ self: { mkDerivation { pname = "codepad"; version = "0.1"; + revision = "1"; sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1"; editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; buildDepends = [ base curl mtl network tagsoup ]; @@ -31635,6 +31680,7 @@ self: { mkDerivation { pname = "compdata-automata"; version = "0.9"; + revision = "1"; sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf"; editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; buildDepends = [ base compdata containers projection ]; @@ -31650,6 +31696,7 @@ self: { mkDerivation { pname = "compdata-dags"; version = "0.1"; + revision = "1"; sha256 = "1ijr3lpl0g5l5xynnwwzj4rflgfgw1y2b4ldabbw5qlk4qa0gr5j"; editedCabalFile = "556bbb62f4b8b6d738a20775066342b4d911fed945729da5aea072fd5df65044"; buildDepends = [ @@ -32803,6 +32850,7 @@ self: { mkDerivation { pname = "containers"; version = "0.4.2.1"; + revision = "2"; sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm"; editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8"; buildDepends = [ array base deepseq ]; @@ -33473,6 +33521,7 @@ self: { mkDerivation { pname = "copr"; version = "1.1.1"; + revision = "1"; sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw"; editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425"; buildDepends = [ @@ -33809,6 +33858,7 @@ self: { mkDerivation { pname = "cprng-aes-effect"; version = "0.1.0.2"; + revision = "1"; sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb"; editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e"; buildDepends = [ @@ -34568,6 +34618,7 @@ self: { mkDerivation { pname = "crypto-numbers"; version = "0.2.7"; + revision = "1"; sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2"; editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca"; buildDepends = [ @@ -34672,6 +34723,7 @@ self: { mkDerivation { pname = "crypto-random-effect"; version = "0.2.0.4.1"; + revision = "1"; sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr"; editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31"; buildDepends = [ @@ -35253,6 +35305,7 @@ self: { mkDerivation { pname = "curlhs"; version = "0.1.3"; + revision = "10"; sha256 = "0m8n19kyimxd9c7aazkw7gak7v1lik04m0y0izs3zanjlhqvnn3j"; editedCabalFile = "1ae61743cd2150bfb25b279dbf7e4b9d0c9a2339e04cdb7fcf5a0358d7b712e0"; buildDepends = [ base bytestring rtld time ]; @@ -36726,6 +36779,7 @@ self: { mkDerivation { pname = "data-reify"; version = "0.6"; + revision = "1"; sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1"; isLibrary = true; @@ -37775,6 +37829,7 @@ self: { mkDerivation { pname = "deepseq-generics"; version = "0.1.1.2"; + revision = "1"; sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3"; editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; buildDepends = [ base deepseq ghc-prim ]; @@ -37863,6 +37918,7 @@ self: { mkDerivation { pname = "definitive-filesystem"; version = "1.2"; + revision = "1"; sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id"; editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121"; buildDepends = [ @@ -37886,6 +37942,7 @@ self: { mkDerivation { pname = "definitive-graphics"; version = "1.2"; + revision = "1"; sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr"; editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed"; buildDepends = [ @@ -37927,6 +37984,7 @@ self: { mkDerivation { pname = "definitive-reactive"; version = "1.0"; + revision = "1"; sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3"; editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797"; buildDepends = [ @@ -37948,6 +38006,7 @@ self: { mkDerivation { pname = "definitive-sound"; version = "1.0"; + revision = "1"; sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj"; editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71"; buildDepends = [ @@ -38704,6 +38763,7 @@ self: { mkDerivation { pname = "diagrams-hsqml"; version = "0.0.0.2"; + revision = "1"; sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng"; editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490"; buildDepends = [ @@ -39646,6 +39706,7 @@ self: { mkDerivation { pname = "disk-free-space"; version = "0.1.0.1"; + revision = "2"; sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi"; editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b"; buildDepends = [ base ]; @@ -40498,6 +40559,7 @@ self: { mkDerivation { pname = "doctest-discover-configurator"; version = "0.1.0.6"; + revision = "1"; sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8"; editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45"; isLibrary = true; @@ -41144,6 +41206,7 @@ self: { mkDerivation { pname = "dtab"; version = "1.0"; + revision = "1"; sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3"; editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15"; isLibrary = true; @@ -41515,6 +41578,7 @@ self: { mkDerivation { pname = "dynamic-plot"; version = "0.1.0.1"; + revision = "1"; sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31"; editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5"; buildDepends = [ @@ -42156,6 +42220,7 @@ self: { mkDerivation { pname = "ehs"; version = "0.7.0"; + revision = "3"; sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; isLibrary = true; @@ -42177,6 +42242,7 @@ self: { mkDerivation { pname = "eibd-client-simple"; version = "0.0.4"; + revision = "1"; sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d"; editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80"; buildDepends = [ base bytestring containers mtl transformers ]; @@ -42934,6 +43000,7 @@ self: { mkDerivation { pname = "engine-io-yesod"; version = "1.0.1"; + revision = "1"; sha256 = "0pczmiqrg046r367j071h2hr6p2amw93sqy7j1drd2gdiwaxzn02"; editedCabalFile = "5963c385f145309049f67eb35f835abf2530a7b117730bd9fe0c4991837a52aa"; buildDepends = [ @@ -44202,6 +44269,7 @@ self: { mkDerivation { pname = "expiring-cache-map"; version = "0.0.5.3"; + revision = "1"; sha256 = "0ihyfhkqdr29pmcb2pylrj6p2xmfgfz9qw6dabxxy8dbcg38ppvf"; editedCabalFile = "e3990400b7a0fc202dd68fb9d4fea926af9fdaeb34d2e9cf7e04eb3c2a03da4c"; buildDepends = [ base containers hashable unordered-containers ]; @@ -44342,6 +44410,7 @@ self: { mkDerivation { pname = "exposed-containers"; version = "0.5.5.1"; + revision = "1"; sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7"; editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c"; buildDepends = [ array base deepseq ghc-prim ]; @@ -44846,6 +44915,7 @@ self: { mkDerivation { pname = "fastcgi"; version = "3001.0.2.4"; + revision = "1"; sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr"; editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a"; buildDepends = [ base bytestring cgi ]; @@ -45223,6 +45293,7 @@ self: { mkDerivation { pname = "fedora-packages"; version = "0.0.3"; + revision = "1"; sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk"; editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a"; buildDepends = [ @@ -45245,6 +45316,7 @@ self: { mkDerivation { pname = "feed"; version = "0.3.9.2"; + revision = "1"; sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg"; editedCabalFile = "62cb5a05a61bc09e6203b5bb7aab4464cba1703216260b0d871d98046c226358"; buildDepends = [ base old-locale old-time time utf8-string xml ]; @@ -46030,6 +46102,7 @@ self: { mkDerivation { pname = "fit"; version = "0.5"; + revision = "1"; sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl"; editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f"; buildDepends = [ @@ -46468,6 +46541,7 @@ self: { mkDerivation { pname = "flippers"; version = "1.0.1"; + revision = "1"; sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3"; editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4"; buildDepends = [ base ]; @@ -48240,6 +48314,7 @@ self: { mkDerivation { pname = "future-resource"; version = "0.3.0.0"; + revision = "1"; sha256 = "1w1ifjzfpqlqf7dzlnca67xhc1m1ddaflq3xin5xf9s2qnmsahvx"; editedCabalFile = "f9842af26e96134d6190b8ee4f8588c0352f192443330012e66105ac4e18b082"; buildDepends = [ base ]; @@ -48321,6 +48396,7 @@ self: { mkDerivation { pname = "fwgl-glfw"; version = "0.1.0.3"; + revision = "1"; sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0"; editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8"; buildDepends = [ @@ -48757,6 +48833,7 @@ self: { mkDerivation { pname = "generic-aeson"; version = "0.2.0.2"; + revision = "1"; sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; editedCabalFile = "51683167451b51086821ec0cb41902f0471a2444aa81a5cf66cc68838f47f99d"; buildDepends = [ @@ -49224,6 +49301,7 @@ self: { mkDerivation { pname = "gf"; version = "3.6"; + revision = "2"; sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx"; editedCabalFile = "ad294ebcd390005a243fe6d2203ec51f7ca2ab87a7f2fa7e7e080f0d416cb6a8"; isLibrary = true; @@ -49661,6 +49739,7 @@ self: { mkDerivation { pname = "ghc-srcspan-plugin"; version = "0.2.0.0"; + revision = "1"; sha256 = "14p2c20xsng1h7129fadvhxs2yy2c865x19vybmzsj5ibjrzrqk2"; editedCabalFile = "540c5844d127af020f38cde32f12c531f2c4953fca5e896faf2a25f33d2a3e94"; buildDepends = [ array base containers ghc hpc ]; @@ -50900,6 +50979,7 @@ self: { mkDerivation { pname = "gloss-accelerate"; version = "1.8.15.0"; + revision = "1"; sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0"; editedCabalFile = "3c0195c2208cb3c6786b8d1f27a17f5249af3797f6a37af410e95f23d03fb8d6"; buildDepends = [ accelerate accelerate-cuda base gloss ]; @@ -51018,6 +51098,7 @@ self: { mkDerivation { pname = "gloss-raster-accelerate"; version = "1.8.15.0"; + revision = "2"; sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10"; editedCabalFile = "7dc701f53445822b911329368601a2de82ef2457573d6ac8ae795c74d61a5635"; buildDepends = [ @@ -51216,6 +51297,7 @@ self: { mkDerivation { pname = "goa"; version = "3.3"; + revision = "1"; sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk"; editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137"; buildDepends = [ base directory filepath process ]; @@ -53842,6 +53924,7 @@ self: { mkDerivation { pname = "hackage-db"; version = "1.22"; + revision = "1"; sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376"; buildDepends = [ @@ -54260,6 +54343,7 @@ self: { mkDerivation { pname = "hadoop-tools"; version = "0.6"; + revision = "2"; sha256 = "1nkkv9i0qk4k9vijabf1lylq8wsfsycllxvkza7abljii5jpj5fp"; editedCabalFile = "31166d3ed285e22977d237a1ae42d29b33503ad7be39c11f97b5890571da19ec"; isLibrary = false; @@ -54713,6 +54797,7 @@ self: { mkDerivation { pname = "half"; version = "0.2.0.1"; + revision = "1"; sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce"; buildDepends = [ base ]; @@ -55700,6 +55785,7 @@ self: { mkDerivation { pname = "happy"; version = "1.19.5"; + revision = "1"; sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c"; isLibrary = false; @@ -56066,6 +56152,7 @@ self: { mkDerivation { pname = "hashable-extras"; version = "0.2.0.1"; + revision = "1"; sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s"; editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d"; buildDepends = [ @@ -56203,6 +56290,7 @@ self: { mkDerivation { pname = "hask"; version = "0"; + revision = "1"; sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39"; editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026"; buildDepends = [ @@ -56459,6 +56547,7 @@ self: { mkDerivation { pname = "haskell-awk"; version = "1.1"; + revision = "3"; sha256 = "0ic21rfm35jp7476pm6ggkp4faqsn9rhvzb58b497ilgj9wzv1dp"; editedCabalFile = "dda4e94c57a8fce2f7d269dc09363ee84b71b33863bf1601347fa5a4b1a55698"; isLibrary = true; @@ -58179,6 +58268,7 @@ self: { mkDerivation { pname = "hastache"; version = "0.6.1"; + revision = "2"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091"; isLibrary = true; @@ -58492,6 +58582,7 @@ self: { mkDerivation { pname = "haxy"; version = "1.0"; + revision = "2"; sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs"; editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940"; buildDepends = [ @@ -59463,6 +59554,7 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; + revision = "1"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e"; buildDepends = [ @@ -60781,6 +60873,7 @@ self: { mkDerivation { pname = "higherorder"; version = "0.0"; + revision = "1"; sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz"; editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459"; buildDepends = [ base ]; @@ -62672,6 +62765,7 @@ self: { mkDerivation { pname = "hoist-error"; version = "0.1.0.2"; + revision = "1"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; editedCabalFile = "900b08c7b95c9490dfc65334b32c1fdcb4a578e458f47dbfa58108c433fe7a8a"; buildDepends = [ base either mtl ]; @@ -63459,6 +63553,7 @@ self: { mkDerivation { pname = "hourglass"; version = "0.2.8"; + revision = "1"; sha256 = "1n5kffmf9qnr2zy6igck7rlrw0gx5lqc92n1lajpa8vq96qzx7lj"; editedCabalFile = "df23ba9b63af9fd6ed50bdbde1c2a2b43dc702e68a85722a49cd1ff1b21894b5"; buildDepends = [ base deepseq ]; @@ -64568,6 +64663,7 @@ self: { mkDerivation { pname = "hsConfigure"; version = "0.1.0.2"; + revision = "2"; sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c"; editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02"; buildDepends = [ base directory filepath process unix ]; @@ -66404,6 +66500,7 @@ self: { mkDerivation { pname = "hspec2"; version = "0.6.1"; + revision = "1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f"; buildDepends = [ base hspec hspec-discover ]; @@ -66495,6 +66592,7 @@ self: { mkDerivation { pname = "hsql-mysql"; version = "1.8.3"; + revision = "1"; sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9"; editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab"; buildDepends = [ base Cabal hsql ]; @@ -67615,6 +67713,7 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; + revision = "1"; sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7"; buildDepends = [ @@ -68677,6 +68776,7 @@ self: { mkDerivation { pname = "hxt-pickle-utils"; version = "0.1.0.2"; + revision = "1"; sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2"; editedCabalFile = "89173b402c57c3ee7ee0eb2814e58d81e46cce5742a4f01684980b841359d2fb"; buildDepends = [ base hxt mtl ]; @@ -69686,6 +69786,7 @@ self: { mkDerivation { pname = "igrf"; version = "0.2.0.0"; + revision = "1"; sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f"; buildDepends = [ ad base polynomial ]; @@ -69952,6 +70053,7 @@ self: { mkDerivation { pname = "image-type"; version = "0.1.0.0"; + revision = "1"; sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks"; editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2"; buildDepends = [ base bytestring ]; @@ -69981,6 +70083,7 @@ self: { mkDerivation { pname = "imagemagick"; version = "0.0.3.5"; + revision = "1"; sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq"; editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203"; isLibrary = true; @@ -70029,6 +70132,7 @@ self: { mkDerivation { pname = "imagesize-conduit"; version = "1.0.0.4"; + revision = "1"; sha256 = "0hhmjbdqdljfy3khzpg2xq6kgxa9x89jvpci7lf413pc1lpg4cw7"; editedCabalFile = "9a9a6ea6572ae1cdf6f1df1bbd35c96ae2aac9f61f7eabbcc1a60ed792d14a3d"; buildDepends = [ base bytestring conduit conduit-extra ]; @@ -70384,6 +70488,7 @@ self: { mkDerivation { pname = "index-core"; version = "1.0.1"; + revision = "1"; sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4"; editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f"; buildDepends = [ base ]; @@ -71225,6 +71330,7 @@ self: { mkDerivation { pname = "io-throttle"; version = "0.1.0"; + revision = "1"; sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9"; editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e"; buildDepends = [ base SafeSemaphore threads ]; @@ -71522,6 +71628,7 @@ self: { mkDerivation { pname = "irc-ctcp"; version = "0.1.2.1"; + revision = "1"; sha256 = "1bpn9i9mqmhiif6mhw6q9nzy5cwx1x1yh81216gkqc5gi43gsc5s"; editedCabalFile = "23e92ff7cad332b34f89273fe543e9b8b87a19b30fb1a18fad61c9c3952d0dce"; buildDepends = [ base bytestring text ]; @@ -73018,6 +73125,7 @@ self: { mkDerivation { pname = "json-extra"; version = "0.1.0.1"; + revision = "1"; sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks"; editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741"; buildDepends = [ @@ -73474,6 +73582,7 @@ self: { mkDerivation { pname = "kan-extensions"; version = "4.2.1"; + revision = "1"; sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl"; editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead"; buildDepends = [ @@ -75170,6 +75279,7 @@ self: { mkDerivation { pname = "language-ecmascript"; version = "0.17"; + revision = "2"; sha256 = "15v0nwp97058yjn0sp0hlsk7pvs6vaak3521p99f0z7a1dx4d876"; editedCabalFile = "834526a1a67668bc7689b50d0ff28b674235724d5b3df5ce8cccbcd5fd4f5622"; buildDepends = [ @@ -76157,6 +76267,7 @@ self: { mkDerivation { pname = "lens"; version = "4.8"; + revision = "1"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ @@ -78013,6 +78124,7 @@ self: { mkDerivation { pname = "list-tries"; version = "0.5.2"; + revision = "1"; sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e"; isLibrary = true; @@ -78864,6 +78976,7 @@ self: { mkDerivation { pname = "lojban"; version = "0.3"; + revision = "1"; sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6"; editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc"; isLibrary = true; @@ -79438,6 +79551,7 @@ self: { mkDerivation { pname = "lvish"; version = "1.1.4"; + revision = "1"; sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44"; editedCabalFile = "38b0af7bd2ebc54b5a2b01a2c24a3832d80f76596c8a8fad621499996ce76e76"; buildDepends = [ @@ -79626,6 +79740,7 @@ self: { mkDerivation { pname = "machines"; version = "0.4.1"; + revision = "1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ @@ -81395,6 +81510,7 @@ self: { mkDerivation { pname = "memexml"; version = "0.0.2"; + revision = "1"; sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a"; editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e"; buildDepends = [ base hxt ]; @@ -82066,6 +82182,7 @@ self: { mkDerivation { pname = "minimal-configuration"; version = "0.1.1"; + revision = "1"; sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43"; editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80"; buildDepends = [ base containers directory filepath tconfig ]; @@ -82912,6 +83029,7 @@ self: { mkDerivation { pname = "monad-lrs"; version = "0.0.2.1"; + revision = "1"; sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg"; editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1"; buildDepends = [ base containers ]; @@ -83069,6 +83187,7 @@ self: { mkDerivation { pname = "monad-peel"; version = "0.1.1"; + revision = "1"; sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l"; editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611"; buildDepends = [ base extensible-exceptions transformers ]; @@ -83927,6 +84046,7 @@ self: { mkDerivation { pname = "mp"; version = "0.2.2"; + revision = "1"; sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1"; isLibrary = false; @@ -84066,6 +84186,7 @@ self: { mkDerivation { pname = "mqtt-hs"; version = "0.2.0"; + revision = "1"; sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg"; editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439"; buildDepends = [ @@ -85156,6 +85277,7 @@ self: { mkDerivation { pname = "myTestlll"; version = "1.0.0"; + revision = "4"; sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0"; editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43"; buildDepends = [ @@ -85243,6 +85365,7 @@ self: { mkDerivation { pname = "mysql-effect"; version = "0.2.0.3"; + revision = "1"; sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3"; editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718"; buildDepends = [ @@ -88962,6 +89085,7 @@ self: { mkDerivation { pname = "optparse-applicative"; version = "0.10.0"; + revision = "1"; sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb"; editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0"; buildDepends = [ @@ -89397,6 +89521,7 @@ self: { mkDerivation { pname = "packedstring"; version = "0.1.0.1"; + revision = "1"; sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8"; editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf"; buildDepends = [ array base ]; @@ -89801,6 +89926,7 @@ self: { mkDerivation { pname = "parallel-io"; version = "0.3.3"; + revision = "1"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; isLibrary = true; @@ -90250,6 +90376,7 @@ self: { mkDerivation { pname = "partial"; version = "0.1.0.0"; + revision = "1"; sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172"; buildDepends = [ base ]; @@ -91673,6 +91800,7 @@ self: { mkDerivation { pname = "pgdl"; version = "7.77"; + revision = "1"; sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; isLibrary = false; @@ -92757,6 +92885,7 @@ self: { mkDerivation { pname = "plivo"; version = "0.2.0.0"; + revision = "1"; sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0"; editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3"; buildDepends = [ @@ -93435,6 +93564,7 @@ self: { mkDerivation { pname = "pool"; version = "0.1.2.1"; + revision = "1"; sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951"; buildDepends = [ base monad-control transformers ]; @@ -94253,6 +94383,7 @@ self: { mkDerivation { pname = "prefix-units"; version = "0.1.0.2"; + revision = "1"; sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav"; editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a"; buildDepends = [ base ]; @@ -94592,6 +94723,7 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.1.0"; + revision = "1"; sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8"; editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec"; buildDepends = [ base ghc-prim ]; @@ -94605,6 +94737,7 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.4.0"; + revision = "1"; sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; buildDepends = [ base ghc-prim ]; @@ -95046,6 +95179,7 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6"; + revision = "3"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; @@ -95242,6 +95376,7 @@ self: { mkDerivation { pname = "projection"; version = "0.1"; + revision = "1"; sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1"; editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b"; buildDepends = [ base ]; @@ -97924,6 +98059,7 @@ self: { mkDerivation { pname = "reasonable-operational"; version = "0.1.0.1"; + revision = "1"; sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9"; editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf"; buildDepends = [ base ]; @@ -97969,6 +98105,7 @@ self: { mkDerivation { pname = "record-gl"; version = "0.1.0.0"; + revision = "1"; sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq"; editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85"; buildDepends = [ @@ -98124,6 +98261,7 @@ self: { mkDerivation { pname = "redis-resp"; version = "0.3.2"; + revision = "1"; sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97"; editedCabalFile = "74f97af6250dcf3b26d424e5a53a4a9bdcda5de4f7f4d5fc4d6b686f60f6d931"; buildDepends = [ @@ -100101,6 +100239,7 @@ self: { mkDerivation { pname = "rest-wai"; version = "0.1.0.7"; + revision = "1"; sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; buildDepends = [ @@ -102438,6 +102577,7 @@ self: { mkDerivation { pname = "scholdoc"; version = "0.1.3"; + revision = "1"; sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4"; editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435"; isLibrary = true; @@ -102472,6 +102612,7 @@ self: { mkDerivation { pname = "scholdoc-citeproc"; version = "0.6"; + revision = "1"; sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll"; editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118"; isLibrary = true; @@ -102730,6 +102871,7 @@ self: { mkDerivation { pname = "scotty"; version = "0.9.1"; + revision = "1"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; buildDepends = [ @@ -103083,6 +103225,7 @@ self: { mkDerivation { pname = "sdl2-ttf"; version = "0.2.0"; + revision = "1"; sha256 = "0ikdkzzzh3wwzypas5bd6wcm17cckxj2qyqkw6y76v0k2kpnzc35"; editedCabalFile = "25cb57affc8ad5bb0ff533037512a39803f4fcd961cb2aca3632f0ab7dc2540b"; buildDepends = [ base sdl2 ]; @@ -103436,6 +103579,7 @@ self: { mkDerivation { pname = "semigroupoids"; version = "4.3"; + revision = "1"; sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf"; editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; buildDepends = [ @@ -104191,6 +104335,7 @@ self: { mkDerivation { pname = "setenv"; version = "0.1.1.3"; + revision = "1"; sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"; editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"; buildDepends = [ base unix ]; @@ -104260,6 +104405,7 @@ self: { mkDerivation { pname = "sexp-show"; version = "0.1.1.0"; + revision = "1"; sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5"; editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c"; isLibrary = false; @@ -105801,6 +105947,7 @@ self: { mkDerivation { pname = "simpleirc-lens"; version = "0.1.0.0"; + revision = "2"; sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5"; editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975"; buildDepends = [ base bytestring simpleirc ]; @@ -105851,6 +105998,7 @@ self: { mkDerivation { pname = "simplesmtpclient"; version = "0.2"; + revision = "1"; sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8"; editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25"; buildDepends = [ array base directory network old-time ]; @@ -106802,6 +106950,7 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.9"; + revision = "1"; sha256 = "143n0y3cavfgn6f40sh7i441q77ys4lkfv0g9cai714n7yr0ya1v"; editedCabalFile = "3a360180bc4463874da336da5b4f1271a1cce298ca36cf9407a04823d4df58d8"; buildDepends = [ @@ -106823,6 +106972,7 @@ self: { mkDerivation { pname = "snap-loader-dynamic"; version = "0.10.0.2"; + revision = "1"; sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7"; editedCabalFile = "2f64bcfd0c84d6f6f161c4418778e5c463d127a383c2f3f8216155d161d87d7d"; buildDepends = [ @@ -106879,6 +107029,7 @@ self: { mkDerivation { pname = "snap-server"; version = "0.9.4.6"; + revision = "1"; sha256 = "01qfqc63qwq604s5vy0sln7l9zhqndyqbb1y1xf397rrn97xhrpp"; editedCabalFile = "32c4388b62e047caebb4a51bd79cb592032a0cb4f2aa56c7eb8bff15e85588bf"; buildDepends = [ @@ -106959,6 +107110,7 @@ self: { mkDerivation { pname = "snaplet-acid-state"; version = "0.2.6.1"; + revision = "1"; sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; @@ -108721,6 +108873,7 @@ self: { mkDerivation { pname = "split"; version = "0.2.2"; + revision = "1"; sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"; editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4"; buildDepends = [ base ]; @@ -108822,6 +108975,7 @@ self: { mkDerivation { pname = "spoon"; version = "0.3.1"; + revision = "1"; sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr"; editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527"; buildDepends = [ base deepseq ]; @@ -110161,6 +110315,7 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0"; + revision = "1"; sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s"; editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b"; buildDepends = [ base stm stm-chans ]; @@ -111878,6 +112033,7 @@ self: { mkDerivation { pname = "syntax"; version = "1.0.0.0"; + revision = "1"; sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x"; editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c"; buildDepends = [ @@ -112926,6 +113082,7 @@ self: { mkDerivation { pname = "takahashi"; version = "0.2.0.2"; + revision = "1"; sha256 = "0iwwmb0przjjgfz9xav4whgqh09dq4ndil29dmq2bp81wryay0l4"; editedCabalFile = "907771d78ac3db503a9d832bae2dcc3a20d03a3a7698ff7769cb9e84703b27a1"; buildDepends = [ base mtl reasonable-lens reasonable-operational ]; @@ -113553,6 +113710,7 @@ self: { mkDerivation { pname = "teeth"; version = "0.1.0.0"; + revision = "1"; sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl"; editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416"; buildDepends = [ base ]; @@ -114310,6 +114468,7 @@ self: { mkDerivation { pname = "testing-feat"; version = "0.4.0.2"; + revision = "1"; sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j"; editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f"; buildDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -114753,6 +114912,7 @@ self: { mkDerivation { pname = "text-stream-decode"; version = "0.1.0.5"; + revision = "1"; sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy"; editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd"; buildDepends = [ base bytestring text ]; @@ -115243,6 +115403,7 @@ self: { mkDerivation { pname = "these"; version = "0.4.2"; + revision = "1"; sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7"; editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629"; buildDepends = [ @@ -115319,6 +115480,7 @@ self: { mkDerivation { pname = "thorn"; version = "0.2"; + revision = "1"; sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h"; editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a"; buildDepends = [ @@ -116799,6 +116961,7 @@ self: { mkDerivation { pname = "trace"; version = "0.1.0.4"; + revision = "1"; sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn"; editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef"; buildDepends = [ @@ -117294,6 +117457,7 @@ self: { mkDerivation { pname = "trivial-constraint"; version = "0.3.0.0"; + revision = "1"; sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y"; editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b"; buildDepends = [ base ]; @@ -117345,6 +117509,7 @@ self: { mkDerivation { pname = "tsession"; version = "0.1"; + revision = "2"; sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk"; editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57"; buildDepends = [ base containers mtl time transformers ]; @@ -117526,6 +117691,7 @@ self: { mkDerivation { pname = "tuple-morph"; version = "0.1.0.0"; + revision = "4"; sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94"; editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada"; buildDepends = [ base HList template-haskell ]; @@ -117646,6 +117812,7 @@ self: { mkDerivation { pname = "twentefp-eventloop-graphics"; version = "0.1.0.4"; + revision = "1"; sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm"; editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817"; buildDepends = [ @@ -117909,6 +118076,7 @@ self: { mkDerivation { pname = "twitter-conduit"; version = "0.1.0"; + revision = "2"; sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji"; editedCabalFile = "e70397da5f43d657c6c3bef7419810f61675e78aa0b0da688b1f5939d1e11bf8"; isLibrary = true; @@ -118612,6 +118780,7 @@ self: { mkDerivation { pname = "types-compat"; version = "0.1.1"; + revision = "1"; sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96"; buildDepends = [ base ]; @@ -118890,6 +119059,7 @@ self: { mkDerivation { pname = "uhc-light"; version = "1.1.8.7"; + revision = "1"; sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; isLibrary = true; @@ -120257,6 +120427,7 @@ self: { mkDerivation { pname = "url-generic"; version = "0.1"; + revision = "1"; sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m"; editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9"; buildDepends = [ base mtl syb ]; @@ -120412,6 +120583,7 @@ self: { mkDerivation { pname = "usb-hid"; version = "0.1.0.0"; + revision = "1"; sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh"; editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc"; buildDepends = [ attoparsec base bytestring usb ]; @@ -120576,6 +120748,7 @@ self: { mkDerivation { pname = "utf8-string"; version = "0.3.8"; + revision = "2"; sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff"; buildDepends = [ base bytestring ]; @@ -120883,6 +121056,7 @@ self: { mkDerivation { pname = "uvector"; version = "0.1.1.1"; + revision = "1"; sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08"; editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508"; buildDepends = [ base ghc-prim ]; @@ -121409,6 +121583,7 @@ self: { mkDerivation { pname = "vect-floating-accelerate"; version = "0.1.0.4"; + revision = "1"; sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x"; editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216"; buildDepends = [ accelerate base vect-floating ]; @@ -122094,6 +122269,7 @@ self: { mkDerivation { pname = "vivid"; version = "0.1.0.1"; + revision = "1"; sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; buildDepends = [ @@ -123857,6 +124033,7 @@ self: { mkDerivation { pname = "webdriver-snoy"; version = "0.6.0.4"; + revision = "1"; sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk"; editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a"; buildDepends = [ @@ -124106,6 +124283,7 @@ self: { mkDerivation { pname = "wedged"; version = "0"; + revision = "1"; sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511"; editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5"; isLibrary = false; @@ -124155,6 +124333,7 @@ self: { mkDerivation { pname = "welshy"; version = "0.1.0.0"; + revision = "1"; sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki"; editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c"; buildDepends = [ @@ -124272,6 +124451,7 @@ self: { mkDerivation { pname = "whois"; version = "1.2.2"; + revision = "1"; sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0"; editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e"; buildDepends = [ base network network-uri split ]; @@ -125171,6 +125351,7 @@ self: { mkDerivation { pname = "x11-xim"; version = "0.0.9.0"; + revision = "1"; sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw"; editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0"; buildDepends = [ base utf8-string X11 ]; @@ -125906,6 +126087,7 @@ self: { mkDerivation { pname = "xml-html-conduit-lens"; version = "0.3.2.1"; + revision = "1"; sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647"; buildDepends = [ @@ -126157,6 +126339,7 @@ self: { mkDerivation { pname = "xmlhtml"; version = "0.2.3.4"; + revision = "1"; sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr"; editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; buildDepends = [ @@ -126251,6 +126434,7 @@ self: { mkDerivation { pname = "xmonad"; version = "0.11"; + revision = "1"; sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b"; isLibrary = true; @@ -126686,6 +126870,7 @@ self: { mkDerivation { pname = "xxhash"; version = "0.0.1"; + revision = "1"; sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn"; editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274"; buildDepends = [ base bytestring crypto-api tagged ]; @@ -127064,6 +127249,7 @@ self: { mkDerivation { pname = "yaop"; version = "0.1.2.1"; + revision = "1"; sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr"; editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c"; buildDepends = [ base mtl template-haskell ]; @@ -128167,6 +128353,7 @@ self: { mkDerivation { pname = "yesod-routes"; version = "1.2.0.7"; + revision = "1"; sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e"; buildDepends = [ @@ -129523,6 +129710,7 @@ self: { mkDerivation { pname = "zot"; version = "0.0.2"; + revision = "1"; sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3"; editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40"; isLibrary = false; From 9170b4bd6587bb7615138929da6800577de97cfa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 20:20:06 +0100 Subject: [PATCH 460/947] haskell-lambdabot: upstream has fixed the build --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 039a602db86..d9ce5d3a1fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -582,15 +582,6 @@ self: super: { hmidi = markBrokenVersion "0.2.1.0" super.hmidi; padKONTROL = markBroken super.padKONTROL; - # https://github.com/lambdabot/lambdabot/issues/105 - lambdabot-core = markBroken super.lambdabot-core; - lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins; - lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins; - lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins; - lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins; - lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins; - lambdabot-social-plugins = markBroken super.lambdabot-social-plugins; - # Upstream provides no issue tracker and no contact details. vivid = markBroken super.vivid; From 1fcac34d468f2965d2c0d8869a185c6f765d9179 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Mar 2015 20:22:17 +0100 Subject: [PATCH 461/947] hackage-packages.nix: re-generate from Hackage 2015-03-24T20:22:17+0100 --- .../haskell-modules/hackage-packages.nix | 346 ++++++++++-------- 1 file changed, 196 insertions(+), 150 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6e7d5a239f7..ea2515b6b53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2514,14 +2514,17 @@ self: { "ConcurrentUtils" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , network, parallel, process + , crypto-random, cryptohash, network, parallel, process + , reexport-crypto-random, RSA, securemem, tagged }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.4.1.0"; - sha256 = "05a5v9g95by4v05zxvjma8hvn5rrvwz0c3r8q0iqqchglljs39xr"; + version = "0.4.2.0"; + sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4"; buildDepends = [ - array base binary bytestring containers network parallel process + array base binary bytestring containers crypto-random cryptohash + network parallel process reexport-crypto-random RSA securemem + tagged ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; @@ -7245,8 +7248,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.16.0.0"; - sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa"; + version = "3.16.1.0"; + sha256 = "0nnrfqgb0ndi1j3nrbj1alv4cq49prxsv3z5jk84qh6ny6hxm486"; buildDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -17835,19 +17838,18 @@ self: { ({ mkDerivation, 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 + , text, time, transformers, transformers-base, transformers-compat }: mkDerivation { pname = "amazonka"; - version = "0.3.2"; - sha256 = "1vyy8gsj31zxjnphzw1y3ylxdzxsgxx034a0s6i1g8vpqpf59n8a"; + version = "0.3.3.1"; + sha256 = "13lblmqpnd6anc6d6wv1xiqy0c2b8bnq9gh8df0xpbch756qfa4w"; 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-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -17857,8 +17859,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.2"; - sha256 = "11rx798qdqqk67djrfaknw3z7z5gf2m0ahi0nh4icgfljv8hzcda"; + version = "0.3.3"; + sha256 = "1jn5phz20xki1zprszp8y0l3wlbdxs23iq7d8rvgdnlp4wx1q4vj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17870,8 +17872,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.2"; - sha256 = "0bbymf4cmlfp812nyk9y648hg8d2j57kf31g46w2a0rg4157rwqh"; + version = "0.3.3"; + sha256 = "1dbf6aabxss5fnbnwpldg5a87qda4vcrazmbnhhgil30pcgcjbld"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17883,8 +17885,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.2"; - sha256 = "1lcl16j4wk19gf3i4jhh85jx4gx3lhacfd4yzrp54ycsgy689y7p"; + version = "0.3.3"; + sha256 = "16i1p7j70rxw4b5hmdjzjrk302zqyfgbgvc49dq0ag5hc4351b71"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17896,8 +17898,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.2"; - sha256 = "0ss8raa4dvzz55x23kb7lrfgjkr0hrp7k6khbjpwp7ff2kk9yvwb"; + version = "0.3.3"; + sha256 = "0sp3z01jwm9jnalq8yy9vxvjwzwvqj0vzb7syms60ii3hclc30ka"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17909,8 +17911,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.2"; - sha256 = "06as3a91061wy6wxd5ci37aisgghfm1w4k40id8b65yh8i0xwjd9"; + version = "0.3.3"; + sha256 = "0z1zvk37kds3wlhvd6036g63lvc37axnam9fv646s183xhfrmns8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17922,8 +17924,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.2"; - sha256 = "1zyf8w88r5827i2l1x29kanqhmq8glgx01739g7hlya5hd30lv4y"; + version = "0.3.3"; + sha256 = "104qj5cc3ka8ixr1hh4asmfar31rd6k04w4g72c5xzy6l11vzp7j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17935,8 +17937,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.2"; - sha256 = "1a3zj57nik0ffayq99y0pn8aqsvhdsi3fc4ynfkn9x0yxhgxx0kz"; + version = "0.3.3"; + sha256 = "00caawzj1jjbhxrd53hzqnw66a20r31gvlv19xps3jr49bhrjs15"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17948,8 +17950,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.2"; - sha256 = "1l6rz3zvnsfym54bs2s1njrpf9rj1s7rdhli5d2yacj7kabb1hlz"; + version = "0.3.3"; + sha256 = "10044nfmdj1isf8wq0si5nn44c0ya16s1kir65c4g2cisarj0vr0"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17960,8 +17962,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.2"; - sha256 = "1yr0xp1camsw7qapnp5w9jlrg8zy275n3izhl5i8z1wc5wln229d"; + version = "0.3.3"; + sha256 = "0fm8zwdsywhgxnpqi9s5jnasfknjiix15wmfx8in1d6kf52sgy5n"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17973,8 +17975,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.2"; - sha256 = "038n7290q9a1hsk0k832q3a782x053jfmh1j6ydk8c245q807544"; + version = "0.3.3"; + sha256 = "1chbakfpiz5ix3z7hi50c25dc71s6dxkxap1b6z28fqyigd8ycn6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17986,8 +17988,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.2"; - sha256 = "094j0m4kjijz6ihr7q4jklnb8gmyrqgk1bxw1z94xqb3s60fwy9c"; + version = "0.3.3"; + sha256 = "1kfnkh5x5s9smg5f82na4kkvc1ljadnc9041zk4nk4vsch41wg5j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17999,8 +18001,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.2"; - sha256 = "1z9p672zwiihaj83wv1wpvqj70m9795pay44qps4as1xcb1skwc4"; + version = "0.3.3"; + sha256 = "138i4b53x82j9agdlbbq90al6397zns2732igadfa3yydy0m9w0v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -18012,8 +18014,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.2"; - sha256 = "0ha6adx6m27dmh6dxyha7kk344190hd151rp1lcihchhsnr283hk"; + version = "0.3.3"; + sha256 = "04gvg50przsxagrj7zvbidyf0xx3iqhh23sbzbpfl6ljczig9qmk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -18025,26 +18027,26 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, bytestring, case-insensitive , conduit, conduit-extra, cryptohash, data-default-class, hashable - , http-client, http-types, lens, mmorph, mtl, nats, resourcet - , scientific, semigroups, tagged, tasty, tasty-hunit - , template-haskell, text, time, transformers, unordered-containers - , vector, xml-conduit + , http-client, http-types, lens, mmorph, mtl, nats, old-locale + , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, vector, xml-conduit }: mkDerivation { pname = "amazonka-core"; - version = "0.3.2"; - sha256 = "0byp43084jinc8pabplcmjr1spkx5gy666rwpl7xxmzcqlacdjzi"; + version = "0.3.3"; + sha256 = "1mglm6w0pmbhvvgzw5ylv0k97f9cx9nk8yq3akp499bn8nxf70i3"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra cryptohash data-default-class hashable http-client http-types lens - mmorph mtl nats resourcet scientific semigroups tagged text time - transformers unordered-containers vector xml-conduit + mmorph mtl nats old-locale resourcet scientific semigroups tagged + text time transformers transformers-compat unordered-containers + vector xml-conduit ]; testDepends = [ aeson base tasty tasty-hunit template-haskell text ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Core functionality and data types for Amazonka libraries"; license = "unknown"; @@ -18054,8 +18056,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.2"; - sha256 = "0hxgzdbv8fc0rl00afny3j1ka2fib98bamjphfdrjkb6ic37a2mx"; + version = "0.3.3"; + sha256 = "1r4k349yy7zi6jas9llxvig6jbqlq2b1nwgy1d40zr4hgjxx9zhk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18067,8 +18069,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.2"; - sha256 = "1nby1qs901k8xc3ykpvi1097b92bcd5c9l3d0sx7dci6i4hnbqlf"; + version = "0.3.3"; + sha256 = "068b60p7gka5azfk181z4n6sdlz5mmnn88x1kcpj3ld290sq264i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18080,8 +18082,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.2"; - sha256 = "08034a5nwcja147rkc0bsgmcj33xv1w6cvz7fpyi4jwip1ffngr9"; + version = "0.3.3"; + sha256 = "0hiksl517yc07dbkm72ms6rr07hwkr7g3390v8xqgv1bqg33cwls"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18093,8 +18095,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.2"; - sha256 = "1x5xqlk0gh9ac2721j444nzz98q749mvkwhdgb476hi6lmc7g9gn"; + version = "0.3.3"; + sha256 = "18gsf2hwa3vii1g80rxw8b6j4cj513sglf6i4jpf6l96ncs1zavy"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18106,8 +18108,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.2"; - sha256 = "02w1zxcs7sz5xgdpr3iq5yd1d3w15rkjnkcqyxhkbgwcv6w4c2zc"; + version = "0.3.3"; + sha256 = "0ssdhcdsjysxxzfa0r40jpf9s6x5gwds1lyr462zkai1nc63f8f3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18118,8 +18120,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.2"; - sha256 = "1a743l0hr7mb337xw3ql7mg4256w0w5c2vss12al9kzpnrgi2lh3"; + version = "0.3.3"; + sha256 = "19zdxmisp3bh2lfx0a7ivghpciwgdmbmj4iah2fgwxbc01p0srbm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18131,8 +18133,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.2"; - sha256 = "16g5v9y3y9wdxiw5cw3z8i4b67y1acvz74d1qdk7by1s2smb4dkf"; + version = "0.3.3"; + sha256 = "09awjlp1yay1arpw5yavz879v40hxsy5pij8ky4fnvwdclsxx0qs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18144,8 +18146,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.2"; - sha256 = "1mymjy2dq4dz1r7yllgxdpbyddg7x7pvaarl395dffrapgqkh0n2"; + version = "0.3.3"; + sha256 = "06nq2zz2yc1wsgx8m9cb0filb9wfmcj4xh0ipk4jzlnhnl2izir2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18157,8 +18159,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.2"; - sha256 = "0jxa9c8y9i1rffxfb2wrpb1fv6niplj2mwwc591k74c99ynjwj6i"; + version = "0.3.3"; + sha256 = "1rdzcxj6ccpqprmq6jdqyv1frmcwd8n21slx70bvqmls208nydf7"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18170,8 +18172,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.2"; - sha256 = "1n6q77riz31xqk5qywiqs75avwdni1d9x9955jgs8s1phk48654c"; + version = "0.3.3"; + sha256 = "1fpppmsg4bdabczcbhcar7kjxkv0c2j8nqjckfimj57bbxslxjdx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18183,8 +18185,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.2"; - sha256 = "1cphxr7a60z18zh543nva7v18zh05r4iircfbgifj98w33gvcvqd"; + version = "0.3.3"; + sha256 = "11dli63wj57yya7yzc8fh06yvcrqhpf9w2wzb08si30xkbzx3jw1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18195,8 +18197,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.2"; - sha256 = "1v869rmqbihn1314nd1ryqpgrwfxicnjh7i41zbn5hq60c4xkn4z"; + version = "0.3.3"; + sha256 = "0hpaj7d9lkfb589qr9nrvf3c7plqml9v1b7kgckx5x7abjva102h"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18208,8 +18210,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.2"; - sha256 = "03bzizq6mchxk79gqnp8v4avw4alyccd51ks3wl2ljgq0ywl41xs"; + version = "0.3.3"; + sha256 = "1fkgz9w3dkvmkyprvadbhwzc0928zib7k09dfvwdb6h1phhl9w6f"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18221,8 +18223,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.2"; - sha256 = "16gqc9d9s3fz2qs1l4b4wjylsyl2p7ncyfibadkp8an6bfdylx31"; + version = "0.3.3"; + sha256 = "08x1wyqf6kibvkrg4dcsz638x7fnl4z23nninvcmrcivfqcjy27a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18234,8 +18236,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.2"; - sha256 = "10xjddl0mwpkcgz9ydy0lvmwpg3d3hb7kliqsqvfwlqgslhvhs18"; + version = "0.3.3"; + sha256 = "13hllhcvn2annqhq0dxcv1rvlhzj161xjhnz8vwazcsmpv2wb6pk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18246,8 +18248,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.2"; - sha256 = "0i4cy5x7br58lmzndx4x8mj81xkwx50nf1r8cszbjwjpml6fc2pz"; + version = "0.3.3"; + sha256 = "0a11riyrs6xx0207p4nkmxvc0y11ndrl6k3rgz2jdvv7g1j31fym"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18259,8 +18261,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.2"; - sha256 = "0xgj4r8zj0f2wmmpr63p3dlgfvgr5lmd43ngn5ignkmha6m6lcys"; + version = "0.3.3"; + sha256 = "03hk0s9l93vksifgy5bdb52mn2v38732c047bgmqfzf48iic2i48"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18272,8 +18274,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.2"; - sha256 = "0p73yn82pd0i1wi98vfy9kndf1ax0c3wza30nj6dra5xl4jnl73p"; + version = "0.3.3"; + sha256 = "1h291g4wx2v50whjn4c9h64gvv1j2pn6pyzs7l7765nm3rdmb7cr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18285,8 +18287,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.2"; - sha256 = "0w75vc1khlncfx82mcbpp41c8svjm7yy7si0p5rqi6cvx0an1k2v"; + version = "0.3.3"; + sha256 = "1wivm4ad6p8f5wip7d9cdwk557vy5dnakg62i5bsvi2l05wxh5zr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18298,8 +18300,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.2"; - sha256 = "0gsfgkcdprqanjfgcw4lj77b4fvhlq47h636kh87yvjg70migyrx"; + version = "0.3.3"; + sha256 = "0095idbqw6gs6h6pm0amzf6yhqr801pnlad914yac3xk80iywh9i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18311,8 +18313,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.2"; - sha256 = "0kzhn1mdk79a8vn0kj5jk5w0vfywh89bf5khjv08m3qwwdyb0mnw"; + version = "0.3.3"; + sha256 = "1np4x5lj9a8qgikiwbq2xchh2ngifmhd01lrbpzy44glda0gpxnc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18324,8 +18326,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.2"; - sha256 = "0ws7dy9bnv7qx43mx6s1lkj4z1r3v7b0pph6kl3s5q60s1f9qr64"; + version = "0.3.3"; + sha256 = "0qhdxklj2ilsgmk0cy5bdiyvdgmi9npwxfjbb8ngbg9mavdcs0rh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18337,8 +18339,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.2"; - sha256 = "1im0lzgxzxxpb6dmigp9vcwwk79bs9m9y3lhcjn7bcspql426c7a"; + version = "0.3.3"; + sha256 = "163aqpaxv2pfbfmz3mjw7dzcsjxjfiy36vqk2hsgavbmsgy7d4wq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18350,8 +18352,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.2"; - sha256 = "0l9v7kagssnzg1f4w63q4dza5gyxlm3v6hrjcspdlaxw695vn7j8"; + version = "0.3.3"; + sha256 = "18qjpn29hyc9lqky6d0kwi3i4kanzvii45csw2fvjlmcchb1mfhs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18363,8 +18365,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.2"; - sha256 = "1crlyx87j5iw7dvjngnrqqhkx24f0zd48l2cz37ldqymrsfn7kqb"; + version = "0.3.3"; + sha256 = "14321x8chggq5fc12z7v5z8aic4p0r3fb8lrk595nwqybnamqg19"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18376,8 +18378,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.2"; - sha256 = "1mr2ra4857j4n4lpf5zlrqxmvf5adk6l0ycbwah4cypd3ki7b7l6"; + version = "0.3.3"; + sha256 = "030a0vx6py0m0gwplzjzkl3z7iq8n8s1f0knpw6da5xa8sy2na6v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18389,8 +18391,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.2"; - sha256 = "0hb35i65j2zl6v1y3drd2kacg5ahvl14isx1f8b7a1k48l90qccn"; + version = "0.3.3"; + sha256 = "0sk8kbb06v52gq0jxhrz0dzdv4kfhn2g0f5kvcpa3vrpvca0jnyk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -18401,8 +18403,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.2"; - sha256 = "08c74hniznflx7xvlk41r2aym1h3xal68lbr2r0qlmh846pfyiqa"; + version = "0.3.3"; + sha256 = "1fzr4c81xqblag8gd3sj6nc029b2klblxall2wm29ggv8j70n48b"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18414,8 +18416,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.2"; - sha256 = "0sq6ws9qyga1giiv2pkfgfaigni5k33mzq3k1psliwjxscxcjknw"; + version = "0.3.3"; + sha256 = "0lzpzvz1k00w1q5ahh76gvhhh7jyk3450ylhbrgjd8gw81k3klnj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18427,8 +18429,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.2"; - sha256 = "1j3vwpjmmlv3c4n4jrgj2vvvcirky1ja7grv5ax790i5p0ll0iw8"; + version = "0.3.3"; + sha256 = "05v8m84gvwdqyalvck8lfn7x525kkah6f87bwd0mrci9vqdi55hc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18440,8 +18442,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.2"; - sha256 = "18yh9saqjfcn8cjprjqiybgkvxq6hc8q8b6njsh61s6ycdnh0yx8"; + version = "0.3.3"; + sha256 = "1lrxr7dlbkv7x7hcdvf0ly3d4aj0i4j94yksd2x3jp5w33811hjx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18717,8 +18719,8 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.7.1"; - sha256 = "1by11bg1bd7z18hqgayk0w76hy5n63kmdl14gainlvfgr9jw506r"; + version = "0.6.7.2"; + sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base ]; @@ -22100,7 +22102,9 @@ self: { mkDerivation { pname = "barrier"; version = "0.1.0"; + revision = "1"; sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z"; + editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22110,7 +22114,6 @@ self: { testDepends = [ base bytestring lens-family-core tasty tasty-golden ]; - jailbreak = true; homepage = "https://github.com/philopon/barrier"; description = "Shield.io style badge generator"; license = stdenv.lib.licenses.mit; @@ -26331,8 +26334,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.2.0"; - sha256 = "08622w2n7aphnv5wyisd5bz7r4nbyb1f86f4g1yia0r3x687sp5a"; + version = "0.2.1"; + sha256 = "1g0i5ibk399kjdw8vmmv33bjw74z941hnj33fp0ch2by7z9fhgnn"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; homepage = "https://github.com/philopon/bytestring-read"; @@ -28311,6 +28314,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "catamorphism" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "catamorphism"; + version = "0.3.0.0"; + sha256 = "1bjvnac5kyc70czx8vdld8whkgnygqz3i5yhfl315mall1xw7h1w"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/catamorphism"; + description = "A package exposing a helper function for generating catamorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "catch-fd" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -31879,8 +31894,8 @@ self: { }: mkDerivation { pname = "compstrat"; - version = "0.1.0.1"; - sha256 = "1cxc85wi5997zsr948wfsn3yf7mn34cjkih5ndbka3whg5sfbpvq"; + version = "0.1.0.2"; + sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg"; buildDepends = [ base compdata mtl template-haskell th-expand-syns transformers ]; @@ -34818,6 +34833,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptol" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, async, base + , containers, deepseq, directory, filepath, gitrev, GraphSCC, happy + , haskeline, heredoc, monadLib, old-time, presburger, pretty + , process, QuickCheck, random, sbv, smtLib, syb, template-haskell + , text, tf-random, transformers, utf8-string + }: + mkDerivation { + pname = "cryptol"; + version = "2.2.0"; + sha256 = "0f82hpw71yb7p3nfh4zpap8ag7dw3932qm9gvaw3b3xiild701gv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-terminal array async base containers deepseq directory + filepath gitrev GraphSCC haskeline heredoc monadLib old-time + presburger pretty process QuickCheck random sbv smtLib syb + template-haskell text tf-random transformers utf8-string + ]; + buildTools = [ alex happy ]; + homepage = "http://www.cryptol.net/"; + description = "Cryptol: The Language of Cryptography"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -37629,17 +37669,16 @@ self: { }) {}; "debian" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, bzlib - , containers, directory, either, exceptions, filepath, HaXml, HUnit - , ListLike, mtl, network, network-uri, old-locale, parsec, pretty - , prettyclass, process, process-extras, pureMD5, regex-compat - , regex-tdfa, template-haskell, text, time, unix, Unixutils - , utf8-string, zlib + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl + , network, network-uri, old-locale, parsec, pretty, prettyclass + , process, process-extras, pureMD5, regex-compat, regex-tdfa + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.87.1"; - sha256 = "1g8l293gk06qjyfng70nzwzir7w27fajbkc1ck6b9w96rpcr3ipf"; + version = "3.87.2"; + sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37650,7 +37689,7 @@ self: { utf8-string zlib ]; testDepends = [ - ansi-wl-pprint base HUnit parsec pretty prettyclass regex-tdfa text + base HUnit parsec pretty prettyclass regex-tdfa text ]; homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; @@ -41881,8 +41920,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.5"; - sha256 = "1nmn5v1y8rhwv9ymxy0x9143h3gch5kf9yazdnnfs84a2k5q60j6"; + version = "0.2.7"; + sha256 = "0b632c476md2wrz0mcxbkc9c8crz2dgl58nfz25zjagqhqylslk6"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -49453,16 +49492,16 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc + ({ mkDerivation, base, containers, directory, filepath, free, ghc , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.1.0"; - sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + version = "0.2"; + sha256 = "1sqk6y6b1scn51kjbvdnazw34bkwmfii5dhb1fzwzx4cb4iqg3ik"; buildDepends = [ - base containers directory filepath ghc ghc-paths ghc-syb-utils mtl - syb + base containers directory filepath free ghc ghc-paths ghc-syb-utils + mtl syb ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils @@ -70852,13 +70891,12 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.1.0"; - sha256 = "1snzggbb2z6rczym0xmbfmi59cdyf49qvjbfqchp8sr7b6dgn0vz"; - buildDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; + buildDepends = [ base nats ]; testDepends = [ base nats QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; @@ -81491,7 +81529,9 @@ self: { mkDerivation { pname = "memcached-binary"; version = "0.2.0"; + revision = "2"; sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad"; + editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530"; buildDepends = [ base bytestring data-default-class network resource-pool storable-endian time unordered-containers @@ -81499,7 +81539,6 @@ self: { testDepends = [ base bytestring data-default-class hspec HUnit network process ]; - jailbreak = true; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -85786,8 +85825,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.1"; - sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + version = "0.2"; + sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp"; buildDepends = [ base ]; testDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -92141,8 +92180,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.2"; - sha256 = "0bvgijrgpv0yc8hkzj9mbm94z6v5s9w8ghjjm9ynh0qrpyf1dlli"; + version = "0.3"; + sha256 = "0z6vxh9pnq3ixmi7bcpn17wf4w1blj6l4k7lw39gzs7jjbcpijzr"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -92285,8 +92324,8 @@ self: { }: mkDerivation { pname = "pipes-cliff"; - version = "0.4.0.0"; - sha256 = "04w6izjx49w3lpagdm1jjikhvqmslcdkjyff8573mc6imw05rj4p"; + version = "0.6.0.0"; + sha256 = "1rlv19imipfjws9zhn0vf3vnnrfmx4laq5npz02fg41sk2gpincq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95886,8 +95925,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.0"; - sha256 = "0xma82nwl35scc43r8yhd0irhf1d60ssxs3gh6y717cpl29zv5wa"; + version = "0.3.2"; + sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i"; buildDepends = [ base bytestring data-default-class template-haskell ]; @@ -98511,12 +98550,15 @@ self: { mkDerivation { pname = "reflex"; version = "0.0.1"; + revision = "1"; sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + editedCabalFile = "35c3eacbc9dde1bb99c93c3a7a27bbc5e2feee1817ba0ecb126cb49327f7b81e"; buildDepends = [ base containers dependent-map dependent-sum lens mtl primitive semigroups template-haskell these ]; jailbreak = true; + homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103683,8 +103725,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.2"; - sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; + version = "0.3.3"; + sha256 = "1gc4g4qva3w4vrxh1pca49rm0s245zq81bg1qxyfbbp29f7zp5ay"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -104463,7 +104505,9 @@ self: { mkDerivation { pname = "sfmt"; version = "0.1.0"; + revision = "1"; sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x"; + editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4"; buildDepends = [ base bytestring entropy primitive ]; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; @@ -114779,8 +114823,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }: mkDerivation { pname = "text-manipulate"; - version = "0.1.2.1"; - sha256 = "1cr1f0d7xxj6nr5rlqhnijjrd5k7xpfamqdd8j9pbwx2qi91vimz"; + version = "0.1.3"; + sha256 = "0f8xfgsvj50x1br9r4szc94y9hycwgdnjmpwn2h4840kdcpds780"; buildDepends = [ base text text-format ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/text-manipulate"; @@ -118780,9 +118824,9 @@ self: { mkDerivation { pname = "types-compat"; version = "0.1.1"; - revision = "1"; + revision = "2"; sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; - editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96"; + editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041"; buildDepends = [ base ]; homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; @@ -123949,7 +123993,9 @@ self: { mkDerivation { pname = "web-routing"; version = "0.6.0"; + revision = "1"; sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w"; + editedCabalFile = "b7b5e934b972d8aff3e4ada5cc54e348fc9984f89d4d70c8bae6488488d7db22"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; From 6792f767060371bc6be54e0f48f9c3abe0d3a4a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 10:20:45 +0100 Subject: [PATCH 462/947] haskell-stm-queue-extras: manually remove the update to revision 1 That revision doesn't exist. What happened is that upstream uploaded a Cabal file that says "x-revision: 1". Of course, the incorrect setting will come back in as soon as we update hackage-packages.nix. Nonetheless, I'm opting for the short-term solution here, hoping that upstream will remove the x-revision header from Hackage soon'ish. https://github.com/haskell/hackage-server/issues/337 --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ea2515b6b53..fcb11f206d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -110359,9 +110359,7 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0"; - revision = "1"; sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s"; - editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b"; buildDepends = [ base stm stm-chans ]; description = "Extra queue utilities for STM"; license = stdenv.lib.licenses.asl20; From f5eed7e14e45f639514d432b680325cae6d40b06 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 25 Mar 2015 15:12:02 +0000 Subject: [PATCH 463/947] Add initial version for bazel.io build manager. --- .../tools/build-managers/bazel/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/build-managers/bazel/default.nix diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix new file mode 100644 index 00000000000..7a12400c06a --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "bazel-20150325.9a0dc1b2"; + + src = fetchFromGitHub { + owner = "google"; + repo = "bazel"; + rev = "9a0dc1b2"; + sha256 = "1bgx12bnrqxz720ljn7kdzd4678p4mxldiylll3h0v5673vgrf5p"; + }; + + buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; + + installPhase = '' + PROTOC=protoc bash compile.sh + mkdir -p $out/bin $out/share + cp -R output $out/share/bazel + ln -s $out/share/bazel/bazel $out/bin/bazel + wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}" + ''; + + meta = { + homepage = http://github.com/google/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a49c126c7a..d9486691f13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4816,6 +4816,8 @@ let bam = callPackage ../development/tools/build-managers/bam {}; + bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; }; + binutils = if stdenv.isDarwin then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else callPackage ../development/tools/misc/binutils { From f5200fd0aaeebe8d4d7dd8c8321feba07fe107ae Mon Sep 17 00:00:00 2001 From: dabus Date: Wed, 25 Mar 2015 17:43:13 +0100 Subject: [PATCH 464/947] Bump version of the_silver_searcher: 0.24.1 -> 0.29.1 --- pkgs/tools/text/silver-searcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index ba17d1865db..ae3bb94fb90 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: -let release = "0.24.1"; in +let release = "0.29.1"; in stdenv.mkDerivation { name = "silver-searcher-${release}"; src = fetchgit { url = "https://github.com/ggreer/the_silver_searcher.git"; rev = "refs/tags/${release}"; - sha256 = "1cwav217mkbwyg8isiak0wynydiil2j9gy4sx79harbcql0f3nl3"; + sha256 = "05508c2714d356464a0de6f41a6a8408ccd861b967e968302c4b72feade89581"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From a040e15a48fe5c4e1f8ad7f50cfbc321044857e3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 11:24:47 -0700 Subject: [PATCH 465/947] kernel: 3.18.9 -> 3.18.10 --- 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 154c9633cdb..06145488d50 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.9"; + version = "3.18.10"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "00cm64s17d03rlzkgqs0fq91vm95csfa2xw4zhp7y0md9fd73dxi"; + sha256 = "0kmh0ybjh1l35pm421v2q3z9fyhss85agh1rkmnh9bim2bq1ac6h"; }; features.iwlwifi = true; From 4d47c0dd24e9a47f66d350daa2c7666483ff3209 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 11:29:57 -0700 Subject: [PATCH 466/947] kernel-config: Add microcode support + early loading on new kernels --- pkgs/os-specific/linux/kernel/common-config.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e6d45af7c59..f2d51082811 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -222,6 +222,16 @@ with stdenv.lib; SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y + # Microcode loading support + MICROCODE y + MICROCODE_INTEL y + MICROCODE_AMD y + ${optionalString (versionAtLeast version "3.11") '' + MICROCODE_EARLY y + MICROCODE_INTEL_EARLY y + MICROCODE_AMD_EARLY y + ''} + # Misc. options. 8139TOO_8129 y 8139TOO_PIO n # PIO is slower @@ -264,7 +274,6 @@ with stdenv.lib; LOGO n # not needed MEDIA_ATTACH y MEGARAID_NEWGEN y - MICROCODE_AMD y MODVERSIONS y MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y From 6e5f25316a24dcfc39a9c9bb6c79e8109fee977d Mon Sep 17 00:00:00 2001 From: Henry Till Date: Wed, 25 Mar 2015 12:53:26 -0400 Subject: [PATCH 467/947] add mplus-outline-fonts --- .../fonts/mplus-outline-fonts/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/mplus-outline-fonts/default.nix diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix new file mode 100644 index 00000000000..eefb663f722 --- /dev/null +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mplus-${version}"; + version = "TESTFLIGHT-059"; + + src = fetchurl { + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; + sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "M+ Outline Fonts"; + homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; + license = licenses.mit; + maintainers = with maintainers; [ henrytill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9486691f13..2336f6a34ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9682,6 +9682,8 @@ let mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; + mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; + nafees = callPackage ../data/fonts/nafees { }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; From a3de8552b04a03b64414d68788a6d92cb1c2db43 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 23 Mar 2015 16:26:13 -0400 Subject: [PATCH 468/947] RStudio: initial commit at version 0.98.110 --- pkgs/applications/editors/rstudio/default.nix | 71 +++++++++++++++++++ .../editors/rstudio/r-location.patch | 24 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 97 insertions(+) create mode 100644 pkgs/applications/editors/rstudio/default.nix create mode 100644 pkgs/applications/editors/rstudio/r-location.patch diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix new file mode 100644 index 00000000000..c3ecbf0a60f --- /dev/null +++ b/pkgs/applications/editors/rstudio/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: + +let + version = "0.98.110"; + ginVer = "1.5"; + gwtVer = "2.5.1"; +in +stdenv.mkDerivation { + name = "RStudio-${version}"; + + buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; + + src = fetchurl { + url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; + sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; + }; + + # Hack RStudio to only use the input R. + patches = [ ./r-location.patch ]; + postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + + inherit ginVer; + ginSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; + sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + }; + + inherit gwtVer; + gwtSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; + sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; + }; + + hunspellDicts = builtins.attrValues hunspellDicts; + + mathJaxSrc = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; + sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; + }; + + preConfigure = + '' + GWT_LIB_DIR=src/gwt/lib + + mkdir -p $GWT_LIB_DIR/gin/$ginVer + unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + + unzip $gwtSrc + mkdir -p $GWT_LIB_DIR/gwt + mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + + mkdir dependencies/common/dictionaries + for dict in $hunspellDicts; do + for i in $dict/share/hunspell/* + do ln -sv $i dependencies/common/dictionaries/ + done + done + + unzip $mathJaxSrc -d dependencies/common/mathjax + ''; + + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + + meta = with stdenv.lib; + { description = "Set of integrated tools for the R language"; + homepage = http://www.rstudio.com/; + license = licenses.agpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch new file mode 100644 index 00000000000..a1ec84a5475 --- /dev/null +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -0,0 +1,24 @@ +diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt +--- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400 ++++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400 +@@ -84,9 +84,7 @@ + { + // define potential paths + std::vector rScriptPaths; +- rScriptPaths.push_back("/usr/bin/R"); +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/opt/local/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + return scanForRScript(rScriptPaths, pErrMsg); + } + +@@ -220,8 +218,7 @@ + // scan in standard locations as a fallback + std::string scanErrMsg; + std::vector rScriptPaths; +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/usr/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); + if (scriptPath.empty()) + { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9486691f13..dce09bf29a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11523,6 +11523,8 @@ let automake = automake114x; }; + rstudio = callPackage ../applications/editors/rstudio { }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); From 9ce41e3fa01bd12196f74c9b0b8670f41b86004f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:03:57 +0100 Subject: [PATCH 469/947] rstudio: fix Emacs syntax highlighting --- pkgs/applications/editors/rstudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index c3ecbf0a60f..fda51dc2401 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { mkdir dependencies/common/dictionaries for dict in $hunspellDicts; do - for i in $dict/share/hunspell/* + for i in "$dict/share/hunspell/"* do ln -sv $i dependencies/common/dictionaries/ done done From 279429b70066bfef23f88165bde44f482e50db6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:09:09 +0100 Subject: [PATCH 470/947] hunspell-dictionaries: update french dictonary to fix the build The old version has disappeared from the server. --- pkgs/development/libraries/hunspell/dictionaries.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index bfa7675034a..1f1f1a7f89d 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -60,12 +60,12 @@ let { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { inherit dictFileName; - version = "5.2"; + version = "5.3"; name = "hunspell-dict-${shortName}-dicollecte-${version}"; readmeFile = "README_dict_fr.txt"; src = fetchurl { url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; - sha256 = "c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02"; + sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0"; }; meta = with stdenv.lib; { inherit longDescription; From f7c2699fdeca1f5f371d5af2b251a257e8a34965 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:09:40 +0100 Subject: [PATCH 471/947] hunspell-dictionaries: cosmetic --- pkgs/development/libraries/hunspell/dictionaries.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 1f1f1a7f89d..0189ecda77f 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -70,7 +70,7 @@ let meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = http://www.dicollecte.org/home.php?prj=fr; + homepage = "http://www.dicollecte.org/home.php?prj=fr"; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -86,7 +86,7 @@ let readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; - homepage =http://wordlist.aspell.net/; + homepage = http://wordlist.aspell.net/; license = licenses.bsd3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; From 5faa4e5aef83ae3ff48939d757d008487402474d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 25 Mar 2015 19:16:26 +0000 Subject: [PATCH 472/947] ansi-wl-pprint: don't patch anymore The package version we have now already has this patch courtesy to @hvr making a release with it. --- .../haskell-modules/configuration-ghc-7.10.x.nix | 6 ------ 1 file changed, 6 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 df44501aadd..a70597e6ee5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -125,10 +125,4 @@ self: super: { sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; stripLen = 1; }); - - # https://github.com/batterseapower/ansi-wl-pprint/issues/13 - ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { - url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; - sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj"; - }); } From 706b2274cb0957e34338a84029597a5e75962438 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 20:33:26 +0100 Subject: [PATCH 473/947] haskell-esqueleto fails its 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 d9ce5d3a1fe..7b69a84007a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -634,6 +634,9 @@ self: super: { Hipmunk = markBroken super.Hipmunk; HipmunkPlayground = dontDistribute super.HipmunkPlayground; + # https://github.com/prowdsponsor/esqueleto/issues/93 + esqueleto = dontCheck super.esqueleto; + } // { # Not on Hackage. From 6ca7fb8f733ddd9a0d7cd62aac4954aa80be062a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 25 Mar 2015 22:08:24 +0100 Subject: [PATCH 474/947] nixos/systemd: Also escape ':' characters --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f853a8f6775..6d9871a2f6f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -13,7 +13,7 @@ let makeUnit = name: unit: let - pathSafeName = lib.replaceChars ["@" "\\"] ["-" "-"] name; + pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name; in if unit.enable then pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; } From 8baaff95e6636174ebdf01abe91a4c351234c0ff Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 11:39:58 -0700 Subject: [PATCH 475/947] intel-ucode: Generate an early loadable microcode image --- pkgs/os-specific/linux/microcode/intel.nix | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index b72194548e0..da354853cf5 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, microcode2ucode }: +{ stdenv, fetchurl, libarchive }: -let version = "20140624"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "microcode-intel-${version}"; + version = "20150121"; src = fetchurl { - url = "http://downloadmirror.intel.com/23984/eng/microcode-${version}.tgz"; - sha256 = "0dza0bdlx7q88yhnynvfgkrhgf7ycrq6mlp6hwnpp2j3h33jlrml"; + url = "http://downloadmirror.intel.com/24661/eng/microcode-${version}.tgz"; + sha256 = "1cznv3f25cxkwxdc930ab0ifvq0c76fryppadi4p26a2pf9knd93"; }; - buildInputs = [ microcode2ucode ]; + buildInputs = [ libarchive ]; sourceRoot = "."; buildPhase = '' - intel-microcode2ucode microcode.dat + gcc -O2 -Wall -o intel-microcode2ucode ${./intel-microcode2ucode.c} + ./intel-microcode2ucode microcode.dat ''; installPhase = '' - mkdir -p $out/lib/firmware - cp -r intel-ucode "$out/lib/firmware/" + mkdir -p $out kernel/x86/microcode + mv microcode.bin kernel/x86/microcode/GenuineIntel.bin + echo kernel/x86/microcode/GenuineIntel.bin | bsdcpio -o -H newc -R 0:0 > $out/intel-ucode.img ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.linux; }; } From f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 12:03:03 -0700 Subject: [PATCH 476/947] makeInitrd: Support prepending other initrds --- nixos/modules/system/boot/stage-1.nix | 10 +++++++++- pkgs/build-support/kernel/make-initrd.nix | 4 ++-- pkgs/build-support/kernel/make-initrd.sh | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 16bebe03740..2c3dfd2f460 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -205,7 +205,7 @@ let # The closure of the init script of boot stage 1 is what we put in # the initial RAM disk. initialRamdisk = pkgs.makeInitrd { - inherit (config.boot.initrd) compressor; + inherit (config.boot.initrd) compressor prepend; contents = [ { object = bootStage1; @@ -247,6 +247,14 @@ in ''; }; + boot.initrd.prepend = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + Other initrd files to prepend to the final initrd we are building. + ''; + }; + boot.initrd.checkJournalingFS = mkOption { default = true; type = types.bool; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 0582ca55301..895160616b7 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor}: +{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }: let inputsFun = ubootName : [perl cpio perlArchiveCpio ] @@ -41,5 +41,5 @@ stdenv.mkDerivation { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; - inherit compressor; + inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 17b261f9840..08961a1b49c 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,10 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor > $out/initrd) +for PREP in $prepend; do + cat $PREP >> $out/initrd +done +(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce09bf29a1..89b23c8de4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,9 +396,9 @@ let inherit lib; }; - makeInitrd = {contents, compressor ? "gzip -9n"}: + makeInitrd = { contents, compressor ? "gzip -9n", prepend }: import ../build-support/kernel/make-initrd.nix { - inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor; + inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor prepend; }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; From b4fedf5315ecad1e0c54052f3e927ab43803a2fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 12:03:30 -0700 Subject: [PATCH 477/947] nixos/intel-microcode: Support early initrd ucode loading --- nixos/modules/hardware/cpu/intel-microcode.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix index 800c391b293..89ae4f45806 100644 --- a/nixos/modules/hardware/cpu/intel-microcode.nix +++ b/nixos/modules/hardware/cpu/intel-microcode.nix @@ -22,8 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.cpu.intel.updateMicrocode { - hardware.firmware = [ "${pkgs.microcodeIntel}/lib/firmware" ]; - boot.kernelModules = [ "microcode" ]; + boot.initrd.prepend = [ "${pkgs.microcodeIntel}/intel-ucode.img" ]; }; } From 1e1683f4ae4b7c83a4f94932e7513b9f9e805e36 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:17:22 -0700 Subject: [PATCH 478/947] Add missing file --- .../linux/microcode/intel-microcode2ucode.c | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 pkgs/os-specific/linux/microcode/intel-microcode2ucode.c diff --git a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c new file mode 100644 index 00000000000..c1660fae38a --- /dev/null +++ b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c @@ -0,0 +1,154 @@ +/* + * Convert Intel microcode.dat into a single binary microcode.bin file + * + * Based on code by Kay Sievers + * Changed to create a single file by Thomas Bächler + */ + + +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct microcode_header_intel { + unsigned int hdrver; + unsigned int rev; + unsigned int date; + unsigned int sig; + unsigned int cksum; + unsigned int ldrver; + unsigned int pf; + unsigned int datasize; + unsigned int totalsize; + unsigned int reserved[3]; +}; + +union mcbuf { + struct microcode_header_intel hdr; + unsigned int i[0]; + char c[0]; +}; + +int main(int argc, char *argv[]) +{ + const char *filename = "/lib/firmware/microcode.dat"; + FILE *f; + char line[LINE_MAX]; + char buf[4000000]; + union mcbuf *mc; + size_t bufsize, count, start; + int rc = EXIT_SUCCESS; + + if (argv[1] != NULL) + filename = argv[1]; + + count = 0; + mc = (union mcbuf *) buf; + f = fopen(filename, "re"); + if (f == NULL) { + printf("open %s: %m\n", filename); + rc = EXIT_FAILURE; + goto out; + } + + while (fgets(line, sizeof(line), f) != NULL) { + if (sscanf(line, "%x, %x, %x, %x", + &mc->i[count], + &mc->i[count + 1], + &mc->i[count + 2], + &mc->i[count + 3]) != 4) + continue; + count += 4; + } + fclose(f); + + bufsize = count * sizeof(int); + printf("%s: %lu(%luk) bytes, %zu integers\n", + filename, + bufsize, + bufsize / 1024, + count); + + if (bufsize < sizeof(struct microcode_header_intel)) + goto out; + + f = fopen("microcode.bin", "we"); + if (f == NULL) { + printf("open microcode.bin: %m\n"); + rc = EXIT_FAILURE; + goto out; + } + + start = 0; + for (;;) { + size_t size; + unsigned int family, model, stepping; + unsigned int year, month, day; + + mc = (union mcbuf *) &buf[start]; + + if (mc->hdr.totalsize) + size = mc->hdr.totalsize; + else + size = 2000 + sizeof(struct microcode_header_intel); + + if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { + printf("unknown version/format:\n"); + rc = EXIT_FAILURE; + break; + } + + /* + * 0- 3 stepping + * 4- 7 model + * 8-11 family + * 12-13 type + * 16-19 extended model + * 20-27 extended family + */ + family = (mc->hdr.sig >> 8) & 0xf; + if (family == 0xf) + family += (mc->hdr.sig >> 20) & 0xff; + model = (mc->hdr.sig >> 4) & 0x0f; + if (family == 0x06) + model += ((mc->hdr.sig >> 16) & 0x0f) << 4; + stepping = mc->hdr.sig & 0x0f; + + year = mc->hdr.date & 0xffff; + month = mc->hdr.date >> 24; + day = (mc->hdr.date >> 16) & 0xff; + + printf("\n"); + printf("signature: 0x%02x\n", mc->hdr.sig); + printf("flags: 0x%02x\n", mc->hdr.pf); + printf("revision: 0x%02x\n", mc->hdr.rev); + printf("date: %04x-%02x-%02x\n", year, month, day); + printf("size: %zu\n", size); + + if (fwrite(mc, size, 1, f) != 1) { + printf("write microcode.bin: %m\n"); + rc = EXIT_FAILURE; + goto out; + } + + start += size; + if (start >= bufsize) + break; + } + fclose(f); + printf("\n"); +out: + return rc; +} From c14919ff611eb11774978254192653ba555ee827 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:25:04 -0700 Subject: [PATCH 479/947] Remove old microcode2ucode --- .../os-specific/linux/microcode/converter.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/os-specific/linux/microcode/converter.nix diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix deleted file mode 100644 index da4d9677217..00000000000 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "microcode2ucode-20120205"; - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/intel-microcode2ucode.c/0efc5f6c74a4d7e61ca22683c93c98cf/intel-microcode2ucode.c"; - sha256 = "c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de"; - }; - - sourceRoot = "."; - - unpackPhase = '' - # nothing to unpack - ''; - - buildPhase = '' - gcc -Wall -O2 $src -o intel-microcode2ucode - ''; - - installPhase = '' - mkdir -p "$out/bin" - cp intel-microcode2ucode "$out/bin/" - ''; - - meta = { - homepage = http://www.intel.com; - description = "Microcode converter for Intel .dat files"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89b23c8de4e..7b2560d04c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8626,7 +8626,6 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; From 8ad832f96a9c75afd1d5f2050d8f24712a751c97 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:28:32 -0700 Subject: [PATCH 480/947] microcode/intel: Correct license --- pkgs/os-specific/linux/microcode/intel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index da354853cf5..ea9ff1d58d1 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; - license = licenses.unfree; + license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; From 79827eb8f5dc8cc60880385fdb954c068b21673b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:43:50 -0700 Subject: [PATCH 481/947] firmware-linux-nonfree: Support version passthru --- .../linux/firmware/firmware-linux-nonfree/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index be3d6a997b3..7c49685bab5 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchgit }: -stdenv.mkDerivation { - name = "firmware-linux-nonfree-2015-03-09"; +stdenv.mkDerivation rec { + name = "firmware-linux-nonfree-${version}"; + version = "2015-03-09"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; @@ -22,4 +23,6 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; + + passthru = { inherit version; }; } From 27f355c1e3dcbcceea8556cced38193f0746e76f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:44:19 -0700 Subject: [PATCH 482/947] microcode-amd: Update to early loading --- pkgs/os-specific/linux/microcode/amd.nix | 35 ++++++++++++++---------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 0ca33fa31f0..76a34052991 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation rec { - name = "amd-ucode-2012-09-10"; + name = "amd-ucode-${firmwareLinuxNonfree.version}"; - src = fetchurl { - urls = - [ "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar" - "http://www.amd64.org/pub/microcode/${name}.tar" - ]; - sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111"; - }; + src = firmwareLinuxNonfree; - installPhase = '' - mkdir -p $out/lib/firmware/amd-ucode $out/share/doc/amd-ucode - mv microcode_amd_fam15h.bin microcode_amd.bin $out/lib/firmware/amd-ucode/ - mv LICENSE $out/share/doc/amd-ucode + sourceRoot = "."; + + buildInputs = [ libarchive ]; + + buildPhase = '' + mkdir -p kernel/x86/microcode + find ${firmwareLinuxNonfree}/lib/firmware/amd-ucode -name \*.bin \ + -exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \; ''; - meta = { + installPhase = '' + mkdir -p $out + echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > $out/amd-ucode.img + ''; + + meta = with stdenv.lib; { description = "AMD Processor microcode patch"; homepage = http://www.amd64.org/support/microcode.html; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b2560d04c1..c77593e027a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8595,8 +8595,6 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { }; - autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; _915resolution = callPackage ../os-specific/linux/915resolution { }; @@ -8626,6 +8624,7 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; + microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; From 86666893f00bb26ea5cc37a59bb2cef420b27df3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:44:36 -0700 Subject: [PATCH 483/947] nixos/microcode-amd: Update to early initrd loader --- nixos/modules/hardware/cpu/amd-microcode.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix index 86a3df5da21..d44f01a4959 100644 --- a/nixos/modules/hardware/cpu/amd-microcode.nix +++ b/nixos/modules/hardware/cpu/amd-microcode.nix @@ -22,8 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.cpu.amd.updateMicrocode { - hardware.firmware = [ "${pkgs.amdUcode}/lib/firmware" ]; - boot.kernelModules = [ "microcode" ]; + boot.initrd.prepend = [ "${pkgs.microcodeAmd}/amd-ucode.img" ]; }; } From ace8dfa22cae9d3a4993d12c63384f1cb8d4059e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 14:46:49 -0700 Subject: [PATCH 484/947] linuxFirmwareNonfree: 3015-03-09 -> 2015-03-20 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 7c49685bab5..6ac468774ad 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-03-09"; + version = "2015-03-20"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; - sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; + rev = "f404336ba808cbd57547196e13367079a23b822c"; + sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; }; preInstall = '' From 04f724873a016895aa5a34b6ebd248b871dd3705 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 3 Feb 2015 15:19:38 -0500 Subject: [PATCH 485/947] libtheora: Fix build on Darwin --- pkgs/development/libraries/libtheora/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index cb936747417..fdf25b23e48 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}: +{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation ({ name = "libtheora-1.1.1"; @@ -7,8 +7,16 @@ stdenv.mkDerivation ({ sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [libogg libvorbis]; + # GCC's -fforce-addr flag is not supported by clang + # It's just an optimization, so it's safe to simply remove it + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-fforce-addr" "" + ''; + crossAttrs = { propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; From 7adbb34315555a81028502d5c487544eab8e1b1b Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 3 Feb 2015 15:36:22 -0500 Subject: [PATCH 486/947] libtheora: Add metadata --- pkgs/development/libraries/libtheora/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index fdf25b23e48..ef7a8ab09a8 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation ({ propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; }; + + meta = with stdenv.lib; { + homepage = http://www.theora.org/; + description = "Library for Theora, a free and open video compression format"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; } # It has an old config.guess that doesn't know the mips64el. From 98bf3f9d395f538d83ae5c335b3a0f251ca84c21 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 3 Feb 2015 15:41:37 -0500 Subject: [PATCH 487/947] x264: snapshot-20130424-2245-stable -> snapshot-20141218-2245-stable Update fixes configure error on Darwin --- pkgs/development/libraries/x264/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 51666e3ba6d..c440493072e 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20130424-2245-stable"; - name = "x264-20130424_2245"; + version = "snapshot-20141218-2245-stable"; + name = "x264-20141218-2245"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; + sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; }; patchPhase = '' From 3630a37dd5330fb1c681597b294abe41186362ba Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 18:10:08 -0400 Subject: [PATCH 488/947] x264: Add option to encode videos as bit depth 10 At compile time libx264 must be configured to encode videos in either 8 bit depth or 10 bit depth. It is not possible to compile libx264 to support both bit depths simultaneously. This exposes the bit depth compile option. --- pkgs/development/libraries/x264/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index c440493072e..9422a8f9ab0 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, yasm}: +{stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { version = "snapshot-20141218-2245-stable"; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" + ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; buildInputs = [ yasm ]; From 985e15007dd519f073652429604936896ed82ab2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 15:11:21 -0700 Subject: [PATCH 489/947] btrfs-progs: 3.19 -> 3.19.1 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index b8db8d9e52a..d1e0e8e430b 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.19"; in +let version = "3.19.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1j1ni8baw6pgjh85jkdys8pzq870xy7z2n7ngn9r7g2f47bnafdj"; + sha256 = "1nw8rsc0dc5k6hrg03m1c65n4d0f7rfs1fjv96xqhqg0wykn5214"; }; buildInputs = [ From 84a15d6d0865e9cc58d78dd68f3ff793248a1956 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 18:13:47 -0400 Subject: [PATCH 490/947] x264: Update metadata --- pkgs/development/libraries/x264/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 9422a8f9ab0..6c541f1aa68 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ yasm ]; - meta = { + meta = with stdenv.lib; { description = "library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; - license = "GPL"; + homepage = http://www.videolan.org/developers/x264.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.spwhitt ]; }; } From 21cd86f2d9449ea2e969900bbc0324bbcad380fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 15:20:23 -0700 Subject: [PATCH 491/947] makeInitrd: Make prepend optional --- 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 c77593e027a..9dba1eb31cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,7 +396,7 @@ let inherit lib; }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend }: + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: import ../build-support/kernel/make-initrd.nix { inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor prepend; }; From 1533a9aef5ff0cedce866600c9bb8327c4373f99 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Mar 2015 23:17:51 +0100 Subject: [PATCH 492/947] nano: bump to 2.4.0 Also set license, platforms, and add myself as maintainer. Changes in this version include a fully functional undo system, vim-compatible file locking, linter support, formatter support, and improved highlighter flexibility. --- pkgs/applications/editors/nano/default.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index caea8758d95..2e48eadb0a2 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, ncurses, gettext }: -stdenv.mkDerivation (rec { - pname = "nano"; - version = "2.3.6"; - - name = "${pname}-${version}"; - +stdenv.mkDerivation rec { + name = "nano-${version}"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534"; + sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh"; }; - buildInputs = [ ncurses gettext ]; + configureFlags = '' + --sysconfdir=/etc + ''; - configureFlags = "sysconfdir=/etc"; - - meta = { + meta = with stdenv.lib; { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joachifm ]; + platforms = platforms.all; }; -}) +} From e1f6d349ec0435b116e1fe810c95f12076f60d54 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Mar 2015 23:21:44 +0100 Subject: [PATCH 493/947] nano: make NLS optional --- pkgs/applications/editors/nano/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 2e48eadb0a2..1c023845199 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, ncurses, gettext }: +{ stdenv, fetchurl +, ncurses +, gettext ? null +, enableNls ? false +}: + +assert enableNls -> (gettext != null); + +with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; @@ -7,12 +15,13 @@ stdenv.mkDerivation rec { url = "mirror://gnu/nano/${name}.tar.gz"; sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh"; }; - buildInputs = [ ncurses gettext ]; + buildInputs = [ ncurses ] ++ optional enableNls gettext; configureFlags = '' --sysconfdir=/etc + ${optionalString (!enableNls) "--disable-nls"} ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; From cf74e83057999ef669b79aea687d5c28bf4e445a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Mar 2015 23:24:27 +0100 Subject: [PATCH 494/947] nano: add option to do tiny build Enabling tiny build reduces the binary to 107K on my system (more than 50% size reduction). --- pkgs/applications/editors/nano/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 1c023845199..84c1a79591b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -2,6 +2,7 @@ , ncurses , gettext ? null , enableNls ? false +, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = '' --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} + ${optionalString enableTiny "--enable-tiny"} ''; meta = { From 151c42aa98fd26a32e130932725d25c80585ddd9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 16:02:24 -0700 Subject: [PATCH 495/947] libvorbis: 1.3.4 -> 1.3.5 --- pkgs/development/libraries/libvorbis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 80381743100..5d3218169d9 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg, pkgconfig }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.4"; + name = "libvorbis-1.3.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; + sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; }; buildInputs = [ pkgconfig ]; From 4fc94e6222d8be99e06e5d8de1e97251ded5f5ff Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 16:09:00 -0700 Subject: [PATCH 496/947] pinentry: Update build --- pkgs/tools/security/pinentry/default.nix | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index bd81b61e12a..44ad0e05ca7 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,10 +1,14 @@ -{ fetchurl, stdenv, pkgconfig, glib -, useGtk ? !stdenv.isDarwin, gtk -, useNcurses ? true, ncurses -, useQt4 ? false, qt4 }: - -assert useGtk || useNcurses || useQt4; +{ fetchurl, stdenv, pkgconfig +, libcap ? null, ncurses ? null, gtk ? null, qt4 ? null +}: +let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; + hasX = gtk != null || qt4 != null; +in +with stdenv.lib; stdenv.mkDerivation rec { name = "pinentry-0.9.0"; @@ -13,16 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"; }; - buildInputs = let opt = stdenv.lib.optional; in [] - ++ opt useGtk glib - ++ opt useGtk gtk - ++ opt useNcurses ncurses - ++ opt useQt4 qt4; + buildInputs = [ libcap gtk ncurses qt4 ]; - configureFlags = [ "--disable-pinentry-gtk" "--disable-pinentry-qt" ] - ++ (if useGtk || useQt4 then ["--with-x"] else ["--without-x"]) - ++ (if useGtk then ["--enable-pinentry-gtk2"] else ["--disable-pinentry-gtk"]) - ++ (if useQt4 then ["--enable-pinentry-qt4"] else ["--disable-pinentry-qt4"]); + configureFlags = [ + (mkWith (libcap != null) "libcap") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk != null) "pinentry-gtk2") + (mkEnable (qt4 != null) "pinentry-qt4") + ]; nativeBuildInputs = [ pkgconfig ]; From 79cfdb2afeada882d5a6452b4d178b639bb00011 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 16:10:00 -0700 Subject: [PATCH 497/947] pinentry: Slight refactoring --- pkgs/tools/security/pinentry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 44ad0e05ca7..54a7887f79e 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig -, libcap ? null, ncurses ? null, gtk ? null, qt4 ? null +, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null }: let @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"; }; - buildInputs = [ libcap gtk ncurses qt4 ]; + buildInputs = [ libcap gtk2 ncurses qt4 ]; configureFlags = [ (mkWith (libcap != null) "libcap") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") - (mkEnable (gtk != null) "pinentry-gtk2") + (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (qt4 != null) "pinentry-qt4") ]; From ba4330a89e9e7aa8905909730e8a5bc0c15ab4f0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 16:15:02 -0700 Subject: [PATCH 498/947] pinentry: Doesn't use qt4 by default so don't enable it --- 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 9dba1eb31cc..f28f8c8c6e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2362,7 +2362,9 @@ let philter = callPackage ../tools/networking/philter { }; - pinentry = callPackage ../tools/security/pinentry { }; + pinentry = callPackage ../tools/security/pinentry { + qt4 = null; + }; pius = callPackage ../tools/security/pius { }; From 70a8bfbcd57ecbb0ec54963196dd8fea562e4b37 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 16:19:02 -0700 Subject: [PATCH 499/947] pinentry: Fix for darwin --- pkgs/tools/security/pinentry/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 54a7887f79e..dd17bdc4af7 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,7 +6,7 @@ let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk != null || qt4 != null; + hasX = gtk2 != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f28f8c8c6e6..db1d42c1614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2363,7 +2363,8 @@ let philter = callPackage ../tools/networking/philter { }; pinentry = callPackage ../tools/security/pinentry { - qt4 = null; + gtk2 = !stdenv.isDarwin; + qt4 = stdenv.isDarwin; }; pius = callPackage ../tools/security/pius { }; From 9060ae8f8978dc95fddf16d4a7c0522a4b44c9ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Mar 2015 00:25:09 +0100 Subject: [PATCH 500/947] include-what-you-use: pin clang to version 3.5 Fixes Hydra failure with clang 3.6 . Also shorten excessive longDescription a bit. --- .../analysis/include-what-you-use/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 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 f9406279b5d..c3381186aa8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, cmake, llvmPackages }: +{ stdenv, fetchurl, cmake, llvmPackages_35 }: -with llvmPackages; - -let version = "3.5"; in +let version = "3.5"; in with llvmPackages_35; stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; @@ -16,12 +14,9 @@ stdenv.mkDerivation rec { longDescription = '' For every symbol (type, function variable, or macro) that you use in foo.cc, either foo.cc or foo.h should #include a .h file that exports the - declaration of that symbol. The include-what-you-use tool is a program - that can be built with the clang libraries in order to analyze #includes - of source files to find include-what-you-use violations, and suggest - fixes for them. The main goal of include-what-you-use is to remove - superfluous #includes. It does this both by figuring out what #includes - are not actually needed for this file (for both .cc and .h files), and + declaration of that symbol. The main goal of include-what-you-use is to + remove superfluous #includes, both by figuring out what #includes are not + 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; From eff3fa79496c98715af34284f6e2bfd4ac84771b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Mar 2015 00:16:39 +0100 Subject: [PATCH 501/947] encfs 1.8 -> 1.8.1 --- pkgs/tools/filesystems/encfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 4583dc1ba77..81a3b46cacb 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl , pkgconfig, rlog }: -let version = "1.8"; in +let version = "1.8.1"; in stdenv.mkDerivation rec { name = "encfs-${version}"; src = fetchFromGitHub { - sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z"; + sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; From cbfaea8191ad2922b71d199b383e6423898ab8ee Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 25 Mar 2015 17:25:01 -0500 Subject: [PATCH 502/947] youtube-dl: wrap with ffmpeg youtube-dl uses ffmpeg for post-processing and fixups. The ffmpeg used can be overridden or libav can be substituted. --- pkgs/tools/misc/youtube-dl/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 70618fafddf..d6d8fa084be 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, zip, pandoc }: +{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: let version = "2015.03.24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv"; }; - buildInputs = [ python ]; + buildInputs = [ python makeWrapper ]; nativeBuildInputs = [ zip pandoc ]; patchPhase = '' @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; + postInstall = '' + # ffmpeg is used for post-processing and fixups + wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" + ''; + meta = { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; From ff759a9890a142c5be3e239bc94c266c17ad2848 Mon Sep 17 00:00:00 2001 From: kmicu Date: Thu, 26 Mar 2015 00:38:44 +0100 Subject: [PATCH 503/947] =?UTF-8?q?Bump=20pavucontrol=202.0=20=E2=86=92=20?= =?UTF-8?q?3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit improved error handling; remember device selection visibility; window sizing improvements --- pkgs/applications/audio/pavucontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8696b1c055d..8e4c31302e2 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -2,11 +2,11 @@ , libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - name = "pavucontrol-2.0"; + name = "pavucontrol-3.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; + sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; preFixup = '' From 5284c5684fcf14dd122840e59c79661ff835fed9 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 22:12:16 -0400 Subject: [PATCH 504/947] orc: Enable building on Darwin --- pkgs/development/compilers/orc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index e6a418c1895..1c1b5d53cee 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } From c7a0e68e5896bf7db8793ffe5ca27d2338e9a084 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:14:43 -0500 Subject: [PATCH 505/947] schroedinger: 1.0.0 -> 1.0.11 --- .../libraries/schroedinger/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 67f026fb482..c80b1bca685 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,11 +1,28 @@ -{stdenv, fetchurl, liboil, pkgconfig}: +{stdenv, fetchurl, orc, pkgconfig}: stdenv.mkDerivation { - name = "schroedinger-1.0.0"; + name = "schroedinger-1.0.11"; + src = fetchurl { - url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz; - sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8"; + url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - buildInputs = [liboil pkgconfig]; + buildInputs = [orc pkgconfig]; + + # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11. + # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See: + # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html + preBuild = '' + substituteInPlace Makefile \ + --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \ + --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools" + ''; + + meta = with stdenv.lib; { + homepage = "http://diracvideo.org/"; + maintainers = [ maintainers.spwhitt ]; + license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; + platforms = platforms.unix; + }; } From 0b853b767ab19ac175c41b7ad42302a5364c8fa6 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:35:52 -0500 Subject: [PATCH 506/947] libebml: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/libebml/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index a2065111190..818177ff49d 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.0"; + name = "libebml-1.3.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; + sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r"; }; - configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out)"; - - meta = { + meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; + license = licenses.lgpl21; homepage = http://dl.matroska.org/downloads/libebml/; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } From af2d875865f6b6cb1c7aa613dba9d84b1a4a711e Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:46:13 -0500 Subject: [PATCH 507/947] libmatroska: Fix Darwin build --- pkgs/development/libraries/libmatroska/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 67b9e728955..b4032f3c22d 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -9,12 +9,16 @@ stdenv.mkDerivation rec { }; configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"; + makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++"; propagatedBuildInputs = [ libebml ]; - meta = { - description = "Matroska library"; - homepage = http://dl.matroska.org/downloads/libmatroska; + meta = with stdenv.lib; { + description = "A library to parse Matroska files"; + homepage = http://matroska.org/; + license = licenses.lgpl21; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } From 54bf845153ccb226da13302d860f068cdf9f057c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:47:40 -0500 Subject: [PATCH 508/947] libmpeg2: Fix Darwin build --- pkgs/development/libraries/libmpeg2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 7ecac071ce4..19d912e5523 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; + # Otherwise clang fails with 'duplicate symbol ___sputc' + buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89"; + meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; From 5fab3e266e643abb588f015cf4cf1055d8a936d5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 21:48:13 -0700 Subject: [PATCH 509/947] nano: Default to having nls support --- pkgs/applications/editors/nano/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 84c1a79591b..3e777207fd0 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , ncurses , gettext ? null -, enableNls ? false +, enableNls ? true , enableTiny ? false }: From 18e140701bc1496b78759991214061e7c3d68f1a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 22:08:17 -0700 Subject: [PATCH 510/947] pulseaudio: 5.0 -> 6.0 --- pkgs/servers/pulseaudio/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5e0bc4f60f1..4228f8b1eab 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -9,20 +9,13 @@ assert jackaudioSupport -> jack2 != null; stdenv.mkDerivation rec { - name = "pulseaudio-5.0"; + name = "pulseaudio-6.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz"; - sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr"; + sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; }; - patches = [(fetchpatch { - name = "CVE-2014-3970.patch"; - url = "http://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/" - + "?id=26b9d22dd24c17eb118d0205bf7b02b75d435e3c"; - sha256 = "13vxp6520djgfrfxkzy5qvabl94sga3yl5pj93xawbkgwzqymdyq"; - })]; - # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated. propagatedBuildInputs = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; @@ -55,6 +48,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" + "--with-systemduserunitdir=\${out}/lib/systemd/user" ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack" ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 960e7c3f582..84f6f3dcc82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8299,11 +8299,13 @@ let bluez = null; avahi = null; }; + pulseaudioFull = pulseaudio.override { bluez = bluez5; avahi = avahi; jackaudioSupport = true; x11Support = true; + useSystemd = stdenv.isLinux; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; From 7721ff4ccb0bee9e095e77e50adceda9d71bffae Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Mar 2015 06:30:21 +0000 Subject: [PATCH 511/947] bazel: add patch suggested by upstream --- pkgs/development/tools/build-managers/bazel/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 7a12400c06a..773112efb37 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; installPhase = '' + # apply patch suggested by bazel people, remove when added upstream + sed -i 's/open(path.c_str(), O_CREAT | O_WRONLY, archive_entry_perm(entry))/open(path.c_str(), O_CREAT | O_WRONLY, 0755)/' ./src/main/cpp/blaze.cc + PROTOC=protoc bash compile.sh mkdir -p $out/bin $out/share cp -R output $out/share/bazel From 61e573fcb62e1ae6b8097afec0d47d7b2677f1fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 26 Mar 2015 10:12:25 +0300 Subject: [PATCH 512/947] Update fossil; use repository-generated tarball because release tarballs disappear --- .../version-management/fossil/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 299819a8a28..1093bbe0d02 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,11 +1,15 @@ {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: -stdenv.mkDerivation { - name = "fossil-1.30"; +stdenv.mkDerivation rec { + name = "fossil-1.32"; src = fetchurl { - url = http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz; - sha256 = "1p4jxd67m2a5rl85hb9gl0vxcvvkxnj1hd8yjaci2qf115d9x5ip"; + urls = + [ + "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec" + ]; + name = "${name}.tar.gz"; + sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr"; }; buildInputs = [ zlib openssl readline sqlite ]; From 8feda47beee4ce96b009e9c855cfe849811cbcb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 26 Mar 2015 10:07:05 +0100 Subject: [PATCH 513/947] pinentry: fix build /cc wkennington --- pkgs/tools/security/pinentry/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/release.nix | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index dd17bdc4af7..632edaedd2e 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ (mkWith (libcap != null) "libcap") + (mkWith (hasX) "x") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; 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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ab84526cd..0d2039624e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2363,8 +2363,8 @@ let philter = callPackage ../tools/networking/philter { }; pinentry = callPackage ../tools/security/pinentry { - gtk2 = !stdenv.isDarwin; - qt4 = stdenv.isDarwin; + gtk2 = if stdenv.isDarwin then null else gtk2; + qt4 = if stdenv.isDarwin then qt4 else null; }; pius = callPackage ../tools/security/pius { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f2c3f88e6bd..cb469e61305 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -147,7 +147,6 @@ let pciutils = linux; pdf2xml = all; php = linux; - pinentry = linux; pltScheme = linux; pmccabe = linux; ppl = all; From 80202fbd2590f7057c117da2072c32f9651c50b8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Mar 2015 09:09:18 +0000 Subject: [PATCH 514/947] GCE image: Add some recommended sysctl settings. Disable OS level firewall by default for GCE images (GCE provides external firewall). Disable passwordAuthentication. Related to issue #6991. --- .../virtualisation/google-compute-image.nix | 81 ++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 98985d2d2c5..b841e0d4422 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -7,6 +7,9 @@ in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; + # https://cloud.google.com/compute/docs/tutorials/building-images + networking.firewall.enable = lib.mkDefault false; + system.build.googleComputeImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "google-compute-image" @@ -95,6 +98,7 @@ in boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; + boot.kernelModules = [ "virtio_pci" "virtio_net" ]; # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. boot.loader.grub.device = "/dev/sda"; @@ -108,6 +112,7 @@ in # at instance creation time. services.openssh.enable = true; services.openssh.permitRootLogin = "without-password"; + services.openssh.passwordAuthentication = false; # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; @@ -178,5 +183,79 @@ in serviceConfig.RemainAfterExit = true; serviceConfig.StandardError = "journal+console"; serviceConfig.StandardOutput = "journal+console"; - }; + }; + + # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel + boot.kernel.sysctl = { + # enables syn flood protection + "net.ipv4.tcp_syncookies" = lib.mkDefault "1"; + + # ignores source-routed packets + "net.ipv4.conf.all.accept_source_route" = lib.mkDefault "0"; + + # ignores source-routed packets + "net.ipv4.conf.default.accept_source_route" = lib.mkDefault "0"; + + # ignores ICMP redirects + "net.ipv4.conf.all.accept_redirects" = lib.mkDefault "0"; + + # ignores ICMP redirects + "net.ipv4.conf.default.accept_redirects" = lib.mkDefault "0"; + + # ignores ICMP redirects from non-GW hosts + "net.ipv4.conf.all.secure_redirects" = lib.mkDefault "1"; + + # ignores ICMP redirects from non-GW hosts + "net.ipv4.conf.default.secure_redirects" = lib.mkDefault "1"; + + # don't allow traffic between networks or act as a router + "net.ipv4.ip_forward" = lib.mkDefault "0"; + + # don't allow traffic between networks or act as a router + "net.ipv4.conf.all.send_redirects" = lib.mkDefault "0"; + + # don't allow traffic between networks or act as a router + "net.ipv4.conf.default.send_redirects" = lib.mkDefault "0"; + + # reverse path filtering - IP spoofing protection + "net.ipv4.conf.all.rp_filter" = lib.mkDefault "1"; + + # reverse path filtering - IP spoofing protection + "net.ipv4.conf.default.rp_filter" = lib.mkDefault "1"; + + # ignores ICMP broadcasts to avoid participating in Smurf attacks + "net.ipv4.icmp_echo_ignore_broadcasts" = lib.mkDefault "1"; + + # ignores bad ICMP errors + "net.ipv4.icmp_ignore_bogus_error_responses" = lib.mkDefault "1"; + + # logs spoofed, source-routed, and redirect packets + "net.ipv4.conf.all.log_martians" = lib.mkDefault "1"; + + # log spoofed, source-routed, and redirect packets + "net.ipv4.conf.default.log_martians" = lib.mkDefault "1"; + + # implements RFC 1337 fix + "net.ipv4.tcp_rfc1337" = lib.mkDefault "1"; + + # randomizes addresses of mmap base, heap, stack and VDSO page + "kernel.randomize_va_space" = lib.mkDefault "2"; + + # provides protection from ToCToU races + "fs.protected_hardlinks" = lib.mkDefault "1"; + + # provides protection from ToCToU races + "fs.protected_symlinks" = lib.mkDefault "1"; + + # makes locating kernel addresses more difficult + "kernel.kptr_restrict" = lib.mkDefault "1"; + + # set ptrace protections + "kernel.yama.ptrace_scope" = lib.mkDefault "1"; + + # set perf only available to root + "kernel.perf_event_paranoid" = lib.mkDefault "2"; + + }; + } From cbb14299c935c5a6a58f5cdd4775273af4a897c1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Mar 2015 09:15:09 +0000 Subject: [PATCH 515/947] GCE image: Remove some unnecessary lib prefixes. --- .../virtualisation/google-compute-image.nix | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index b841e0d4422..ee5485071a3 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -8,7 +8,7 @@ in imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; # https://cloud.google.com/compute/docs/tutorials/building-images - networking.firewall.enable = lib.mkDefault false; + networking.firewall.enable = mkDefault false; system.build.googleComputeImage = pkgs.vmTools.runInLinuxVM ( @@ -112,7 +112,7 @@ in # at instance creation time. services.openssh.enable = true; services.openssh.permitRootLogin = "without-password"; - services.openssh.passwordAuthentication = false; + services.openssh.passwordAuthentication = mkDefault false; # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; @@ -188,73 +188,73 @@ in # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel boot.kernel.sysctl = { # enables syn flood protection - "net.ipv4.tcp_syncookies" = lib.mkDefault "1"; + "net.ipv4.tcp_syncookies" = mkDefault "1"; # ignores source-routed packets - "net.ipv4.conf.all.accept_source_route" = lib.mkDefault "0"; + "net.ipv4.conf.all.accept_source_route" = mkDefault "0"; # ignores source-routed packets - "net.ipv4.conf.default.accept_source_route" = lib.mkDefault "0"; + "net.ipv4.conf.default.accept_source_route" = mkDefault "0"; # ignores ICMP redirects - "net.ipv4.conf.all.accept_redirects" = lib.mkDefault "0"; + "net.ipv4.conf.all.accept_redirects" = mkDefault "0"; # ignores ICMP redirects - "net.ipv4.conf.default.accept_redirects" = lib.mkDefault "0"; + "net.ipv4.conf.default.accept_redirects" = mkDefault "0"; # ignores ICMP redirects from non-GW hosts - "net.ipv4.conf.all.secure_redirects" = lib.mkDefault "1"; + "net.ipv4.conf.all.secure_redirects" = mkDefault "1"; # ignores ICMP redirects from non-GW hosts - "net.ipv4.conf.default.secure_redirects" = lib.mkDefault "1"; + "net.ipv4.conf.default.secure_redirects" = mkDefault "1"; # don't allow traffic between networks or act as a router - "net.ipv4.ip_forward" = lib.mkDefault "0"; + "net.ipv4.ip_forward" = mkDefault "0"; # don't allow traffic between networks or act as a router - "net.ipv4.conf.all.send_redirects" = lib.mkDefault "0"; + "net.ipv4.conf.all.send_redirects" = mkDefault "0"; # don't allow traffic between networks or act as a router - "net.ipv4.conf.default.send_redirects" = lib.mkDefault "0"; + "net.ipv4.conf.default.send_redirects" = mkDefault "0"; # reverse path filtering - IP spoofing protection - "net.ipv4.conf.all.rp_filter" = lib.mkDefault "1"; + "net.ipv4.conf.all.rp_filter" = mkDefault "1"; # reverse path filtering - IP spoofing protection - "net.ipv4.conf.default.rp_filter" = lib.mkDefault "1"; + "net.ipv4.conf.default.rp_filter" = mkDefault "1"; # ignores ICMP broadcasts to avoid participating in Smurf attacks - "net.ipv4.icmp_echo_ignore_broadcasts" = lib.mkDefault "1"; + "net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1"; # ignores bad ICMP errors - "net.ipv4.icmp_ignore_bogus_error_responses" = lib.mkDefault "1"; + "net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1"; # logs spoofed, source-routed, and redirect packets - "net.ipv4.conf.all.log_martians" = lib.mkDefault "1"; + "net.ipv4.conf.all.log_martians" = mkDefault "1"; # log spoofed, source-routed, and redirect packets - "net.ipv4.conf.default.log_martians" = lib.mkDefault "1"; + "net.ipv4.conf.default.log_martians" = mkDefault "1"; # implements RFC 1337 fix - "net.ipv4.tcp_rfc1337" = lib.mkDefault "1"; + "net.ipv4.tcp_rfc1337" = mkDefault "1"; # randomizes addresses of mmap base, heap, stack and VDSO page - "kernel.randomize_va_space" = lib.mkDefault "2"; + "kernel.randomize_va_space" = mkDefault "2"; # provides protection from ToCToU races - "fs.protected_hardlinks" = lib.mkDefault "1"; + "fs.protected_hardlinks" = mkDefault "1"; # provides protection from ToCToU races - "fs.protected_symlinks" = lib.mkDefault "1"; + "fs.protected_symlinks" = mkDefault "1"; # makes locating kernel addresses more difficult - "kernel.kptr_restrict" = lib.mkDefault "1"; + "kernel.kptr_restrict" = mkDefault "1"; # set ptrace protections - "kernel.yama.ptrace_scope" = lib.mkDefault "1"; + "kernel.yama.ptrace_scope" = mkDefault "1"; # set perf only available to root - "kernel.perf_event_paranoid" = lib.mkDefault "2"; + "kernel.perf_event_paranoid" = mkDefault "2"; }; From e42547d8e9f6cf04a6969c7b486b72da3e17cb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 26 Mar 2015 10:23:55 +0100 Subject: [PATCH 516/947] pythonPackages.subunit: rewrite to use buildPythonPackage --- pkgs/top-level/python-packages.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8281c25e4ea..a79d9d296cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10866,21 +10866,17 @@ let }); - subunit = stdenv.mkDerivation rec { + subunit = buildPythonPackage rec { name = "subunit-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = pkgs.fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; + url = "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-${version}.tar.gz"; + sha256 = "125zh5i1f21ficn8ix5q33jk87j2pfmzbw6jq5l8v0hhjrp619yr"; }; - buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ]; - propagatedBuildInputs = with self; [ testtools testscenarios ]; - postFixup = "wrapPythonPrograms"; - meta = { description = "A streaming protocol for test results"; homepage = https://launchpad.net/subunit; From ac35d15bccc594d40d0493f7bf1f9d920bbc1fc1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Mar 2015 09:46:15 +0000 Subject: [PATCH 517/947] bazel: Upstream pushed patch, removing patch. --- pkgs/development/tools/build-managers/bazel/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 773112efb37..4a9106fbb1f 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }: stdenv.mkDerivation rec { - name = "bazel-20150325.9a0dc1b2"; + name = "bazel-20150326.981b7bc1"; src = fetchFromGitHub { owner = "google"; repo = "bazel"; - rev = "9a0dc1b2"; + rev = "981b7bc1"; sha256 = "1bgx12bnrqxz720ljn7kdzd4678p4mxldiylll3h0v5673vgrf5p"; }; buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; installPhase = '' - # apply patch suggested by bazel people, remove when added upstream - sed -i 's/open(path.c_str(), O_CREAT | O_WRONLY, archive_entry_perm(entry))/open(path.c_str(), O_CREAT | O_WRONLY, 0755)/' ./src/main/cpp/blaze.cc - PROTOC=protoc bash compile.sh mkdir -p $out/bin $out/share cp -R output $out/share/bazel From 46eedd9de5e21d80a4e4ae48f381a084db55c897 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Mar 2015 09:48:27 +0000 Subject: [PATCH 518/947] Dohh --- pkgs/development/tools/build-managers/bazel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 4a9106fbb1f..e9ddc17bb02 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "bazel"; rev = "981b7bc1"; - sha256 = "1bgx12bnrqxz720ljn7kdzd4678p4mxldiylll3h0v5673vgrf5p"; + sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; }; buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; From a6f3b54fd07ec0ddf27eb4cbd8bed74c7771a924 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 15:37:27 +0100 Subject: [PATCH 519/947] haskell-ng: disable failing builds on Hydra --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b69a84007a..4c495a61f0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -637,6 +637,17 @@ self: super: { # https://github.com/prowdsponsor/esqueleto/issues/93 esqueleto = dontCheck super.esqueleto; + # https://github.com/anchor/ceilometer-common/issues/16 + ceilometer-common = dontCheck super.ceilometer-common; + + # https://github.com/fumieval/audiovisual/issues/1 + audiovisual = markBroken super.audiovisual; + + # https://github.com/cdupont/Nomyx/issues/85 + Nomyx-Core = markBroken super.Nomyx-Core; + Nomyx-Web = dontDistribute super.Nomyx-Web; + Nomyx = dontDistribute super.Nomyx; + } // { # Not on Hackage. From 93bd02a6aae7e53db928ec53c889c8216e292b0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 15:45:20 +0100 Subject: [PATCH 520/947] ghc: versions prior to 7.4.x currently don't work on Darwin https://github.com/NixOS/nixpkgs/commit/db4cb021c024b65c08a3791edf2d4c613e8d44d8#commitcomment-10320216 --- pkgs/development/compilers/ghc/6.10.4.nix | 3 ++- pkgs/development/compilers/ghc/6.12.3.nix | 3 ++- pkgs/development/compilers/ghc/7.0.4.nix | 4 ++-- pkgs/development/compilers/ghc/7.2.2.nix | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index ee7ca20ddf7..d8157673fbc 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 2364fe1d5b9..f6beaf3a006 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9e61be7b47f..c28359af16f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 778b47afde7..651cf200a8d 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } From 6bd48cbfef266b2ff8f1930a3b83693a3340cdb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 15:51:39 +0100 Subject: [PATCH 521/947] Enable Darwin builds of Haskell packages again. Hopefully, issues like https://github.com/NixOS/nixpkgs/issues/2689 are all remedied by now. --- pkgs/development/compilers/ghc/7.8.4.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index c4000fc86c2..5497b35ec1d 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -38,15 +38,11 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - meta = with stdenv.lib; { + meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; - inherit (ghc.meta) license; - # Filter old "i686-darwin" platform which is unsupported these days. - platforms = filter (x: elem x platforms.all) ghc.meta.platforms; - # Disable Darwin builds: . - hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; }; } From eb4f75a868e11e4ce1c18f31f7cc1b100a329f42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 15:52:47 +0100 Subject: [PATCH 522/947] ghc: remove obsolete "i686-darwin" from meta.platforms --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index b3371eb920b..a1cdd6171ee 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -116,5 +116,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4bf7d6d3531..2b8d403701f 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -124,5 +124,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } From 73f35dcc0c3553a3fe3c44cf6504cd0821f420f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 16:01:49 +0100 Subject: [PATCH 523/947] haskell-CLI fails its test suite because of missing modules. --- 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 4c495a61f0b..d8c466aa672 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -302,6 +302,7 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw + CLI = dontCheck super.CLI; # Upstream has no issue tracker. cjk = dontCheck super.cjk; command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; From 1368206eb8463dffee6a3c43fdf7ee12ca0aa468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 17:12:08 +0100 Subject: [PATCH 524/947] haskell-configuration-common: remember ticket URL --- 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 d8c466aa672..76910ed61f9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -254,7 +254,7 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw - directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; + directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24 hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); From 49f3c375b50eea5f7e3bc59c7ee687fb507edf2e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 22:11:23 +0300 Subject: [PATCH 525/947] ghcWithPackages: add withLLVM --- .../haskell-modules/configuration-common.nix | 8 +++--- .../configuration-ghc-6.12.x.nix | 3 +++ .../configuration-ghc-7.0.x.nix | 3 +++ .../configuration-ghc-7.10.x.nix | 3 +++ .../configuration-ghc-7.2.x.nix | 3 +++ .../configuration-ghc-7.4.x.nix | 3 +++ .../configuration-ghc-7.6.x.nix | 3 +++ .../configuration-ghc-7.8.x.nix | 3 +++ .../configuration-ghc-head.nix | 3 +++ .../haskell-modules/configuration-ghcjs.nix | 3 +++ pkgs/development/haskell-modules/default.nix | 5 +++- .../haskell-modules/with-packages-wrapper.nix | 26 +++++++++++++------ 12 files changed, 52 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 76910ed61f9..d959e91cf2a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Use LLVM for particular GHC version. + inherit (self.llvmPackages) llvm; + # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; @@ -485,11 +488,6 @@ self: super: { # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); - # LLVM 3.5 breaks GHC: https://ghc.haskell.org/trac/ghc/ticket/9142. - GlomeVec = super.GlomeVec.override { llvm = pkgs.llvm_34; }; # https://github.com/jimsnow/glome/issues/2 - gloss-raster = super.gloss-raster.override { llvm = pkgs.llvm_34; }; - repa-examples = super.repa-examples.override { llvm = pkgs.llvm_34; }; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index cccf5833c8a..2a5213d4e12 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + # Disable GHC 6.12.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 4343970bb00..27c4b642c4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.0.x core libraries. array = null; base = null; 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 a70597e6ee5..f04ad96fc5f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + # Disable GHC 7.10.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 9c03b7e469d..8428af7ca6e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.2.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 383a0318390..fd4109fad72 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.4.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index b7cf7c77e10..fceb444b3e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.6.x core libraries. array = null; base = null; 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 9d4bf40eca6..e53ea6fc4c8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.8.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 4c4065e8889..47b450afc4e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + # Disable GHC 7.11.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 000a0647bef..9ae45e9425b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell '' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 973ff83c42d..673855227b8 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -54,7 +54,10 @@ let inherit mkDerivation callPackage; - ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { packages = pkgs self; }; + ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { + inherit (self) llvmPackages; + packages = pkgs self; + }; ghc = ghc // { withPackages = self.ghcWithPackages; }; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 763164cec87..b2071fa61c0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,11 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: +{ stdenv, ghc, llvmPackages, packages, buildEnv +, makeWrapper +, ignoreCollisions ? false, withLLVM ? false }: + +with stdenv.lib; # This wrapper works only with GHC 6.12 or later. -assert stdenv.lib.versionOlder "6.12" ghc.version; +assert versionOlder "6.12" ghc.version; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -25,15 +29,20 @@ assert stdenv.lib.versionOlder "6.12" ghc.version; # fi let - ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; + ghc761OrLater = versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; libDir = "$out/lib/ghc-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages); - hasLibraries = stdenv.lib.any (x: x.isHaskellLibrary) paths; + paths = filter (x: x ? isHaskellLibrary) (closePropagation packages); + hasLibraries = any (x: x.isHaskellLibrary) paths; + # CLang is needed on Darwin for -fllvm to work: + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + llvm = makeSearchPath "bin" + ([ llvmPackages.llvm ] + ++ optional stdenv.isDarwin llvmPackages.clang); in -if paths == [] then ghc else +if paths == [] && !withLLVM then ghc else buildEnv { inherit (ghc) name; paths = paths ++ [ghc]; @@ -55,7 +64,8 @@ buildEnv { --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" + --set "NIX_GHC_LIBDIR" "${libDir}" \ + ${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do @@ -73,7 +83,7 @@ buildEnv { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"} + ${optionalString hasLibraries "$out/bin/ghc-pkg recache"} $out/bin/ghc-pkg check ''; } // { From 39ec62fa964e0ff2b55da0c379e7fc8c4976871a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:46:42 +0100 Subject: [PATCH 526/947] haskell-configuration-common: don't import LLVM into the package set Instead, we'll make sure that packages find it in self.llvmPackages. --- 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 d959e91cf2a..abd1b9e2c9a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -4,9 +4,6 @@ with import ./lib.nix { inherit pkgs; }; self: super: { - # Use LLVM for particular GHC version. - inherit (self.llvmPackages) llvm; - # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; From 2e811ff754c18ed7c70da623ba3670b5e9cf5ba6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:49:53 +0100 Subject: [PATCH 527/947] hackage-packages: re-generate from Hackage 2015-03-25T19:49:53+0100 --- .../haskell-modules/hackage-packages.nix | 279 ++++++++++++------ 1 file changed, 195 insertions(+), 84 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fcb11f206d0..31939bf3f41 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4893,13 +4893,15 @@ self: { "GLUT" = callPackage ({ mkDerivation, array, base, containers, freeglut, libICE, libSM - , libXi, libXmu, mesa, OpenGL, OpenGLRaw + , libXi, libXmu, mesa, OpenGL, OpenGLRaw, StateVar, transformers }: mkDerivation { pname = "GLUT"; - version = "2.6.0.1"; - sha256 = "1bapwhhvc1mijq2macnwx79qbqsa6xg3882q58zfx7s3mqm3qycs"; - buildDepends = [ array base containers OpenGL OpenGLRaw ]; + version = "2.7.0.0"; + sha256 = "02y565fdfsl7pwl1wmyk5dma9ipc3l0yz7kwcgkvbzvqajhdg13d"; + buildDepends = [ + array base containers OpenGL OpenGLRaw StateVar transformers + ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; @@ -4922,6 +4924,7 @@ self: { linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; + jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -10988,14 +10991,17 @@ self: { }) {}; "OpenGL" = callPackage - ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, OpenGLRaw - , text + ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, ObjectName + , OpenGLRaw, StateVar, text, transformers }: mkDerivation { pname = "OpenGL"; - version = "2.11.1.0"; - sha256 = "0fsk5jrap27rzv70q2257jwyrwr4g5qbv7kzi0fblydf7m1nq8hp"; - buildDepends = [ base bytestring GLURaw OpenGLRaw text ]; + version = "2.12.0.0"; + sha256 = "0f5s6b1mv3hm6xnansv0jsxahn8acc8nmr9754fx5b44bn1s6iqy"; + buildDepends = [ + base bytestring GLURaw ObjectName OpenGLRaw StateVar text + transformers + ]; extraLibraries = [ libX11 mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; @@ -14088,6 +14094,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Titim" = callPackage + ({ mkDerivation, base, containers, matrix, random }: + mkDerivation { + pname = "Titim"; + version = "0.2.3"; + sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base containers matrix random ]; + description = "Game for Lounge Marmelade"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Top" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -15617,7 +15636,9 @@ self: { mkDerivation { pname = "abeson"; version = "0.1.0.1"; + revision = "1"; sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c"; + editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727"; buildDepends = [ aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector @@ -19025,8 +19046,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.2"; - sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; + version = "1.4.3"; + sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19039,7 +19060,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; @@ -19054,7 +19074,9 @@ self: { mkDerivation { pname = "apiary-authenticate"; version = "1.4.0"; + revision = "1"; sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; + editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b"; buildDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types @@ -19073,7 +19095,9 @@ self: { mkDerivation { pname = "apiary-clientsession"; version = "1.4.0"; + revision = "1"; sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; + editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd"; buildDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -19090,7 +19114,9 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; + revision = "1"; sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; + editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing @@ -19106,7 +19132,9 @@ self: { mkDerivation { pname = "apiary-eventsource"; version = "1.4.0"; + revision = "1"; sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; + editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6"; buildDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -19121,7 +19149,9 @@ self: { mkDerivation { pname = "apiary-helics"; version = "1.4.0"; + revision = "1"; sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a"; + editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827"; buildDepends = [ apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai @@ -19140,7 +19170,9 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; + revision = "1"; sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; + editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base @@ -19159,7 +19191,9 @@ self: { mkDerivation { pname = "apiary-memcached"; version = "1.4.0"; + revision = "1"; sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby"; + editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29"; buildDepends = [ apiary base bytestring data-default-class memcached-binary monad-control text transformers types-compat @@ -19177,7 +19211,9 @@ self: { mkDerivation { pname = "apiary-mongoDB"; version = "1.4.0"; + revision = "1"; sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; + editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b"; buildDepends = [ apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers types-compat @@ -19195,7 +19231,9 @@ self: { mkDerivation { pname = "apiary-persistent"; version = "1.4.0"; + revision = "1"; sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; + editedCabalFile = "23a9ba31cd7fab41378b61a82e5ad92d04b6f3a32e32edca3217f5f824c13736"; buildDepends = [ apiary apiary-logger base monad-control monad-logger persistent resource-pool resourcet transformers transformers-base types-compat @@ -19214,7 +19252,9 @@ self: { mkDerivation { pname = "apiary-purescript"; version = "1.4.0"; + revision = "1"; sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz"; + editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c"; buildDepends = [ apiary base bytestring data-default-class filepath Glob parsec purescript text transformers types-compat unordered-containers @@ -19229,7 +19269,9 @@ self: { mkDerivation { pname = "apiary-session"; version = "1.4.0"; + revision = "1"; sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; + editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd"; buildDepends = [ apiary base types-compat wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; @@ -19243,7 +19285,9 @@ self: { mkDerivation { pname = "apiary-websockets"; version = "1.4.0"; + revision = "1"; sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; + editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581"; buildDepends = [ apiary base wai-websockets web-routing websockets ]; @@ -19992,8 +20036,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.1"; - sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; + version = "0.2.1.2"; + sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20005,7 +20049,7 @@ self: { ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.mit; }) {}; "ascii-vector-avc" = callPackage @@ -21011,9 +21055,9 @@ self: { mkDerivation { pname = "auto"; version = "0.2.0.5"; - revision = "1"; + revision = "2"; sha256 = "1c6n5yc24g3chm18c5jaspidgi064pbzbd9gnakxj6q0npwwmp1h"; - editedCabalFile = "d157149714040ab304b3cc808a27ac914576f0c7cbf73e399f2fb9eb0cd7f7cb"; + editedCabalFile = "21de0f6b3309a084876f2e6a3ef4a87a2953511d9d564528071c0a81bcf22dd0"; buildDepends = [ base bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -22322,6 +22366,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic-lens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-lens"; + version = "0.0.0"; + revision = "1"; + sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj"; + editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; + buildDepends = [ base ]; + description = "Basic lens type and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, hashable , lifted-base, ReadArgs, safe, system-filepath, text, transformers @@ -24301,18 +24358,17 @@ self: { }) {}; "bit-vector" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-quickcheck2, vector + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, vector }: mkDerivation { pname = "bit-vector"; - version = "0.1.0"; - sha256 = "1z2gk5wbl865p893hz77jkg7lyl6698va5r33fi7w1vv8656s14n"; + version = "0.2.0"; + sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1"; buildDepends = [ base vector ]; testDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 vector + base QuickCheck tasty tasty-quickcheck tasty-th vector ]; - jailbreak = true; homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25217,17 +25273,17 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, array, base, bytestring, containers + ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-exts, http-types, pointful, transformers, wai, warp }: mkDerivation { pname = "blunt"; - version = "0.0.11"; - sha256 = "020g7yn2nrsgr2lpk5q6b2mzj3hh6j7h9vjwxbdr8gq2q13rvq9q"; + version = "0.0.12"; + sha256 = "19x4djczbzrjpqmcjz4pal0cks4xbrhgxw9gs45r6rbs3d7g06am"; isLibrary = true; isExecutable = true; buildDepends = [ - array base bytestring containers haskell-src-exts http-types + aeson array base bytestring containers haskell-src-exts http-types pointful transformers wai warp ]; description = "Point-free Haskell as a service"; @@ -26024,8 +26080,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.4.7"; - sha256 = "1fc8y2incvci9ib9gkbr03shjj8fwxsb5q34phwycmqiaq3j5c88"; + version = "0.4.8"; + sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26037,7 +26093,7 @@ self: { hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; - description = "Draw pretty sequence diagrams of D-Bus traffic"; + description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -29910,8 +29966,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.7"; - sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; + version = "0.7.1"; + sha256 = "1hy1bx83faf0n3irp0g2136bmd9gvpd638ap8ifys6gdni25k3zv"; buildDepends = [ base data-default ghc-prim integer-gmp singletons template-haskell th-lift @@ -33045,8 +33101,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.3"; - sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; + version = "1.3.1"; + sha256 = "18zmjn2d4ig0sfbbdajjzmqd9fjcyb6gjf4xywimdjg6wv053cxw"; buildDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -40353,8 +40409,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "1.4.4"; - sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd"; + version = "1.4.5"; + sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5"; buildDepends = [ attoparsec base binary blaze-builder bytestring conduit conduit-extra containers iproute mtl network random resourcet @@ -53996,6 +54052,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackage-mirror" = callPackage + ({ mkDerivation, aws, base, bytestring, cereal, conduit + , conduit-extra, cryptohash, data-default, directory, exceptions + , fast-logger, filepath, http-conduit, lifted-async, lifted-base + , mmorph, monad-control, monad-logger, old-locale + , optparse-applicative, resourcet, retry, shakespeare, stm, tar + , template-haskell, temporary, text, thyme, transformers + , unordered-containers + }: + mkDerivation { + pname = "hackage-mirror"; + version = "0.1.0.0"; + sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aws base bytestring cereal conduit conduit-extra cryptohash + data-default directory exceptions fast-logger filepath http-conduit + lifted-async lifted-base mmorph monad-control monad-logger + old-locale optparse-applicative resourcet retry shakespeare stm tar + template-haskell temporary text thyme transformers + unordered-containers + ]; + jailbreak = true; + homepage = "http://fpcomplete.com"; + description = "Simple mirroring utility for Hackage"; + license = stdenv.lib.licenses.mit; + }) {}; + "hackage-plot" = callPackage ({ mkDerivation, base, bytestring, containers, directory , download-curl, filepath, gnuplot, old-locale, old-time, parsedate @@ -56925,7 +57010,9 @@ self: { mkDerivation { pname = "haskell-packages"; version = "0.2.4.4"; + revision = "1"; sha256 = "1n4il9vkszr48n0zg3kccyqa744p0cc6idamdk6xb6hj0flpqzzc"; + editedCabalFile = "0d8b5e0dd102cc4c6aac5bc12e523d5c2ad94d981f33792b459d9373bb25c399"; buildDepends = [ aeson base bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -57140,12 +57227,13 @@ self: { mkDerivation { pname = "haskell-src-meta"; version = "0.6.0.8"; + revision = "1"; sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; + editedCabalFile = "98609677e15a08af231b3bb957670cb1de50132625a36ef1fc83d530fb319f8a"; buildDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; - jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59643,8 +59731,10 @@ self: { }: mkDerivation { pname = "helics"; - version = "0.5.0.1"; - sha256 = "0kqmqyf22fjcbsqlbyxmg6238im8kp6baip3v8f7hibkpgyfqip1"; + version = "0.5.1"; + revision = "1"; + sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c"; + editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59666,8 +59756,8 @@ self: { }: mkDerivation { pname = "helics-wai"; - version = "0.5.0"; - sha256 = "1d1kaik2aj0vnln4nbj958d7ay7adb6l62fx606y7xlp7zyhysr4"; + version = "0.5.1"; + sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61687,17 +61777,19 @@ self: { "hjsonschema" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, hashable, hjsonpointer, http-types, HUnit, lens + , filepath, hashable, hjsonpointer, http-conduit, http-types, HUnit , regexpr, scientific, test-framework, test-framework-hunit, text - , unordered-containers, vector, wreq + , unordered-containers, vector }: mkDerivation { pname = "hjsonschema"; - version = "0.5.0.0"; - sha256 = "0a79i7agvkhrc4w6k6g0c2pra4gg99mj11f3jjc8vlzxxwghc6hz"; + version = "0.5.1.2"; + sha256 = "0vxlmlfyv3an8dhw5yrsnkaqhascdw3hdmpillrj266ag5w4b139"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base bytestring file-embed hashable hjsonpointer http-types - lens regexpr scientific text unordered-containers vector wreq + aeson base bytestring file-embed hashable hjsonpointer http-conduit + http-types regexpr scientific text unordered-containers vector ]; testDepends = [ aeson base bytestring directory filepath HUnit test-framework @@ -62606,8 +62698,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "0.4.5"; - sha256 = "1lxn7ykk24a0kj9y36mwyd52xgw0hfvf3mqqm7m8ikrnpqps5nrs"; + version = "0.4.6"; + sha256 = "1sn2m1vpbkbiv7lyhffgkcs1ck7680qqgi7d8hk2b02ca53lw8wp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69114,8 +69206,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hydrogen-multimap"; - version = "0.1"; - sha256 = "165lxvm0yvz0jq3l520ww0fp4zb7y4azz32bvrz00z4j1dqr5vaw"; + version = "0.2"; + sha256 = "0v0yylh9zpfzyb19mhwwf6pw36pmpn3gj7cdiamqzz3db0zcadwb"; buildDepends = [ base containers ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; @@ -69143,14 +69235,13 @@ self: { }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.18"; - sha256 = "1w1a2hlvsryjd9766b3464nh0facipihdd30jvsargsnkq9g2nb3"; + version = "0.19"; + sha256 = "0sl8gvihqhp7jrf6x6m6yg4kv4by63q6r4qi9bnlwbs3yykbriah"; buildDepends = [ array base cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network process random regex-base regex-tdfa strict time transformers uuid ]; - jailbreak = true; homepage = "http://scravy.de/hydrogen-prelude/"; description = "Hydrogen Prelude"; license = stdenv.lib.licenses.mit; @@ -76197,8 +76288,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.2.0"; - sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; + version = "0.3.2.1"; + sha256 = "1nk5dcz6h27d6y5lq4sgl9vn6dl9cmwrkfghxx33nbfq5p77vkyb"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -85387,8 +85478,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.1.7"; - sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; + version = "0.1.1.8"; + sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h"; buildDepends = [ base bytestring containers ]; buildTools = [ mysql ]; extraLibraries = [ openssl zlib ]; @@ -90298,6 +90389,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parseerror-eq" = callPackage + ({ mkDerivation, base, hspec, parsec }: + mkDerivation { + pname = "parseerror-eq"; + version = "0.1.0.0"; + sha256 = "1vyghahkmsvd6nj5armf2i3plnzp7mkcnx4a999c3yzxpic71vic"; + buildDepends = [ base parsec ]; + testDepends = [ base hspec parsec ]; + homepage = "https://github.com/stackbuilders/parseerror-eq"; + description = "Adds and Eq instance for Parsec's ParseError if needed"; + license = stdenv.lib.licenses.mit; + }) {}; + "parsek" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -91838,10 +91942,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "7.77"; - revision = "1"; - sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; - editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; + version = "8.0"; + sha256 = "1pll0zr16f1h53vcsbbd69x8kkim165mvlgmlgdpf4p9gll01pra"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -94574,11 +94676,10 @@ self: { ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { pname = "presburger"; - version = "1.3"; - sha256 = "0chwx0906gsmbnjkf14d864qzfvxb5gzaih7nq7ckfc6icbc4x25"; + version = "1.3.1"; + sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; buildDepends = [ base containers pretty ]; testDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -95100,8 +95201,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.6.9.0"; - sha256 = "12kqsdw0011x1alcsl7y1bycnf3awxlzb9bzyfjw0gz2b1ak9k0c"; + version = "0.7.0.0"; + sha256 = "0ja4ba5w8rq3snmgaky8kxaq9s5h446kw7cbp7agrzc06w03xaci"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -96876,8 +96977,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-unicode"; - version = "1.0.0.0"; - sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + version = "1.0.0.1"; + sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4"; buildDepends = [ base QuickCheck ]; homepage = "https://github.com/bos/quickcheck-unicode"; description = "Generator and shrink functions for testing Unicode-related software"; @@ -98545,16 +98646,14 @@ self: { "reflex" = callPackage ({ mkDerivation, base, containers, dependent-map, dependent-sum - , lens, mtl, primitive, semigroups, template-haskell, these + , mtl, primitive, semigroups, template-haskell, these }: mkDerivation { pname = "reflex"; - version = "0.0.1"; - revision = "1"; - sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; - editedCabalFile = "35c3eacbc9dde1bb99c93c3a7a27bbc5e2feee1817ba0ecb126cb49327f7b81e"; + version = "0.1.0"; + sha256 = "1l64kz1haicq4qfw5nrn93jrv37c93zz6z0xkhjnm5rxff7qrdns"; buildDepends = [ - base containers dependent-map dependent-sum lens mtl primitive + base containers dependent-map dependent-sum mtl primitive semigroups template-haskell these ]; jailbreak = true; @@ -106630,6 +106729,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smartconstructor" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "smartconstructor"; + version = "0.1.0.0"; + sha256 = "1iq9803ijx9497lc49mmvq8anm8r6ww0gysc693gq0ixf8ga2f8y"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/smartconstructor"; + description = "A package exposing a helper function for generating smart constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smartword" = callPackage ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }: mkDerivation { @@ -108010,6 +108121,7 @@ self: { buildDepends = [ base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; + jailbreak = true; homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; @@ -108046,13 +108158,12 @@ self: { }: mkDerivation { pname = "soap-openssl"; - version = "0.1.0.1"; - sha256 = "0b0d15nvg9qhf0ccsmw53qpcnxsw2cqslkmfzr1hw90whzaw3l5h"; + version = "0.1.0.2"; + sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; buildDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; @@ -109917,8 +110028,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.13.2.1"; - sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva"; + version = "0.13.2.3"; + sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n"; buildDepends = [ aeson base binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms vector-binary-instances @@ -110359,7 +110470,9 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0"; + revision = "1"; sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s"; + editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b"; buildDepends = [ base stm stm-chans ]; description = "Extra queue utilities for STM"; license = stdenv.lib.licenses.asl20; @@ -123990,10 +124103,8 @@ self: { }: mkDerivation { pname = "web-routing"; - version = "0.6.0"; - revision = "1"; - sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w"; - editedCabalFile = "b7b5e934b972d8aff3e4ada5cc54e348fc9984f89d4d70c8bae6488488d7db22"; + version = "0.6.1"; + sha256 = "0lz81mdc0a2i1jpra1c7v1pva9nff2b35cm5snllnpkb7r898vgr"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; From 753284c2d0ce266bdfb3652b5600e961160651cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 19:55:56 +0100 Subject: [PATCH 528/947] hackage-packages.nix: add compiler-specific LLVM support This change will resolve 'llvm' and related symbols from the compiler-specific 'llvmPackages' set rather than the global 'pkgs'. This allows us to use different versions of llvm depending on the copmiler we're building with. --- pkgs/development/haskell-modules/hackage-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 31939bf3f41..b84aa2f2a17 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5272,7 +5272,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par @@ -51184,7 +51184,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, accelerate-cuda, base, gloss @@ -78467,7 +78467,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "llvm-base-types" = callPackage ({ mkDerivation, base, c2hs, containers, deepseq, dwarf, failure @@ -99649,7 +99649,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-array" = callPackage ({ mkDerivation, base, bytestring, double-conversion, mtl @@ -99727,7 +99727,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-fftw" = callPackage ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty From a8d249cbbb6a72e8c26cb90e6acb698882fc625a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 20:27:41 +0100 Subject: [PATCH 529/947] haskell-bytestring-arbitrary: use compiler-specific LLVM version --- 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 abd1b9e2c9a..18a156ebb28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -431,7 +431,7 @@ self: super: { snappy = dontCheck super.snappy; # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34; + bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm; # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; From 1841a05b9d035cba7f0985fe625e0927dde78047 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 11:02:45 +0100 Subject: [PATCH 530/947] haskell-stm-queue-extras: real fix for the broken Cabal file --- 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 18a156ebb28..25839d0fed1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -644,6 +644,9 @@ self: super: { Nomyx-Web = dontDistribute super.Nomyx-Web; Nomyx = dontDistribute super.Nomyx; + # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 + stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); + } // { # Not on Hackage. From 62d4564de4477609b98a4a7170f52f55e23e1f20 Mon Sep 17 00:00:00 2001 From: goodwillcoding Date: Sun, 22 Mar 2015 20:00:04 -0700 Subject: [PATCH 531/947] fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m, references: - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021) Signed-off-by: Domen Kožar --- ...cmake_find_openssl_for_openssl-1.0.1m_and_up.patch | 11 +++++++++++ .../tools/build-managers/cmake/default.nix | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch diff --git a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch new file mode 100644 index 00000000000..25bbd2a91ba --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch @@ -0,0 +1,11 @@ +--- ./Modules/FindOpenSSL.cmake ++++ ./Modules/FindOpenSSL.cmake +@@ -264,7 +264,7 @@ + set(OPENSSL_VERSION "${_OPENSSL_VERSION}") + elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") ++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + + # The version number is encoded as 0xMNNFFPPS: major minor fix patch status + # The status gives if this is a developer or prerelease and is ignored here. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 60a941a6637..64ed4d59d3d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -32,14 +32,18 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); + }) ++ + # fix cmake detection of openssl libs + # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386 + # and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1 + [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch]; buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses @@ -48,7 +52,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - + configureFlags = "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + stdenv.lib.optionalString useQt4 " --qt-gui"; From 3dc7849ab9496feb79b9b5638b73d962ca68a620 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 25 Mar 2015 07:45:53 -0500 Subject: [PATCH 532/947] robomongo: fix build with openssl-1.0.1m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 35c0e0a768692ffe241e874cdac6b771e5e7dcbf) Signed-off-by: Domen Kožar --- pkgs/applications/misc/robomongo/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 8b0ba581612..e0bb591ac28 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation { }; patches = [ ./robomongo.patch ]; - + + postPatch = '' + rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file + ''; + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ]; From 636b25af67e573a625ae5cc5f0d203d99cbfb2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 26 Mar 2015 11:55:39 +0100 Subject: [PATCH 533/947] fira: 4.002 -> 4.004 --- pkgs/data/fonts/fira/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 7696632ef92..532abd4e587 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.002"; + name = "fira-4.004"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; - sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; + url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip"; + sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; + sourceRoot = "FiraFonts4004"; installPhase = '' mkdir -p $out/share/fonts/opentype From c96bc1e5079fd5e178cc293533a2bf2f5b32e8e3 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Thu, 26 Mar 2015 12:20:07 +0100 Subject: [PATCH 534/947] r-modules: fixing rggobi by adding initial expression for ggobi --- pkgs/development/r-modules/default.nix | 7 ++----- pkgs/tools/graphics/ggobi/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/graphics/ggobi/default.nix diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f662c26fe42..5769181fa00 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -267,6 +267,7 @@ let rgeos = [ pkgs.geos ]; rgl = [ pkgs.mesa pkgs.x11 ]; Rglpk = [ pkgs.glpk ]; + rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; ridge = [ pkgs.gsl ]; @@ -339,6 +340,7 @@ let WideLM = [ pkgs.cudatoolkit ]; RCurl = [ pkgs.curl ]; R2SWF = [ pkgs.pkgconfig ]; + rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; @@ -664,7 +666,6 @@ let "BcDiag" # requires fabia "bdvis" # requres taxize "beadarrayFilter" # requires beadarray - "beadarrayMSV" # requires rggobi "bigGP" # requires MPI running. HELP WANTED! "bigpca" # requires NCmisc "Biograph" # requires mvna @@ -680,7 +681,6 @@ let "ChemoSpec" # depends on broken speaq "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp - "clusterfly" # requires rggobi "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX @@ -821,7 +821,6 @@ let "permGPU" # requires Biobase "PhViD" # requires LBE "pi0" # requires qvalue - "PKgraph" # requires rggobi "plmDE" # requires limma "plsRcox" # requires survcomp "PMA" # requires impute @@ -855,7 +854,6 @@ let "REBayes" # requires Rmosek "RefFreeEWAS" # requires isva "retistruct" # depends on broken RImageJROI - "rggobi" # requires GGobi "RImageJROI" # requires spatstat "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks @@ -886,7 +884,6 @@ let "selectspm" # depends on broken ecespa "semiArtificial" # requires RSNNS "SeqFeatR" # requires Biostrings, qvalue, and widgetTools - "SeqGrapheR" # requires rggobi "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix new file mode 100644 index 00000000000..cf2c5598d2a --- /dev/null +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: + +stdenv.mkDerivation rec { + version = "2.1.11"; + name = "ggobi-${version}"; + + src = fetchurl { + url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; + sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; + }; + + buildInputs = [ pkgconfig libxml2 gtk2 ]; + + configureFlags = "--with-all-plugins"; + + meta = with stdenv.lib; { + description = "Visualization program for exploring high-dimensional data"; + homepage = http://www.ggobi.org/; + license = licenses.cpl10; + platforms = platforms.linux; + maintainers = [ maintainers.michelk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d2039624e0..1abb768f402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1407,6 +1407,8 @@ let gftp = callPackage ../tools/networking/gftp { }; + ggobi = callPackage ../tools/graphics/ggobi { }; + gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { From 5990cce95f562ed185f55cb9bc3f230265d2ab9d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 15:48:54 +0000 Subject: [PATCH 535/947] lib: cleanup a little bit, add traceIf --- lib/customisation.nix | 17 +++++++++-------- lib/debug.nix | 10 ++++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 960eebfc79b..91a25055df2 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -29,8 +29,8 @@ rec { For another application, see build-support/vm, where this function is used to build arbitrary derivations inside a QEMU - virtual machine. */ - + virtual machine. + */ overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); @@ -56,18 +56,17 @@ rec { makeOverridable = f: origArgs: let ff = f origArgs; + overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // - { override = newArgs: - makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); + { override = newArgs: makeOverridable f (overrideWith newArgs); deepOverride = newArgs: makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs); overrideDerivation = fdrv: makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; }) else if builtins.isFunction ff then - { override = newArgs: - makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); + { override = newArgs: makeOverridable f (overrideWith newArgs); __functor = self: ff; deepOverride = throw "deepOverride not yet supported for functors"; overrideDerivation = throw "overrideDerivation not yet supported for functors"; @@ -102,8 +101,10 @@ rec { }; */ callPackageWith = autoArgs: fn: args: - let f = if builtins.isFunction fn then fn else import fn; in - makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args); + let + f = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + in makeOverridable f (auto // args); /* Add attributes to each output of a derivation without changing the derivation itself */ diff --git a/lib/debug.nix b/lib/debug.nix index 8852c22981c..2d10d981114 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -13,10 +13,11 @@ rec { addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v); + traceIf = p: msg: x: if p then trace msg x else x; - traceVal = x: builtins.trace x x; - traceXMLVal = x: builtins.trace (builtins.toXML x) x; - traceXMLValMarked = str: x: builtins.trace (str + builtins.toXML x) x; + traceVal = x: trace x x; + traceXMLVal = x: trace (builtins.toXML x) x; + traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x : trace (showVal x) x; @@ -42,6 +43,7 @@ rec { traceCall2 = n : f : a : b : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); traceCall3 = n : f : a : b : c : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + # FIXME: rename this? traceValIfNot = c: x: if c x then true else trace (showVal x) false; @@ -106,6 +108,6 @@ rec { ) else let r = strict expr; - in builtins.trace "${str}\n result:\n${builtins.toXML r}" r + in trace "${str}\n result:\n${builtins.toXML r}" r ); } From 89bfacdf90fff0dde857c5b0e29b73042ec1d4c7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 21:34:54 +0000 Subject: [PATCH 536/947] kernel: add a warning/note at the top of common-config so that people would hopefully stop breaking the older kernels --- .../os-specific/linux/kernel/common-config.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e6d45af7c59..002c2997cd6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1,3 +1,21 @@ +/* + + WARNING/NOTE: whenever you want to add an option here you need to + either + + * mark it as an optional one with `?` suffix, + * or make sure it works for all the versions in nixpkgs, + * or check for which kernel versions it will work (using kernel + changelog, google or whatever) and mark it with `versionOlder` or + `versionAtLeast`. + + Then do test your change by building all the kernels (or at least + their configs) in nixpkgs or else you will guarantee lots and lots + of pain to users trying to switch to an older kernel because of some + hardware problems with a new one. + +*/ + { stdenv, version, kernelPlatform, extraConfig, features }: with stdenv.lib; From dc4fa2da8acd6acc2b83fd4526711b8c35a79058 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 10:51:49 +0000 Subject: [PATCH 537/947] nixos: udev: build rules locally --- nixos/modules/services/hardware/udev.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 39180f4d37e..a775aed0fda 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -28,6 +28,7 @@ let # Perform substitutions in all udev rules files. udevRules = stdenv.mkDerivation { name = "udev-rules"; + preferLocalBuild = true; buildCommand = '' mkdir -p $out shopt -s nullglob From 5c6d86540b748096b89051182840e6e3b83b47c8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 16:03:09 +0000 Subject: [PATCH 538/947] nixos: use types.enum instead of ad-hoc check in sshd service --- nixos/modules/services/networking/ssh/sshd.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b11f996c63c..b2740bd33b7 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -9,12 +9,6 @@ let nssModulesPath = config.system.nssModules.path; - permitRootLoginCheck = v: - v == "yes" || - v == "without-password" || - v == "forced-commands-only" || - v == "no"; - knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHostsText = flip (concatMapStringsSep "\n") knownHosts @@ -116,12 +110,9 @@ in permitRootLogin = mkOption { default = "without-password"; - type = types.addCheck types.str permitRootLoginCheck; + type = types.enum ["yes" "without-password" "forced-commands-only" "no"]; description = '' - Whether the root user can login using ssh. Valid values are - yes, without-password, - forced-commands-only or - no. + Whether the root user can login using ssh. ''; }; From 18127cc1e23fd1414dead49764c99225f494aa23 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:08:44 +0000 Subject: [PATCH 539/947] conky: cleanup --- pkgs/top-level/all-packages.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb83bcc8996..e93d393249d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8675,16 +8675,7 @@ let cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; - conky = callPackage ../os-specific/linux/conky { - mpdSupport = config.conky.mpdSupport or true; - x11Support = config.conky.x11Support or false; - xdamage = config.conky.xdamage or false; - wireless = config.conky.wireless or false; - luaSupport = config.conky.luaSupport or false; - rss = config.conky.rss or false; - weatherMetar = config.conky.weatherMetar or false; - weatherXoap = config.conky.weatherXoap or false; - }; + conky = callPackage ../os-specific/linux/conky (config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; From de222a9cee95f65833bf338d0cad9781c1af9194 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 16:13:16 +0000 Subject: [PATCH 540/947] fetchmail: use callPackage --- 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 e93d393249d..51c102e3088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10386,9 +10386,7 @@ let fbreader = callPackage ../applications/misc/fbreader { }; - fetchmail = import ../applications/misc/fetchmail { - inherit stdenv fetchurl openssl; - }; + fetchmail = callPackage ../applications/misc/fetchmail { }; fldigi = callPackage ../applications/audio/fldigi { }; From 4cd43bd2aed32ec6127feb35b4d5c613ced24286 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:24:19 +0000 Subject: [PATCH 541/947] ocamlnat: use newScope directly --- 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 51c102e3088..803b44e9274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4253,7 +4253,7 @@ let }; opam = callPackage ../development/tools/ocaml/opam { }; - ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; + ocamlnat = newScope pkgs.ocamlPackages_3_12_1 ../development/ocaml-modules/ocamlnat { }; qcmm = callPackage ../development/compilers/qcmm { lua = lua4; From 6258728318fe55faef64285e614fe97edc7b9111 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:36:00 +0000 Subject: [PATCH 542/947] pythonPackages: notmuch: fix sourceRoot so that one can use overrides in top-level notmuch and still have this work --- 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 c01b3b59ee0..bdc3be08bc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6885,7 +6885,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; buildInputs = with self; [ python pkgs.notmuch ]; From 3e15f6a3700968904c4a30c5a90c46d766856bbf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:35:51 +0000 Subject: [PATCH 543/947] xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment --- pkgs/misc/screensavers/xscreensaver/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cb937a94000..1d039e0a440 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { libXxf86misc intltool ]; - patchPhase = + preConfigure = '' # Fix build error in version 5.18. Remove this patch when updating # to a later version. #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c - # Fix path to GTK. + + # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in + -i driver/Makefile.in po/Makefile.in.in ''; configureFlags = From 94df35da1fdfd9ded4c902e7be595df674fb1b72 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 22:54:31 +0000 Subject: [PATCH 544/947] emacs: ghc-mod: add the binary to user environment This is the correct way to do it, because users will expect to see the same ghc-mod both in emacs and in shell. --- pkgs/top-level/emacs-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a5a087e16ad..4b23992d12a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -454,6 +454,7 @@ let self = _self // overrides; pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; + propagatedUserEnvPkgs = [ external.ghc-mod ]; fileSpecs = [ "elisp/*.el" ]; meta = { license = bsd3; }; }; From 46aa9361d6ce1374708b9c403a5a51d7e9aa9370 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 18:53:10 +0000 Subject: [PATCH 545/947] tolua++ (toluapp): add version 1.0.92 --- pkgs/development/tools/toluapp/default.nix | 33 +++++++++++++++++ .../environ-and-linux-is-kinda-posix.patch | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/development/tools/toluapp/default.nix create mode 100644 pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix new file mode 100644 index 00000000000..5edc57e2f81 --- /dev/null +++ b/pkgs/development/tools/toluapp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, scons, lua }: + +stdenv.mkDerivation rec { + version = "1.0.92"; + name = "toluapp-${version}"; + + src = fetchFromGitHub { + owner = "eddieringle"; + repo = "toluapp"; + rev = "b1e680dc486c17128a3c21f89db1693ff06c02b1"; + sha256 = "1d1a9bll9825dg4mz71vwykvfd3s5zi2yvzbfsvlr3qz1l3zqfwb"; + }; + + buildInputs = [ lua scons ]; + + patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + + preConfigure = '' + substituteInPlace config_posix.py \ + --replace /usr/local $out + ''; + + NIX_CFLAGS_COMPILE = "-fPIC"; + + buildPhase = ''scons''; + + installPhase = ''scons install''; + + meta = { + licence = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch new file mode 100644 index 00000000000..6743b25cb8a --- /dev/null +++ b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch @@ -0,0 +1,36 @@ +As it turns out, scons doesn't inherit environment variables by +default. Debugging this was very pleasant. -- oxij + +diff --git a/SConstruct b/SConstruct +index 5c1e774..66aa4c8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -5,13 +5,11 @@ tools = ['default'] + if os.name == 'nt': + tools = ['mingw'] + +-env = Environment(tools = tools) ++env = Environment(tools = tools, ENV = os.environ) + + options_file = None +-if sys.platform == 'linux2': +- options_file = "linux" + +-elif 'msvc' in env['TOOLS']: ++if 'msvc' in env['TOOLS']: + options_file = "msvc" + else: + options_file = "posix" +diff --git a/config_posix.py b/config_posix.py +index 2bb696c..eb4eb9b 100644 +--- a/config_posix.py ++++ b/config_posix.py +@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall'] + prefix = '/usr/local' + + # libraries +-LIBS = ['lua', 'lualib', 'm'] ++LIBS = ['lua', 'liblua', 'm'] + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb83bcc8996..e5899d392c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4482,6 +4482,10 @@ let luarocks = luaPackages.luarocks; + toluapp = callPackage ../development/tools/toluapp { + lua = lua5_1; # doesn't work with any other :( + }; + ### END OF LUA lush2 = callPackage ../development/interpreters/lush {}; From 0bee7429c2cb8bc022e1e08c3cd433329900517e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 8 Mar 2015 20:10:21 +0000 Subject: [PATCH 546/947] physlock: add version git-20150126 --- pkgs/misc/screensavers/physlock/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/misc/screensavers/physlock/default.nix diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix new file mode 100644 index 00000000000..683b7012058 --- /dev/null +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "git-20150126"; + name = "physlock-${version}"; + src = fetchFromGitHub { + owner = "muennich"; + repo = "physlock"; + rev = "b64dccc8c22710f8bf01eb5419590cdb0e65cabb"; + sha256 = "1dapkwj3y6bb4j8q4glms7zsqm7drr37nrnr30sbahwq67rnvzcc"; + }; + + preConfigure = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace "-m 4755 -o root -g root" "" + ''; + + meta = with stdenv.lib; { + description = "A secure suspend/hibernate-friendly alternative to `vlock -an` without PAM support"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb83bcc8996..ebf75a6b895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13703,6 +13703,8 @@ let phabricator = callPackage ../misc/phabricator { }; + physlock = callPackage ../misc/screensavers/physlock { }; + pjsip = callPackage ../applications/networking/pjsip { }; polytable = callPackage ../tools/typesetting/tex/polytable { }; From 47328e663c275151fdcef82e910fd3725c920df7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:46:47 +0000 Subject: [PATCH 547/947] rss-glx: update 0.8.1 -> 0.9.1, add meta, rename attribute in all-packages --- pkgs/misc/screensavers/rss-glx/default.nix | 25 ++++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index a41fe5afb9e..48d88ed40ce 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,14 +1,25 @@ -{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "rss-glx-${version}"; -stdenv.mkDerivation { - name = "rss-glx-0.8.1"; - src = fetchurl { - url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; - sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; + url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2"; + sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; + buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; + NIX_LDFLAGS= "-rpath ${libXext}/lib"; + + meta = { + description = "Really Slick Screensavers Port to GLX"; + longDescription = '' + This package currently contains all of the screensavers from the + original collection, plus a few others. + ''; + licence = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb83bcc8996..cd5b03770c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13723,7 +13723,7 @@ let retroarch = retroarchBare; }); - rssglx = callPackage ../misc/screensavers/rss-glx { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; runit = callPackage ../tools/system/runit { }; @@ -14014,6 +14014,8 @@ let nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 cool-old-term = cool-retro-term; # added 2015-01-31 + rssglx = rss-glx; #added 2015-03-25 + opentsdb = callPackage ../tools/misc/opentsdb {}; From 3de81cb3c7596099ee0afb8648716cedc74b5a16 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Tue, 24 Mar 2015 14:22:20 +0000 Subject: [PATCH 548/947] Add pathlib 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 a79d9d296cc..a3624b00d31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7361,6 +7361,23 @@ let }; }; + pathlib = buildPythonPackage rec { + name = "pathlib-${version}"; + version = "1.0.1"; + disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4 + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pathlib/${name}.tar.gz"; + sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; + }; + + meta = { + description = "Object-oriented filesystem paths"; + homepage = "https://pathlib.readthedocs.org/"; + license = stdenv.lib.licenses.mit; + }; + }; + pathpy = buildPythonPackage rec { name = "path.py-5.2"; From fdec6de0bb72a21f6191b1a3a938a0087e5f1432 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Tue, 24 Mar 2015 14:29:21 +0000 Subject: [PATCH 549/947] Add pyScss python package --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3624b00d31..0f31233a194 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9061,6 +9061,25 @@ let }; }); + pyscss = buildPythonPackage rec { + name = "pyScss-${version}"; + version = "1.3.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyScss/${name}.tar.gz"; + sha256 = "03lcp853kgr66aqrw2jd1q9jhs9h049w7zlwp7bfmly7xh832cnh"; + }; + + propagatedBuildInputs = with self; [ six ] + ++ (optionals (pythonOlder "3.4") [ enum34 pathlib ]) + ++ (optionals (pythonOlder "2.7") [ ordereddict ]); + + meta = { + description = "A Scss compiler for Python"; + homepage = http://pyscss.readthedocs.org/en/latest/; + license = stdenv.lib.licenses.mit; + }; + }; pyserial = buildPythonPackage rec { name = "pyserial-2.7"; From 1cef6dc89acdd7e00b2281f0d81e1c3bc136e7c2 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:55:59 -0500 Subject: [PATCH 550/947] SDL: Build on Darwin --- pkgs/development/libraries/SDL/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3f1fbfcd6a9..6d6148e092a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -7,7 +7,7 @@ # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport; +assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { "--without-x" ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + # Fix a build failure on OS X Mavericks + # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 + patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl { + url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320"; + sha1 = "3137feb503a89a8d606405373905b92dcf7e293b"; + }) ]; + crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { patches = let f = rev: sha256: fetchurl { @@ -72,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1d42c1614..f66870a8102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7357,7 +7357,7 @@ let openglSupport = mesaSupported; alsaSupport = (!stdenv.isDarwin); x11Support = true; - pulseaudioSupport = true; + pulseaudioSupport = (!stdenv.isDarwin); # resolve the unrecognized -fpascal-strings option error stdenv = if stdenv.isDarwin From b5099669ace72ef8a9f3f3dd9808c34a7493dab9 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:56:41 -0500 Subject: [PATCH 551/947] SDL_image: Enable building on Darwin --- pkgs/development/libraries/SDL_image/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 2aa122a8fb2..a1d83950477 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 230182f61b001ff04f418c2e8ef9561235f6e002 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 16:17:31 +0100 Subject: [PATCH 552/947] pythonPackages.subunit: revert "rewrite to use buildPythonPackage" This reverts commit e42547d8e9f6cf04a6969c7b486b72da3e17cb90. The change broke samba and dependent packages. --- pkgs/top-level/python-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a79d9d296cc..8281c25e4ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10866,17 +10866,21 @@ let }); - subunit = buildPythonPackage rec { + subunit = stdenv.mkDerivation rec { name = "subunit-${version}"; - version = "1.1.0"; + version = "1.0.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-${version}.tar.gz"; - sha256 = "125zh5i1f21ficn8ix5q33jk87j2pfmzbw6jq5l8v0hhjrp619yr"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; }; + buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ]; + propagatedBuildInputs = with self; [ testtools testscenarios ]; + postFixup = "wrapPythonPrograms"; + meta = { description = "A streaming protocol for test results"; homepage = https://launchpad.net/subunit; From 6ca841a4e9fea22522f1560f8ef7c9e64d8d6c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= Date: Thu, 26 Mar 2015 16:27:24 +0100 Subject: [PATCH 553/947] [ntopng] geolite hash update --- pkgs/tools/networking/ntopng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 23b45358594..be853dad841 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -10,22 +10,22 @@ stdenv.mkDerivation rec { geoLiteCity = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; - sha256 = "1sqskc8nh9k46nif4i6abjil9nfl4x6na4gadzbxp0929lbzyh0f"; + sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; }; geoLiteCityV6 = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; - sha256 = "1427zljjhbixjcihinj7l79v1daii7ikcmxgkmwdp4rbr25qxlhz"; + sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; }; geoIPASNum = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; - sha256 = "1rh2920sdciqn3pifl4rz0jl3m32ww4gjx495p5xd6ldpy95gn31"; + sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; }; geoIPASNumV6 = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; - sha256 = "1064arl40c80kwhbdylhwk6gn2xs36dr0aq3634i1rdpd4jm1a41"; + sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; }; src = fetchurl { From c37f53ed56d4d7eb24ff2159c1bb5afcdbebb087 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 26 Mar 2015 11:41:17 -0400 Subject: [PATCH 554/947] libsvm: New package --- pkgs/development/libraries/libsvm/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libsvm/default.nix diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix new file mode 100644 index 00000000000..9b6e87bd57e --- /dev/null +++ b/pkgs/development/libraries/libsvm/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "libsvm-${version}"; + version = "3.20"; + + src = fetchurl { + url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; + }; + + buildPhase = '' + make + make lib + ''; + + installPhase = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in '' + mkdir -p $out/lib $out/bin $out/include; + cp libsvm.so.2 $out/lib/libsvm.2.${libSuff}; + ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff}; + cp svm-scale svm-train svm-predict $out/bin; + cp svm.h $out/include; + ''; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib; + ''; + + meta = with stdenv.lib; { + description = "A library for support vector machines"; + homepage = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1d42c1614..0b095ded241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6694,6 +6694,8 @@ let libstatgrab = callPackage ../development/libraries/libstatgrab { }; + libsvm = callPackage ../development/libraries/libsvm { }; + libtar = callPackage ../development/libraries/libtar { }; libtasn1 = callPackage ../development/libraries/libtasn1 { }; From 5d59e78828dfcdcfd4a855ad2fabe86fa6aafcd3 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Thu, 26 Mar 2015 13:23:39 -0400 Subject: [PATCH 555/947] pinentry: fix on darwin libcap and qt4 aren't supported on Darwin, but gtk2 is. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d2039624e0..db8291db033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2363,8 +2363,8 @@ let philter = callPackage ../tools/networking/philter { }; pinentry = callPackage ../tools/security/pinentry { - gtk2 = if stdenv.isDarwin then null else gtk2; - qt4 = if stdenv.isDarwin then qt4 else null; + libcap = if stdenv.isDarwin then null else libcap; + qt4 = null; }; pius = callPackage ../tools/security/pius { }; From 24ddfc7c38d0cb6f6348874be04bdb34a72ed7cd Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 26 Mar 2015 19:02:11 +0100 Subject: [PATCH 556/947] passthru.home in openjdk8, similar to other jdks --- pkgs/development/compilers/openjdk/openjdk8.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 55b7ff36f8f..d7bcabd0a78 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -37,8 +37,7 @@ let url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; }; -in -stdenv.mkDerivation { + openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn]; outputs = [ "out" "jre" ]; @@ -138,5 +137,6 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.cocreature ]; platforms = stdenv.lib.platforms.linux; }; - -} + + passthru.home = "${openjdk8}/lib/openjdk"; +}; in openjdk8 From df0c059f83b9bf079398c0257c032870b9328eca Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 26 Mar 2015 19:02:51 +0100 Subject: [PATCH 557/947] Update Jetbrains IDE versions --- pkgs/applications/editors/idea/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 61d508936b8..9c4683b8c9e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -205,14 +205,14 @@ in }; clion = buildClion rec { - name = "clion-${version}"; + name = "clion-${build}"; version = "eap"; - build = "140.1740.3"; + build = "141.102.4"; description = "C/C++ IDE. New. Intelligent. Cross-platform."; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; - sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y"; + url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; + sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym"; }; }; @@ -242,13 +242,13 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0"; - build = "135.1104"; + version = "7.0.4"; + build = "139.1231"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4"; + sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; }; }; From a1044bd26e63502f7a8797f075349bb277c3b1c1 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 26 Mar 2015 14:25:17 -0400 Subject: [PATCH 558/947] xonsh: new package --- pkgs/shells/xonsh/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/shells/xonsh/default.nix diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix new file mode 100644 index 00000000000..3849c96ec13 --- /dev/null +++ b/pkgs/shells/xonsh/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, python3Packages}: + +python3Packages.buildPythonPackage rec { + name = "xonsh-${version}"; + version = "0.1.3"; + + # The logo xonsh prints during build contains unicode characters, and this + # fails because locales have not been set up in the build environment. + # We can fix this on Linux by setting: + # export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + # but this would not be a cross platform solution, so it's simpler to just + # patch the setup.py script to not print the logo during build. + prePatch = '' + substituteInPlace setup.py --replace "print(logo)" "" + ''; + + propagatedBuildInputs = [ python3Packages.ply ]; + + src = fetchurl { + url = "https://github.com/scopatz/xonsh/archive/${version}.zip"; + sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306"; + }; + + meta = with stdenv.lib; { + description = "A Python-ish, BASHwards-compatible shell"; + homepage = "http://xonsh.org"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1d42c1614..80c970cf9f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3239,6 +3239,8 @@ let rush = callPackage ../shells/rush { }; + xonsh = callPackage ../shells/xonsh { }; + zsh = callPackage ../shells/zsh { }; From 8ca8b0868c419418cdddc612ef84f93f244bce90 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 11:31:50 -0700 Subject: [PATCH 559/947] cryptsetup: 1.6.3 -> 1.6.7 --- pkgs/os-specific/linux/cryptsetup/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index d3a0b827ed1..50ea3f6a067 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.6.3"; + name = "cryptsetup-1.6.7"; src = fetchurl { - url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; + url = "mirror://kernel/linux/utils/cryptsetup/v1.6/${name}.tar.xz"; + sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1edc3c938b..f90d5bb7dc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8703,7 +8703,9 @@ let criu = callPackage ../os-specific/linux/criu { }; - cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { + libgcrypt = libgcrypt_1_6; + }; cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; From 9ce3b3b746841e8206fc031eba415df474fd9946 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 11:36:47 -0700 Subject: [PATCH 560/947] dhcpcd: 6.6.1 -> 6.8.0 --- pkgs/tools/networking/dhcpcd/default.nix | 11 ++++++----- .../dhcpcd/lxc_ro_promote_secondaries.patch | 12 ------------ 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 8c5896561fc..8154816ab86 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.6.7"; + name = "dhcpcd-6.8.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3"; + sha256 = "0h52rkzw87fyq5vj8zscbgf0ig9c881xz7i0rn3hvk28li7la0cb"; }; - patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; - buildInputs = [ pkgconfig udev ]; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch deleted file mode 100644 index 066ea67db9e..00000000000 --- a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c ---- dhcpcd-6.1.0-old/if-linux.c 2013-09-20 12:27:24.000000000 +0200 -+++ dhcpcd-6.1.0/if-linux.c 2013-12-13 09:50:24.183694744 +0100 -@@ -86,7 +86,7 @@ if_init(struct interface *iface) - - fp = fopen(path, "w"); - if (fp == NULL) -- return errno == ENOENT ? 0 : -1; -+ return (errno == ENOENT || errno == EROFS) ? 0 : -1; - n = fprintf(fp, "1"); - fclose(fp); - return n == -1 ? -1 : 0; From ab131767d122e20d0e43bad5155b3d7e12ff0c83 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 11:37:02 -0700 Subject: [PATCH 561/947] lvm2: 2.02.114 -> 2.02.118 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1d4ecdec98d..228f7b34be0 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.114"; + version = "2.02.118"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "19bl536yylyi873p46prfwv086bg0sg0q5l4c7x6lnlwzfnb176y"; + sha256 = "1ishsibxn1l5fymrrc5fd3z05x1z2zh0y8939wpvwz0qp9rwxazn"; }; configureFlags = From d201dfc94cc5889580b4af5ad1c8b5baf82abe60 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Mar 2015 18:19:57 +0100 Subject: [PATCH 562/947] eid-mw 4.0.6-1620 -> 4.1.2 --- pkgs/tools/security/eid-mw/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 4bd0587135c..88f6e359d2b 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, gtk2, nssTools, pcsclite, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite +, pkgconfig }: +let version = "4.1.2"; in stdenv.mkDerivation rec { - name = "${package}-${build}"; - package = "eid-mw-4.0.6-1620"; - build = "tcm406-258906"; + name = "eid-mw-${version}"; - src = fetchurl { - url = "http://eid.belgium.be/en/binaries/${package}.tar_${build}.gz"; - sha256 = "1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2"; + src = fetchFromGitHub { + sha256 = "034ar1v2qamdyq71nklh1nvqbmw6ryz63jdwnnc873f639mf5w94"; + rev = "v${version}"; + repo = "eid-mw"; + owner = "Fedict"; }; - buildInputs = [ gtk2 pcsclite pkgconfig ]; + buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ]; - unpackPhase = "tar -xzf ${src} --strip-components=1"; + doCheck = true; postInstall = '' install -D ${./eid-nssdb.in} $out/bin/eid-nssdb @@ -20,8 +22,6 @@ stdenv.mkDerivation rec { --replace "modutil" "${nssTools}/bin/modutil" ''; - doCheck = true; - meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; From 4febebe9cf4d3614a1241cdd9c7bac03605998a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 11:59:36 -0700 Subject: [PATCH 563/947] hwdata: 249 -> 276 --- pkgs/os-specific/linux/hwdata/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 325a44f97aa..1987e914ad9 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { - name = "hwdata-0.249"; + name = "hwdata-0.276"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.249-1.tar.bz2"; - sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; + url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.276.tar.xz"; + sha256 = "0pg0ms6kb2mm25mdklsb0xn2spcwi2mhygzc7bkpji72qq8srzsh"; }; preConfigure = "patchShebangs ./configure"; From 08995697de8838e526cd0b5a54f0e8225b25977c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:00:00 -0700 Subject: [PATCH 564/947] usbutils: 007 -> 008 --- pkgs/os-specific/linux/usbutils/default.nix | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index ca1f698fa31..710a01ed03d 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,32 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: - -let - - # Obtained from http://www.linux-usb.org/usb.ids.bz2. - usbids = fetchurl { - url = http://tarballs.nixos.org/usb.ids.20130821.bz2; - sha256 = "0x7mf4h5h5wjzhygfr4lc8yz0cwm7mahxrnp5nkxcmawmyxwsg53"; - }; - -in +{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }: stdenv.mkDerivation rec { - name = "usbutils-007"; + name = "usbutils-008"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm"; + sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; buildInputs = [ pkgconfig libusb1 ]; - preBuild = "bunzip2 < ${usbids} > usb.ids"; - postInstall = '' rm $out/sbin/update-usbids.sh substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids $out/share/usb.ids + --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids ''; meta = { From 75169aabc37071298a62a25f705029beda3a4e8b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 22 Mar 2015 23:12:11 +0100 Subject: [PATCH 565/947] Add ripple data api package and nixos service --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/misc/ripple-data-api.nix | 168 + pkgs/servers/rippled/data-api.nix | 25 + pkgs/servers/rippled/package.nix | 3909 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 4107 insertions(+) create mode 100644 nixos/modules/services/misc/ripple-data-api.nix create mode 100644 pkgs/servers/rippled/data-api.nix create mode 100644 pkgs/servers/rippled/package.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index eec2f1bb6f6..b03107610fe 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -211,6 +211,7 @@ unifi = 183; uptimed = 184; zope2 = 185; + ripple-data-api = 186; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -399,6 +400,7 @@ #unifi = 183; # unused #uptimed = 184; # unused #zope2 = 185; # unused + #ripple-data-api = 186; #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 71915a0d3eb..cca1c1a73d3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./services/misc/phd.nix ./services/misc/redmine.nix ./services/misc/rippled.nix + ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix ./services/misc/svnserve.nix diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix new file mode 100644 index 00000000000..6e5ac7ab00b --- /dev/null +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -0,0 +1,168 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rippleDataApi; + + deployment_env_config = builtins.toJSON { + production = { + port = toString cfg.port; + maxSockets = 150; + batchSize = 100; + startIndex = 32570; + rippleds = cfg.rippleds; + redis = { + enable = cfg.redis.enable; + host = cfg.redis.host; + port = cfg.redis.port; + options.auth_pass = null; + }; + }; + }; + + db_config = builtins.toJSON { + production = { + username = optional (cfg.couchdb.pass != "") cfg.couchdb.user; + password = optional (cfg.couchdb.pass != "") cfg.couchdb.pass; + host = cfg.couchdb.host; + port = cfg.couchdb.port; + database = cfg.couchdb.db; + protocol = "http"; + }; + }; + +in { + options = { + services.rippleDataApi = { + enable = mkEnableOption "Whether to enable ripple data api."; + + port = mkOption { + description = "Ripple data api port"; + default = 5993; + type = types.int; + }; + + redis = { + enable = mkOption { + description = "Whether to enable caching of ripple data to redis."; + default = true; + type = types.bool; + }; + + host = mkOption { + description = "Ripple data api redis host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple data api redis port."; + default = 5984; + type = types.int; + }; + }; + + couchdb = { + host = mkOption { + description = "Ripple data api couchdb host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple data api couchdb port."; + default = 5984; + type = types.int; + }; + + db = mkOption { + description = "Ripple data api couchdb database."; + default = "rippled"; + type = types.str; + }; + + user = mkOption { + description = "Ripple data api couchdb username."; + default = "rippled"; + type = types.str; + }; + + pass = mkOption { + description = "Ripple data api couchdb password."; + default = ""; + type = types.str; + }; + + create = mkOption { + description = "Whether to create couchdb database needed by ripple data api."; + type = types.bool; + default = true; + }; + }; + + rippleds = mkOption { + description = "List of rippleds to be used by ripple data api."; + default = [ + "http://s_east.ripple.com:51234" + "http://s_west.ripple.com:51234" + ]; + type = types.listOf types.str; + }; + }; + }; + + config = mkIf (cfg.enable) { + services.couchdb.enable = mkDefault true; + services.couchdb.bindAddress = mkDefault "0.0.0.0"; + services.redis.enable = mkDefault true; + + systemd.services.ripple-data-api = { + after = [ "couchdb.service" "redis.service" "ripple-data-api-importer.service" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + NODE_ENV = "production"; + DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; + DB_CONFIG = pkgs.writeText "db.config.json" db_config; + }; + + serviceConfig = { + ExecStart = "${pkgs.ripple-data-api}/bin/api"; + User = "ripple-data-api"; + }; + }; + + systemd.services.ripple-data-importer = { + after = [ "couchdb.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.curl ]; + + environment = { + NODE_ENV = "production"; + DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; + DB_CONFIG = pkgs.writeText "db.config.json" db_config; + LOG_FILE = "/dev/null"; + }; + + serviceConfig = { + ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2"; + User = "ripple-data-api"; + }; + + preStart = mkMerge [ + (mkIf (cfg.couchdb.create) '' + HOST="http://${optionalString (cfg.couchdb.pass != "") "${cfg.couchdb.user}:${cfg.couchdb.pass}@"}${cfg.couchdb.host}:${toString cfg.couchdb.port}" + curl -X PUT $HOST/${cfg.couchdb.db} || true + '') + "${pkgs.ripple-data-api}/bin/update-views" + ]; + }; + + users.extraUsers = singleton + { name = "ripple-data-api"; + description = "Ripple data api user"; + uid = config.ids.uids.ripple-data-api; + }; + }; +} diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix new file mode 100644 index 00000000000..230e0aee218 --- /dev/null +++ b/pkgs/servers/rippled/data-api.nix @@ -0,0 +1,25 @@ +{ lib, fetchgit, fetchurl, nodePackages }: + +with lib; + +let + np = nodePackages.override { generated = ./package.nix; self = np; }; +in nodePackages.buildNodePackage rec { + name = "ripple-data-api-${version}"; + version = lib.strings.substring 0 7 rev; + rev = "c56b860105f36c1c44ae011189d495272648c589"; + + src = fetchgit { + url = https://github.com/ripple/ripple-data-api.git; + inherit rev; + sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues np)); + + meta = { + description = "Historical ripple data"; + homepage = https://github.com/ripple/ripple-data-api; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix new file mode 100644 index 00000000000..fd318c979fe --- /dev/null +++ b/pkgs/servers/rippled/package.nix @@ -0,0 +1,3909 @@ +{ 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz"; + name = "accepts-1.2.5.tgz"; + sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9"; + }; + 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."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = self.buildNodePackage { + name = "asn1-0.1.11"; + version = "0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + 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 { + name = "assert-plus-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = self.buildNodePackage { + name = "async-0.9.0"; + version = "0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = self.buildNodePackage { + name = "aws-sign2-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz"; + name = "batch-0.5.2.tgz"; + sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bindings"."1.2.x" = + self.by-version."bindings"."1.2.1"; + by-version."bindings"."1.2.1" = self.buildNodePackage { + name = "bindings-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + name = "bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bl"."~0.9.0" = + self.by-version."bl"."0.9.4"; + by-version."bl"."0.9.4" = self.buildNodePackage { + name = "bl-0.9.4"; + version = "0.9.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; + name = "bl-0.9.4.tgz"; + sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7"; + }; + deps = { + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = self.buildNodePackage { + name = "boom-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; + name = "boom-2.6.1.tgz"; + sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753"; + }; + deps = { + "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bufferutil"."1.0.x" = + self.by-version."bufferutil"."1.0.1"; + by-version."bufferutil"."1.0.1" = self.buildNodePackage { + name = "bufferutil-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz"; + name = "bufferutil-1.0.1.tgz"; + sha1 = "0c53a9ffe8d616c4e2df27d00b808f7a25501e3b"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bytes"."1.0.0" = + self.by-version."bytes"."1.0.0"; + by-version."bytes"."1.0.0" = self.buildNodePackage { + name = "bytes-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + name = "bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + name = "caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."caseless"."~0.9.0" = + self.by-version."caseless"."0.9.0"; + by-version."caseless"."0.9.0" = self.buildNodePackage { + name = "caseless-0.9.0"; + version = "0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; + name = "caseless-0.9.0.tgz"; + sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; + name = "clone-0.1.19.tgz"; + sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = self.buildNodePackage { + name = "combined-stream-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + name = "commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."component-emitter"."1.1.2" = + self.by-version."component-emitter"."1.1.2"; + by-version."component-emitter"."1.1.2" = self.buildNodePackage { + name = "component-emitter-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + name = "component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."compressible"."~2.0.2" = + self.by-version."compressible"."2.0.2"; + by-version."compressible"."2.0.2" = self.buildNodePackage { + name = "compressible-2.0.2"; + version = "2.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz"; + name = "compressible-2.0.2.tgz"; + sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; + }; + deps = { + "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz"; + name = "compression-1.4.3.tgz"; + sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d"; + }; + deps = { + "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "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"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz"; + name = "connect-2.29.1.tgz"; + sha1 = "e0456742d25ed232b573ce156883dd4e6f208538"; + }; + 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 = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = self.buildNodePackage { + name = "content-disposition-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = self.buildNodePackage { + name = "content-type-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie"."0.1.2" = + self.by-version."cookie"."0.1.2"; + by-version."cookie"."0.1.2" = self.buildNodePackage { + name = "cookie-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + name = "cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "cookie-signature-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + name = "cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.1"; + by-version."core-util-is"."1.0.1" = self.buildNodePackage { + name = "core-util-is-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "couch-compile" = self.by-version."couch-compile"."1.2.0"; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = self.buildNodePackage { + name = "crc-3.2.1"; + version = "3.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "cryptiles-0.2.2"; + version = "0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cryptiles"."2.x.x" = + self.by-version."cryptiles"."2.0.4"; + by-version."cryptiles"."2.0.4" = self.buildNodePackage { + name = "cryptiles-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; + name = "cryptiles-2.0.4.tgz"; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = self.buildNodePackage { + name = "ctype-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cycle"."1.0.x" = + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = self.buildNodePackage { + name = "cycle-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + deps = { + }; + 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 { + name = "debug-0.7.4"; + version = "0.7.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "debug-2.1.3"; + version = "2.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + name = "debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + }; + deps = { + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "delayed-stream-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."destroy"."1.0.3" = + self.by-version."destroy"."1.0.3"; + by-version."destroy"."1.0.3" = self.buildNodePackage { + name = "destroy-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + name = "destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + deps = { + }; + 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 { + name = "ee-first-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = self.buildNodePackage { + name = "escape-html-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + 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 { + name = "etag-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + name = "etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + }; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz"; + name = "express-3.20.2.tgz"; + sha1 = "c604027746e60f3da0a4b43063375d21c3235858"; + }; + 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"; + "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"; + "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"; + "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"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7"; + "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"; + "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 = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extend"."~1.2.1" = + self.by-version."extend"."1.2.1"; + by-version."extend"."1.2.1" = self.buildNodePackage { + name = "extend-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + name = "extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + 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 { + name = "eyes-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + 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 { + name = "finalhandler-0.3.4"; + version = "0.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz"; + name = "finalhandler-0.3.4.tgz"; + sha1 = "4787d3573d079ae8b07536f26b0b911ebaf2a2ac"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = self.buildNodePackage { + name = "forever-agent-0.5.2"; + version = "0.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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 = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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.2.10" = self.by-version."async"."0.2.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = self.buildNodePackage { + name = "form-data-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + 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 = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~0.2.0" = + self.by-version."form-data"."0.2.0"; + by-version."form-data"."0.2.0" = self.buildNodePackage { + name = "form-data-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; + name = "form-data-0.2.0.tgz"; + sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formidable"."1.0.14" = + self.by-version."formidable"."1.0.14"; + by-version."formidable"."1.0.14" = self.buildNodePackage { + name = "formidable-1.0.14"; + version = "1.0.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + name = "formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = self.buildNodePackage { + name = "forwarded-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fresh"."0.2.4" = + self.by-version."fresh"."0.2.4"; + by-version."fresh"."0.2.4" = self.buildNodePackage { + name = "fresh-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + name = "fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."^3.2.11" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = self.buildNodePackage { + name = "glob-3.2.11"; + version = "3.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + 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 { + name = "hawk-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + name = "hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "hawk-2.3.1"; + version = "2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; + name = "hawk-2.3.1.tgz"; + 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"; + "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; + "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + name = "hoek-0.7.6.tgz"; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = self.buildNodePackage { + name = "hoek-0.9.1"; + version = "0.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-2.11.1.tgz"; + name = "hoek-2.11.1.tgz"; + sha1 = "3839a8b72f86aade3312100afaf80648af155b38"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "http-signature-0.10.1"; + version = "0.10.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.2"; + by-version."isstream"."0.1.2" = self.buildNodePackage { + name = "isstream-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + name = "isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { + name = "json-stringify-safe-5.0.0"; + version = "5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"; + name = "lodash-3.5.0.tgz"; + sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; + name = "lodash-1.3.1.tgz"; + sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."~2.5.0" = + self.by-version."lru-cache"."2.5.0"; + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = self.buildNodePackage { + name = "media-typer-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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 = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + name = "methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = self.buildNodePackage { + name = "methods-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + version = "1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.8.0" = + self.by-version."mime-db"."1.8.0"; + by-spec."mime-types"."~1.0.1" = + self.by-version."mime-types"."1.0.2"; + by-version."mime-types"."1.0.2" = self.buildNodePackage { + name = "mime-types-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + name = "mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + 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"; + }; + deps = { + "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.0.10" = + self.by-version."mime-types"."2.0.10"; + by-spec."mime-types"."~2.0.3" = + self.by-version."mime-types"."2.0.10"; + by-spec."minimatch"."0.3" = + self.by-version."minimatch"."0.3.0"; + by-version."minimatch"."0.3.0" = self.buildNodePackage { + name = "minimatch-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + name = "minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + deps = { + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."0.0.8" = + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = self.buildNodePackage { + name = "minimist-0.0.8"; + version = "0.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + deps = { + }; + 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 { + name = "mkdirp-0.5.0"; + version = "0.5.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + name = "moment-2.1.0.tgz"; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 = [ ]; + }; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = self.buildNodePackage { + name = "ms-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = self.buildNodePackage { + name = "ms-0.7.0"; + version = "0.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + name = "multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + 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 = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."1.6.x" = + self.by-version."nan"."1.6.2"; + by-version."nan"."1.6.2" = self.buildNodePackage { + name = "nan-1.6.2"; + version = "1.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; + name = "nan-1.6.2.tgz"; + sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"; + name = "negotiator-0.5.1.tgz"; + sha1 = "498f661c522470153c6086ac83019cb3eb66f61c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-statsd" = self.by-version."node-statsd"."0.1.1"; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = self.buildNodePackage { + name = "node-uuid-1.4.3"; + version = "1.4.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + name = "oauth-sign-0.2.0.tgz"; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.6.0" = + self.by-version."oauth-sign"."0.6.0"; + by-version."oauth-sign"."0.6.0" = self.buildNodePackage { + name = "oauth-sign-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; + name = "oauth-sign-0.6.0.tgz"; + sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + 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"; + }; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."on-headers"."~1.0.0" = + self.by-version."on-headers"."1.0.0"; + by-version."on-headers"."1.0.0" = self.buildNodePackage { + name = "on-headers-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz"; + name = "on-headers-1.0.0.tgz"; + sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."options".">=0.0.5" = + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = self.buildNodePackage { + name = "options-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseurl"."~1.3.0" = + self.by-version."parseurl"."1.3.0"; + by-version."parseurl"."1.3.0" = self.buildNodePackage { + name = "parseurl-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; + name = "parseurl-1.3.0.tgz"; + sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + name = "pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pkginfo"."0.3.x" = + self.by-version."pkginfo"."0.3.0"; + by-version."pkginfo"."0.3.0" = self.buildNodePackage { + name = "pkginfo-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "qs-0.6.6"; + version = "0.6.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."2.4.1" = + self.by-version."qs"."2.4.1"; + by-version."qs"."2.4.1" = self.buildNodePackage { + name = "qs-2.4.1"; + version = "2.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz"; + name = "qs-2.4.1.tgz"; + sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + name = "qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."range-parser"."~1.0.2" = + self.by-version."range-parser"."1.0.2"; + by-version."range-parser"."1.0.2" = self.buildNodePackage { + name = "range-parser-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; + name = "range-parser-1.0.2.tgz"; + sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."1.0.27-1" = + self.by-version."readable-stream"."1.0.27-1"; + by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { + name = "readable-stream-1.0.27-1"; + version = "1.0.27-1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + name = "readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + 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.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" = + self.by-version."readable-stream"."1.1.13"; + by-version."readable-stream"."1.1.13" = self.buildNodePackage { + name = "readable-stream-1.1.13"; + version = "1.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }; + 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.9" = + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + name = "redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "redis" = self.by-version."redis"."0.10.3"; + by-spec."reduce-component"."1.0.1" = + self.by-version."reduce-component"."1.0.1"; + by-version."reduce-component"."1.0.1" = self.buildNodePackage { + name = "reduce-component-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + name = "reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; + name = "request-2.16.6.tgz"; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + }; + 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"; + "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"; + "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"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "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"; + "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"; + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"; + name = "rndm-1.1.0.tgz"; + sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."send"."0.12.2" = + self.by-version."send"."0.12.2"; + by-version."send"."0.12.2" = self.buildNodePackage { + name = "send-0.12.2"; + version = "0.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.12.2.tgz"; + name = "send-0.12.2.tgz"; + sha1 = "ba6785e47ab41aa0358b9da401ab22ff0f58eab6"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "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"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "serve-static-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz"; + name = "serve-static-1.9.2.tgz"; + sha1 = "069fa32453557b218ec2e39140c82d8905d5672c"; + }; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.2" = self.by-version."send"."0.12.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.0"; + by-version."sigmund"."1.0.0" = self.buildNodePackage { + name = "sigmund-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + name = "sigmund-1.0.0.tgz"; + sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + name = "sntp-0.1.4.tgz"; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + }; + deps = { + "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = self.buildNodePackage { + name = "sntp-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."1.x.x" = + self.by-version."sntp"."1.0.9"; + by-version."sntp"."1.0.9" = self.buildNodePackage { + name = "sntp-1.0.9"; + version = "1.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + name = "sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + deps = { + "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = self.buildNodePackage { + name = "stack-trace-0.0.9"; + version = "0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stringstream"."~0.0.4" = + self.by-version."stringstream"."0.0.4"; + by-version."stringstream"."0.0.4" = self.buildNodePackage { + name = "stringstream-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; + name = "stringstream-0.0.4.tgz"; + sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/sugar/-/sugar-1.3.9.tgz"; + name = "sugar-1.3.9.tgz"; + sha1 = "f879c6c87721252b51fd0b6520412d98d83cb179"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz"; + name = "superagent-0.18.2.tgz"; + sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb"; + }; + 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"; + "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"; + "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"; + "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + version = "0.2.0"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tunnel-agent"."~0.4.0" = + self.by-version."tunnel-agent"."0.4.0"; + by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { + name = "tunnel-agent-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; + name = "tunnel-agent-0.4.0.tgz"; + sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + 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"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; + name = "uid-safe-1.1.0.tgz"; + sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + }; + 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 = { + }; + peerDependencies = []; + 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 { + name = "ultron-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"; + name = "ultron-1.0.1.tgz"; + sha1 = "c9d8d86c9cf2823028eb45629ab725897dd65dc5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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 { + name = "underscore-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + name = "underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + 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 { + name = "utf-8-validate-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz"; + name = "utf-8-validate-1.0.1.tgz"; + sha1 = "d15eb67e28f6bb93c9401eeb7eac7030a183e8d1"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + 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 { + name = "utils-merge-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.0"; + by-version."vary"."1.0.0" = self.buildNodePackage { + name = "vary-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; + name = "vary-1.0.0.tgz"; + sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"; + name = "vhost-3.0.0.tgz"; + sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; + name = "winston-0.7.3.tgz"; + sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "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 = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "winston" = self.by-version."winston"."0.7.3"; + by-spec."ws"."~0.7.1" = + self.by-version."ws"."0.7.1"; + by-version."ws"."0.7.1" = self.buildNodePackage { + name = "ws-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz"; + name = "ws-0.7.1.tgz"; + sha1 = "8f1c7864ca08081be3cd0ac330df0d29c5fcd0da"; + }; + deps = { + "options-0.0.6" = self.by-version."options"."0.0.6"; + "ultron-1.0.1" = self.by-version."ultron"."1.0.1"; + }; + optionalDependencies = { + "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1"; + "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0f408b73f..3407f139c3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8413,6 +8413,8 @@ let boost = boost155; }; + ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; + s6 = callPackage ../servers/s6 { }; spamassassin = callPackage ../servers/mail/spamassassin { From 4364645181d154f2b3f83d84ca6d605284d17be2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:27:48 -0700 Subject: [PATCH 566/947] dhcp: 4.3.1 -> 4.3.2 --- pkgs/tools/networking/dhcp/default.nix | 31 ++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 91cd8274039..4bf321d1ac0 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper +, coreutils, gnused, bind, openldap ? null +}: stdenv.mkDerivation rec { name = "dhcp-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; - sha256 = "1w4s7sni1m9223ya8m2a64lr62845c6xlraprjf8zfx6lylbqv16"; + sha256 = "0rc156qqv7293yi69gxvvc8s4cp7fspwl12iqkf6r7vmb2rwjik2"; }; patches = @@ -32,10 +34,31 @@ stdenv.mkDerivation rec { # due to an uninitialized variable. CFLAGS = "-g -O2 -Wall"; - buildInputs = [ perl makeWrapper ]; + buildInputs = [ perl makeWrapper openldap ]; + + configureFlags = [ + "--with-libbind=${bind}" + "--enable-failover" + "--enable-execute" + "--enable-tracing" + "--enable-delayed-ack" + "--enable-dhcpv6" + "--enable-paranoia" + "--enable-early-chroot" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + + installFlags = [ "DESTDIR=\${out}" ]; postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + cp client/scripts/linux $out/sbin/dhclient-script substituteInPlace $out/sbin/dhclient-script \ --replace /sbin/ip ${iproute}/sbin/ip From 09ca3430892df5e307c0d94ee8237c6a3838d9c5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:30:51 -0700 Subject: [PATCH 567/947] hostapd: 2.3 -> 2.4 --- pkgs/os-specific/linux/hostapd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index f8081127d51..84535e8d25e 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libnl, openssl, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "1pxlkfj1r2k5lxph2x9l02jrn652b3whcfh6l604rbbghxv2nk69"; + sha256 = "0zv5pnfrp6z7jjbskzgdb2rlmlbvdxmmis7ca94x5jy9s5mypq3g"; }; buildInputs = [ libnl openssl pkgconfig ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { echo CONFIG_IEEE80211N=y | tee -a .config export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)" ''; + preInstall = "mkdir -p $out/bin"; meta = with stdenv.lib; { From b17cf394bd1404b7c177f875f2761b1bea9ce29b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:34:05 -0700 Subject: [PATCH 568/947] libdrm: 2.4.59 -> 2.4.60 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ecc92fce40c..5323cc693fc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.59"; + name = "libdrm-2.4.60"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; + sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr"; }; nativeBuildInputs = [ pkgconfig ]; From 8071107881fb15bcb034c9ba3da940faead87a59 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:36:04 -0700 Subject: [PATCH 569/947] libwebp: 0.4.2 -> 0.4.3 --- pkgs/development/libraries/libwebp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index ce8a58be7f4..6da1b00ee81 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "0bbjl5spgq7jq7ms5q0scxg5hmg4dd386syb3di4jzggqbbjbn0l"; + sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg"; }; configureFlags = [ From a12a63fc084d5c121886983ccf9e7a0dd8c6daed Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:39:05 -0700 Subject: [PATCH 570/947] libqmi: 1.8.0 -> 1.12.6 --- pkgs/development/libraries/libqmi/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0292067dbb..9699d67d7b8 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.8.0"; + name = "libqmi-1.12.6"; src = fetchurl { url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs"; + sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; preBuild = '' @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } From e41037ae041f0e0a4bf014204c05e3b4004a659c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:44:17 -0700 Subject: [PATCH 571/947] libmbim: 1.6.0 -> 1.12.2 --- pkgs/development/libraries/libmbim/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 8207051b2a8..d58f031f376 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev }: stdenv.mkDerivation rec { - name = "libmbim-1.6.0"; + name = "libmbim-1.12.2"; src = fetchurl { url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0"; + sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; }; preConfigure = '' - for f in build-aux/mbim-codegen/*; do - substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" - done + patchShebangs . ''; - buildInputs = [ pkgconfig glib udev ]; + buildInputs = [ pkgconfig glib udev python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/software/libmbim/; description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } From cb4c9cf633abe9b2b233d1e1918d25c6bd0f8041 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:47:27 -0700 Subject: [PATCH 572/947] harfbuzz: 0.9.38 -> 0.9.40 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index a7ec3a75878..311bfe2c209 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.38"; + name = "harfbuzz-0.9.40"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; + sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p"; }; configureFlags = [ From ec21d9d526947cac64e793445c692aeae1da9d0f Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 26 Mar 2015 21:16:21 +0300 Subject: [PATCH 573/947] vimPlugins: update --- pkgs/misc/vim-plugins/default.nix | 402 ++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 3 files changed, 201 insertions(+), 205 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 6378ffdafe3..8cc44f2bfcb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, bash, stdenv, python, cmake, vim, vimUtils, perl, ruby, unzip, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip, - vim_configurable, vimPlugins, xkb_switch + vim_configurable, vimPlugins, xkb_switch, git }: let @@ -51,25 +51,24 @@ rec { alternative = a; # backwards compat, added 2014-10-21 calendar = buildVimPlugin { - name = "calendar-git-2014-10-19"; + name = "calendar-git-2015-03-19"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim.git"; - rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324"; - sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202"; - }; + rev = "a1b9d1a11e301a25bc48350da833469ef8bb6c9f"; + sha256 = "a3a8da7890c5eedba72e2def86760b79092b3b5cf2ca3999deda5fa8eddecd49"; + }; meta = { - homepage = https://github.com/itchyny/calendar.vim; + homepage = https://github.com/itchyny/calendar.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; command-t = buildVimPlugin rec { - version = "1.8"; - name = "command-t-${version}"; - src = fetchzip { - inherit name; - url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz"; - sha256 = "186qz1smf7w91r68p724whg6d821f7ph6ks63l2vkhff8f9qqhrc"; + name = "command-t-git-2015-01-12"; + src = fetchgit { + url = "https://github.com/wincent/Command-T"; + rev = "13760a725779b65fa0f2ebef51806f3c05a52550"; + sha256 = "0cb284w1m8sxcc8ph64pm0cvqslpixss593a1ffnx9c09g6d7m8w"; }; buildInputs = [ perl ruby ]; buildPhase = '' @@ -83,25 +82,26 @@ rec { command_T = command-t; # backwards compat, added 2014-10-18 easymotion = buildVimPlugin { - name = "easymotion-git-2014-09-29"; + name = "easymotion-git-2015-02-24"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion.git"; - rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77"; - sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77"; - }; + rev = "8acdfc60e58bb0600ded42a4f752bec6e3b6d882"; + sha256 = "1177d1c06a16fe7c1e681a729d158a6cacf3fed9c14bd8c4ece35a069f21dc07"; + }; meta = { - homepage = https://github.com/lokaltog/vim-easymotion; + homepage = https://github.com/lokaltog/vim-easymotion; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - - eighties = buildVimPlugin rec { - version = "1.0.4"; - name = "eighties-${version}"; - src = fetchurl { - url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz"; - sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr"; + + eighties = buildVimPlugin { + name = "eighties-git-2015-02-12"; + src = fetchgit { + url = "https://github.com/justincampbell/vim-eighties"; + rev = "5d0ebf5424adb8017bec049de0cd51f6fa427281"; + sha256 = "b4216c805e54f923efcbd8d914f97883f135c989f33e87d2eee69b488b57e747"; }; + buildPhase = ":"; meta = with stdenv.lib; { description = "Automatically resizes your windows to 80 characters"; homepage = https://github.com/justincampbell/vim-eighties; @@ -111,6 +111,7 @@ rec { }; }; + gitgutter = vim-gitgutter; golang = buildVimPlugin { @@ -195,40 +196,40 @@ rec { }; idris-vim = buildVimPlugin { - name = "idris-vim-git-2014-10-14"; + name = "idris-vim-git-2014-12-29"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim.git"; - rev = "78730e511cae0a067f79da1168466601553f619b"; - sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b"; - }; + rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1"; + sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff"; + }; meta = { - homepage = https://github.com/idris-hackers/idris-vim; + homepage = https://github.com/idris-hackers/idris-vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; ipython = buildVimPlugin { - name = "ipython-git-2014-07-17"; + name = "ipython-git-2015-01-12"; src = fetchgit { url = "https://github.com/ivanov/vim-ipython.git"; - rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272"; - sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824"; - }; + rev = "a47d92b371588a81f8501c66604d79e2827c60a8"; + sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53"; + }; meta = { - homepage = https://github.com/ivanov/vim-ipython; + homepage = https://github.com/ivanov/vim-ipython; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; latex-box = buildVimPlugin { - name = "latex-box-git-2014-10-05"; + name = "latex-box-git-2015-03-05"; src = fetchgit { url = "https://github.com/latex-box-team/latex-box.git"; - rev = "3e000fb161bdf6efe7aef517aef276554aeabb65"; - sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4"; - }; + rev = "0992511ad9b250cbe53bccbec3b0cb24feca64ec"; + sha256 = "8e73020a4ad275dfb8887bfc6a85c8aa059a081feefb680b2fd7c85267137440"; + }; meta = { - homepage = https://github.com/latex-box-team/latex-box; + homepage = https://github.com/latex-box-team/latex-box; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; @@ -247,14 +248,14 @@ rec { }; neco-ghc = buildVimPlugin { - name = "neco-ghc-git-2014-10-17"; + name = "neco-ghc-git-2015-03-21"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc.git"; - rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de"; - sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638"; - }; + rev = "7d2c360736679064986925873b8d1e2b1978d9f8"; + sha256 = "3c4d1b00c79953e56379792a64df036075a456cb10a7b891e1691d04c9f15310"; + }; meta = { - homepage = https://github.com/eagletmt/neco-ghc; + homepage = https://github.com/eagletmt/neco-ghc; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; @@ -262,12 +263,12 @@ rec { necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = buildVimPlugin { - name = "neocomplete-git-2014-11-18"; + name = "neocomplete-git-2015-03-24"; src = fetchgit { url = "https://github.com/Shougo/neocomplete.vim.git"; - rev = "26aef680ece29047089e7540b78696f1e6336be2"; - sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; - }; + rev = "1ef1c33cfdcae43d8b3c6381c4f54f0e93a17287"; + sha256 = "5c61629c30906aacc00924ab5aaad720aba0011df348ea8835b6aaa53199550a"; + }; meta = { homepage = https://github.com/Shougo/neocomplete.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; @@ -275,12 +276,12 @@ rec { }; neosnippet = buildVimPlugin { - name = "neosnippet-git-2014-11-18"; + name = "neosnippet-git-2015-01-19"; src = fetchgit { url = "https://github.com/Shougo/neosnippet.vim.git"; - rev = "811176b29b1a60a164c9878f8dcbe4a680ee32e5"; - sha256 = "903b6fa01511e319e5ce3efa3a7007047512f5f7ee7d61b69cd4a324420cf718"; - }; + rev = "044c9cb8ca46a5e27eec37198990c26fe707b02a"; + sha256 = "c448fac34e432a496ec1d76e07b478b27e66e6e4ec99c1b3923e66c781b74fc8"; + }; meta = { homepage = https://github.com/Shougo/neosnippet.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; @@ -288,26 +289,27 @@ rec { }; neosnippet-snippets = buildVimPlugin { - name = "neosnippet-snippets-git-2014-11-17"; + name = "neosnippet-snippets-git-2015-03-25"; src = fetchgit { url = "https://github.com/Shougo/neosnippet-snippets.git"; - rev = "a15cdc307a62d64c3510b4a1097a8bd174746894"; - sha256 = "8d69b93163dd93474422bf4f362130151f25e2c9fad3500ba170161c24bf5bce"; - }; + rev = "dfa436157c9e72f16f0f0d088fa181b37e226c2f"; + sha256 = "00a65d1f6a1309acef42c0ca70f333ab355db521319c14db8247be38d28da730"; + }; meta = { homepage = https://github.com/Shougo/neosnippet-snippets; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; + nerdcommenter = The_NERD_Commenter; quickrun = buildVimPlugin { - name = "quickrun-git-2014-10-08"; + name = "quickrun-git-2015-03-26"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun.git"; - rev = "ae97cef42ae142306e9431dce9ab97c4353e5254"; - sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787"; + rev = "2d03b3a7405da0e95ff7f6f617843ba9f536395f"; + sha256 = "803e902a083b79c70ea3f826a89864b8879897cd36a655d9e789a0d651127eb3"; }; meta = { homepage = https://github.com/thinca/vim-quickrun; @@ -316,16 +318,14 @@ rec { }; racer = buildVimPlugin { - name = "racer-git-2014-11-24"; + name = "racer-git-2015-03-23"; src = fetchgit { - url = https://github.com/phildawes/racer; - rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; - sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + url = "https://github.com/phildawes/racer"; + rev = "c6f557bfd9a22d45476651fa95f7d8415ed897a8"; + sha256 = "697d92e0acbb3a8c1d691eaebc008bec422060df10e3c4cf6fad448b30391852"; }; buildPhase = '' find . -type f -not -name 'racer.vim' -exec rm -rf {} \; - mkdir plugin - mv ./editors/racer.vim plugin/racer.vim rm -rf editors images src ''; meta = { @@ -399,11 +399,11 @@ rec { }; thumbnail = buildVimPlugin { - name = "thumbnail-git-2014-07-24"; + name = "thumbnail-git-2015-03-15"; src = fetchgit { url = "https://github.com/itchyny/thumbnail.vim.git"; - rev = "e59a1791862ed470510a58456cc001226e177a39"; - sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66"; + rev = "19bd717307a8d0986a4a77116f47168fbe11e178"; + sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882"; }; meta = { homepage = https://github.com/itchyny/thumbnail.vim; @@ -412,11 +412,11 @@ rec { }; tmux-navigator = buildVimPlugin { - name = "tmux-navigator-git-2014-09-09"; + name = "tmux-navigator-git-2015-03-16"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator.git"; - rev = "195cdf087fea7beaf6274d0a655d157dfab3130c"; - sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9"; + rev = "928a52fbda90ec70b2eb6edaf570654df4521af0"; + sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c"; }; meta = { homepage = https://github.com/christoomey/vim-tmux-navigator; @@ -427,11 +427,11 @@ rec { tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = buildVimPlugin { - name = "tslime-git-2014-06-12"; + name = "tslime-git-2015-02-10"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim.git"; - rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd"; - sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251"; + rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; + sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; }; meta = { homepage = https://github.com/jgdavey/tslime.vim; @@ -440,12 +440,12 @@ rec { }; vimproc = buildVimPlugin { - name = "vimproc-git-2014-10-03"; + name = "vimproc-git-2015-02-23"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim.git"; - rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e"; - sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb"; - }; + rev = "0f68bcd93399ecbcde3eaa4efd09107314c9bdee"; + sha256 = "850cb6d347f4c353782c48533f2dc6e3150a3982dc71efbd5f6b0a921264f939"; + }; buildInputs = [ which ]; buildPhase = '' @@ -460,9 +460,12 @@ rec { }; vimshell = buildVimPlugin rec { - version = "9.2"; - name = "vimshell-${version}"; - + name = "vimshell-git-2015-03-24"; + src = fetchgit { + url = "https://github.com/Shougo/vimshell.vim"; + rev = "41d3ad325852e80588ab57c64433fa338789d6ac"; + sha256 = "bf76ee252a3cbb121013ce10547cee7d31a64d10c46687ddfaa988e7c5baf095"; + }; meta = with stdenv.lib; { description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; homepage = https://github.com/Shougo/vimshell.vim; @@ -471,14 +474,7 @@ rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - - src = fetchurl { - url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz"; - sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a"; - }; - buildInputs = [ vimproc ]; - preBuild = '' sed -ie '1 i\ set runtimepath+=${vimproc}/${rtpPath}/vimproc\ @@ -508,11 +504,11 @@ rec { }; watchdogs = buildVimPlugin { - name = "watchdogs-git-2014-10-18"; + name = "watchdogs-git-2015-03-20"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs.git"; - rev = "ad222796eb88b44954340c19c39938046af26e05"; - sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279"; + rev = "01ba53074fd3bedd81f5aed2dcc4fec092f62ba9"; + sha256 = "7b363779a0b035a0aaec025653a29e2f4dbd9e1518a34a6e993c43e8ec810d57"; }; meta = { homepage = https://github.com/osyo-manga/vim-watchdogs; @@ -548,14 +544,13 @@ rec { }; }; - YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation rec { + YouCompleteMe = buildVimPlugin { src = fetchgit { - rev = "035b6ca862da3bba0ab8aad388a485758311a464"; + rev = "56dc60ddc88d075902a5f13f10446923b009ad2f"; url = "https://github.com/Valloric/YouCompleteMe.git"; - sha256 = "0l4a7mp0r888gdfzl59z8vk5jx4km58kzzqbn8v48i1k6scryvl7"; + sha256 = "1i4qv2g9vhd8999iv7ly0pxyp9l99dzq3rjf4snkb8rpcrimgbkj"; }; - - name = "vimplugin-youcompleteme-2015-02-05"; + name = "youcompleteme-2015-03-25"; buildInputs = [ python cmake llvmPackages.clang ]; @@ -583,13 +578,13 @@ rec { installPhase = ":"; meta = { - description = "fastest non utf-8 aware word and C completion engine for Vim"; + description = "Fastest non utf-8 aware word and C completion engine for Vim"; homepage = http://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.linux; }; - }); + }; youcompleteme = YouCompleteMe; @@ -639,6 +634,7 @@ rec { ### The following derivations are generated by nix#ExportPluginsForNix + "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour_Sampler_Pack"; src = fetchurl { @@ -655,11 +651,11 @@ rec { }; "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist"; + name = "Gist-2015-03-25"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "8a567b823163d349406dffaff4519e0bac10eade"; - sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88"; + rev = "22eeb3a72f116818dec0e2f9fe3ea46443141b95"; + sha256 = "9ecaa593267958c5860d6e34be5fc1e3280da5265a1fb35bdb2904163049325f"; }; dependencies = []; @@ -675,7 +671,7 @@ rec { }; "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle"; + name = "Hoogle-2013-11-26"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; @@ -685,7 +681,7 @@ rec { }; "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized"; + name = "Solarized-2011-05-09"; src = fetchgit { url = "git://github.com/altercation/vim-colors-solarized"; rev = "528a59f26d12278698bb946f8fb82a63711eec21"; @@ -695,27 +691,27 @@ rec { }; "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab"; + name = "Supertab-2015-02-15"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "454c06e25680799b6f408622d6bfbaf920ace825"; - sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01"; + rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; + sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; }; dependencies = []; }; "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic"; + name = "Syntastic-2015-03-25"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52"; - sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723"; + rev = "dac07db61758590c71d655ed5403181af4e845a2"; + sha256 = "96ae43056b79a50c34272f483c5c7a3cf55f5aa8699b319fe9ed5f7ba12ed0d7"; }; dependencies = []; }; "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular"; + name = "Tabular-2013-05-16"; src = fetchgit { url = "git://github.com/godlygeek/tabular"; rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; @@ -725,17 +721,17 @@ rec { }; "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar"; + name = "Tagbar-2015-03-17"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "00dfa82b00e734b453153564efeec933c48087f0"; - sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635"; + rev = "3634e7ab4feeab8ad49166e9e716638c20f1637c"; + sha256 = "cecbb15e025b300f688a7a67cc886a2e8a8afaf3e8fdca4a4d8ba73dabda8ab2"; }; dependencies = []; }; "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter"; + name = "The_NERD_Commenter-2014-07-08"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; @@ -745,7 +741,7 @@ rec { }; "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree"; + name = "The_NERD_tree-2014-11-20"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; @@ -755,17 +751,17 @@ rec { }; "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips"; + name = "UltiSnips-2015-03-05"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "d693259abb2e28f70abf760d395fcf526d5272ee"; - sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600"; + rev = "1971030b506a8f0e2e0398fb166f21a5341f8c7a"; + sha256 = "84c07f73ea22a34422c843c5ccb40aa8d3967175ff38ab6155303ba3c039e859"; }; dependencies = []; }; "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner"; + name = "VimOutliner-2015-01-09"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; rev = "7c995f973c54b0d026137615af28059890edb197"; @@ -775,7 +771,7 @@ rec { }; "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI"; + name = "WebAPI-2014-10-27"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; rev = "a7789abffe936db56e3152e23733847f94755753"; @@ -800,7 +796,7 @@ rec { }; "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary"; + name = "commentary-2014-11-10"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; @@ -810,7 +806,7 @@ rec { }; "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp"; + name = "ctrlp-2013-07-29"; src = fetchgit { url = "git://github.com/kien/ctrlp.vim"; rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; @@ -820,7 +816,7 @@ rec { }; "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite"; + name = "extradite-2015-01-26"; src = fetchgit { url = "git://github.com/int3/vim-extradite"; rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; @@ -830,33 +826,33 @@ rec { }; "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive"; + name = "fugitive-2015-02-20"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "933f6a1e1df549564062f936bd1c836d28cf1676"; - sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908"; + rev = "0095769029709b531d2505ee6ad9907dd9bd72a0"; + sha256 = "83184b527538d0aac01783074ec29addfa18b62880ec8959dae6e404c6ff3d11"; }; dependencies = []; }; "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod"; + name = "ghcmod-2015-03-17"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb"; + sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899"; }; dependencies = []; }; - "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "github-MarcWeber-vim-addon-vim2nix"; + "github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06"; src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-vim2nix"; - rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; - sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx"; - }; - dependencies = ["vim-addon-manager"]; + url = "git://github.com/JagaJaga/vim-addon-vim2nix"; + rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5"; + sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564"; + }; + dependencies = ["vim-addon-manager"]; }; "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -881,7 +877,7 @@ rec { ''; }; "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen"; + name = "pathogen-2014-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; @@ -891,7 +887,7 @@ rec { }; "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus"; + name = "quickfixstatus-2011-09-02"; src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; rev = "fd3875b914fc51bbefefa8c4995588c088163053"; @@ -901,7 +897,7 @@ rec { }; "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses"; + name = "rainbow_parentheses-2013-03-04"; src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; @@ -911,7 +907,7 @@ rec { }; "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust"; + name = "rust-2015-01-29"; src = fetchgit { url = "git://github.com/wting/rust.vim"; rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; @@ -921,26 +917,27 @@ rec { }; "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible"; + name = "sensible-2014-11-24"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; rev = "b30dcf387af977acfa21732592bfca05598b2188"; sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f"; }; dependencies = []; + }; "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate"; + name = "snipmate-2015-03-21"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5"; - sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0"; + rev = "2079ea5aadaada568f78acfc6b565945625ed97d"; + sha256 = "47f5d131485f8a57389a0b455c6e83f8f543d71a04cbaa7af594b3abe9099d9f"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap"; + name = "sourcemap-2012-09-19"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; @@ -950,47 +947,47 @@ rec { }; "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround"; + name = "surround-2015-03-15"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd"; - sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269"; + rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a"; + sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef"; }; dependencies = []; }; "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode"; + name = "table-mode-2015-03-17"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9"; - sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c"; + rev = "c0a6d43f2191b841c01cec0638a33a8116f7f920"; + sha256 = "222532a9803f855b5f261eb311359980625606716c1b9419703b97874554c49d"; }; dependencies = []; }; "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib"; + name = "tlib-2015-02-23"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "9e629767e5a91ede057d07f8754326e68c92a692"; - sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6"; + rev = "2376d1233e7d1db8157fdc3157278dda7a2c796f"; + sha256 = "07966a0f2a073ae07e8d2a63a8a265ec0053997721545b41cedff910bcc24de0"; }; dependencies = []; }; "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree"; + name = "undotree-2015-03-01"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "42000e2a7140843030f517de9d4923dd5fa40458"; - sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293"; + rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277"; + sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7"; }; dependencies = []; }; "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions"; + name = "vim-addon-actions-2014-09-22"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; rev = "a5d20500fb8812958540cf17862bd73e7af64936"; @@ -1000,7 +997,7 @@ rec { }; "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async"; + name = "vim-addon-async-2013-10-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; @@ -1010,7 +1007,7 @@ rec { }; "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd"; + name = "vim-addon-background-cmd-2015-01-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; rev = "e99076519139b959edce0581b0f31207a5ec7c64"; @@ -1020,7 +1017,7 @@ rec { }; "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting"; + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; @@ -1030,17 +1027,17 @@ rec { }; "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion"; + name = "vim-addon-completion-2015-02-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; - sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "969a474749edf7e4443d2540eaf12e891cc0a3f5533e62e081d32408f403a0ea"; }; dependencies = ["tlib"]; }; "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats"; + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; @@ -1050,7 +1047,7 @@ rec { }; "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor"; + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; @@ -1060,27 +1057,27 @@ rec { }; "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc"; + name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "f0687e08f380ff085b6fa3e708d1631049571706f55d796e22612aff02e51459"; }; dependencies = []; }; "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager"; + name = "vim-addon-manager-2014-12-03"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; - sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3"; + sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be"; }; dependencies = []; }; "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru"; + name = "vim-addon-mru-2013-08-08"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; @@ -1090,7 +1087,7 @@ rec { }; "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils"; + name = "vim-addon-mw-utils-2012-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; @@ -1100,17 +1097,17 @@ rec { }; "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix"; + name = "vim-addon-nix-2015-03-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1"; + sha256 = "0e326e2c6cb6597ca533a64a845ef9dd946cd249250375ef9775d974ecef37e2"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other"; + name = "vim-addon-other-2014-07-15"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; @@ -1120,7 +1117,7 @@ rec { }; "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual"; + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; @@ -1130,7 +1127,7 @@ rec { }; "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs"; + name = "vim-addon-signs-2013-04-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; @@ -1140,7 +1137,7 @@ rec { }; "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql"; + name = "vim-addon-sql-2014-01-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; @@ -1150,7 +1147,7 @@ rec { }; "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker"; + name = "vim-addon-syntax-checker-2013-07-12"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; @@ -1160,7 +1157,7 @@ rec { }; "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer"; + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; @@ -1170,7 +1167,7 @@ rec { }; "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug"; + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; @@ -1180,17 +1177,17 @@ rec { }; "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline"; + name = "vim-airline-2015-03-24"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "446397e006d8cba9e1ac38d8c656ba39218c139b"; - sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119"; + rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3"; + sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012"; }; dependencies = []; }; "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script"; + name = "vim-coffee-script-2014-10-10"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; rev = "827e4a38b07479433b619091469a7495a392df8a"; @@ -1200,7 +1197,7 @@ rec { }; "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align"; + name = "vim-easy-align-2014-12-14"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; rev = "c62d124be614de65922b15d468c4049d1eee9353"; @@ -1210,17 +1207,17 @@ rec { }; "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter"; + name = "vim-gitgutter-2015-03-23"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd"; - sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d"; + rev = "8345c35770ffc6fc4088c36406d1e24170aabcc6"; + sha256 = "f7580832ebfd60f0b7cf05e697ac44e4b59a0f606fe49b7ef392052a50c69ad3"; }; dependencies = []; }; "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script"; + name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; @@ -1230,7 +1227,7 @@ rec { }; "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview"; + name = "vim-latex-live-preview-2013-11-25"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; @@ -1240,7 +1237,7 @@ rec { }; "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature"; + name = "vim-signature-2015-01-12"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; @@ -1250,17 +1247,17 @@ rec { }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets"; + name = "vim-snippets-2015-03-24"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "27906a3754f0ac292d0915a4075bff22db53fa3e"; - sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6"; + rev = "707f005ccddaa15a0b8c207a7a711b0a9590578a"; + sha256 = "0c5807b82e18530a6b83f4f1c0010564a1a4b39f687672ab235b95e694095d03"; }; dependencies = []; }; "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs"; + name = "vim2hs-2014-04-16"; src = fetchgit { url = "git://github.com/dag/vim2hs"; rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; @@ -1270,11 +1267,11 @@ rec { }; "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle"; + name = "vundle-2015-03-21"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933"; + sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50"; }; dependencies = []; @@ -1292,7 +1289,6 @@ rec { url = "http://www.vim.org/scripts/script.php?script_id=2465"; }; - }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c69f9122356..32ff3045a13 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,5 +52,5 @@ "YankRing" "vim-addon-manager" "vim-addon-nix" -"github:MarcWeber/vim-addon-vim2nix" +"github:JagaJaga/vim-addon-vim2nix" "sensible" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 6b5dd139525..9140acffe0d 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -296,7 +296,7 @@ rec { pluginnames2Nix = {name, namefiles} : vim_configurable.customize { inherit name; vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["github:MarcWeber/vim-addon-vim2nix"]; + vimrcConfig.vam.pluginDictionaries = ["github:JagaJaga/vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream vimrcConfig.customRC = '' " Yes - this is impure and will create the cache file and checkout vim-pi " into ~/.vim/vim-addons From f56b17cb30bef87651462d00852928f8b40d404c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 26 Mar 2015 13:04:21 +0000 Subject: [PATCH 574/947] django: minimum supported python version for django 1.7 is 2.7 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8281c25e4ea..4fab5c6ae47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3952,6 +3952,7 @@ let django_1_7 = buildPythonPackage rec { name = "Django-${version}"; version = "1.7.7"; + disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; From c99fa3a2614d02227a182f822fd1f0adae488722 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:04:27 -0700 Subject: [PATCH 575/947] musl: 1.1.6 -> 1.1.7 --- pkgs/os-specific/linux/musl/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index cd13914580a..c10cfb38cbd 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1d7inhai37g1ph6yg7ldyl4k5c7i8xvaa5w62n85n3albk2n00as"; + sha256 = "168mz5mwmzr5j6l4jxnwaxw6l89xycql3vfk01jsmy7chziamq6q"; }; enableParallelBuilding = true; - configurePhase = '' - ./configure --enable-shared --enable-static --prefix=$out --syslibdir=$out/lib - ''; + + configureFlags = [ + "--enable-shared" + "--enable-static" + ]; + + dontDisableStatic = true; meta = { description = "An efficient, small, quality libc implementation"; From bb4bb9fc4326dc657f5ced9017bf26c84e832f2b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:12:50 -0700 Subject: [PATCH 576/947] modemmanager: 1.2.0 -> 1.4.6 --- .../tools/networking/modemmanager/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 0640f55bc9e..b044b526873 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.2.0"; + version = "1.4.6"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "1g08ciyhys9bi5m45z30kln17zni4r07i5byjaglmwq6np1xincb"; + sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c"; }; nativeBuildInputs = [ intltool pkgconfig ]; @@ -17,9 +17,25 @@ stdenv.mkDerivation rec { "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--sysconfdir=/etc" + "--localstatedir=/var" ]; + installFlags = [ "DESTDIR=\${out}" ]; + + preInstall = '' + mkdir -p $out/etc/systemd/system + ''; + postInstall = '' + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system + rm -rf $out/$out/etc + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/ModemManager.service \ From eff828a27534c07b0b730ef560ec48f9f2b773fb Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 26 Mar 2015 13:19:12 -0700 Subject: [PATCH 577/947] z3: copy all headers into nix store --- pkgs/applications/science/logic/z3/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index a213f6da37e..1df4035c29c 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -26,11 +26,8 @@ stdenv.mkDerivation rec { soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; installPhase = '' mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include - cp ../src/api/z3.h $out/include - cp ../src/api/z3_api.h $out/include - cp ../src/api/z3_v1.h $out/include - cp ../src/api/z3_macros.h $out/include - cp ../src/api/c++/z3++.h $out/include + cp ../src/api/z3*.h $out/include + cp ../src/api/c++/z3*.h $out/include cp z3 $out/bin cp libz3${soext} $out/lib cp libz3${soext} $out/lib/${python.libPrefix}/site-packages From f6d223c7736f9dc9def8a640b487bb68eafc0665 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 14:29:10 -0400 Subject: [PATCH 578/947] Add SSL support to HAProxy --- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 58e238c3c02..66a4e753646 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { version = "1.5.11"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; - buildInputs = [ ]; + buildInputs = [ openssl ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out" + export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" ''; meta = { From eb54c42ffaf44b7504fcca79f433ccdbae739741 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 14:32:37 -0400 Subject: [PATCH 579/947] Clean up HAProxy nix expression --- pkgs/tools/networking/haproxy/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 66a4e753646..9a7d05d79bf 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,11 +1,12 @@ { stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - version = "1.5.11"; + major-version = "1.5"; + version = "${major-version}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz"; sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; @@ -29,9 +30,6 @@ stdenv.mkDerivation rec { homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; - /* TODO license = [ - stdenv.lib.licenses.gpl2 - stdenv.lib.licenses.lgpl21 - ];*/ + license = stdenv.lib.licenses.gpl2; }; } From ab2cb8593091984bbd985836f0d0d52b4e1dc043 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 16:21:15 -0400 Subject: [PATCH 580/947] Fixed case in HAProxy nix expr --- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 9a7d05d79bf..4119afa5228 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - major-version = "1.5"; - version = "${major-version}.11"; + majorVersion = "1.5"; + version = "${majorVersion}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; From 032859faba7174ef69f96b53bc07d544fba5e871 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:30:45 -0700 Subject: [PATCH 581/947] cups: 1.7.5 -> 2.0.2 --- pkgs/misc/cups/default.nix | 25 ++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 883de8d2b9d..68972c2e6c3 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl }: +, dbus, acl +, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null +}: -let version = "1.7.5"; in +let version = "2.0.2"; in +with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -10,15 +13,27 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; + sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl ]; - configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-systemd=\${out}/lib/systemd/system" + "--enable-raw-printing" + "--enable-threads" + ] ++ optionals stdenv.isLinux [ + "--enable-dbus" + "--enable-pam" + ] ++ optional (libusb != null) "--enable-libusb" + ++ optional (gnutls != null) "--enable-ssl" + ++ optional (avahi != null) "--enable-avahi" + ++ optional (libpaper != null) "--enable-libpaper"; installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f473f7663..6415da28cc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13534,7 +13534,9 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { libusb = libusb1; }; + cups = callPackage ../misc/cups { + libusb = libusb1; + }; cups_filters = callPackage ../misc/cups/filters.nix { }; From 0fb50ed75460579dec6258dec44b2bdccfbd5263 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:11:23 -0500 Subject: [PATCH 582/947] libass: build on Darwin --- pkgs/development/libraries/libass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 7dda6912a98..2a9af50fcde 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Portable ASS/SSA subtitle renderer"; homepage = https://github.com/libass/libass; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; From f74adfdb453790ccf08e7d04bafb33eeb6713e69 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:51:24 -0500 Subject: [PATCH 583/947] libdc1394: Build on Darwin --- pkgs/development/libraries/libdc1394/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afde4e260e8..1d6b00abe53 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; - buildInputs = [ libraw1394 libusb1 ]; + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 8c3dcb25b98ccc0e450ae79df55ac98fa0f511c6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:58:48 -0700 Subject: [PATCH 584/947] libva: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0f09af30b0a..dc648e1ea2e 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: stdenv.mkDerivation rec { - name = "libva-1.5.0"; + name = "libva-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "11ilp32fy7s42ii2dlcnf7305r9pi610r3jqdbn26khf26rx8ip9"; + sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; From 721c425962524fb7ccc447d755c94869c9cc65e5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:59:01 -0700 Subject: [PATCH 585/947] libvdpau: 0.9 -> 1.1 --- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index dfb3575b89b..4da60397444 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-0.9"; + name = "libvdpau-1.1"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3"; + sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; From ed40a9fe42370a792112dce1fd672c28cd7c8912 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:59:12 -0700 Subject: [PATCH 586/947] libva-intel-driver: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f4d87e8effa..8eddb2b0ae8 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.5.0"; + name = "libva-intel-driver-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1p537n2dpmybpf7rligbnhw406lr575bhkafs4n64jxk78clid6h"; + sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb"; }; prePatch = '' From 65b74314e844e451fd7324466ca32d54703ca4a8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:59:24 -0700 Subject: [PATCH 587/947] vdpauinfo: 0.9 -> 1.0 --- pkgs/tools/X11/vdpauinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 2332cd1bc51..167c710dd26 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-0.9"; + name = "vdpauinfo-1.0"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50"; + sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; buildInputs = [ pkgconfig libvdpau ]; From 2f02ae037afff544dd014717fd79dfa8bdf5f373 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:01:07 -0700 Subject: [PATCH 588/947] sudo: 1.8.12 -> 1.8.13 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 3a710d56406..b6ae48c5d83 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.12"; + name = "sudo-1.8.13"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1c7kqhyps5hw38vl7a50f8gqz57mc4npi9l1clkikbg83n252fqn"; + sha256 = "09asw1hpxc39a6hhydr8n33m2pni1b5m37vaj7b00761ybnyax73"; }; configureFlags = [ From 912dd5a35666059cf60209416fe43ccf7a26aceb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:48:54 -0700 Subject: [PATCH 589/947] nbd: 3.8 -> 3.10 --- pkgs/tools/networking/nbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index dffafe5c816..b16aa46cc75 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.8"; + name = "nbd-3.10"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1qnkzrnc9m4n814ciqh95q9j8l7d6yd7sn36q8yn0dmi1rvj78j8"; + sha256 = "1kj772zv6s3rjmvr0gi3yhagzlq2nmv5n5gfhrjphv5bcxx3mibg"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; From 940d381d7387c607aa46c795c4bad47643353ba0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 12:59:21 -0700 Subject: [PATCH 590/947] git: 2.3.3 -> 2.3.4 --- .../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 123bb65da8d..65a9679576e 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.3.3"; + version = "2.3.4"; 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 = "11s6w6dsv9kfgpfa75sas4pi6spw75ph0b0b6b12xq37hl4l8ma7"; + sha256 = "15fv155skjy80j7sv7x4kxlj3m8i334bic4q2qmb6zvr04hjpslp"; }; patches = [ From ce9f2d57203b14b907b962fc80c092e1b74f7204 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:51:12 -0700 Subject: [PATCH 591/947] tcpdump: 4.6.2 -> 4.7.3 --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 179908a1007..231d7e293b8 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.6.2"; + name = "tcpdump-4.7.3"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1f701387jyxq7rjhv4hiig3b3g55m4b4403rd0zncv1sx3cf8kjj"; + sha256 = "1kla3l7lja8cfwimp512x7z176x2dsy03ih6g8gd95p95ijzp1qz"; }; buildInputs = [ libpcap ]; From 78d8e55245030575ca9e3a2378ca558bba4cad9d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:51:27 -0700 Subject: [PATCH 592/947] libinput: 0.11.0 -> 0.13.0 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a57ff0bb737..80ad7879e10 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.11.0"; + name = "libinput-0.13.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j"; + sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c"; }; configureFlags = [ From 8a8097eb90bc5e78f725dfd3e53f7b5415486927 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:09:56 -0700 Subject: [PATCH 593/947] nedit: 5.5 -> 5.6 --- pkgs/applications/editors/nedit/builder.sh | 10 ------- pkgs/applications/editors/nedit/default.nix | 22 ++++++++------- pkgs/applications/editors/nedit/dynamic.patch | 27 ------------------- 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/editors/nedit/builder.sh delete mode 100644 pkgs/applications/editors/nedit/dynamic.patch diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37d..00000000000 --- a/pkgs/applications/editors/nedit/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" - -installPhase() { - mkdir -p $out/bin - cp -p source/nedit source/nc $out/bin -} - -genericBuild diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index bd53f8d81d0..a4dfc4719dc 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl, x11, motif, libXpm}: +{ stdenv, fetchurl, x11, motif, libXpm }: assert stdenv.isLinux; -stdenv.mkDerivation { - name = "nedit-5.5"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nedit-5.6"; src = fetchurl { - url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; - md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; + url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - patches = [./dynamic.patch]; - inherit motif; - buildInputs = [x11 motif libXpm]; + buildInputs = [ x11 motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; + NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + + installPhase = '' + mkdir -p $out/bin + cp -p source/nedit source/nc $out/bin + ''; + meta = { homepage = http://www.nedit.org; }; diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch deleted file mode 100644 index adb2cbc2592..00000000000 --- a/pkgs/applications/editors/nedit/dynamic.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux -*** nedit-5.5-orig/makefiles/Makefile.linux 2003-05-20 02:27:56.000000000 +0200 ---- nedit-5.5/makefiles/Makefile.linux 2005-12-03 00:42:23.000000000 +0100 -*************** -*** 17,27 **** - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common - ---- 17,27 ---- - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common From b91e83dc77a4d9bcb437d1b302972f9de0f33248 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:33:12 -0700 Subject: [PATCH 594/947] vim: 7.4.410 -> 7.4.683 --- pkgs/applications/editors/vim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8f27f540997..4f14aade5a5 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.410"; + version = "7.4.683"; src = fetchhg { - url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-410"; - sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp"; + url = "https://code.google.com/p/vim/"; + rev = "v7-4-663"; + sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc"; }; enableParallelBuilding = true; From 46d1dd5b113db63949e9e50de405848f6c87c237 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 26 Mar 2015 21:42:36 +0000 Subject: [PATCH 595/947] Downgraded Emacs priority, for exuberant ctags Exuberant ctags works with Emacs among with other editors, and if installed is probably preferred to Emacs' ctags. --- pkgs/applications/editors/emacs-24/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index af5c11e69ae..83774206b5c 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; platforms = platforms.all; + # So that Exuberant ctags is preferred + priority = 1; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp From 53d5b564d4108264907a674239e8258c24444c92 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:54:00 -0700 Subject: [PATCH 596/947] qemu: 2.2.0 -> 2.2.1 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b329750ea5..69888e22a01 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.2.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = From c8a05f484f8c775f0d6723e491535738f4d6daf1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:57:59 -0700 Subject: [PATCH 597/947] usbredir: 0.6 -> 0.7 --- pkgs/development/libraries/usbredir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 7f05daab021..f970a63ff12 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf"; + sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa"; }; buildInputs = [ pkgconfig libusb ]; From e8a8f784713c9041f218ad55940b74396b6a70fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 15:00:31 -0700 Subject: [PATCH 598/947] gptfdisk: 0.8.8 -> 1.0.0 --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 0fe4cbc986c..b8c92eeab56 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.8"; + name = "gptfdisk-1.0.0"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "16myqa72mp0wyhca8il299h1gd6k6sr7m52qcr97j840wk0fjcac"; + sha256 = "0v0xl0mzwabdf9yisgsvkhpyi48kbik35c6df42gr6d78dkrarjv"; }; buildInputs = [ libuuid popt icu ncurses ]; From 65e303570e15465319301414024c788d03010e8c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 15:04:44 -0700 Subject: [PATCH 599/947] macchanger: 1.6.0 -> 1.7.0 --- pkgs/os-specific/linux/macchanger/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1ab7a600fcd..b6ae89afbaf 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: let pname = "macchanger"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "31534f138f1d21fa247be74ba6bef3fbfa47bbcd5033e99bd10c432fe58e51f7"; + + src = fetchFromGitHub { + owner = "alobbs"; + repo = "macchanger"; + rev = version; + sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; + buildInputs = [ autoreconfHook texinfo ]; + meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = [ stdenv.lib.maintainers.joachifm ]; From c7a0045b80ddf199af66246477eae267576b3b20 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:07:02 -0700 Subject: [PATCH 600/947] openntpd: 5.7p3 -> 5.7p4 --- pkgs/tools/networking/openntpd/default.nix | 16 +++++++++--- .../networking/openntpd/no-install.patch | 26 ------------------- 2 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/networking/openntpd/no-install.patch diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 167fea80622..55147464416 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p3"; + version = "5.7p4"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a"; + sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; }; - patches = [ ./no-install.patch ]; - configureFlags = [ "--with-privsep-path=${privsepPath}" "--with-privsep-user=${privsepUser}" @@ -23,6 +21,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + meta = with stdenv.lib; { homepage = "http://www.openntpd.org/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/openntpd/no-install.patch b/pkgs/tools/networking/openntpd/no-install.patch deleted file mode 100644 index 0194e414062..00000000000 --- a/pkgs/tools/networking/openntpd/no-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 81549cf..1262bbf 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1740,21 +1740,6 @@ uninstall-man: uninstall-man5 uninstall-man8 - - install-exec-hook: - @ln -f "$(DESTDIR)$(sbindir)/ntpd" "$(DESTDIR)$(sbindir)/ntpctl" -- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/db" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/db"; \ -- fi -- @if [ ! -f "$(DESTDIR)$(sysconfdir)/ntpd.conf" ]; then \ -- $(INSTALL) -m 644 "$(srcdir)/ntpd.conf" "$(DESTDIR)$(sysconfdir)/ntpd.conf"; \ -- else \ -- echo; \ -- echo " $(DESTDIR)$(sysconfdir)/ntpd.conf already exists, install will not overwrite"; \ -- fi - @if [ ! -d "$(PRIVSEP_PATH)" ]; then \ - echo; \ - echo " Please created a privilege separation directory for ntpd." ; \ From b91bac282d31a72a32bd764967dc8f961d9f2022 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:18:17 -0700 Subject: [PATCH 601/947] cups: Fix gmp linking by propagating --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 68972c2e6c3..d2170cfc332 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl +, dbus, acl, gmp , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; - propagatedBuildInputs = [ openssl ]; + propagatedBuildInputs = [ openssl gmp ]; configureFlags = [ "--localstatedir=/var" From b6607a14af1bbc534cf7a7707f04d28db09d8784 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:18:35 -0700 Subject: [PATCH 602/947] ettercap: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/sniffers/ettercap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 7e32a26abf1..3ff12c274d5 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; + sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; buildInputs = [ From d6cd4c57dc6a3cae3a3675fea38a7d564babdd7e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:38:42 -0700 Subject: [PATCH 603/947] bluedevil: 1.3.1 -> 2.1.1 --- pkgs/tools/bluetooth/bluedevil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index e5a4f83ab0f..229b0512679 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; - version = "1.3.1"; + version = "2.1.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi"; }; buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ]; From 7b5f6ca9ba36fb1430f5ef5d54ee1d2ee6c2580c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:39:15 -0700 Subject: [PATCH 604/947] prosody: 0.9.7 -> 0.9.8 --- pkgs/servers/xmpp/prosody/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 67882b1a02a..684a06eff4a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -14,11 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; name = "prosody-${version}"; + src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "001fgslg3h7zfrfpkmqixnz5ircq6l0kr4wci5aj0i3nk6rrjjyx"; + sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l"; }; communityModules = fetchhg { From cd3b4602003283e1fc820316d86c23bbb218254f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:40:56 -0700 Subject: [PATCH 605/947] tig: 2.0.3 -> 2.1 --- .../version-management/git-and-tools/tig/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 4c82c96a7c1..c8973e4a660 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tig-2.0.3"; + name = "tig-2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s"; - + sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; From 0a8efb537b4567de62fae09c8eb179039345f1cf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:52:41 -0700 Subject: [PATCH 606/947] librsync: 0.9.7 -> 1.0.0 --- .../libraries/librsync/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 76daf7d748b..c5a7a7202e2 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,22 +1,29 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }: -stdenv.mkDerivation { - name = "librsync-0.9.7"; +stdenv.mkDerivation rec { + name = "librsync-${version}"; + version = "1.0.0"; - src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; + src = fetchFromGitHub { + owner = "librsync"; + repo = "librsync"; + rev = "v${version}"; + sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc"; }; + buildInputs = [ autoreconfHook perl zlib bzip2 popt ]; + configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; crossAttrs = { dontStrip = true; }; - meta = { + meta = with stdenv.lib; { homepage = http://librsync.sourceforge.net/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } From 06ea22649512dda634bd3f65a13b05e194e22fdc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:15:29 -0700 Subject: [PATCH 607/947] cgit: 0.10.2 -> 0.11.2 --- .../version-management/git-and-tools/cgit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 383114f1c3c..6cde64b3090 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.10.2"; + version = "0.11.2"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl"; + sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if"; }; # cgit is tightly coupled with git and needs a git source tree to build. @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to # 1.9.2 (see the repository history) gitSrc = fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz"; - sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13"; + url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; buildInputs = [ From 611a4bfc0dfefc8388a5026fc1490247bdc3ac55 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:22:11 -0700 Subject: [PATCH 608/947] licenses: Add mpl-1.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d4810d412b1..6d2a6c6aada 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -287,6 +287,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "MIT License"; }; + mpl10 = spdx { + spdxId = "MPL-1.0"; + fullName = "Mozilla Public License 1.0"; + }; + mpl11 = spdx { spdxId = "MPL-1.1"; fullName = "Mozilla Public License 1.1"; From 5e790f0e177494a2b7dcc5b737f9cc67fbf14a42 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:29:57 -0700 Subject: [PATCH 609/947] libical: 1.0.0 -> 1.0.1 --- .../development/libraries/libical/default.nix | 24 ++++++++++++++----- .../libraries/libical/respect-env-tzdir.patch | 16 ++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index dbb104546ad..6292318d5ca 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,13 +1,25 @@ -{stdenv, fetchurl, perl, cmake}: +{ stdenv, fetchFromGitHub, perl, cmake }: stdenv.mkDerivation rec { - pName = "libical"; - name = "${pName}-1.0"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; - sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; + name = "libical-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "libical"; + repo = "libical"; + rev = "v${version}"; + sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; }; + nativeBuildInputs = [ perl cmake ]; patches = [ ./respect-env-tzdir.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libical/libical; + description = "an Open Source implementation of the iCalendar protocols"; + license = licenses.mpl10; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 12da8d41c7b..980a0d5c71a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,21 +1,19 @@ -* Remove /usr/*/zoneinfo from the default search path -* Respect $TZDIR diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c -index adf7598..d2fd5c8 100644 +index fe984c9..22ba0a1 100644 --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -108,7 +108,7 @@ typedef struct - - static int r_pos [] = {1, 2, 3, -2, -1}; +@@ -107,7 +107,7 @@ typedef struct + 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 *zdir = NULL; #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -195,6 +195,16 @@ set_zonedir (void) +@@ -194,6 +194,16 @@ set_zonedir (void) const char *fname = ZONES_TAB_SYSTEM_FILENAME; - int i; + unsigned int i; + const char *env_tzdir = strdup (getenv ("TZDIR")); + if (env_tzdir) { @@ -27,6 +25,6 @@ index adf7598..d2fd5c8 100644 + free (env_tzdir); + } + - for (i = 0;i < NUM_SEARCH_PATHS; i++) { + for (i = 0; i < NUM_SEARCH_PATHS; i++) { sprintf (file_path, "%s/%s", search_paths [i], fname); if (!access (file_path, F_OK|R_OK)) { From 82eb45bf99e2893b4dfb2b8d2ba48a0de6fa7f4e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:32:02 -0700 Subject: [PATCH 610/947] bluez5: 5.25 -> 5.29 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index e8be1b6b0e6..61d3667f165 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.25"; + name = "bluez-5.29"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; + sha256 = "1r7h8qr52n372r73fdyk804r92hqg9g6pvflwmak64y6brnnl8fz"; }; pythonPath = with pythonPackages; From 7719f7f23b8ad754d3a5916f5a218110c89eb69f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:40:11 -0700 Subject: [PATCH 611/947] mdadm: 3.3 -> 3.3.2 --- pkgs/os-specific/linux/mdadm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 48e1c178490..767f1e9ecae 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3"; + name = "mdadm-3.3.2"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + sha256 = "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"; }; nativeBuildInputs = [ groff ]; From 1eeee6c87c225b0c669997692a11c8983e30da05 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:54:08 -0700 Subject: [PATCH 612/947] libseccomp: 2.1.1 -> 2.2.0 --- .../libraries/libseccomp/default.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a66d31d2ec4..00655b51afc 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, getopt, bash }: +{ stdenv, fetchFromGitHub, autoreconfHook, getopt }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.1.1"; + version = "2.2.0"; - src = fetchurl { - url = "mirror://sourceforge/libseccomp/libseccomp-${version}.tar.gz"; - sha256 = "0744mjx5m3jl1hzz13zypivl88m0wn44mf5gsrd3yf3w80gc24l8"; + src = fetchFromGitHub { + owner = "seccomp"; + repo = "libseccomp"; + rev = "v${version}"; + sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; }; - # This fixes the check for 'getopt' to function appropriately. - # Additionally, this package can optionally include the kernel - # headers if they exist, or use its own inline copy of the source - # for talking to the seccomp filter - we opt to always use the - # inline copy + buildInputs = [ autoreconfHook getopt ]; + patchPhase = '' - substituteInPlace ./configure --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace ./configure --replace "verify_deps getopt" "" - substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt - substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"' + patchShebangs . ''; - meta = { + meta = with stdenv.lib; { description = "high level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } From 1697b2a2281b248fa9e053713e18b896b9b9bb5a Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 21:12:10 -0400 Subject: [PATCH 613/947] Added Eiffel Forum License v1 and v2 to lib/licenses.nix --- lib/licenses.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9b3acf8653b..09c5fb21606 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -125,6 +125,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + efl10 = spdx { + spdxId = "EFL-1.0"; + fullName = "Eiffel Forum License v1.0"; + }; + + efl20 = spdx { + spdxId = "EFL-2.0"; + fullName = "Eiffel Forum License v2.0"; + }; + epl10 = spdx { spdxId = "EPL-1.0"; fullName = "Eclipse Public License 1.0"; From 702590081b67a2f0dfc2744150741466eddd4344 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 18:11:39 -0700 Subject: [PATCH 614/947] cgmanager: Add derivation --- pkgs/os-specific/linux/cgmanager/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/linux/cgmanager/default.nix diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix new file mode 100644 index 00000000000..79be500a13d --- /dev/null +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libnih, dbus }: + +stdenv.mkDerivation rec { + name = "cgmanager-0.36"; + + src = fetchurl { + url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz"; + sha256 = "039azd4ghpmiccd95ki8fna321kccapff00rib6hrdgg600pyw7l"; + }; + + buildInputs = [ pkgconfig libnih dbus ]; + + configureFlags = [ + "--with-init-script=systemd" + "--sysconfdir=/etc/" + "--localstatedir=/var" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + + meta = with stdenv.lib; { + homepage = https://linuxcontainers.org/cgmanager/introduction/; + description = "a central privileged daemon that manages all your cgroups"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f25d37dd62..3e6d3fdd5f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8682,6 +8682,8 @@ let busybox = callPackage ../os-specific/linux/busybox { }; + cgmanager = callPackage ../os-specific/linux/cgmanager { }; + checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; checksec = callPackage ../os-specific/linux/checksec { }; From 26c7e2605ed7d8b9bcff55d7311ec7f3a4d427a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:54:25 -0700 Subject: [PATCH 615/947] lxc: 1.0.7 -> 1.1.1 --- pkgs/os-specific/linux/lxc/default.nix | 61 +++++++++++++------ .../lxc/install-localstatedir-in-store.patch | 15 ----- 2 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 97f80b53032..9939a552574 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,38 +1,63 @@ -{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x -, docbook_xml_dtd_45, gnutls, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x +, docbook_xml_dtd_45, systemd +, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null +, libnih ? null, dbus ? null, libcap ? null }: +let + enableCgmanager = cgmanager != null && libnih != null && dbus != null; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-1.0.7"; + name = "lxc-1.1.1"; - src = fetchurl { - url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "lxc"; + rev = name; + sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql"; }; - buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; + buildInputs = [ + autoreconfHook pkgconfig perl docbook2x systemd + libapparmor gnutls libseccomp cgmanager libnih dbus libcap + ]; - patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; + patches = [ ./support-db2x.patch ]; - preConfigure = '' - export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml - substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs' - substituteInPlace configure.ac --replace '$sysconfdir/' '/etc/' - substituteInPlace configure.ac --replace '$${sysconfdir}/' '/etc/' - ''; + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; configureFlags = [ "--localstatedir=/var" + "--sysconfdir=/etc" "--with-rootfs-path=/var/lib/lxc/rootfs" + ] ++ optional (libapparmor != null) "--enable-apparmor" + ++ optional (gnutls != null) "--enable-gnutls" + ++ optional (libseccomp != null) "--enable-seccomp" + ++ optional (enableCgmanager) "--enable-cgmanager" + ++ optional (libcap != null) "--enable-capabilities" + ++ [ "--enable-doc" "--enable-tests" - "--enable-apparmor" ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # Remove the unneeded var/lib directories + rm -rf $out/var + ''; + meta = { homepage = "http://lxc.sourceforge.net"; description = "userspace tools for Linux Containers, a lightweight virtualization system"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -42,7 +67,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.linux; + maintainers = with maintainers; [ simons wkennington ]; }; } diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch deleted file mode 100644 index d45335a0232..00000000000 --- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index eac2bfd..8f040d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig - pcdata_DATA = lxc.pc - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(LXCPATH) -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc -+ $(MKDIR_P) $(out)$(LXCPATH) -+ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc - - ChangeLog:: - @touch ChangeLog From b3e4968491844020d58014aaaf1189aab6f3158c Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 22:28:09 -0400 Subject: [PATCH 616/947] Added willie package --- pkgs/top-level/python-packages.nix | 102 +++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f2d646c217..5966d4594b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7678,6 +7678,27 @@ let }; + + praw = pythonPackages.buildPythonPackage rec { + name = "praw-2.1.21"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/praw/praw-2.1.21.tar.gz"; + md5 = "3b0388c9105662f8be8f1a4d3a38216d"; + }; + + propagatedBuildInputs = with pythonPackages; [ update_checker six mock flake8 ]; + + # can't find the tests module? + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + }; + }; + prettytable = buildPythonPackage rec { name = "prettytable-0.7.1"; @@ -8264,6 +8285,33 @@ let }; }; + + pyenchant = pythonPackages.buildPythonPackage rec { + name = "pyenchant-1.6.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyenchant/pyenchant-1.6.6.tar.gz"; + md5 = "9f5acfd87d04432bf8df5f9710a17358"; + }; + + propagatedBuildInputs = with pythonPackages; [ pkgs.enchant ]; + + patchPhase = let + path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; + in '' + sed -i "${path_hack_script}" enchant/_enchant.py + ''; + + # dictionaries needed for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "pyenchant: Python bindings for the Enchant spellchecker"; + homepage = https://pythonhosted.org/pyenchant/; + license = licenses.lgpl21; + }; + }; + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; @@ -8320,6 +8368,24 @@ let }; }; + + pygeoip = pythonPackages.buildPythonPackage rec { + name = "pygeoip-0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.3.2.tar.gz"; + md5 = "861664f8be3bed44820356539f2ea5b6"; + }; + + propagatedBuildInputs = with pythonPackages; [ ]; + + meta = with stdenv.lib; { + description = "Pure Python GeoIP API"; + homepage = https://github.com/appliedsec/pygeoip; + license = licenses.lgpl3Plus; + }; + }; + pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; @@ -11345,6 +11411,24 @@ let }; + + update_checker = pythonPackages.buildPythonPackage rec { + name = "update_checker-0.11"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/update_checker/update_checker-0.11.tar.gz"; + md5 = "1daa54bac316be6624d7ee77373144bb"; + }; + + propagatedBuildInputs = with pythonPackages; [ requests2 ]; + + meta = with stdenv.lib; { + description = "A python module that will check for package updates"; + homepage = https://github.com/bboe/update_checker; + license = licenses.bsd2; + }; + }; + urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; disabled = isPy3k; @@ -11700,6 +11784,24 @@ let }; + + willie = pythonPackages.buildPythonPackage rec { + name = "willie-5.2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/willie/willie-5.2.0.tar.gz"; + md5 = "a19f8c34e10e3c2d0d915c894224e521"; + }; + + propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + + meta = with stdenv.lib; { + description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python."; + homepage = http://willie.dftba.net/; + license = licenses.efl20; + }; + }; + wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; name = nameFromURL url ".tar"; From a0154fed8c2e45da54caf330855c5c7eb3b7a758 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 26 Mar 2015 23:35:57 -0400 Subject: [PATCH 617/947] Update and simplify hologram expression --- pkgs/top-level/go-packages.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4f9f6947c98..3410bd0b8c5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -626,33 +626,16 @@ let self = _self // overrides; _self = with self; { }; hologram = buildGoPackage rec { - rev = "6e81a11091f59a9392e424d8f1c42b4b813c4bff"; + rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; src = fetchFromGitHub { inherit rev; owner = "copumpkin"; repo = "hologram"; - sha256 = "1rpnc8sv9mwm9r9yfh8h2zxczznmvlhasrz55bcifmk4sym4ywq7"; + sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - preBuild = '' - cd "go/src/$goPackagePath" - - govers -d -m code.google.com/p/goprotobuf github.com/golang/protobuf - - # Work around `go install` assuming containing directory is the executable name we want - for i in */bin; do - mv "$i" "$(dirname "$i")/$(dirname "$i")" - done - - # Generate protobuf definitions and static assets - sed -i '1s|^|SHELL = ${stdenv.shell}\n|' Makefile - make protocol/hologram.pb.go - make transport/remote/bindata.go - ''; - - buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata - go-homedir ldap g2s gox govers ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox govers ]; }; httprouter = buildGoPackage rec { @@ -1026,14 +1009,14 @@ let self = _self // overrides; _self = with self; { }; rgbterm = buildGoPackage rec { - rev = "9e3d038e1b8341ed7416c841a884cab4a3487941"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/aybabtme/rgbterm"; src = fetchFromGitHub { inherit rev; owner = "aybabtme"; repo = "rgbterm"; - sha256 = "1pfg56pkm9clzd3c1s0czvydw1k35jggz9ydv8x2dbns3f7qn2ph"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; }; }; From 6987f5bea9bb96d848dbccc81f335db469f09664 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 26 Mar 2015 23:40:40 -0400 Subject: [PATCH 618/947] Whoops, spurious dependency --- pkgs/top-level/go-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3410bd0b8c5..5a63be2e9c6 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -635,7 +635,7 @@ let self = _self // overrides; _self = with self; { repo = "hologram"; sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox govers ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; }; httprouter = buildGoPackage rec { From ba4f29aee6c431254f1c6d3fb6f37b2e643127d2 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Fri, 27 Mar 2015 00:56:44 -0400 Subject: [PATCH 619/947] update_checker doesn't pass tests --- 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 5966d4594b1..7062834e72a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11422,6 +11422,8 @@ let propagatedBuildInputs = with pythonPackages; [ requests2 ]; + doCheck = false; + meta = with stdenv.lib; { description = "A python module that will check for package updates"; homepage = https://github.com/bboe/update_checker; From 9fc71d3bf63937952a92bc5249ac5e7b88c188d3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 27 Mar 2015 08:24:35 +0300 Subject: [PATCH 620/947] Add mkcl; patch by Tomas Hlavaty --- pkgs/development/compilers/mkcl/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/compilers/mkcl/default.nix diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix new file mode 100644 index 00000000000..2a34a5dc50b --- /dev/null +++ b/pkgs/development/compilers/mkcl/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, gmp }: + +stdenv.mkDerivation rec { + v = "1.1.9"; + name = "mkcl-${v}"; + + src = fetchgit { + url = "https://github.com/jcbeaudoin/mkcl.git"; + rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; + sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; + }; + + propagatedBuildInputs = [ gmp ]; + + configureFlags = [ + "GMP_CFLAGS=-I${gmp}/include" + "GMP_LDFLAGS=-L${gmp}/lib" + ]; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = https://common-lisp.net/project/mkcl/; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75167544379..eb6fb098a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3858,6 +3858,8 @@ let mitscheme = callPackage ../development/compilers/mit-scheme { }; + mkcl = callPackage ../development/compilers/mkcl {}; + mlton = callPackage ../development/compilers/mlton { }; mono = callPackage ../development/compilers/mono { From 1148374cb5011892e78f2ca9bcbe3daf0c3fcbd3 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 27 Mar 2015 00:59:16 -0400 Subject: [PATCH 621/947] soxr: Fix Darwin build --- pkgs/applications/misc/audio/soxr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 73cdbb37616..084a95b962a 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; }; - preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src''; + preConfigure = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:"`pwd`/build/src + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src + ''; buildInputs = [ cmake ]; From 3311513df60a421903c0dbabc27b5ce10b827268 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 27 Mar 2015 12:45:32 +0200 Subject: [PATCH 622/947] Rename ccgo back to gccgo I believe this is result of typo, introduced in 48f63c2f. --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index df43da58e3e..f6826c837ca 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation { '' + optionalString cc.langGo or false '' - wrap ccgo ${./cc-wrapper.sh} $ccPath/gccgo + wrap gccgo ${./cc-wrapper.sh} $ccPath/gccgo '' + optionalString cc.langAda or false '' From 51b06c5865d6b7d54b14da0f33caab1564cac94c Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Fri, 27 Mar 2015 11:48:50 +0100 Subject: [PATCH 623/947] Add MediaTomb service --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/mediatomb.nix | 282 ++++++++++++++++++++++ 3 files changed, 285 insertions(+) create mode 100644 nixos/modules/services/misc/mediatomb.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b03107610fe..acb4af7a933 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -212,6 +212,7 @@ uptimed = 184; zope2 = 185; ripple-data-api = 186; + mediatomb = 187; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -401,6 +402,7 @@ #uptimed = 184; # unused #zope2 = 185; # unused #ripple-data-api = 186; #unused + mediatomb = 187; # 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 cca1c1a73d3..738faa79e29 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -191,6 +191,7 @@ ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix + ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix ./services/misc/nix-daemon.nix diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix new file mode 100644 index 00000000000..23227548039 --- /dev/null +++ b/nixos/modules/services/misc/mediatomb.nix @@ -0,0 +1,282 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + uid = config.ids.uids.mediatomb; + gid = config.ids.gids.mediatomb; + cfg = config.services.mediatomb; + + mtConf = pkgs.writeText "config.xml" '' + + + + + + + + + ${cfg.serverName} + uuid:${cfg.uuid} + ${cfg.dataDir} + ${pkgs.mediatomb}/share/mediatomb/web + + + mediatomb.db + + + + ${if cfg.dsmSupport then '' + + + + + redsonic.com + 105 + '' else ""} + ${if cfg.tg100Support then '' + 101 + '' else ""} + + + * + + video + + + + + + + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/common.js + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/playlists.js + + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/import.js + + + + + + + + + + + + + + + + + + + + + + + + ${if cfg.ps3Support then '' + + '' else ""} + ${if cfg.dsmSupport then '' + + '' else ""} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + audio/L16 + no + yes + no + + + + + video/mpeg + yes + yes + yes + + + + + + + ''; + +in { + + + ###### interface + + options = { + + services.mediatomb = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the mediatomb DLNA server. + ''; + }; + + serverName = mkOption { + type = types.string; + default = "mediatomb"; + description = '' + How to identify the server on the network. + ''; + }; + + ps3Support = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable ps3 specific tweaks. + WARNING: incompatible with DSM 320 support. + ''; + }; + + dsmSupport = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable D-Link DSM 320 specific tweaks. + WARNING: incompatible with ps3 support. + ''; + }; + + tg100Support = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Telegent TG100 specific tweaks. + ''; + }; + + transcoding = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable transcoding. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/mediatomb"; + description = '' + The directory where mediatomb stores its state, data, etc. + ''; + }; + + user = mkOption { + default = "mediatomb"; + description = "User account under which mediatomb runs."; + }; + + group = mkOption { + default = "mediatomb"; + description = "Group account under which mediatomb runs."; + }; + + port = mkOption { + default = 49152; + description = '' + The network port to listen on. + ''; + }; + + uuid = mkOption { + default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687"; + description = '' + A unique (on your network) to identify the server by. + ''; + }; + + customCfg = mkOption { + type = types.bool; + default = false; + description = '' + Allow mediatomb to create and use its own config file inside ${cfg.dataDir}. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.mediatomb = { + description = "MediaTomb media Server"; + 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.User = "${cfg.user}"; + }; + + users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + name = "mediatomb"; + gid = gid; + }); + + users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + name = "mediatomb"; + isSystemUser = true; + group = cfg.group; + home = "${cfg.dataDir}"; + createHome = true; + description = "Mediatomb DLNA Server User"; + }); + + networking.firewall = { + allowedUDPPorts = [ 1900 cfg.port ]; + allowedTCPPorts = [ cfg.port ]; + }; + }; +} From 1f34a1d4ada652b04057b7457c802c963f04c109 Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Thu, 26 Mar 2015 12:41:02 +0000 Subject: [PATCH 624/947] Update python package enum34 1.0 -> 1.0.4, also fixed missing build input for python26 --- pkgs/top-level/python-packages.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1e7e2b3352..0d55b5ffffe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4244,13 +4244,22 @@ let }; enum34 = buildPythonPackage rec { - name = "enum34-1.0"; + name = "enum34-${version}"; + version = "1.0.4"; + disabled = pythonAtLeast "3.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; - md5 = "9d57f5454c70c11707998ea26c1b0a7c"; + sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk"; }; + buildInputs = optional isPy26 self.ordereddict; + + meta = { + homepage = https://pypi.python.org/pypi/enum34; + description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; + license = "BSD"; + }; }; epc = buildPythonPackage rec { From fa8c5144070c8c2b8c096cb6d7084864e366b987 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 14:11:09 +0100 Subject: [PATCH 625/947] hackage-packages.nix: re-generate from Hackage 2015-03-26T14:11:09+0100 --- .../haskell-modules/hackage-packages.nix | 334 +++++++++++------- 1 file changed, 216 insertions(+), 118 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b84aa2f2a17..9fa2b6bc12c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -417,12 +417,12 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, OpenGL }: + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: mkDerivation { pname = "ALUT"; - version = "2.3.0.2"; - sha256 = "02kfyb4g7sfjfzqlddxqbjffrj4a0gfrzkisdpbj2lw67j1gq5dp"; - buildDepends = [ base OpenAL OpenGL ]; + version = "2.4.0.0"; + sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g"; + buildDepends = [ base OpenAL StateVar transformers ]; extraLibraries = [ freealut ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; @@ -10529,8 +10529,8 @@ self: { }: mkDerivation { pname = "Nomyx"; - version = "0.7.5"; - sha256 = "1vnq19yh1sr39zch76fxangslx12zsv5w7p6nq48cbz8jix0ypxp"; + version = "0.7.6"; + sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -10554,8 +10554,8 @@ self: { }: mkDerivation { pname = "Nomyx-Core"; - version = "0.7.5"; - sha256 = "0kd8rl0i7d4kbhnsakiqk0zmz956f12hccmql8fgnnww4fmf36zs"; + version = "0.7.6"; + sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; buildDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -10577,8 +10577,8 @@ self: { }: mkDerivation { pname = "Nomyx-Language"; - version = "0.7.5"; - sha256 = "11480ggfphwdyakhch1i8fr3cqhdmx32jg5nj5pc43sk3bpq2dwk"; + version = "0.7.6"; + sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; buildDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -10617,8 +10617,8 @@ self: { }: mkDerivation { pname = "Nomyx-Web"; - version = "0.7.5"; - sha256 = "161b87ysa9fh40r1z9cp1mzyrs5ws3d97bsrnqwgcaz4rhnjzyvb"; + version = "0.7.6"; + sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; buildDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -10935,12 +10935,14 @@ self: { }) {}; "OpenAL" = callPackage - ({ mkDerivation, base, openal, OpenGL }: + ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar + , transformers + }: mkDerivation { pname = "OpenAL"; - version = "1.6.0.1"; - sha256 = "0m29p6mm87lbx1507n9w4ara4l1xva8j42xjp0771ngx4sbphn2y"; - buildDepends = [ base OpenGL ]; + version = "1.7.0.0"; + sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw"; + buildDepends = [ base ObjectName OpenGL StateVar transformers ]; extraLibraries = [ openal ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; @@ -21054,10 +21056,8 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.2.0.5"; - revision = "2"; - sha256 = "1c6n5yc24g3chm18c5jaspidgi064pbzbd9gnakxj6q0npwwmp1h"; - editedCabalFile = "21de0f6b3309a084876f2e6a3ef4a87a2953511d9d564528071c0a81bcf22dd0"; + version = "0.2.0.6"; + sha256 = "1k0nzhkn32jypf1yqjqadmqwq9ckyax23lmvwzz110fx657j1nhi"; buildDepends = [ base bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -21772,8 +21772,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.4.0"; - sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; + version = "0.4.1"; + sha256 = "1zylnxh6r6sbk6fyx3b5hh6msajrrr07nsb4hwqlh07n1zzavw7j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25273,19 +25273,22 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, containers - , haskell-src-exts, http-types, pointful, transformers, wai, warp + ({ mkDerivation, aeson, array, base, bytestring, clay, containers + , haskell-src-exts, http-types, jmacro, lucid, pointful, text + , transformers, wai, warp, wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.12"; - sha256 = "19x4djczbzrjpqmcjz4pal0cks4xbrhgxw9gs45r6rbs3d7g06am"; + version = "0.0.13"; + sha256 = "1mawchdfywhs7gqfy1p91drfc4l31c2m2v8nkma5bg9i5zb81kyr"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson array base bytestring containers haskell-src-exts http-types - pointful transformers wai warp + aeson array base bytestring clay containers haskell-src-exts + http-types jmacro lucid pointful text transformers wai warp + wl-pprint-text ]; + homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; license = stdenv.lib.licenses.mit; }) {}; @@ -25466,6 +25469,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "borel" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava + , ceilometer-common, chevalier-common, configurator, containers + , either, errors, hslogger, hspec, lens, lens-properties, marquise + , mtl, multiset, network, network-uri, pipes, pipes-concurrency + , pipes-safe, QuickCheck, text, time, transformers + , unordered-containers, vaultaire-common, vector, zeromq4-haskell + }: + mkDerivation { + pname = "borel"; + version = "0.18.0"; + sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453"; + buildDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers errors hslogger lens + marquise mtl multiset network network-uri pipes pipes-concurrency + pipes-safe text time transformers unordered-containers + vaultaire-common vector zeromq4-haskell + ]; + testDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers either errors hslogger + hspec lens lens-properties marquise mtl multiset network + network-uri pipes pipes-concurrency pipes-safe QuickCheck text time + transformers unordered-containers vaultaire-common vector + zeromq4-haskell + ]; + homepage = "https://github.com/anchor/borel-core"; + description = "Metering System for OpenStack metrics provided by Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -26414,6 +26449,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-short" = callPackage + ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: + mkDerivation { + pname = "bytestring-short"; + version = "0.0.1.0"; + sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv"; + buildDepends = [ base bytestring deepseq ]; + testDepends = [ base bytestring QuickCheck ]; + jailbreak = true; + description = "Backport copy of ShortByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-show" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , integer-gmp @@ -28577,8 +28625,8 @@ self: { }: mkDerivation { pname = "ceilometer-common"; - version = "0.2.2"; - sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + version = "0.2.3"; + sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps"; buildDepends = [ base bimap binary bytestring containers foldl lens pipes siphash template-haskell text vaultaire-common @@ -28589,7 +28637,7 @@ self: { text transformers vaultaire-common ]; homepage = "https://github.com/anchor/ceilometer-common"; - description = "Common Haskell types and encoding for ceilometer"; + description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -29305,6 +29353,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chevalier-common" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, locators + , mtl, network, network-uri, protobuf, text, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "chevalier-common"; + version = "0.6.0"; + sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs"; + buildDepends = [ + base bifunctors bytestring cereal locators mtl network network-uri + protobuf text unordered-containers vaultaire-common zeromq4-haskell + ]; + description = "Query interface for Chevalier"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chp" = callPackage ({ mkDerivation, base, containers, deepseq, extensible-exceptions , pretty, stm @@ -30770,8 +30835,8 @@ self: { }: mkDerivation { pname = "clustering"; - version = "0.1.1"; - sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + version = "0.1.2"; + sha256 = "0idmh6k6j4dmnaf8zsvw30lkwsgk5hqvp4hlzfd4j6d9ah2pwmfp"; buildDepends = [ base binary containers matrices mwc-random primitive vector ]; @@ -34898,8 +34963,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.2.0"; - sha256 = "0f82hpw71yb7p3nfh4zpap8ag7dw3932qm9gvaw3b3xiild701gv"; + version = "2.2.1"; + sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -46041,6 +46106,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filtrable"; + version = "0.1.0.0"; + sha256 = "0hxnfjmwv1p1izxr5h7qrd5zdynj2c8k4zh198pinav5skf6v3kd"; + buildDepends = [ base ]; + jailbreak = true; + description = "Class of filtrable containers"; + license = "unknown"; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -49752,8 +49829,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.4.0"; - sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; + version = "0.1.6.0"; + sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -50174,6 +50251,7 @@ self: { aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -56967,8 +57045,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.13"; - sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; + version = "0.3.0.15"; + sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base mtl resourcet scientific text @@ -61783,8 +61861,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.5.1.2"; - sha256 = "0vxlmlfyv3an8dhw5yrsnkaqhascdw3hdmpillrj266ag5w4b139"; + version = "0.5.2.1"; + sha256 = "0kff73g9gjvc035lw3420mxz9mp7pd1yl941wr3jagqnh6g1s85m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68136,13 +68214,13 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, blaze-builder - , bytestring, containers, directory, doctest, filepath, hex, hspec - , PSQueue, text, unordered-containers, vector, word8 + , bytestring, containers, directory, doctest, filepath, Glob, hex + , hspec, PSQueue, text, unordered-containers, vector, word8 }: mkDerivation { pname = "http2"; - version = "0.8.0"; - sha256 = "1hvjb22jmmfrj0ym4sk4yn2y4x9manic42w7yfy8kckhihzh1j1s"; + version = "0.9.0"; + sha256 = "117s8kjbqhd034f483j2x3m2kkjl895b1bc1lxj35b6ar326fp2b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68152,7 +68230,7 @@ self: { ]; testDepends = [ aeson aeson-pretty array base blaze-builder bytestring containers - directory doctest filepath hex hspec PSQueue text + directory doctest filepath Glob hex hspec PSQueue text unordered-containers vector word8 ]; description = "HTTP/2.0 library including frames and HPACK"; @@ -69203,12 +69281,12 @@ self: { }) {}; "hydrogen-multimap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "hydrogen-multimap"; - version = "0.2"; - sha256 = "0v0yylh9zpfzyb19mhwwf6pw36pmpn3gj7cdiamqzz3db0zcadwb"; - buildDepends = [ base containers ]; + version = "0.3"; + sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; + buildDepends = [ base containers ghc-prim ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; license = stdenv.lib.licenses.mit; @@ -69228,19 +69306,19 @@ self: { }) {}; "hydrogen-prelude" = callPackage - ({ mkDerivation, array, base, cereal, containers, directory - , filepath, hashable, hydrogen-multimap, hydrogen-version, network - , process, random, regex-base, regex-tdfa, strict, time - , transformers, uuid + ({ mkDerivation, array, base, binary, bytestring, cereal + , containers, directory, filepath, hashable, hydrogen-multimap + , hydrogen-version, network, process, random, regex-base + , regex-tdfa, strict, text, time, transformers, uuid }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.19"; - sha256 = "0sl8gvihqhp7jrf6x6m6yg4kv4by63q6r4qi9bnlwbs3yykbriah"; + version = "0.20"; + sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697"; buildDepends = [ - array base cereal containers directory filepath hashable - hydrogen-multimap hydrogen-version network process random - regex-base regex-tdfa strict time transformers uuid + array base binary bytestring cereal containers directory filepath + hashable hydrogen-multimap hydrogen-version network process random + regex-base regex-tdfa strict text time transformers uuid ]; homepage = "http://scravy.de/hydrogen-prelude/"; description = "Hydrogen Prelude"; @@ -69297,8 +69375,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hydrogen-version"; - version = "1.3"; - sha256 = "1211ynxr4l1kwkxj37gyyfjcd8mmdajrnmwg9lwlf85dn49r4xzv"; + version = "1.4"; + sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; buildDepends = [ base ]; homepage = "https://scravy.de/hydrogen-version/"; description = "Hydrogen Version Type"; @@ -69926,40 +70004,40 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , classy-prelude, cmdargs, containers, directory, filepath, ghc - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, http-client, http-client-tls, HUnit, ipython-kernel - , MissingH, mono-traversable, mtl, parsec, process, random, setenv - , shelly, split, stm, strict, system-argv0, system-filepath, tar - , template-haskell, text, transformers, unix, unordered-containers - , utf8-string, uuid, vector + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, classy-prelude, cmdargs, containers + , directory, filepath, ghc, ghc-parser, ghc-paths, haskeline + , haskell-src-exts, here, hlint, hspec, http-client + , http-client-tls, HUnit, ipython-kernel, MissingH + , mono-traversable, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, system-filepath, tar, text + , transformers, unix, unordered-containers, utf8-string, uuid + , vector }: mkDerivation { pname = "ihaskell"; - version = "0.5.0.0"; - sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; + version = "0.6.0.0"; + sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random shelly split stm strict system-argv0 - system-filepath tar template-haskell text transformers unix - unordered-containers utf8-string uuid vector + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; testDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random setenv shelly split stm strict system-argv0 system-filepath tar text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -70127,8 +70205,8 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.0"; - sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + version = "0.2.0.1"; + sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; buildDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat @@ -71669,18 +71747,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, tar, text, transformers, unix - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, SHA, tar, text, transformers + , unix, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.3.0.0"; - sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + version = "0.6.0.0"; + sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers unix uuid zeromq4-haskell ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; @@ -74617,15 +74695,14 @@ self: { }: mkDerivation { pname = "laika"; - version = "0.1.1"; - sha256 = "1ifs8brgbhzwl58ccnpyvfrkn1x27a38ylawik382n221sv28pj5"; + version = "0.1.3"; + sha256 = "1j9f76sch91igpgarw7pwzhymd6ji7wnwr9l8riallglphc55g7l"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -79927,6 +80004,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-zlib" = callPackage + ({ mkDerivation, base, basic-prelude, machines, streaming-commons + }: + mkDerivation { + pname = "machines-zlib"; + version = "0.1.0"; + sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d"; + buildDepends = [ base basic-prelude machines streaming-commons ]; + homepage = "https://github.com/lshift/machines-zlib"; + description = "Decompression support for machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "macho" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -86504,8 +86594,8 @@ self: { }: mkDerivation { pname = "network-anonymous-i2p"; - version = "0.9.2"; - sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + version = "0.10.0"; + sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; buildDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -92282,8 +92372,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.3"; - sha256 = "0z6vxh9pnq3ixmi7bcpn17wf4w1blj6l4k7lw39gzs7jjbcpijzr"; + version = "0.4"; + sha256 = "0vn5fy15yshr9ypz8qagnqsgkkn33qv19ayqp4fy5x5bv68y7a0b"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -93941,8 +94031,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.0.4"; - sha256 = "1cym8c5hjjs7i2gx4n9m7a9zg7dls4wqnnr5bravj7gv2gh9s67q"; + version = "0.2.0.5"; + sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring doctest HUnit QuickCheck unix ]; description = "POSIX filepath/directory functionality"; @@ -95201,8 +95291,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.0.0"; - sha256 = "0ja4ba5w8rq3snmgaky8kxaq9s5h446kw7cbp7agrzc06w03xaci"; + version = "0.7.0.1"; + sha256 = "1dnarvm26xwrys8wjh43757r59pby41w5cizqwyg1zcr2qk7awd8"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -104772,8 +104862,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.14.3"; - sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl"; + version = "0.15"; + sha256 = "02zqkm248fvv6nh10nj6rw7ks5w832q2zrzzk9z9gp1zrqnbhxhk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104848,6 +104938,7 @@ self: { version = "0.1.2"; sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; buildDepends = [ base bytestring css-text hjsmin shake text ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; @@ -104860,6 +104951,7 @@ self: { version = "0.1.0"; sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; buildDepends = [ base bytestring bzlib shake tar ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Actions"; license = stdenv.lib.licenses.bsd3; @@ -112545,8 +112637,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.1"; - sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk"; + version = "0.3.16.2"; + sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time @@ -121612,14 +121704,14 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.3"; - sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; + version = "0.2.4"; + sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers ]; homepage = "http://github.com/dmbarbour/haskell-vcache"; - description = "large, persistent, memcached values and structure sharing for Haskell"; + description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122118,8 +122210,10 @@ self: { ({ mkDerivation, alex, array, base, happy, monadLib }: mkDerivation { pname = "verilog"; - version = "0.0.9"; - sha256 = "0i7jc3lriy0ad4ixkf7lj7yis9lzs9j3wh5la7rlawvfq8hj0sag"; + version = "0.0.10"; + sha256 = "1kyhxxa1d1pqipq714nh60qh90pwb2b3a5wiy1h6yms77c2p4wq4"; + isLibrary = true; + isExecutable = true; buildDepends = [ array base monadLib ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; @@ -122814,8 +122908,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.6"; - sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; + version = "3.0.5"; + sha256 = "1z4ifsldm1j6kf7jnbq8j4pk39f5d51yrygaxfs1m3mnnvr8xl52"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -124722,8 +124816,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.1"; - sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; + version = "0.1.2.2"; + sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; @@ -126257,14 +126351,18 @@ self: { }) {}; "xml-lens" = callPackage - ({ mkDerivation, base, containers, lens, text, xml-conduit }: + ({ mkDerivation, base, case-insensitive, containers, lens, text + , xml-conduit + }: mkDerivation { pname = "xml-lens"; - version = "0.1.6.2"; - sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz"; - buildDepends = [ base containers lens text xml-conduit ]; + version = "0.1.6.3"; + sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + buildDepends = [ + base case-insensitive containers lens text xml-conduit + ]; homepage = "https://github.com/fumieval/xml-lens"; - description = "Lenses, traversals, prisms for xml-conduit"; + description = "Lenses, traversals, and prisms for xml-conduit"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127946,8 +128044,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.3"; - sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; + version = "1.4.9"; + sha256 = "10rf7xrb0zrqpiv8149z52h1jx4nr96ajs2pxdr9avazprls9jmb"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit From 5f0d93351daa317a455518e94e503975c16a3bdd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 14:12:12 +0100 Subject: [PATCH 626/947] Bump cabal2nix to latest version. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25839d0fed1..c01083df0fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -655,8 +655,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "a8eaadbe6529cabd5088b8ae24fb325fc85a50c1"; - sha256 = "08q6c6g6syf4qgmgmicq8gf3fmp2cvy9mm6wm0vi7wjll3i2dns1"; + rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e"; + sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a"; deepClone = true; }; isLibrary = false; From 64a4fab42bccc18b1b0bd8521fa5c03a464c1e1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 15:33:53 +0100 Subject: [PATCH 627/947] ghc: bump version to 7.10.1 release --- pkgs/development/compilers/ghc/7.10.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 09d89b80f34..d39c4b921ba 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150316"; + version = "7.10.1"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; - sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; + url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; + sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; }; buildInputs = [ ghc perl ]; From 0e2257966f030799334a8df5cdf94977c3513c28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 15:38:45 +0100 Subject: [PATCH 628/947] Disable packages that depend on Nothing in Nixpkgs should use , because it can cause Nixpkgs evaluation to depend in part on a different version of Nixpkgs, leading to unpredictable results (including evaluation errors). --- .../interpreters/ruby/bundler-env/default-gem-config.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index eba2a0b0a10..cf7bf881a8f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,7 +25,7 @@ let v8 = v8_3_16_14; - mysql = (import {}).mysql; + mysql = assert false; (import {}).mysql; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6fb098a9e..732b7612fcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1735,7 +1735,7 @@ let kexectools = callPackage ../os-specific/linux/kexectools { }; - keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + #keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; keychain = callPackage ../tools/misc/keychain { }; From 8b2f209838668ead093dec603bdfdb0347a69a07 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 16:42:06 +0100 Subject: [PATCH 629/947] mkDerivation: Use function arguments --- pkgs/stdenv/generic/default.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 751366e38d2..a53ccc3b60a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -83,7 +83,15 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. - mkDerivation = attrs: + mkDerivation = + { buildInputs ? [] + , nativeBuildInputs ? [] + , propagatedBuildInputs ? [] + , propagatedNativeBuildInputs ? [] + , crossConfig ? null + , meta ? {} + , passthru ? {} + , ... } @ attrs: let pos = if attrs.meta.description or null != null then @@ -122,13 +130,7 @@ let lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) - // (let - buildInputs = attrs.buildInputs or []; - nativeBuildInputs = attrs.nativeBuildInputs or []; - propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; - crossConfig = attrs.crossConfig or null; - in + // { builder = attrs.realBuilder or shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; @@ -144,7 +146,7 @@ let nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs else []); - }))) ( + })) ( { # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not @@ -152,15 +154,15 @@ let # include it in the result, it *is* available to nix-env for # queries. We also a meta.position attribute here to # identify the source location of the package. - meta = attrs.meta or {} // (if pos != null then { - position = pos.file + ":" + (toString pos.line); + meta = meta // (if pos != null then { + position = pos.file + ":" + toString pos.line; } else {}); - passthru = attrs.passthru or {}; + inherit passthru; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). - (attrs.passthru or {})); + passthru); # The stdenv that we are producing. result = From 5c0eb64d4312737f34b9f766f1836a6e75878251 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 16:11:18 +0100 Subject: [PATCH 630/947] Set more precise meta.position for Haskell packages --- .../haskell-modules/generic-builder.nix | 4 +++- pkgs/stdenv/generic/default.nix | 23 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4b0ddaf991c..3e9f82db359 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -43,7 +43,7 @@ , preFixup ? "", postFixup ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -}: +} @ args: assert pkgconfigDepends != [] -> pkgconfig != null; assert editedCabalFile != null -> revision != null; @@ -112,6 +112,8 @@ in stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; + pos = builtins.unsafeGetAttrPos "pname" args; + prePhases = ["setupCompilerEnvironmentPhase"]; preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index a53ccc3b60a..6960c84ba5e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,8 +69,6 @@ let isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; - unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); - defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -91,19 +89,22 @@ let , crossConfig ? null , meta ? {} , passthru ? {} + , pos ? null # position used in error messages and for meta.position , ... } @ attrs: let - pos = - if attrs.meta.description or null != null then - unsafeGetAttrPos "description" attrs.meta + pos' = + if pos != null then + pos + else if attrs.meta.description or null != null then + builtins.unsafeGetAttrPos "description" attrs.meta else - unsafeGetAttrPos "name" attrs; - pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; + builtins.unsafeGetAttrPos "name" attrs; + pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; throwEvalHelp = unfreeOrBroken: whatIsWrong: assert builtins.elem unfreeOrBroken ["Unfree" "Broken" "blacklisted"]; - throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos'} ${whatIsWrong}, refusing to evaluate." + throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${whatIsWrong}, refusing to evaluate." + (lib.strings.optionalString (unfreeOrBroken != "blacklisted") '' For `nixos-rebuild` you can set @@ -129,7 +130,7 @@ let assert licenseAllowed attrs; lib.addPassthru (derivation ( - (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) + (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"]) // { builder = attrs.realBuilder or shell; @@ -154,8 +155,8 @@ let # include it in the result, it *is* available to nix-env for # queries. We also a meta.position attribute here to # identify the source location of the package. - meta = meta // (if pos != null then { - position = pos.file + ":" + toString pos.line; + meta = meta // (if pos' != null then { + position = pos'.file + ":" + toString pos'.line; } else {}); inherit passthru; } // From c82dc7018de57f29c1812ac535c8b6a02a79eb99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 16:13:18 +0100 Subject: [PATCH 631/947] Remove unused Darcs expression --- .../version-management/darcs/default.nix | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/applications/version-management/darcs/default.nix diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix deleted file mode 100644 index d5f03a41f22..00000000000 --- a/pkgs/applications/version-management/darcs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec -, random, regexCompat, tar, terminfo, text, utf8String, vector -, zlib -}: - -cabal.mkDerivation (self: { - pname = "darcs"; - version = "2.8.5"; - sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; - isLibrary = true; - isExecutable = true; - doCheck = false; - buildDepends = [ - extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network networkUri parsec random regexCompat tar terminfo - text utf8String vector zlib - ]; - extraLibraries = [ curl ]; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - patchPhase = '' - sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal - ''; - meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) From c5aa2e7946690185e099725aba9669a9a6145b6d Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 27 Mar 2015 15:57:03 +0000 Subject: [PATCH 632/947] grc: 1.5 -> 1.7 --- pkgs/tools/misc/grc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index de380222a66..9e6c31c055f 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.7"; name = "grc-${version}"; src = fetchurl { - url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.tar.gz"; - sha256 = "1p6xffp5mmnaw9llvrd4rc7zd4l7b1m62dlmn3c8p1ina831yn52"; + url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz"; + sha256 = "01hpvs5915ajcswm7kg4167qsa9kbg0snxxj5k3ymkz6c567dp70"; }; installPhase = '' From 38220d0315626bf36868af813a352c380e9f5e5b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 27 Mar 2015 18:03:38 +0100 Subject: [PATCH 633/947] Add jabref. --- pkgs/applications/office/jabref/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/office/jabref/default.nix diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix new file mode 100644 index 00000000000..5f32077104e --- /dev/null +++ b/pkgs/applications/office/jabref/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: + +stdenv.mkDerivation rec { + version = "2.10"; + name = "jabref-${version}"; + src = fetchurl { + url = "mirror://sourceforge/jabref/${version}/JabRef-${version}-src.tar.bz2"; + sha256 = "09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad"; + }; + + desktopItem = makeDesktopItem { + comment = meta.description; + name = "jabref"; + desktopName = "JabRef"; + genericName = "Bibliography manager"; + categories = "Application;Office;"; + icon = "jabref"; + exec = "jabref"; + }; + + buildInputs = [ ant jdk makeWrapper ]; + + buildPhase = ''ant''; + + installPhase = '' + mkdir -p $out/bin $out/share/java $out/share/icons + cp -r ${desktopItem}/share/applications $out/share/ + cp build/lib/JabRef-${version}.jar $out/share/java/ + cp src/images/JabRef-icon-mac.svg $out/share/icons/jabref.svg + makeWrapper ${jre}/bin/java $out/bin/jabref \ + --add-flags "-jar $out/share/java/JabRef-${version}.jar" + ''; + + meta = with stdenv.lib; { + description = "Open source bibliography reference manager"; + homepage = http://jabref.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 979bc9e0e4c..a131eb2a4fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10807,6 +10807,8 @@ let bip = callPackage ../applications/networking/irc/bip { }; + jabref = callPackage ../applications/office/jabref/default.nix { }; + jack_capture = callPackage ../applications/audio/jack-capture { }; jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { }; From 52d77f2360140152c3d6a72bdb56ae5016ad95ea Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 20:16:23 +0100 Subject: [PATCH 634/947] kona: reimplement using mkDerivation Also set supported platforms to `all`, per upstream, and specify license (ISC). --- .../development/interpreters/kona/default.nix | 60 +++++-------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2a8f7ca2c30..ab89332046a 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,50 +1,22 @@ -x@{builderDefsPackage - , fetchgit - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit"]; +{ stdenv, fetchgit }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - srcDrv = a.fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - inherit rev; - sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb"; - }; - - src = "${srcDrv}/"; - - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - version = "git-${rev}"; +stdenv.mkDerivation rec { name = "kona-${version}"; - inherit buildInputs; + src = fetchgit { + url = "https://github.com/kevinlawler/kona.git"; + rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; + sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658"; + }; + version = "git-${src.rev}"; - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareOut" "doMakeInstall"]; - makeFlags = ["PREFIX=\$out"]; + makeFlags = "PREFIX=$(out)"; + preInstall = ''mkdir -p "$out/bin"''; - prepareOut = a.fullDepEntry '' - mkdir -p "$out/bin" - '' ["minInit" "defEnsureDir"]; - - meta = { + meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.free; + homepage = https://github.com/kevinlawler/kona/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + license = licenses.isc; }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/kevinlawler/kona"; - }; - }; -}) x +} From 7a9e7905db4a5141c81c2338030afc5a38766f24 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:28 -0700 Subject: [PATCH 635/947] kernel: 3.10.72 -> 3.10.73 --- 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 31fe3081ab2..853b784a335 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.72"; + version = "3.10.73"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "17qfy5hmd2cn5wfk4mfvv9ygn958a4j75lsya9xdjrw10in1a22a"; + sha256 = "0xy8738sdbw7lbqwkmbhr2zghva5nyfqq163r6jmjr6cfw116kin"; }; features.iwlwifi = true; From ca12b0b30476ee6af4c01ad191169de9b63f2501 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:39 -0700 Subject: [PATCH 636/947] kernel: 3.19.2 -> 3.19.3 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 2a34202c895..10c6215f871 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.2"; + version = "3.19.3"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0b8bfpfpyrpccb8v4nld0a0siricg8f3awmhz8wn4kwdvhhf83hc"; + sha256 = "0nis1r9fg562ysirzlyvfxvirpcfhxhhpfv3s13ccz20qiqiy46f"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a2473e3f4c8..9018ccb8a67 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.19.2"; - revision = "201503201903"; + { kversion = "3.19.3"; + revision = "201503270049"; branch = "test"; - sha256 = "0ha4hvf2c9im9cyq9sxdbdx165i6ngywf46899aq3giyw74gnpf3"; + sha256 = "0m76p947gr0bqk6xxb237bpf4ikxjzycjzq4i2szm4n86k9sfac0"; }; grsec_fix_path = From 304b3c077c5c5193710401346fa68c49775ca35c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:34 -0700 Subject: [PATCH 637/947] kernel: 3.14.36 -> 3.14.37 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index a1340335983..ea5a9f927d4 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.36"; + version = "3.14.37"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "03pl303z3vvldc3hamlrq77mcy66nsqdfk7yi43nzyrnmrby3l0r"; + sha256 = "1pq4i97vys38rl8ylx4s08qgh9yz3cl840j1f70yzakmc2017byc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9018ccb8a67..6a4b707e777 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.36"; - revision = "201503182218"; + { kversion = "3.14.37"; + revision = "201503270048"; branch = "stable"; - sha256 = "14njc3xih3v38fnh7wrx7xdapqi67032qa6gp2qzhp41f5q7i4i8"; + sha256 = "1ryxh89m392mwqlwqiy3jszyhq9cxmvkv320di7hi50aqx8k2lqf"; }; grsecurity_unstable = grsecPatch From 933e6cc83244c974403e2bdbee63271a3c9db537 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 27 Mar 2015 17:58:55 +0100 Subject: [PATCH 638/947] kona: bump to 3.21 Use release tarball rather than GIT checkout. Note: disregard the platform and arch embedded in the release tarball name. --- pkgs/development/interpreters/kona/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index ab89332046a..03c836d9251 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "kona-${version}"; - src = fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658"; + version = "3.21"; + src = fetchurl { + url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; + sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; }; - version = "git-${src.rev}"; makeFlags = "PREFIX=$(out)"; preInstall = ''mkdir -p "$out/bin"''; From 7215167342713d6ba65b0c3be6f6691d5495159e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 11:37:06 -0700 Subject: [PATCH 639/947] nss: 3.17.4 -> 3.18 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a9c7d51923b..d86a55b78bd 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.17.4"; + version = "3.18"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz"; - sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz"; + sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1"; }; buildInputs = [ nspr perl zlib sqlite ]; From f0742a4bfbbd9e66840fd422a5db3d0a21e331ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 19:44:19 +0100 Subject: [PATCH 640/947] cryptol is now available from Hackage, --- .../haskell-modules/configuration-common.nix | 5 ++++ .../configuration-ghc-7.6.x.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c01083df0fa..51cd53476ff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -647,6 +647,11 @@ self: super: { # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); + # https://github.com/GaloisInc/cryptol/issues/197 + cryptol = overrideCabal super.cryptol (drv: { + postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; + }); + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index fceb444b3e2..d853e9265ba 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -70,30 +70,4 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); -} // { - - # Not on Hackage. - cryptol = self.mkDerivation rec { - pname = "cryptol"; - version = "2.1.0"; - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "cryptol"; - rev = "v${version}"; - sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3"; - }; - isLibrary = true; - isExecutable = true; - buildDepends = with self; [ - ansi-terminal array async base containers deepseq directory - executable-path filepath GraphSCC haskeline monadLib mtl old-time - presburger pretty process QuickCheck random smtLib syb text - tf-random transformers utf8-string - ]; - buildTools = with self; [ alex happy Cabal_1_22_2_0 ]; - patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; - description = "Cryptol: The Language of Cryptography"; - license = pkgs.stdenv.lib.licenses.bsd3; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b461cc8d9..95734d55550 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3325,7 +3325,7 @@ let compcert = callPackage ../development/compilers/compcert {}; - cryptol = haskell-ng.packages.ghc763.cryptol; + cryptol = haskellngPackages.cryptol; cython = pythonPackages.cython; cython3 = python3Packages.cython; From 0721527078208873e566b5d71d55544ff67fe838 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 27 Mar 2015 19:51:29 +0100 Subject: [PATCH 641/947] add nova-filters: LADSPA plugins based on filters of nova --- .../audio/nova-filters/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/nova-filters/default.nix diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix new file mode 100644 index 00000000000..f49f756ce3a --- /dev/null +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, scons, boost, ladspaH, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.2-2"; + name = "nova-filters-${version}"; + + src = fetchurl { + url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; + }; + + buildInputs = [ scons boost ladspaH pkgconfig ]; + + patchPhase = '' + # remove TERM: + sed -i -e '4d' SConstruct + sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct + sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp + sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp + ''; + + buildPhase = '' + scons + ''; + + installPhase = '' + scons $sconsFlags "prefix=$out" install + ''; + + meta = { + homepage = http://klingt.org/~tim/nova-filters/; + description = "LADSPA plugins based on filters of nova"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95734d55550..05d639dec18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11305,6 +11305,8 @@ let novaclient = callPackage ../applications/virtualization/nova/client.nix { }; + nova-filters = callPackage ../applications/audio/nova-filters { }; + nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; nvi = callPackage ../applications/editors/nvi { }; From 7f0e6b76ff9e1a548b5f251b5737b781df226e8b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 27 Mar 2015 12:05:19 -0700 Subject: [PATCH 642/947] nano: patch for darwin --- pkgs/applications/editors/nano/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 3e777207fd0..e7b96bd4b7d 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { ${optionalString enableTiny "--enable-tiny"} ''; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/text.c --replace "__time_t" "time_t" + ''; + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; From c9258a76bad8a47dfd3b473776aa499200d1e38d Mon Sep 17 00:00:00 2001 From: utdemir Date: Fri, 27 Mar 2015 22:53:11 +0200 Subject: [PATCH 643/947] Fix some build failures on GHC 7.10.1 --- .../configuration-ghc-7.10.x.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 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 f04ad96fc5f..6855a9b13a8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,13 +89,29 @@ self: super: { barecheck = doJailbreak super.barecheck; cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); + syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { + url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; + sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; + }); + + wl-pprint = overrideCabal super.wl-pprint (drv: { + patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + patchPhase = '' + sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs + sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs + ''; + }); + # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; - sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w"; + sha256 = "0idf12b2wd6chyvsgdcfl5kzx67crvgs1cqklx5say3426j57g4q"; }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; @@ -108,7 +124,7 @@ self: super: { }); stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g"; + sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; From 47aa6725e2b551bd4b1ea583c1cf788db8998f8e Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Fri, 27 Mar 2015 16:50:05 +0000 Subject: [PATCH 644/947] nixos: prosody service - rename virtualHosts option 'enabled' to 'enable' --- nixos/modules/rename.nix | 3 +++ nixos/modules/services/networking/prosody.nix | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e820b2cb9ce..840188f89f8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -122,6 +122,9 @@ in zipModules ([] ++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] +# Prosody +++ deprecated [ "services" "prosody" "virtualHosts" "enabled" ] [ "services" "prosody" "virtualHosts" "enable" ] + # Multiple efi bootloaders now ++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ] diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index f82f8bfddbb..4e9199f0fcf 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -113,7 +113,7 @@ let description = "Domain name"; }; - enabled = mkOption { + enable = mkOption { default = false; description = "Whether to enable the virtual host"; }; @@ -169,14 +169,14 @@ in example = { myhost = { domain = "my-xmpp-example-host.org"; - enabled = true; + enable = true; }; }; default = { localhost = { domain = "localhost"; - enabled = true; + enable = true; }; }; @@ -214,7 +214,6 @@ in pidfile = "/var/lib/prosody/prosody.pid" - log = "*syslog" data_path = "/var/lib/prosody" @@ -244,7 +243,7 @@ in ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" - enabled = ${if v.enabled then "true" else "false"}; + enabled = ${if v.enable then "true" else "false"}; ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } ${ v.extraConfig } '') cfg.virtualHosts) } From 57d9198552487b80e97bf1930bfcabcb86b2fdf6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Mar 2015 01:13:46 +0300 Subject: [PATCH 645/947] Adding Bluez 5.28; 5.29 breaks LibreOffice build --- pkgs/os-specific/linux/bluez/bluez5_28.nix | 79 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 83 insertions(+) create mode 100644 pkgs/os-specific/linux/bluez/bluez5_28.nix diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix new file mode 100644 index 00000000000..7f5a30144c8 --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python, + pythonPackages, pythonDBus, readline, libsndfile, udev, libical, + systemd, enableWiimote ? false }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "bluez-5.28"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; + sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5"; + }; + + pythonPath = with pythonPackages; + [ pythonDBus pygobject pygobject3 recursivePthLoader ]; + + buildInputs = + [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython + readline libsndfile udev libical + # Disables GStreamer; not clear what it gains us other than a + # zillion extra dependencies. + # gstreamer gst_plugins_base + ]; + + preConfigure = '' + substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm + substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " + ''; + + configureFlags = [ + "--localstatedir=/var" + "--enable-library" + "--enable-cups" + "--with-dbusconfdir=$(out)/etc" + "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" + "--with-dbussessionbusdir=$(out)/share/dbus-1/services" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-udevdir=$(out)/lib/udev" + ] ++ + stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; + + # Work around `make install' trying to create /var/lib/bluetooth. + installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + + makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; + + # FIXME: Move these into a separate package to prevent Bluez from + # depending on Python etc. + postInstall = '' + mkdir $out/test + cp -a test $out + pushd $out/test + for a in \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + list-devices \ + monitor-bluetooth \ + ; do + ln -s ../test/$a $out/bin/bluez-$a + done + popd + wrapPythonProgramsIn $out/test "$out/test $pythonPath" + + # for bluez4 compatibility for NixOS + mkdir $out/sbin + ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ''; + + meta = with stdenv.lib; { + homepage = http://www.bluez.org/; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; + description = "Bluetooth support for Linux"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95734d55550..280cd0f3267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8676,6 +8676,9 @@ let bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + # Needed for LibreOffice + bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); + bluez = bluez4; inherit (pythonPackages) bedup; @@ -10970,6 +10973,7 @@ let harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + bluez5 = bluez5_28; }; liferea = callPackage ../applications/networking/newsreaders/liferea { From 5d2fd00457c19fc92f5c9ebd9b61aa3702351b32 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 11:42:06 -0700 Subject: [PATCH 646/947] imagemagick: 6.9.0 -> 6.9.1 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 939b59b8d1c..d16aa03793f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -20,7 +20,7 @@ let - version = "6.9.0-0"; + version = "6.9.1-0"; arch = if stdenv.system == "i686-linux" then "i686" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj"; + sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; }; enableParallelBuilding = true; From 3a2df159e63e98a951171d837480c84584980218 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 12:41:22 -0700 Subject: [PATCH 647/947] libfpx: Add derivation --- pkgs/development/libraries/libfpx/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/libfpx/default.nix diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix new file mode 100644 index 00000000000..11ec1c0ecf3 --- /dev/null +++ b/pkgs/development/libraries/libfpx/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfpx-1.3.1-4"; + + src = fetchurl { + url = "mirror://imagemagick/delegates/${name}.tar.xz"; + sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; + }; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org; + description = "A library for manipulating FlashPIX images"; + license = "Flashpix"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280cd0f3267..51ac5fb9741 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6314,6 +6314,8 @@ let libfprint = callPackage ../development/libraries/libfprint/master.nix { }; + libfpx = callPackage ../development/libraries/libfpx { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; From 8fbc082d1f829b11a9448921ef5b2e58fbf85e70 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 12:56:43 -0700 Subject: [PATCH 648/947] unrar: 5.1.7 -> 5.2.7 --- pkgs/tools/archivers/unrar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 1d11a8ab478..d973649c9ed 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.1.7"; + version = "5.2.7"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc"; + sha256 = "1b1ggrqn020pvvh2ia98alqxpl1q3x65cb6zzqwv91rpjiz7a57g"; }; preBuild = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; - license = licenses.unfreeRedistributable; + license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.all; }; From 4631afc21e920485f597c812c866c237dd60c698 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 13:22:51 -0700 Subject: [PATCH 649/947] Support unraring source files --- pkgs/build-support/builder-defs/builder-defs.nix | 4 ++++ pkgs/tools/archivers/unrar/default.nix | 2 ++ pkgs/tools/archivers/unrar/setup-hook.sh | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 pkgs/tools/archivers/unrar/setup-hook.sh diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index da5d2249852..42d8f35b076 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -23,6 +23,7 @@ let inherit (builtins) head tail trace; in else if hasSuffixHack ".tar.Z" s then "tZ" else if hasSuffixHack ".tar.lzma" s then "tar.lzma" else if hasSuffixHack ".tar.xz" s then "tar.xz" + else if hasSuffixHack ".rar" s then "rar" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if hasSuffixHack "-cvs-export" s then "cvs-dir" else if hasSuffixHack "-git-export" s then "git-dir" @@ -213,6 +214,9 @@ let inherit (builtins) head tail trace; in " else if (archiveType s) == "tar.xz" then " xz -d -c <'${s}' | tar xv cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" + " else if (archiveType s) == "rar" then " + unrar x '${s}' + cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "zip" then " unzip '${s}' cd \"$( unzip -lqq '${s}' | tail -1 | diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index d973649c9ed..eb0d3a3bd83 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { $out/share/doc/unrar ''; + setupHook = ./setup-hook.sh; + meta = with stdenv.lib; { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/tools/archivers/unrar/setup-hook.sh new file mode 100644 index 00000000000..41d6a5cd217 --- /dev/null +++ b/pkgs/tools/archivers/unrar/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnrar) +_tryUnrar() { + if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi + unrar x "$curSrc" >/dev/null +} From e632b7a0c9874ced23153ae3b577228f22b17438 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:09:22 -0700 Subject: [PATCH 650/947] djvulibre: Refactor --- pkgs/applications/misc/djvulibre/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 3a5cf4edc6f..b0f89cc5ea0 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { + meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ urkud ]; + platforms = platforms.all; }; } From 8fd9a7cb59c1efaedc30396f38ebcf173e57dd28 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:29:38 -0700 Subject: [PATCH 651/947] lcms2: 2.6 -> 2.7 --- pkgs/development/libraries/lcms2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 8bb015a6c5f..db82c943d7c 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.6"; + name = "lcms2-2.7"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; + sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; From 29ea62382eac1d81e8301156143df1ee946066c5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:30:44 -0700 Subject: [PATCH 652/947] jbigkit: Add derivation --- .../development/libraries/jbigkit/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/jbigkit/default.nix diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix new file mode 100644 index 00000000000..8b95a8a4807 --- /dev/null +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jbigkit-2.1"; + + src = fetchurl { + url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; + }; + + installPhase = '' + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a + install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a + install -D -m644 libjbig/jbig.h $out/include/jbig.h + install -D -m644 libjbig/jbig_ar.h $out/include/jbig_ar.h + install -D -m644 libjbig/jbig85.h $out/include/jbig85.h + + install -d -m755 $out/share/man/man1 + install -m644 pbmtools/*.1* $out/share/man/man1 + + install -D -m755 pbmtools/jbgtopbm $out/bin/jbgtopbm + install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg + install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 + install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + ''; + + meta = with stdenv.lib; { + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; + description = "a software implementation of the JBIG1 data compression standard"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51ac5fb9741..1c8a72956d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6077,6 +6077,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbigkit = callPackage ../development/libraries/jbigkit { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; From bf562adad21ff78d193cd2dcc4f43f56e62e3838 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:37:45 -0700 Subject: [PATCH 653/947] liblqr: 0.4.1 -> 0.4.2 --- pkgs/development/libraries/liblqr-1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index c6323fcc84a..3af1227c69b 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.1"; + name = "liblqr-1-0.4.2"; + src = fetchurl { url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = "--enable-install-man"; meta = with stdenv.lib; { homepage = http://liblqr.wikidot.com; From 0cb847652e1101bf6fd4fb59c7b478f77634055f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:31:15 -0700 Subject: [PATCH 654/947] openjpeg: Fix pkgconfig file --- pkgs/development/libraries/openjpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index a635f68839b..4ffcd62f982 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { Name: openjp2 Description: JPEG2000 library (Part 1 and 2) URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ + Version: ${version} Libs: -L$out/lib -lopenjp2 Cflags: -I$out/include EOF From c8021333d4b6380dce4d46e00b75760fe5c860c3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:34:06 -0700 Subject: [PATCH 655/947] jbigkit: Needs fPIC for library support --- pkgs/development/libraries/jbigkit/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 8b95a8a4807..af2611a0bae 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + postPatch = '' + sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + ''; + installPhase = '' install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a From 1f82542fcba27b33c1d796dec5c8974c5494322d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:34:55 -0700 Subject: [PATCH 656/947] librsvg: 2.36.4 -> 2.40.9 --- pkgs/development/libraries/librsvg/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 808407877e9..3ed89ec8a8a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf , bzip2, libcroco -, gtk2 ? null, gtk3 ? null +, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2 + name = "librsvg-2.40.9"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; - sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; + url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; + sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c8a72956d5..9618bf13d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6671,9 +6671,7 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { - gtk2 = null; gtk3 = null; # neither gtk version by default - }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; From 1f632813e40a5955e479859201b6f844ace11b88 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:36:11 -0700 Subject: [PATCH 657/947] imagemagick: Refactor --- .../graphics/ImageMagick/default.nix | 98 ++++++++++++------- pkgs/top-level/all-packages.nix | 36 ++++++- 2 files changed, 95 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d16aa03793f..ec3ebc0bad6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,21 +1,11 @@ -{ lib -, stdenv -, fetchurl -, pkgconfig -, bzip2 -, fontconfig -, freetype -, ghostscript ? null -, libjpeg -, libpng -, libtiff -, libxml2 -, zlib -, libtool -, jasper -, libX11 -, tetex ? null -, librsvg ? null +{ stdenv, fetchurl, pkgconfig, libtool +, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null +, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null +, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null +, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null +, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null +, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null +, libxml2 ? null }: let @@ -27,8 +17,15 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; + mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; + mkWith = mkFlag "with" "without"; + mkEnable = mkFlag "enable" "disable"; + + hasX11 = libX11 != null && libXext != null && libXt != null; + in +with stdenv.lib; stdenv.mkDerivation rec { name = "imagemagick-${version}"; @@ -39,26 +36,55 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; + #preConfigure = if tetex != null then + # '' + # export DVIDecodeDelegate=${tetex}/bin/dvips + # '' else ""; - configureFlags = - [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optionals (stdenv.system != "x86_64-darwin") - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" - "--with-gslib" - ]; + configureFlags = [ + (mkEnable (libcl != null) "opencl") + (mkWith true "modules") + (mkWith true "gcc-arch=${arch}") + (mkEnable true "hdri") + (mkWith (perl != null) "perl") + (mkWith (jemalloc != null) "jemalloc") + (mkWith true "frozenpaths") + (mkWith (bzip2 != null) "bzlib") + (mkWith hasX11 "x") + (mkWith (zlib != null) "zlib") + (mkWith false "dps") + (mkWith (fftw != null) "fftw") + (mkWith (libfpx != null) "fpx") + (mkWith (djvulibre != null) "djvu") + (mkWith (fontconfig != null) "fontconfig") + (mkWith (freetype != null) "freetype") + (mkWith (ghostscript != null) "gslib") + (mkWith (graphviz != null) "gvc") + (mkWith (jbigkit != null) "jbig") + (mkWith (libjpeg != null) "jpeg") + (mkWith (lcms2 != null) "lcms2") + (mkWith false "lcms") + (mkWith (openjpeg != null) "openjp2") + (mkWith (liblqr1 != null) "lqr") + (mkWith (xz != null) "lzma") + (mkWith (openexr != null) "openexr") + (mkWith (pango != null) "pango") + (mkWith (libpng != null) "png") + (mkWith (librsvg != null) "rsvg") + (mkWith (libtiff != null) "tiff") + (mkWith (libwebp != null) "webp") + (mkWith (libxml2 != null) "xml") + ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" + ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - propagatedBuildInputs = - [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 - ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + propagatedBuildInputs = [ ]; - buildInputs = [ tetex pkgconfig ]; + buildInputs = [ + pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw + libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg + lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp + libxml2 + ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; @@ -66,6 +92,6 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9618bf13d9c..41106d957c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10816,12 +10816,42 @@ let AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { - tetex = null; + imagemagick_light = imagemagick.override { + libcl = null; + perl = null; + jemalloc = null; + bzip2 = null; + zlib = null; + libX11 = null; + libXext = null; + libXt = null; + dejavu_fonts = null; + fftw = null; + libfpx = null; + djvulibre = null; + fontconfig = null; + freetype = null; + ghostscript = null; + graphviz = null; + jbigkit = null; + libjpeg = null; + lcms2 = null; + openjpeg = null; + liblqr1 = null; + xz = null; + openexr = null; + pango = null; + libpng = null; librsvg = null; + libtiff = null; + libwebp = null; + libxml2 = null; }; - imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { }); + imagemagick = callPackage ../applications/graphics/ImageMagick { + ghostscript = if stdenv.isDarwin then null else ghostscript; + perl = null; # Currently Broken + }; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { From 49e980fa3249bbedbaecfba59d9833f668326311 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:46:08 -0700 Subject: [PATCH 658/947] imagemagick: More cleanups --- pkgs/applications/graphics/ImageMagick/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ec3ebc0bad6..35e12e8a8c7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - #preConfigure = if tetex != null then - # '' - # export DVIDecodeDelegate=${tetex}/bin/dvips - # '' else ""; - configureFlags = [ (mkEnable (libcl != null) "opencl") (mkWith true "modules") @@ -77,8 +72,6 @@ stdenv.mkDerivation rec { ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - propagatedBuildInputs = [ ]; - buildInputs = [ pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg From c7bf9d2749544e2f861da14abbfa5f436fb0634f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:50:47 -0700 Subject: [PATCH 659/947] spl_git: 2015-03-20 -> 2015-03-25 --- pkgs/os-specific/linux/spl/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 5c3ccd86120..be09b424a6b 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "79a0056e137c9cc540eb9ff7327c85ac8d094e6c"; - sha256 = "0xj132x0q76h9anjh7km2blqnr19yx7szwifj02x5h6xa07vq6fd"; + rev = "a4f54cf036d9a966ff87abe9a0063f2b457c2389"; + sha256 = "0n10icwmnx3y6201fncswhd1mfvs6xyk8praj27z0wnzxs1i4k96"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; From 123bde971eb55fdac715562075c499062b72eaf9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:52:44 -0700 Subject: [PATCH 660/947] zfs_git: 2015-03-20 -> 2015-03-25 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 62600886fa6..fb7b7f76ee4 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "bc88866657979c5658441e201e19df365c67ddfe"; - sha256 = "1d97xw7cak64f0ywwskjssnryljidf4hpngmqv0mmz4lk4hwirm9"; + rev = "7d90f569b3f05def7cbd0a52ce8ac3040364d702"; + sha256 = "09qcfd3h6zjwvgr1prs41qi8wlzvdv8x4sfrcf95bjj6h25v7n51"; }; patches = [ From c612a25666013c1abcbe338f8f2af14dea278f75 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 16:01:42 -0700 Subject: [PATCH 661/947] dhcpcd: 6.8.0 -> 6.8.1 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 8154816ab86..95700cb3806 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.8.0"; + name = "dhcpcd-6.8.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0h52rkzw87fyq5vj8zscbgf0ig9c881xz7i0rn3hvk28li7la0cb"; + sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7"; }; buildInputs = [ pkgconfig udev ]; From 125885974d28fd2bdc9126e4be5643214fb50d22 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 17:22:46 -0700 Subject: [PATCH 662/947] imagemagick: Add imagemagickBig for compat --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41106d957c3..87fb79efa36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10852,6 +10852,8 @@ let ghostscript = if stdenv.isDarwin then null else ghostscript; perl = null; # Currently Broken }; + + imagemagickBig = imagemagick; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { From 4ca6bdfa52bb2787d5df6d549ef96e37b442a190 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 27 Mar 2015 01:03:11 -0400 Subject: [PATCH 663/947] fftw: Fix Darwin build --- pkgs/development/libraries/fftw/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 83735376b98..104b7229bb1 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -16,16 +16,20 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--disable-static" - "--enable-threads" "--enable-openmp" # very small wrappers + "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2"; + ++ optional stdenv.isx86_64 "--enable-sse2" + ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Fastest Fourier Transform in the West library"; homepage = http://www.fftw.org/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } From 75ab87edc8128e03143d12ee037e8a4a09fd0e39 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 27 Mar 2015 17:46:35 -0500 Subject: [PATCH 664/947] nixpkgs: z3 is now MIT licensed. It's also been moved to GitHub, meaning we can avoid some of the hackiness in the original expression. This updates the Git revision, but only so that it contains the proper license (it's otherwise equivalent to Z3 v4.3.2) Also, make sure the python API .py files exist besides the .pyc files. Signed-off-by: Austin Seipp --- .../applications/science/logic/z3/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 1df4035c29c..2296a28444b 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, python, unzip }: +{ stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { name = "z3-${version}"; version = "4.3.2"; - src = fetchurl { - url = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=cee7dd39444c9060186df79c2a2c7f8845de415b"; - name = "${name}.zip"; - sha256 = "0hagy7xm0m52jd6vlrbizkj24mn6c49hkb3r5p66wilvp15ivpbn"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3"; + sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci"; }; - buildInputs = [ python unzip ]; + buildInputs = [ python ]; enableParallelBuilding = true; - # The zip file doesn't unpack a directory, just the code itself. - unpackPhase = "mkdir ${name} && cd ${name} && unzip $src"; - - configurePhase = '' - python scripts/mk_make.py --prefix=$out - cd build - ''; + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; # z3's install phase is stupid because it tries to calculate the # python package store location itself, meaning it'll attempt to @@ -32,12 +28,13 @@ stdenv.mkDerivation rec { cp libz3${soext} $out/lib cp libz3${soext} $out/lib/${python.libPrefix}/site-packages cp z3*.pyc $out/lib/${python.libPrefix}/site-packages + cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages ''; meta = { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://z3.codeplex.com"; - license = stdenv.lib.licenses.msrla; + homepage = "http://github.com/Z3Prover/z3"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; From a6813ca62d240f25b5a28545ae5ea70f20b2a86d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 28 Mar 2015 01:28:40 -0500 Subject: [PATCH 665/947] nixpkgs: add lean-20150328, a theorem prover. Signed-off-by: Austin Seipp --- .../science/logic/lean/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/science/logic/lean/default.nix diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix new file mode 100644 index 00000000000..4d391379e81 --- /dev/null +++ b/pkgs/applications/science/logic/lean/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python +, gperftools, ninja }: + +stdenv.mkDerivation rec { + name = "lean-20150328"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean"; + rev = "1b15036dba469020d37f7d6b77b88974d8a36cb1"; + sha256 = "0w38g83gp7d3ybfiz9jpl2jz3ljad70bxmar0dnnv45wx42clg96"; + }; + + buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; + enableParallelBuilding = true; + + preConfigure = "cd src"; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + meta = { + description = "Automatic and interactive theorem prover"; + homepage = "http://leanprover.github.io"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87fb79efa36..3e7ef6a4798 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13370,6 +13370,8 @@ let iprover = callPackage ../applications/science/logic/iprover {}; + lean = callPackage ../applications/science/logic/lean {}; + leo2 = callPackage ../applications/science/logic/leo2 {}; logisim = callPackage ../applications/science/logic/logisim {}; From 5b0310ec59d3e8117d40fa108c9b2da22e3d9258 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 28 Mar 2015 01:51:00 -0500 Subject: [PATCH 666/947] nixpkgs: afl 1.57b -> 1.58b Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/default.nix | 4 +-- .../afl/qemu-patches/afl-qemu-cpu-inl.h | 5 +++- .../security/afl/qemu-patches/syscall.patch | 25 +++++++++++++++++++ pkgs/tools/security/afl/qemu.nix | 1 + 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/security/afl/qemu-patches/syscall.patch diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index ed9b6d56edb..93c5988b55d 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.57b"; + version = "1.58b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "05dwh2kgz31702y339bvbs0b3ffadxgxk8cqqhs2i0ggx5bnl5p4"; + sha256 = "1szggm4x9i9bsrcb99s5vbgncagp7jvhz8cg9amkx7p6mp2x4pld"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h index 7d5a47669e4..c6ebc873ae0 100644 --- a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h +++ b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h @@ -69,9 +69,10 @@ abi_ulong afl_entry_point, /* ELF entry point (_start) */ afl_start_code, /* .text start pointer */ afl_end_code; /* .text end pointer */ -/* Set on the child in forkserver mode: */ +/* Set in the child process in forkserver mode: */ static unsigned char afl_fork_child; +unsigned int afl_forksrv_pid; /* Instrumentation ratio: */ @@ -158,6 +159,8 @@ static void afl_forkserver(CPUArchState *env) { if (write(FORKSRV_FD + 1, tmp, 4) != 4) return; + afl_forksrv_pid = getpid(); + /* All right, let's await orders... */ while (1) { diff --git a/pkgs/tools/security/afl/qemu-patches/syscall.patch b/pkgs/tools/security/afl/qemu-patches/syscall.patch new file mode 100644 index 00000000000..c8ffb61ba2c --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/syscall.patch @@ -0,0 +1,25 @@ +--- qemu-2.2.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 ++++ qemu-2.2.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 +@@ -227,7 +227,21 @@ + _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo) + _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) + #if defined(TARGET_NR_tgkill) && defined(__NR_tgkill) +-_syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig) ++ ++extern unsigned int afl_forksrv_pid; ++ ++static int sys_tgkill(int tgid, int pid, int sig) { ++ ++ /* Workaround for -lpthread to make abort() work properly, without ++ killing the forkserver due to a prematurely cached PID. */ ++ ++ if (afl_forksrv_pid && afl_forksrv_pid == pid && sig == SIGABRT) ++ pid = tgid = getpid(); ++ ++ return syscall(__NR_sys_tgkill, pid, tgid, sig); ++ ++} ++ + #endif + #if defined(TARGET_NR_tkill) && defined(__NR_tkill) + _syscall2(int,sys_tkill,int,tid,int,sig) diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 929f9fba9a6..441d64415cb 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ./qemu-patches/cpu-exec.patch ./qemu-patches/no-etc-install.patch ./qemu-patches/translate-all.patch + ./qemu-patches/syscall.patch ]; preConfigure = '' From 6dc86cea5d270b543c02e0366f232bcadef26dfb Mon Sep 17 00:00:00 2001 From: = Date: Thu, 26 Mar 2015 22:20:12 +0000 Subject: [PATCH 667/947] fatsort: add version number (close #7025) Website monitor.nixos.org reported it as out of date when in reality it just had no version number. @vcunat refactored meta a bit. --- pkgs/tools/filesystems/fatsort/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 3e483a29364..e5315f03d60 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,9 +1,11 @@ {stdenv, fetchurl, help2man}: -stdenv.mkDerivation { - name = "fatsort"; +stdenv.mkDerivation rec { + version = "1.3.365"; + name = "fatsort-${version}"; + src = fetchurl { - url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + url = "mirror://sourceforge/fatsort/${name}.tar.gz"; sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; }; @@ -11,10 +13,11 @@ stdenv.mkDerivation { buildInputs = [ help2man ]; - meta = { + meta = with stdenv.lib; { homepage = http://fatsort.sourceforge.net/; description = "Sorts FAT partition table, for devices that don't do sorting of files."; - maintainers = [ stdenv.lib.maintainers.kovirobi ]; - license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.kovirobi ]; + license = licenses.gpl2; + inherit version; }; } From b6fb62fd22a9b48034fdfaa2e8431df9c4fa9817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 28 Mar 2015 08:22:26 +0100 Subject: [PATCH 668/947] fatsort: meta nitpick --- pkgs/tools/filesystems/fatsort/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index e5315f03d60..02087ff97b2 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fatsort.sourceforge.net/; - description = "Sorts FAT partition table, for devices that don't do sorting of files."; + description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; inherit version; From 54b722c5e51a32251b926133a3684902b5e83474 Mon Sep 17 00:00:00 2001 From: Matthew Brown Date: Sat, 28 Mar 2015 08:55:52 +0000 Subject: [PATCH 669/947] Upgraded goaccess to version 0.9 --- pkgs/tools/misc/goaccess/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 7aea9870b84..e73bc487f21 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }: let - version = "0.8.5"; + version = "0.9"; mainSrc = fetchurl { url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "121s1hva33nq0g5n354ln68nalv2frg8slm7n84r81bmi2wvdim4"; + sha256 = "1yi7bxrmhvd11ha405bqpz7q442l9bnnx317iy22xzxjl96frn29"; }; in @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; - buildInputs = [ + buildInputs = [ pkgconfig - geoip + geoip ncurses glib ]; From 42c5c4a9a657adc827b90690e54ef6e3c1ab7382 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 22:37:08 -0700 Subject: [PATCH 670/947] libmsgpack: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/libmsgpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 4bec67f8513..3e43842495a 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; + sha256 = "0qyjz2rm0gxbv81dlh28ynss66dsyhlqzs09rblbjsdf1vh6yzcq"; }; }) From ae42047bcd416e1a28eafe7d8f4864de117fbb73 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 22:44:17 -0700 Subject: [PATCH 671/947] lightdm: 1.13.1 -> 1.14.0 --- pkgs/applications/display-managers/lightdm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b2a2d879979..ac4d4d83c7b 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,15 +4,15 @@ }: let - ver_branch = "1.13"; - version = "1.13.1"; + ver_branch = "1.14"; + version = "1.14.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0xa23maq6phkfil8xx26viig2m99sbzcf1w7s56hns2qw6pycn79"; + sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; }; buildInputs = [ From 5929fe2748a4328bfb65648db4b82c61375c3225 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 22:48:07 -0700 Subject: [PATCH 672/947] protobuf-c: 1.1.0 -> 1.1.1 --- pkgs/development/libraries/protobufc/1.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix index 228225b721d..97fc8642778 100644 --- a/pkgs/development/libraries/protobufc/1.1.nix +++ b/pkgs/development/libraries/protobufc/1.1.nix @@ -1,11 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; rev = "v${version}"; - sha256 = "11j9vg55a732v14cki4721ipr942c4krr562gliqmnlwvyz0hlyb"; + sha256 = "0mdl2i87394l4zdvq2npsxq4zs8p7sqhqmbm2r380ngjs6zic6gw"; }; }) From 80f331fc6c5a207413c43cb56f078c4294b9a6f0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 22:49:50 -0700 Subject: [PATCH 673/947] rdkafka: 0.8.5 -> 0.8.6 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 8ba2d52741f..0ab4f21f2d8 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = version; - sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; + sha256 = "0iklvslz35dd0lz26ffrbfb20qirl9v5kcdmlcnnzc034hr2zmnv"; }; buildInputs = [ zlib perl ]; From 5281377fb5132489f481244219cf741926def1cd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 23:46:47 -0700 Subject: [PATCH 674/947] bareos: 14.2.3 -> 14.2.4 --- pkgs/tools/backup/bareos/default.nix | 63 ++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index fa492835e05..5342b4f489d 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,39 +1,78 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, readline, openssl, python -, ncurses ? null -, sqlite ? null, postgresql ? null, mysql ? null, libcap ? null -, zlib ? null, lzo ? null, acl ? null, ceph ? null +{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool +, readline ? null, openssl ? null, python ? null, ncurses ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null +, acl ? null, glusterfs ? null, ceph ? null, libcap ? null }: assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; +let + withGlusterfs = "\${with_glusterfs_directory}"; +in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "14.2.3"; + version = "14.2.4"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "04z6nwlnk6kk5ghbdw5g34mkypmpk4qpkd08cjxwblg8sdj4j8fl"; + sha256 = "0shb91pawdgrn6rb4np3zyyxv36899nvwf8jaihkg0wvb01viqzr"; }; buildInputs = [ pkgconfig nettools gettext readline openssl python - ncurses sqlite postgresql mysql libcap zlib lzo acl ceph + ncurses sqlite postgresql mysql zlib lzo acl glusterfs ceph libcap ]; + postPatch = '' + sed -i 's,\(-I${withGlusterfs}/include\),\1/glusterfs,' configure + ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" "--exec-prefix=\${out}" - "--with-openssl=${openssl}" - "--with-python=${python}" - "--with-readline=${readline}" + "--enable-lockmgr" + "--enable-dynamic-storage-backends" + "--with-basename=nixos" # For reproducible builds since it uses the hostname otherwise + "--with-hostname=nixos" # For reproducible builds since it uses the hostname otherwise + "--with-working-dir=/var/lib/bareos" + "--with-bsrdir=/var/lib/bareos" + "--with-logdir=/var/log/bareos" + "--with-pid-dir=/var/run/bareos" + "--with-subsys-dir=/var/run/bareos" "--enable-ndmp" "--enable-lmdb" - ] ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + "--enable-batch-insert" + "--enable-dynamic-cats-backends" + "--enable-sql-pooling" + "--enable-scsi-crypto" + ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline}" ] + ++ optional (python != null) "--with-python=${python}" + ++ optional (openssl != null) "--with-openssl=${openssl}" + ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql}"; + ++ optional (mysql != null) "--with-mysql=${mysql}" + ++ optional (zlib != null) "--with-zlib=${zlib}" + ++ optional (lzo != null) "--with-lzo=${lzo}" + ++ optional (acl != null) "--enable-acl" + ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" + ++ optional (ceph != null) "--with-cephfs=${ceph}"; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + rm -rf /tmp /var + ''; meta = with stdenv.lib; { homepage = http://www.bareos.org/; From a31471876d9e80709759d01d929f0d2f105b7b7c Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sat, 28 Mar 2015 01:57:00 +0100 Subject: [PATCH 675/947] ensure that gmp and libffi are found when compiling with gcc dynamically --- pkgs/development/compilers/ecl/default.nix | 15 ++++++- .../compilers/ecl/libffi-prefix.patch | 39 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/ecl/libffi-prefix.patch diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index be65061c544..bb57ebbfa87 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchurl +, libtool, autoconf, automake , gmp, mpfr, libffi , noUnicode ? false, }: @@ -13,10 +14,10 @@ let sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; }; buildInputs = [ - libffi + libtool autoconf automake ]; propagatedBuildInputs = [ - gmp mpfr + libffi gmp mpfr ]; in stdenv.mkDerivation { @@ -25,8 +26,18 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ ./libffi-prefix.patch ]; + preConfigure = '' + (cd src ; libtoolize -f) + (cd src ; autoheader -f) + (cd src ; aclocal) + (cd src ; automake --add-missing -c) + (cd src ; autoconf -f) + ''; configureFlags = [ "--enable-threads" + "--with-gmp-prefix=${gmp}" + "--with-libffi-prefix=${libffi}" ] ++ (stdenv.lib.optional (! noUnicode) diff --git a/pkgs/development/compilers/ecl/libffi-prefix.patch b/pkgs/development/compilers/ecl/libffi-prefix.patch new file mode 100644 index 00000000000..d02cc214f31 --- /dev/null +++ b/pkgs/development/compilers/ecl/libffi-prefix.patch @@ -0,0 +1,39 @@ +diff --git a/src/configure.in b/src/configure.in +index 434da49..642c66c 100644 +--- ecl-15.3.7.orig/src/configure.ac ++++ ecl-15.3.7/src/configure.ac +@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi, + [(system|included|auto|no, default=AUTO if libffi available)]), + [enable_libffi=${withval}], [enable_libffi=auto]) + ++AC_ARG_WITH(libffi-prefix, ++ AS_HELP_STRING( [--with-libffi-prefix=path], ++ [prefix for system LIBFFI includes and libraries] ), ++ [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], []) ++ + AC_ARG_WITH(fpe, + AS_HELP_STRING( [--with-fpe], + [detect floating point exceptions] +@@ -368,6 +373,22 @@ else + INFOEXT=info + fi + ++dnl libffi ++ ++if test "x$LIBFFI_INCDIR" != "x"; then ++ LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR" ++fi ++if test "x$LIBFFI_LIBDIR" != "x"; then ++ LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR" ++ if test "$enable_rpath" = "yes"; then ++ if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then ++ LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS" ++ fi ++ fi ++fi ++CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS" ++LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS" ++ + dnl ====================================================================== + dnl GNU multiprecision library + dnl From f6886c62dc2abaf057d33bc74fb0601d37993ebe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Mar 2015 16:06:40 +0100 Subject: [PATCH 676/947] r-modules: disable broken builds on Hydra --- pkgs/development/r-modules/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5769181fa00..abaf586974f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -729,6 +729,7 @@ let "GeneticTools" # requires snpStats "GExMap" # requires Biobase and multtest "gitter" # requires EBImage + "glmgraph" # test suite says: "undefined symbol: dgemv_" "gmatrix" # depends on proprietary cudatoolkit "GOGANPA" # requires WGCNA "gputools" # depends on proprietary cudatoolkit @@ -796,6 +797,7 @@ let "NCmisc" # requires BiocInstaller "netClass" # requires samr "nettools" # requires WGCNA + "NORRRM" # can't load SDMTools properly "netweavers" # requires BiocGenerics, Biobase, and limma "NLPutils" # requires qdap "NSA" # requires aroma_core @@ -803,6 +805,7 @@ let "optBiomarker" # requires rpanel "ora" # requires ROracle "orQA" # requires genefilter + "PBSmapping" # fails its test suite for unclear reasons "PairViz" # requires graph "PANDA" # requires GO.db "ParDNAcopy" # requires DNAcopy @@ -843,6 +846,7 @@ let "rainfreq" # SDMTools.so: undefined symbol: X "RAM" # requires Heatplus "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges + "RapidPolygonLookup" # depends on broken PBSmapping "RbioRXN" # requires fmcsR, and KEGGREST "RcppAPT" # configure script depends on /bin/sh "RcmdrPlugin_seeg" # requires seeg @@ -920,6 +924,7 @@ let "ttScreening" # requires sva, and limma "V8" # compilation error "vows" # requires rpanel + "vmsbase" # depends on broken PBSmapping "WGCNA" # requires impute "wgsea" # requires snpStats "WideLM" # depends on proprietary cudatoolkit From 0c22b40422ec976d2d506607438f75b666314ef8 Mon Sep 17 00:00:00 2001 From: Matthew Brown Date: Sat, 28 Mar 2015 10:04:39 +0000 Subject: [PATCH 677/947] Upgraded Sphinx Search to version 2.2.8 --- pkgs/servers/search/sphinxsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index a72240064f2..17095750dbf 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, - version ? "2.1.9", + version ? "2.2.8", mainSrc ? fetchurl { url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; - sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2"; + sha256 = "1q6jdw5g81k7ciw9fhwklb5ifgb8zna39795m0x0lbvwjbk3ampv"; } }: From ad2b2a79979bbc93343f241b92b46d50a6762b2c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 28 Mar 2015 10:29:22 +0100 Subject: [PATCH 678/947] anki: update from 2.0.31 to 2.0.32 --- pkgs/games/anki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 5d50d25194a..dab4e2b6aff 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,7 +6,7 @@ let py = pythonPackages; - version = "2.0.31"; + version = "2.0.32"; in stdenv.mkDerivation rec { name = "anki-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "http://ankisrs.net/download/mirror/${name}.tgz" "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "0bxy4pq9yq78g0ffnlkpqj91ri0w4xqgv8mqksddn02v4llrd5jb"; + sha256 = "0g5rmg0yqh40a3g8ci3y3if7vw4jl5nrpq8ki1a13a3xmgch13rr"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] From c01313085809b56f3b3ef39699a206b4ede9294e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 28 Mar 2015 10:30:06 +0100 Subject: [PATCH 679/947] httrack: update from 3.48.20 to 3.48.21 --- pkgs/tools/backup/httrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index c09ee6a52f7..573c4b58d60 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.20"; + version = "3.48.21"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "129cpf324ihqxc8mvvkqjfanl17g60zfiqy1zx8ri56dkrg52mii"; + sha256 = "10p4gf8y9h7mxkqlbs3hqgvmvbgvcbax8jp1whbw4yidwahn06w7"; }; buildInputs = [ zlib openssl ]; From 51bc557070cd70ab76995595b579aacf4817b561 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 Mar 2015 11:48:13 +0100 Subject: [PATCH 680/947] Delete expression for the Qi compiler The Qi language project appears to have been abandoned in favour of Shen. The source listed in the Qi expression is unavailable (except through an unofficial mirror on Google Code, which is also going away soon) and the project's website is defunct. --- pkgs/development/compilers/qi/default.nix | 36 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/compilers/qi/default.nix diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix deleted file mode 100644 index 5665fc5da6c..00000000000 --- a/pkgs/development/compilers/qi/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, builderDefs, unzip, clisp }: - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://www.lambdassociates.org/Download/Qi9.1.zip; - sha256 = "1j584i7pj38rnlf7v9njfdwc6gc296v5friw2887dsw34dmwyg3f"; - }; - buildInputs = [ unzip clisp]; - configureFlags = []; - }; - in with localDefs; -let - shell=stdenv.shell; -in -let - allBuild = fullDepEntry (" - (sleep 0.1; echo ) | clisp install.txt; - (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp - mkdir -p \$out/share - mkdir -p \$out/bin - cp -r . \$out/share/Qi-9.1 - echo -e '#! ${shell} - arg1=\${1:-'\$out'/share/Qi-9.1/startup.txt} - shift - clisp -M '\$out'/share/Qi-9.1/lispinit.mem \$arg1 \"\$@\"\\n' > \$out/bin/qi - chmod a+x \$out/bin/qi - ") [ addInputs minInit doUnpack defEnsureDir]; -in -stdenv.mkDerivation rec { - name = "Qi-9.1"; - builder = writeScript (name + "-builder") - (textClosure localDefs [allBuild doForceShare doPropagate]); - meta = { - description = "Functional programming language, built top of Common Lisp"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..50ccb3a39fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4514,8 +4514,6 @@ let pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - qi = callPackage ../development/compilers/qi { }; - racket = callPackage ../development/interpreters/racket { }; rakudo = callPackage ../development/interpreters/rakudo { }; From a1689c951c605986bc3a1a9451f15e7374084fb6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Mar 2015 11:10:39 +0100 Subject: [PATCH 681/947] Add package 'cpulimit'. --- pkgs/tools/misc/cpulimit/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/cpulimit/default.nix diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix new file mode 100644 index 00000000000..490d97cff2e --- /dev/null +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "cpulimit-${version}"; + version = "2.2"; + + src = fetchurl { + url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; + sha256 = "1r19rk2cbyfmgwh3l445fxkn1bmkzyi69dg5dbx4b4mbqjjxlr1z"; + }; + + buildFlags = with stdenv; + if isDarwin then "osx" + else if isFreeBSD then "freebsd" + else "cpulimit"; + + installFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = "http://limitcpu.sourceforge.net/"; + description = "A tool to throttle the CPU usage of programs"; + platforms = with platforms; [linux freebsd darwin]; + license = licenses.gpl2; + maintainer = [maintainers.rycee]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7ef6a4798..ec9b66586d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -733,6 +733,8 @@ let flex = flex_2_5_35; }; + cpulimit = callPackage ../tools/misc/cpulimit { }; + crawlTiles = callPackage ../games/crawl { }; crawl = callPackage ../games/crawl { From 72d0d04d0a6a137ff69a7436708732847335743f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 18 Mar 2015 22:32:37 +0000 Subject: [PATCH 682/947] add package for daemonize tool --- pkgs/tools/system/daemonize/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/system/daemonize/default.nix diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix new file mode 100644 index 00000000000..5b52e0feb59 --- /dev/null +++ b/pkgs/tools/system/daemonize/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "daemonize-${version}"; + version = "1.7.5"; + + src = fetchurl { + url = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz"; + sha256 = "0sx0k05n8kyn0ma51nkjll8cs1xygmhv4qsyshxxj8apvjw20qk1"; + }; + + meta = with stdenv.lib; { + description = "Runs a command as a Unix daemon"; + homepage = http://software.clapper.org/daemonize/; + license = licenses.bsd3; + platforms = with platforms; linux ++ freebsd ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f473f7663..9be631a316c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1067,6 +1067,8 @@ let dadadodo = callPackage ../tools/text/dadadodo { }; + daemonize = callPackage ../tools/system/daemonize { }; + daq = callPackage ../applications/networking/ids/daq { }; dar = callPackage ../tools/archivers/dar { }; From 59771abeda5efc1fde385fd41c18d3ccf11ec3f2 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 28 Mar 2015 20:44:35 +0300 Subject: [PATCH 683/947] vimPlugins: add vim-gista --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8cc44f2bfcb..d6c09e1b297 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1245,6 +1245,16 @@ rec { }; dependencies = []; + }; + "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gista-2015-01-29"; + src = fetchgit { + url = "git://github.com/lambdalisue/vim-gista"; + rev = "e450417a6eaeb99d3982b880507697dce85b7217"; + sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec"; + }; + dependencies = []; + }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-snippets-2015-03-24"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 32ff3045a13..39f6aa18904 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,5 +52,6 @@ "YankRing" "vim-addon-manager" "vim-addon-nix" +"vim-gista" "github:JagaJaga/vim-addon-vim2nix" "sensible" From a4409438475411627f6f609f25e83b64e328a8d6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 18 Mar 2015 16:26:40 +0000 Subject: [PATCH 684/947] add packages django_classytags & django_reversion --- pkgs/top-level/python-packages.nix | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1e7e2b3352..418dafcd595 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4078,6 +4078,50 @@ let }; + django_classytags = buildPythonPackage rec { + name = "django-classy-tags-${version}"; + version = "0.6.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/django-classy-tags/${name}.tar.gz"; + md5 = "eb686aa767ad8cf88c1fa0f400a42516"; + sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; + }; + + propagatedBuildInputs = with self; [ django_1_7 ]; + + # tests appear to be broken on 0.6.1 at least + doCheck = ( version != "0.6.1" ); + + meta = with stdenv.lib; { + description = "Class based template tags for Django"; + homepage = https://github.com/ojii/django-classy-tags; + license = stdenv.lib.licenses.bsd3; + }; + }; + + + django_reversion = buildPythonPackage rec { + name = "django-reversion-${version}"; + version = "1.8.5"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/django-reversion/${name}.tar.gz"; + md5 = "2de5a3fe82aaf505c134570f96fcc7a8"; + sha256 = "0z8fxvxgbxfnalr5br74rsw6g42nry2q656rx7rsgmicd8n42v2r"; + }; + + propagatedBuildInputs = with self; [ django_1_7 ] ++ + (optionals (pythonOlder "2.7") [ importlib ordereddict ]); + + meta = with stdenv.lib; { + description = "An extension to the Django web framework that provides comprehensive version control facilities"; + homepage = https://github.com/etianen/django-reversion; + license = stdenv.lib.licenses.bsd3; + }; + }; + + djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; From 424188e6b61c56236cfae171334f4c2619510c09 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Mar 2015 20:03:18 +0100 Subject: [PATCH 685/947] Fix platforms attribute for 'cpulimit' expression. --- pkgs/tools/misc/cpulimit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 490d97cff2e..8ae137bbd89 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; - platforms = with platforms; [linux freebsd darwin]; + platforms = with platforms; linux ++ freebsd ++ darwin; license = licenses.gpl2; maintainer = [maintainers.rycee]; }; From 569fdb15747da8d369702dad27afc09c7a4db709 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Mar 2015 15:34:52 -0400 Subject: [PATCH 686/947] wavpack: build on Darwin --- pkgs/development/libraries/wavpack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 4bfcd356949..8a63b780b4c 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Hybrid audio compression format"; homepage = http://www.wavpack.com/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; } From da73e45cd0e8b07602097702d4c9ed19fe6e2d74 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 28 Mar 2015 12:57:54 -0700 Subject: [PATCH 687/947] fetchgitlocal: local fetcher based on `git ls-files` --- pkgs/build-support/fetchgitlocal/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/build-support/fetchgitlocal/default.nix diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix new file mode 100644 index 00000000000..24568667751 --- /dev/null +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -0,0 +1,10 @@ +{ runCommand, git }: src: + +runCommand "local-git-export" {} '' + cd ${src} + mkdir -p "$out" + for file in $(${git}/bin/git ls-files); do + mkdir -p "$out/$(dirname $file)" + cp -d $file "$out/$file" + done +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48824508bbb..2e432e24b51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -329,6 +329,10 @@ let fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; + fetchgitLocal = import ../build-support/fetchgitlocal { + inherit runCommand git; + }; + fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); packer = callPackage ../development/tools/packer { }; From 1a68f81db46fec44523ca1be57aa0c0ae830e1d3 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 28 Mar 2015 13:13:18 -0700 Subject: [PATCH 688/947] fetchgitlocal: don't force copying the whole source directory into the store.. --- pkgs/build-support/fetchgitlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 24568667751..04e6aafc8a1 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,10 +1,10 @@ { runCommand, git }: src: runCommand "local-git-export" {} '' - cd ${src} + cd ${toString src} mkdir -p "$out" for file in $(${git}/bin/git ls-files); do mkdir -p "$out/$(dirname $file)" - cp -d $file "$out/$file" + cp -d $file "$out/$file" || true # don't fail when trying to copy a directory done '' From 5248ba84fdb0806b3167dbf1ac6cef2eb3ea63dc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 28 Mar 2015 13:56:12 -0700 Subject: [PATCH 689/947] mako: 0.9.1 -> 1.0.1 --- 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 418dafcd595..0017e307b66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6000,14 +6000,14 @@ let Mako = buildPythonPackage rec { - name = "Mako-0.9.1"; + name = "Mako-1.0.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz"; - md5 = "fe3f394ef714776d09ec6133923736a7"; + md5 = "9f0aafd177b039ef67b90ea350497a54"; }; - buildInputs = with self; [ markupsafe nose ]; + buildInputs = with self; [ markupsafe nose mock ]; propagatedBuildInputs = with self; [ markupsafe ]; meta = { From 7d52faac72ac350f3461aeafd29dc64fe1167e2d Mon Sep 17 00:00:00 2001 From: Henry Till Date: Sat, 28 Mar 2015 17:11:14 -0400 Subject: [PATCH 690/947] texi2html: change platforms to unix Tested on Darwin --- pkgs/development/tools/misc/texi2html/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 1f36a14fa97..28eb95fd08b 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/texi2html/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 52a6c8496b95389f68e7455aad2eabbb3fabe569 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 28 Mar 2015 17:38:24 -0430 Subject: [PATCH 691/947] complete removal of obsolete kdelibs derivation --- pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index 74d520415f3..b1673d4b4e8 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -220,7 +220,6 @@ versions=builtins.listToAttrs[ {name="kdegraphics-mobipocket";value="4.14.3";} {name="kdegraphics-strigi-analyzer";value="4.14.3";} {name="kdegraphics-thumbnailers";value="4.14.3";} - {name="kdelibs";value="4.14.3";} {name="kdenetwork-filesharing";value="4.14.3";} {name="kdenetwork-strigi-analyzers";value="4.14.3";} {name="kdepim";value="4.14.3";} @@ -386,7 +385,6 @@ modules=[ module="kdelibs"; split=true; pkgs=[ - { name="kdelibs"; } { name="baloo"; } { name="baloo-widgets"; sane="baloo_widgets"; } { name="kfilemetadata"; } From aed1895643345291e1a06868434aeef3ef2e34b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Mar 2015 23:51:20 +0100 Subject: [PATCH 692/947] r-modules: remedy remaining Hydra failures --- pkgs/development/r-modules/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index abaf586974f..818cdcb3376 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -436,6 +436,7 @@ let "PBSadmb" "PBSmodelling" "PCPS" + "PKgraph" "PopGenReport" "PredictABEL" "PrevMap" @@ -664,6 +665,7 @@ let "babel" # requires edgeR "BACA" # requires RDAVIDWebService "BcDiag" # requires fabia + "beadarrayMSV" # requires Biobase, geneplotter, andlimma "bdvis" # requres taxize "beadarrayFilter" # requires beadarray "bigGP" # requires MPI running. HELP WANTED! @@ -679,6 +681,7 @@ let "CARrampsOcl" # depends on OpenCL "CHAT" # requires DNAcopy "ChemoSpec" # depends on broken speaq + "Crossover" # fails self-test "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp "compendiumdb" # requires Biobase @@ -733,6 +736,7 @@ let "gmatrix" # depends on proprietary cudatoolkit "GOGANPA" # requires WGCNA "gputools" # depends on proprietary cudatoolkit + "gMCP" # fails self-test "gRain" # requires gRbase "gRapHD" # requires graph "gRbase" # requires RBGL, and graph @@ -805,7 +809,9 @@ let "optBiomarker" # requires rpanel "ora" # requires ROracle "orQA" # requires genefilter + "pRF" # requires multtest "PBSmapping" # fails its test suite for unclear reasons + "PBSddesolve" # fails its test suite for unclear reasons "PairViz" # requires graph "PANDA" # requires GO.db "ParDNAcopy" # requires DNAcopy @@ -874,6 +880,8 @@ let "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! "RQuantLib" # requires QuantLib "RSAP" # requires SAPNWRFCSDK + "rgp" # fails self-test + "rgpui" # depends on broken rgp "RSeed" # requires RBGL, and graph "rsig" # requires survcomp "RSNPset" # requires qvalue @@ -909,6 +917,8 @@ let "spocc" # requires leafletR "SQDA" # requires limma "Statomica" # requires Biobase, multtest + "stagePop" # depends on broken PBSddesolve + "SeqGrapheR" # depends on Biostrings "stpp" # requires spatstat "structSSI" # requires multtest "strum" # requires Rgraphviz From 5cb2cee954342d9ddd67a82e3226f5d1a3207ce6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 Mar 2015 22:47:01 +0100 Subject: [PATCH 693/947] nixos: condition sysctl.kptr_restrict on features.grsecurity Conditioning `sysctl.kptr_restrict` on `features.grsecurity` supports any grsecurity enabled kernel without having to enable the grsecurity module. --- nixos/modules/config/sysctl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 3b6ccd380c7..e83562a8356 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -64,6 +64,6 @@ in # # Removed under grsecurity. boot.kernel.sysctl."kernel.kptr_restrict" = - if config.security.grsecurity.enable then null else 1; + if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; }; } From 6a2ec766fc45befc8867dd09d2bbd0be53185952 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 28 Mar 2015 18:52:56 -0500 Subject: [PATCH 694/947] s6-dns: update checksum Upstream unfortunately changed the tag v2.0.0.2 from revision b533774a704c271a6feeaef76939b0aefbf039d7 to one commit forward: 539bee3f515b13a9a55ce65c0c0593babc7c5048. --- pkgs/tools/networking/s6-dns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 2339ac5ff05..89c7642d0a5 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0y76gvgvg2y3hhr3pk2nkki1idjj6sxxcnvd29yd79v0419p2dl3"; + sha256 = "0rsw19r9hwxb0xj9xs1rwb7fa21wwbsnfq3p2nfg4lf6cc64b39r"; }; dontDisableStatic = true; From 273d31fff4135fa232daff0230b786b4548faafb Mon Sep 17 00:00:00 2001 From: Petar Bogdanovic Date: Sat, 28 Mar 2015 16:53:48 -0700 Subject: [PATCH 695/947] gnupg1orig: Remove left-over debug message. Patch committed by James Cook . --- pkgs/tools/security/gnupg/1.nix | 2 ++ .../security/gnupg/remove-debug-message.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/security/gnupg/remove-debug-message.patch diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index c5d2ca1349c..d5045806e0c 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86"; }; + patches = [ ./remove-debug-message.patch ]; + buildInputs = [ readline bzip2 ]; doCheck = true; diff --git a/pkgs/tools/security/gnupg/remove-debug-message.patch b/pkgs/tools/security/gnupg/remove-debug-message.patch new file mode 100644 index 00000000000..92fc6f2cfca --- /dev/null +++ b/pkgs/tools/security/gnupg/remove-debug-message.patch @@ -0,0 +1,22 @@ +commit 936416690e6c889505d84fe96983a66983beae5e +Author: Werner Koch +Date: Thu Feb 26 09:38:58 2015 +0100 + + gpg: Remove left-over debug message. + + * g10/armor.c (check_input): Remove log_debug. + +diff --git a/g10/armor.c b/g10/armor.c +index 6c0013d..de1726d 100644 +--- a/g10/armor.c ++++ b/g10/armor.c +@@ -534,9 +534,6 @@ check_input( armor_filter_context_t *afx, IOBUF a ) + /* This is probably input from a keyserver helper and we + have not yet seen an error line. */ + afx->key_failed_code = parse_key_failed_line (line+4, len-4); +- log_debug ("armor-keys-failed (%.*s) ->%d\n", +- (int)len, line, +- afx->key_failed_code); + } + if( i >= 0 && !(afx->only_keyblocks && i != 1 && i != 5 && i != 6 )) { + hdr_line = i; From 1901f3fe77d24c0eef00f73f73c176fae3bcb44e Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 28 Mar 2015 23:59:01 +0000 Subject: [PATCH 696/947] fix initrd now that cryptsetup switched to libgcrypt 1.6 --- nixos/modules/system/boot/luksroot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index e1e472186e3..da5bb8fe066 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -407,7 +407,7 @@ in boot.initrd.extraUtilsCommands = '' cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin - cp -pdv ${pkgs.libgcrypt}/lib/libgcrypt*.so.* $out/lib + cp -pdv ${pkgs.libgcrypt_1_6}/lib/libgcrypt*.so.* $out/lib cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib From d590a0f4b63901766b94ef8691baa389db56d074 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 12 Mar 2015 23:20:56 -0400 Subject: [PATCH 697/947] ghcjs: support for Haskell-NG closes #5828 closes #6786 --- pkgs/build-support/cabal/ghcjs.nix | 282 ------------------ pkgs/development/compilers/ghc/7.10.1.nix | 2 + pkgs/development/compilers/ghcjs/default.nix | 117 +++++--- pkgs/development/compilers/ghcjs/ghcjs.patch | 6 +- .../configuration-ghc-7.10.x.nix | 39 ++- .../haskell-modules/configuration-ghcjs.nix | 78 ++++- .../haskell-modules/generic-builder.nix | 34 ++- .../haskell-src-meta-ghc710.patch | 55 ++++ .../haskell-modules/with-packages-wrapper.nix | 37 ++- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/haskell-defaults.nix | 91 ------ pkgs/top-level/haskell-ng.nix | 4 + pkgs/top-level/haskell-packages.nix | 17 -- 13 files changed, 287 insertions(+), 476 deletions(-) delete mode 100644 pkgs/build-support/cabal/ghcjs.nix create mode 100644 pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch diff --git a/pkgs/build-support/cabal/ghcjs.nix b/pkgs/build-support/cabal/ghcjs.nix deleted file mode 100644 index 8ae1746dc78..00000000000 --- a/pkgs/build-support/cabal/ghcjs.nix +++ /dev/null @@ -1,282 +0,0 @@ -# generic builder for Cabal packages - -{ stdenv, fetchurl, lib, pkgconfig, ghcjs, ghc, Cabal, jailbreakCabal, glibcLocales -, gnugrep, coreutils, hscolour # hscolour is unused -, enableLibraryProfiling ? false -, enableSharedLibraries ? false -, enableSharedExecutables ? false -, enableStaticLibraries ? true -, enableCheckPhase ? true -, enableHyperlinkSource ? false -, extension ? (self : super : {}) -}: - -let - enableFeature = stdenv.lib.enableFeature; - optional = stdenv.lib.optional; - optionals = stdenv.lib.optionals; - optionalString = stdenv.lib.optionalString; - filter = stdenv.lib.filter; - - defaultSetupHs = builtins.toFile "Setup.hs" '' - import Distribution.Simple - main = defaultMain - ''; -in - -{ - mkDerivation = - args : # arguments for the individual package, can modify the defaults - let # These attributes are removed in the end. This is in order not to spoil the build - # environment overly, but also to keep hash-backwards-compatible with the old cabal.nix. - internalAttrs = [ - "internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends" - "isLibrary" "isExecutable" "testDepends" - ]; - - # Stuff happening after the user preferences have been processed. We remove - # internal attributes and strip null elements from the dependency lists, all - # in the interest of keeping hashes stable. - postprocess = - x : (removeAttrs x internalAttrs) // { - buildInputs = filter (y : ! (y == null)) x.buildInputs; - propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; - propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - doCheck = enableCheckPhase && x.doCheck; - hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; - }; - - defaults = - self : { # self is the final version of the attribute set - - # pname should be defined by the client to be the package basename - # version should be defined by the client to be the package version - - # fname is the internal full name of the package - fname = "${self.pname}-${self.version}"; - - # name is the external full name of the package; usually we prefix - # all packages with haskell- to avoid name clashes for libraries; - # if that is not desired (for applications), name can be set to - # fname. - name = if self.isLibrary then - if enableLibraryProfiling && self.enableSharedLibraries then - "haskell-${self.pname}-ghcjs${ghc.ghc.version}-${self.version}-profiling-shared" - else if enableLibraryProfiling && !self.enableSharedLibraries then - "haskell-${self.pname}-ghcjs${ghc.ghc.version}-${self.version}-profiling" - else if !enableLibraryProfiling && self.enableSharedLibraries then - "haskell-${self.pname}-ghcjs${ghc.ghc.version}-${self.version}-shared" - else - "haskell-${self.pname}-ghcjs${ghc.ghc.version}-${self.version}" - else - "${self.pname}-${self.version}"; - - # the default download location for Cabal packages is Hackage, - # you still have to specify the checksum - src = fetchurl { - url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz"; - inherit (self) sha256; - }; - - # default buildInputs are just ghc, if more buildInputs are required - # buildInputs can be extended by the client by using extraBuildInputs, - # but often propagatedBuildInputs is preferable anyway - buildInputs = [ghc ghc.ghc.parent.Cabal_1_22_0_0] ++ self.extraBuildInputs; - extraBuildInputs = self.buildTools ++ - (optionals self.doCheck self.testDepends) ++ - (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++ - (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends); - - # we make sure that propagatedBuildInputs is defined, so that we don't - # have to check for its existence - propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else []; - - # By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because - # GHC also needs all dependencies to be available. - propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else []; - - # library directories that have to be added to the Cabal files - extraLibDirs = []; - - # build-depends Cabal field - buildDepends = []; - - # target(s) passed to the cabal build phase as an argument - buildTarget = ""; - - # build-depends Cabal fields stated in test-suite stanzas - testDepends = []; - - # target(s) passed to the cabal test phase as an argument - testTarget = ""; - - # build-tools Cabal field - buildTools = []; - - # extra-libraries Cabal field - extraLibraries = []; - - # pkgconfig-depends Cabal field - pkgconfigDepends = []; - - isLibrary = ! self.isExecutable; - isExecutable = false; - - # ignore version restrictions on the build inputs that the cabal file might specify - jailbreak = false; - - # pass the '--enable-split-objs' flag to cabal in the configure stage - enableSplitObjs = false; # !stdenv.isDarwin; # http://hackage.haskell.org/trac/ghc/ticket/4013 - - # pass the '--enable-tests' flag to cabal in the configure stage - # and run any regression test suites the package might have - doCheck = false; #enableCheckPhase; - - # pass the '--hyperlink-source' flag to ./Setup haddock - hyperlinkSource = enableHyperlinkSource; - - # abort the build if the configure phase detects that the package - # depends on multiple versions of the same build input - strictConfigurePhase = true; - - # pass the '--enable-library-vanilla' flag to cabal in the - # configure stage to enable building shared libraries - inherit enableStaticLibraries; - - # pass the '--enable-shared' flag to cabal in the configure - # stage to enable building shared libraries - inherit enableSharedLibraries; - - # pass the '--enable-executable-dynamic' flag to cabal in - # the configure stage to enable linking shared libraries - inherit enableSharedExecutables; - - extraConfigureFlags = [ - (enableFeature self.enableSplitObjs "split-objs") - (enableFeature enableLibraryProfiling "library-profiling") - (enableFeature true "shared") - (enableFeature self.enableStaticLibraries "library-vanilla") - (enableFeature self.enableSharedExecutables "executable-dynamic") - (enableFeature self.doCheck "tests") - ]; - - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; - - # compiles Setup and configures - configurePhase = '' - eval "$preConfigure" - - ${optionalString self.jailbreak "${ghc.ghc.parent.jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"} - - PATH=$PATH:${ghc.ghc.ghc}/bin - - for i in Setup.hs Setup.lhs ${defaultSetupHs}; do - test -f $i && break - done - ghc --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i - - for p in $extraBuildInputs $propagatedBuildInputs $propagatedNativeBuildInputs; do - PkgDir="$p/lib/ghcjs-${ghc.ghc.version}_ghc-${ghc.ghc.ghc.version}/package.conf.d" - if [ -f "$PkgDir/package.cache" ]; then - extraConfigureFlags+=" --package-db=$PkgDir" - continue; - fi - if [ -d "$p/include" ]; then - extraConfigureFlags+=" --extra-include-dirs=$p/include" - fi - for d in lib{,64}; do - if [ -d "$p/$d" ]; then - extraConfigureFlags+=" --extra-lib-dirs=$p/$d" - fi - done - done - - configureFlags+=" --package-db=${ghc.ghc}/${ghc.ghc.libDir}/package.conf.d" - - ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) '' - configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"; - ''} - ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) '' - configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"; - ''} - - echo "configure flags: $extraConfigureFlags $configureFlags" - ./Setup configure --ghcjs --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \ - --libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \ - ${optionalString self.strictConfigurePhase '' - | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then - echo >&2 "*** abort because of serious configure-time warning from Cabal" - exit 1 - fi - ''} - - eval "$postConfigure" - ''; - - # builds via Cabal - buildPhase = '' - eval "$preBuild" - - ./Setup build ${self.buildTarget} - - export GHC_PACKAGE_PATH=$(${ghc.GHCPackages}) - #test -n "$noHaddock" || ./Setup haddock --html --hoogle \ - # ${optionalString self.hyperlinkSource "--hyperlink-source"} - - eval "$postBuild" - ''; - - checkPhase = optional self.doCheck '' - eval "$preCheck" - - ./Setup test ${self.testTarget} - - eval "$postCheck" - ''; - - # installs via Cabal; creates a registration file for nix-support - # so that the package can be used in other Haskell-builds; also - # adds all propagated build inputs to the user environment packages - installPhase = '' - eval "$preInstall" - - ./Setup copy - - mkdir -p $out/bin # necessary to get it added to PATH - - local confDir=$out/lib/ghcjs-${ghc.ghc.version}_ghc-${ghc.ghc.ghc.version}/package.conf.d - local installedPkgConf=$confDir/${self.fname}.installedconf - local pkgConf=$confDir/${self.fname}.conf - mkdir -p $confDir - ./Setup register --gen-pkg-config=$pkgConf - if test -f $pkgConf; then - echo '[]' > $installedPkgConf - GHC_PACKAGE_PATH=$installedPkgConf ghcjs-pkg --global register $pkgConf --force --package-db=$confDir || true - ghcjs-pkg recache --package-db=$confDir - fi - - if test -f $out/nix-support/propagated-native-build-inputs; then - ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages - fi - - ${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) '' - for exe in $out/bin/* ; do - install_name_tool -add_rpath $out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe || true # Ignore failures, which seem to be due to hitting bash scripts rather than binaries - done - ''} - - eval "$postInstall" - ''; - - # We inherit stdenv and ghc so that they can be used - # in Cabal derivations. - inherit stdenv ghc; - }; - in - stdenv.mkDerivation (postprocess (let super = defaults self // args self; - self = super // extension self super; - in self)); -} diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index d39c4b921ba..629ac69d36f 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 preConfigure = '' + sed -i 's/HcPkg.useSingleFileDb = .*/HcPkg.useSingleFileDb = False/' libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index e6798be78f8..d04bd842bf6 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,64 +1,91 @@ -{ nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time -, zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable -, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative -, parallel, safe, shelly, split, stringsearch, syb, systemFileio -, systemFilepath, tar, terminfo, textBinary, unorderedContainers -, vector, wlPprintText, yaml, fetchgit, Cabal, cabalInstall -, regexPosix, alex, happy, git, gnumake, gcc, autoconf, patch -, automake, libtool, gmp, base16Bytestring -, cryptohash, executablePath, transformersCompat, haddockApi -, haddock, hspec, xhtml, primitive, cacert, pkgs, ghc +{ mkDerivation +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, data-default +, ghc-paths +, haskell-src-exts +, haskell-src-meta +, optparse-applicative +, system-fileio +, system-filepath +, text-binary +, unordered-containers +, cabal-install +, wl-pprint-text +, base16-bytestring +, executable-path +, transformers-compat +, haddock-api +, ghcjs-prim +, regex-posix + +, ghc, gmp +, jailbreak-cabal + +, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm +, time +, zlib, aeson, attoparsec, bzlib, hashable +, lens +, parallel, safe, shelly, split, stringsearch, syb +, tar, terminfo +, vector, yaml, fetchgit, Cabal +, alex, happy, git, gnumake, autoconf, patch +, automake, libtool +, cryptohash +, haddock, hspec, xhtml, primitive, cacert, pkgs , coreutils -, ghcjsPrim +, libiconv }: let version = "0.1.0"; - libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.ghc.version}/ghcjs"; + libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "5c7a71472d5a797e895914d3b82cea447a058793"; - sha256 = "0dp97bgbnlr3sd9yfnk27p6dfv46fi26sn6y6qv1wxs5i29kmjav"; + rev = "8cd6144870470258fb037b3e04a0a2a98c2b6551"; # 7.10 branch + sha256 = "16cbncx179n5khf8hkj9r221wf73rc8isffk8rv3n9psshv1jiji"; fetchSubmodules = true; }; shims = fetchgit { url = git://github.com/ghcjs/shims.git; - rev = "99bbd4bed584ec42bfcc5ea61c3808a2c670053d"; - sha256 = "1my3gqkln7hgm0bpy32pnhwjfza096alh0n9x9ny8xfpxhmzz4h6"; + rev = "6ada4bf1a084d1b80b993303d35ed863d219b031"; # master branch + sha256 = "0dhfnjj3rxdbb2m1pbnjc2yp4xcgsfdrsinljgdmg0hpqkafp4vc"; }; -in cabal.mkDerivation (self: rec { +in mkDerivation (rec { pname = "ghcjs"; inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "4b9461e8be646d5152a0ae7ece5b3616bf938637"; - sha256 = "19g62j1kkdwcgp0042ppmskwbvfk7qkf1fjs8bpjc6wwd19ipiar"; + rev = "35a59743c4027f26a227635cb24a6246bd851f8d"; # master branch + sha256 = "107sh36ji3psdl3py84vxgqbywjyzglj3p0akzpvcmbarxwfr1mw"; }; isLibrary = true; isExecutable = true; jailbreak = true; - noHaddock = true; + doHaddock = false; doCheck = false; buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta - lens optparseApplicative parallel safe shelly split - stringsearch syb systemFileio systemFilepath tar terminfo textBinary - unorderedContainers vector wlPprintText yaml - alex happy git gnumake gcc autoconf automake libtool patch gmp - base16Bytestring cryptohash executablePath haddockApi - transformersCompat QuickCheck haddock hspec xhtml - ghcjsPrim regexPosix + bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta + lens optparse-applicative parallel safe shelly split + stringsearch syb system-fileio system-filepath tar terminfo text-binary + unordered-containers vector wl-pprint-text yaml + alex happy git gnumake autoconf automake libtool patch gmp + base16-bytestring cryptohash executable-path haddock-api + transformers-compat QuickCheck haddock hspec xhtml + ghcjs-prim regex-posix libiconv ]; buildTools = [ nodejs git ]; testDepends = [ - HUnit testFramework testFrameworkHunit + HUnit test-framework test-framework-hunit ]; patches = [ ./ghcjs.patch ]; postPatch = '' substituteInPlace Setup.hs --replace "/usr/bin/env" "${coreutils}/bin/env" substituteInPlace src/Compiler/Info.hs --replace "@PREFIX@" "$out" - substituteInPlace src-bin/Boot.hs --replace "@PREFIX@" "$out" + substituteInPlace src-bin/Boot.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@CC@" "${stdenv.cc}/bin/cc" ''; preBuild = '' local topDir=$out/${libDir} @@ -69,23 +96,33 @@ in cabal.mkDerivation (self: rec { cp -r ${shims} $topDir/shims chmod -R u+w $topDir/shims + + # Make the patches be relative their corresponding package's directory. + # See: https://github.com/ghcjs/ghcjs-boot/pull/12 + for patch in $topDir/ghcjs-boot/patches/*.patch; do + echo "fixing patch: $patch" + sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch + done ''; postInstall = '' - PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.cc}/lib64:$LD_LIBRARY_PATH \ + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ --dev \ - --with-cabal ${cabalInstall}/bin/cabal \ + --with-cabal ${cabal-install}/bin/cabal \ --with-gmp-includes ${gmp}/include \ --with-gmp-libraries ${gmp}/lib ''; passthru = { inherit libDir; + isGhcjs = true; + nativeGhc = ghc; }; - meta = { - homepage = "https://github.com/ghcjs/ghcjs"; - description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.jwiegley ]; - }; + + homepage = "https://github.com/ghcjs/ghcjs"; + description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; + license = stdenv.lib.licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ + jwiegley cstrahan + ]; }) diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 92f67fb7212..618656f787c 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -1,5 +1,5 @@ diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs -index 988955b..a55f07b 100644 +index 3c68dcf..64f3cf7 100644 --- a/src-bin/Boot.hs +++ b/src-bin/Boot.hs @@ -512,9 +512,7 @@ initPackageDB :: B () @@ -46,9 +46,11 @@ index 988955b..a55f07b 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim -@@ -1086,7 +1077,9 @@ cabalInstallFlags parmakeGhcjs = do +@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do + , "--avoid-reinstalls" , "--builddir", "dist" , "--with-compiler", ghcjs ^. pgmLocText ++ , "--with-gcc", "@CC@" , "--with-hc-pkg", ghcjsPkg ^. pgmLocText - , "--prefix", toTextI instDir + , "--prefix", "@PREFIX@" 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 6855a9b13a8..82566d2a8db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -33,6 +33,9 @@ self: super: { unix = null; xhtml = null; + # Cabal_1_22_1_1 requires filepath >=1 && <1.4 + cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); + # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; @@ -55,6 +58,9 @@ self: super: { # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; + # requires filepath >=1.1 && <1.4 + Glob = doJailbreak super.Glob; + # 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"; @@ -83,6 +89,20 @@ self: super: { # Test suite fails in "/tokens_bytestring_unicode.g.bin". alex = dontCheck super.alex; + # TODO: should eventually update the versions in hackage-packages.nix + haddock-library = overrideCabal super.haddock-library (drv: { + version = "1.2.0"; + sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + }); + haddock-api = overrideCabal super.haddock-api (drv: { + version = "2.16.0"; + sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; + }); + haddock = overrideCabal super.haddock (drv: { + version = "2.16.0"; + sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; + }); + # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. @@ -104,14 +124,13 @@ self: super: { sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs ''; }); - + # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage - haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { - url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; - sha256 = "0idf12b2wd6chyvsgdcfl5kzx67crvgs1cqklx5say3426j57g4q"; + haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: { + prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal"; }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; @@ -144,4 +163,16 @@ self: super: { sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; stripLen = 1; }); + + ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { + pname = "ghcjs-prim"; + version = "0.1.0.0"; + src = fetchgit { + url = git://github.com/ghcjs/ghcjs-prim.git; + rev = "ca08e46257dc276e01d08fb47a693024bae001fa"; # ghc-7.10 branch + sha256 = "0w7sqzp5p70yhmdhqasgkqbf3b61wb24djlavwil2j8ry9y472w3"; + }; + buildDepends = [ primitive ]; + license = pkgs.stdenv.lib.licenses.bsd3; + }) {}; } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 9ae45e9425b..aad0da0604e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -7,6 +7,12 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; + jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal; + + # Many packages fail with: + # haddock: internal error: expectJust getPackageDetails + mkDerivation = drv: super.mkDerivation (drv // { doHaddock = false; }); + # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell '' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" @@ -19,21 +25,21 @@ self: super: { binary = null; rts = null; bytestring = null; - caseInsensitive = null; + case-insensitive = null; containers = null; deepseq = null; directory = null; dlist = null; - extensibleExceptions = null; + extensible-exceptions = null; filepath = null; - ghcPrim = null; - ghcjsBase = null; - ghcjsPrim = null; + ghc-prim = null; + ghcjs-base = null; + ghcjs-prim = null; hashable = null; - integerGmp = null; + integer-gmp = null; mtl = null; - oldLocale = null; - oldTime = null; + old-locale = null; + old-time = null; parallel = null; pretty = null; primitive = null; @@ -41,12 +47,64 @@ self: super: { scientific = null; stm = null; syb = null; - templateHaskell = null; + template-haskell = null; text = null; time = null; transformers = null; unix = null; - unorderedContainers = null; + unordered-containers = null; vector = null; + pqueue = overrideCabal super.pqueue (drv: { + patchPhase = '' + sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs + sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs + sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs + sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs + ''; + }); + + reactive-banana = overrideCabal super.reactive-banana (drv: { + patchPhase = '' + cat >> src/Reactive/Banana/Switch.hs <) = ap + EOF + ''; + }); + + transformers-compat = overrideCabal super.transformers-compat (drv: { + configureFlags = []; + }); + + dependent-map = overrideCabal super.dependent-map (drv: { + preConfigure = '' + sed -i 's/^.*trust base.*$//' *.cabal + ''; + }); + + profunctors = overrideCabal super.profunctors (drv: { + preConfigure = '' + sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + ''; + }); + + "ghcjs-dom" = self.callPackage + ({ mkDerivation, base, mtl, text, ghcjs-base + }: + mkDerivation { + pname = "ghcjs-dom"; + version = "0.1.1.3"; + sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; + buildDepends = [ base mtl text ghcjs-base ]; + description = "DOM library that supports both GHCJS and WebKitGTK"; + license = pkgs.stdenv.lib.licenses.mit; + hydraPlatforms = pkgs.stdenv.lib.platforms.none; + }) {}; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3e9f82db359..30109b9a249 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -15,8 +15,8 @@ , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false -, enableSharedExecutables ? stdenv.lib.versionOlder "7.7" ghc.version -, enableSharedLibraries ? stdenv.lib.versionOlder "7.7" ghc.version +, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 , enableStaticLibraries ? true , extraLibraries ? [] @@ -53,6 +53,8 @@ let inherit (stdenv.lib) optional optionals optionalString versionOlder concatStringsSep enableFeature optionalAttrs; + isGhcjs = ghc.isGhcjs or false; + newCabalFile = fetchurl { url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; sha256 = editedCabalFile; @@ -64,7 +66,7 @@ let main = defaultMain ''; - ghc76xOrLater = stdenv.lib.versionOlder "7.6" ghc.version; + ghc76xOrLater = isGhcjs || stdenv.lib.versionOlder "7.6" ghc.version; packageDbFlag = if ghc76xOrLater then "package-db" else "package-conf"; hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); @@ -82,14 +84,17 @@ let (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableSharedLibraries "shared") - (optionalString (versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) - (optionalString (versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) - (optionalString (versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) + (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) + (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + ] ++ optionals isGhcjs [ + "--with-hsc2hs=${ghc.nativeGhc}/bin/hsc2hs" + "--ghcjs" ]; setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") - (optionalString (versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") + (optionalString (isGhcjs || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") (optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398 ]; @@ -108,9 +113,12 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); + setupBuilder = if isGhcjs then "${ghc.nativeGhc}/bin/ghc" else "ghc"; + ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + in stdenv.mkDerivation ({ - name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; + name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; pos = builtins.unsafeGetAttrPos "pname" args; @@ -162,7 +170,7 @@ stdenv.mkDerivation ({ configureFlags+=" --extra-lib-dirs=$p/lib" fi done - ghc-pkg --${packageDbFlag}="$packageConfDir" recache + ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache runHook postSetupCompilerEnvironment ''; @@ -175,7 +183,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ghc $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; @@ -248,13 +256,13 @@ stdenv.mkDerivation ({ isHaskellLibrary = hasActiveLibrary; env = stdenv.mkDerivation { - name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment"; + name = "interactive-${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}-environment"; nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' - export NIX_GHC="${ghcEnv}/bin/ghc" - export NIX_GHCPKG="${ghcEnv}/bin/ghc" + export NIX_GHC="${ghcEnv}/bin/${ghcCommand}" + export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" ''; diff --git a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch new file mode 100644 index 00000000000..c3df98043b3 --- /dev/null +++ b/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch @@ -0,0 +1,55 @@ +From 24e6f45408083745080ff2f3710f58209041113c Mon Sep 17 00:00:00 2001 +From: Luite Stegeman +Date: Sun, 28 Dec 2014 21:33:22 +0100 +Subject: [PATCH] updates for GHC 7.10 and Template Haskell 2.10 + +--- + haskell-src-meta.cabal | 4 ++-- + src/Language/Haskell/Meta/Syntax/Translate.hs | 6 ++++++ + src/Language/Haskell/Meta/Utils.hs | 5 ++++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs +index 189d32e..36a08f1 100644 +--- a/src/Language/Haskell/Meta/Syntax/Translate.hs ++++ b/src/Language/Haskell/Meta/Syntax/Translate.hs +@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b + toCxt :: Hs.Context -> Cxt + toCxt = fmap toPred + where ++#if MIN_VERSION_template_haskell(2,10,0) ++ toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts) ++ toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2]) ++ toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2]) ++#else + toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts) + toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2]) + toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2) ++#endif + toPred a@Hs.IParam{} = noTH "toCxt" a + + foldAppT :: Type -> [Type] -> Type +diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs +index 36f7e96..d194f3e 100644 +--- a/src/Language/Haskell/Meta/Utils.hs ++++ b/src/Language/Haskell/Meta/Utils.hs +@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) = + unVarT (VarT n) = PlainTV n + renamePreds = renameThings renamePred + ++#if MIN_VERSION_template_haskell(2,10,0) ++ renamePred = renameT ++#else + renamePred env new (ClassP n ts) = let + (ts', env', new') = renameTs env new [] ts + in (ClassP (normaliseName n) ts', env', new') +@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) = + (t1', env1, new1) = renameT env new t1 + (t2', env2, new2) = renameT env1 new1 t2 + in (EqualP t1' t2', env2, new2) +- ++#endif + + -- | Remove qualification, etc. + normaliseName :: Name -> Name + diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index b2071fa61c0..d2116a879d5 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -29,9 +29,10 @@ assert versionOlder "6.12" ghc.version; # fi let - ghc761OrLater = versionOlder "7.6.1" ghc.version; + ghc761OrLater = ghc.isGhcjs || versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - libDir = "$out/lib/ghc-${ghc.version}"; + ghcCommand = if ghc.isGhcjs then "ghcjs" else "ghc"; + libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = filter (x: x ? isHaskellLibrary) (closePropagation packages); @@ -50,6 +51,10 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook + ${lib.optionalString ghc.isGhcjs '' + cp -r ${ghc}/${ghc.libDir}/* ${libDir}/ + ''} + if test -L "$out/bin"; then binTarget="$(readlink -f "$out/bin")" rm "$out/bin" @@ -59,32 +64,32 @@ buildEnv { for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags '"-B$NIX_GHC_LIBDIR"' \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" \ + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags '"-B$NIX_GHC_LIBDIR"' \ + --set "NIX_GHC" "$out/bin/${ghcCommand}" \ + --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ + --set "NIX_GHC_LIBDIR" "${libDir}" \ ${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-f $out/bin/ghc" \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags "-f $out/bin/ghc" \ + --set "NIX_GHC" "$out/bin/${ghcCommand}" \ + --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done - for prg in ghc-pkg ghc-pkg-${ghc.version}; do + for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do rm -f $out/bin/$prg makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${optionalString hasLibraries "$out/bin/ghc-pkg recache"} - $out/bin/ghc-pkg check + ${optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + $out/bin/${ghcCommand}-pkg check ''; } // { preferLocalBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e432e24b51..4e099d17fb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3664,7 +3664,6 @@ let haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; - haskellPackages_ghcjs = haskell.packages_ghcjs; haskellPackages = haskellPackages_ghc784; haskell-ng = callPackage ./haskell-ng.nix { }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 204603ddee6..f4d513c0c68 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,15 +17,6 @@ ghcHEADPrefs = self : super : super // { cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = null; }; mtl = self.mtl_2_2_1; - ghcjsBase = null; - ghcjsDom = with self; super.ghcjsDom.override { - cabal = self.cabal.override { - extension = self: super: { - configureFlags = [ "-f-ghcjs" "-fwebkit" "-f-gtk3" ]; - buildDepends = [ mtl glib transformers gtk webkit ]; - }; - }; - }; }; ghc784Prefs = self : super : ghcHEADPrefs self super // { @@ -200,88 +191,6 @@ prefFun = ghc784Prefs; }; - packages_ghcjs = - packages { - ghc = pkgs.haskell-ng.compiler.ghc784; - prefFun = self : super : super // { - ghc = let parent = packages_ghc784; in - callPackage ../development/compilers/ghcjs/wrapper.nix { - ghc = parent.ghcjs // { inherit parent; }; - }; - cabal = self.cabalJs; - buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // { - nativePkgs = packages_ghc784; - }); - ghcjsDom = with self; super.ghcjsDom.override { - cabal = self.cabal.override { - extension = self: super: { - configureFlags = [ ]; - buildDepends = [ mtl ghcjsBase ]; - }; - }; - }; - # This is the list of packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell '' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" - Cabal = null; - aeson = null; - array = null; - async = null; - attoparsec = null; - base = null; - binary = null; - rts = null; - bytestring = null; - caseInsensitive = null; - containers = null; - deepseq = null; - directory = null; - dlist = null; - extensibleExceptions = null; - filepath = null; - ghcPrim = null; - ghcjsBase = null; - ghcjsPrim = null; - hashable = null; - integerGmp = null; - mtl = null; - oldLocale = null; - oldTime = null; - parallel = null; - pretty = null; - primitive = null; - process = null; - scientific = null; - stm = null; - syb = null; - templateHaskell = null; - text = null; - time = null; - transformers = null; - unix = null; - unorderedContainers = null; - vector = null; - - # GHCJS-specific workarounds - split = super.split.override { - cabal = self.cabal.override { - extension = self: super: { - doCheck = false; # Under ghcjs, the tests hang - }; - }; - }; - dependentMap = super.dependentMap.override { - cabal = self.cabal.override { - extension = self: super: { - preConfigure = '' - sed -i 's/^.*ghc-options:.*$//' *.cabal - ''; # Without this, we get "target ‘base’ is not a module name or a source file" - }; - }; - }; - }; - }; - packages_ghc763 = packages { ghc = pkgs.haskell-ng.compiler.ghc763; prefFun = ghc763Prefs; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 6a55023d358..0051c2b3e21 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -39,6 +39,9 @@ rec { }); ghc = compiler.ghc784; + ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { + ghc = compiler.ghc7101; + }; }; packages = { @@ -77,6 +80,7 @@ rec { packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; ghcjs = callPackage ../development/haskell-modules { + ghc = compiler.ghcjs; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e6c49c1aad8..51141e5ef00 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -103,15 +103,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in extension = self : super : {}; }; - cabalJs = callPackage ../build-support/cabal/ghcjs.nix { - Cabal = null; # prefer the Cabal version shipped with the compiler - hscolour = self.hscolourBootstrap; - inherit enableLibraryProfiling enableCheckPhase - enableStaticLibraries enableSharedLibraries enableSharedExecutables; - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : {}; - }; - # A variant of the cabal build driver that disables unit testing. # Useful for breaking cycles, where the unit test of a package A # depends on package B, which has A as a regular build input. @@ -968,14 +959,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; - ghcjs = callPackage ../development/compilers/ghcjs { - Cabal = self.Cabal_1_22_0_0; - cabalInstall = self.cabalInstall_1_22_0_0; - haddock = self.haddock.override { - Cabal = null; - }; - }; - ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {}; ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; From 8c16648f56a462577414e2484350d9f2e2c295d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Mar 2015 11:16:34 +0100 Subject: [PATCH 698/947] ghcjs: fix evaluation error in with-packages-wrapper.nix --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index d2116a879d5..e50672221eb 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -51,7 +51,7 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${lib.optionalString ghc.isGhcjs '' + ${optionalString ghc.isGhcjs '' cp -r ${ghc}/${ghc.libDir}/* ${libDir}/ ''} From 2502b537431c09180cb5939b7958ed0b3feb56b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Mar 2015 11:19:34 +0100 Subject: [PATCH 699/947] ghcjs: fix emacs syntax highlighting --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index e50672221eb..ac887a3f60e 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -52,7 +52,7 @@ buildEnv { . ${makeWrapper}/nix-support/setup-hook ${optionalString ghc.isGhcjs '' - cp -r ${ghc}/${ghc.libDir}/* ${libDir}/ + cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ ''} if test -L "$out/bin"; then From acdc2c019dc3450c50c317e0c0f4164e53983634 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Mar 2015 11:23:09 +0100 Subject: [PATCH 700/947] ghcjs-dom in the old package set doesn't evaluate any more. --- .../libraries/haskell/ghcjs-dom/default.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ghcjs-dom/default.nix diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix deleted file mode 100644 index b5e0a258fde..00000000000 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ghcjsBase, mtl, text }: - -cabal.mkDerivation (self: { - pname = "ghcjs-dom"; - version = "0.1.1.3"; - sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - buildDepends = [ ghcjsBase mtl text ]; - meta = { - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51141e5ef00..0d724e21080 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -959,8 +959,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; - ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {}; - ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; ghcjsPrim = callPackage ../development/libraries/haskell/ghcjs-prim {}; From b1e854d660b03cc3f7f25dce44e673b9e5bcaf32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Mar 2015 11:46:27 +0100 Subject: [PATCH 701/947] ghcjs: fix evaluation error in with-packages-wrapper.nix some more --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac887a3f60e..be708e7da57 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -51,7 +51,7 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${optionalString ghc.isGhcjs '' + ${optionalString (ghc.isGhcjs or false) '' cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ ''} From 4868649f037c4fe80034f281212b8ccd2d0ac148 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 28 Mar 2015 17:15:41 -0700 Subject: [PATCH 702/947] nixos/initrd: Generic library copying --- .../scripts/ec2/amazon-hvm-install-config.nix | 6 +- .../cd-dvd/system-tarball-sheevaplug.nix | 2 +- nixos/modules/system/boot/luksroot.nix | 28 +++------ nixos/modules/system/boot/stage-1.nix | 58 +++++++++++-------- nixos/modules/tasks/filesystems/btrfs.nix | 6 +- nixos/modules/tasks/filesystems/cifs.nix | 2 +- nixos/modules/tasks/filesystems/ext.nix | 5 +- nixos/modules/tasks/filesystems/f2fs.nix | 4 +- nixos/modules/tasks/filesystems/jfs.nix | 2 +- nixos/modules/tasks/filesystems/reiserfs.nix | 3 +- .../tasks/filesystems/unionfs-fuse.nix | 5 +- nixos/modules/tasks/filesystems/vfat.nix | 3 +- nixos/modules/tasks/filesystems/xfs.nix | 2 +- nixos/modules/tasks/filesystems/zfs.nix | 13 +++-- nixos/modules/virtualisation/amazon-image.nix | 2 +- nixos/modules/virtualisation/qemu-vm.nix | 2 +- nixos/tests/virtualbox.nix | 5 +- 17 files changed, 71 insertions(+), 77 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix index 530769cec5b..c0ec38bf489 100644 --- a/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix +++ b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix @@ -23,9 +23,9 @@ in boot.kernelParams = [ "console=ttyS0" ]; boot.initrd.extraUtilsCommands = '' - cp -v ${pkgs.gawk}/bin/gawk $out/bin/gawk - cp -v ${pkgs.gnused}/bin/sed $out/bin/gnused - cp -v ${pkgs.utillinux}/sbin/sfdisk $out/bin/sfdisk + copy_bin_and_libs ${pkgs.gawk}/bin/gawk + copy_bin_and_libs ${pkgs.gnused}/bin/sed + copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk cp -v ${growpart} $out/bin/growpart ''; boot.initrd.postDeviceCommands = '' diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 4ce7582c166..46dc1c70502 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -98,7 +98,7 @@ in boot.initrd.extraUtilsCommands = '' - cp ${pkgs.utillinux}/sbin/hwclock $out/bin + copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock ''; boot.initrd.postDeviceCommands = diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index da5bb8fe066..20eee8e06e0 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -405,29 +405,19 @@ in # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' - cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin - - cp -pdv ${pkgs.libgcrypt_1_6}/lib/libgcrypt*.so.* $out/lib - cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib - cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib - cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib + copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup ${optionalString luks.yubikeySupport '' - cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin - cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin - cp -pdv ${pkgs.openssl}/bin/openssl $out/bin + copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp + copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo + copy_bin_and_libs ${pkgs.openssl}/bin/openssl - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o $out/bin/pbkdf2-sha512 -lcrypto - strip -s $out/bin/pbkdf2-sha512 + cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + strip -s pbkdf2-sha512 + copy_bin_and_libs pbkdf2-sha512 - cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib - cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib - cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib - cp -pdv ${pkgs.openssl}/lib/libssl*.so.* $out/lib - cp -pdv ${pkgs.openssl}/lib/libcrypto*.so.* $out/lib - - mkdir -p $out/etc/ssl - cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl + mkdir -p $out/etc/ssl + cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl cat > $out/bin/openssl-wrap <&1 | grep "BusyBox" + $out/bin/blkid >/dev/null $out/bin/udevadm --version $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM" diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index d0a2ac645e0..049f7708d73 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -17,13 +17,9 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' - mkdir -p $out/bin - cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin + copy_bin_and_libs ${pkgs.btrfsProgs}/bin/btrfs ln -sv btrfs $out/bin/btrfsck ln -sv btrfsck $out/bin/fsck.btrfs - # !!! Increases uncompressed initrd by 240k - cp -pv ${pkgs.zlib}/lib/libz.so* $out/lib - cp -pv ${pkgs.lzo}/lib/liblzo2.so* $out/lib ''; boot.initrd.extraUtilsCommandsTest = mkIf inInitrd diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index c60f175db84..3932b5c9acf 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -18,7 +18,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' - cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin + copy_bin_and_libs ${pkgs.cifs_utils}/sbin/mount.cifs ''; }; diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 24592e9d588..cc9d0ef37d5 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -10,12 +10,11 @@ boot.initrd.extraUtilsCommands = '' # Copy e2fsck and friends. - cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin - cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/e2fsck + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/tune2fs ln -sv e2fsck $out/bin/fsck.ext2 ln -sv e2fsck $out/bin/fsck.ext3 ln -sv e2fsck $out/bin/fsck.ext4 - cp -pdv ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib ''; }; diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index 1ed7b1b6a62..430ac630a88 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -13,9 +13,7 @@ in boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ]; boot.initrd.extraUtilsCommands = mkIf inInitrd '' - mkdir -p $out/bin $out/lib - cp -v ${pkgs.f2fs-tools}/sbin/fsck.f2fs $out/bin - cp -pdv ${pkgs.f2fs-tools}/lib/lib*.so.* $out/lib + copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs ''; }; } diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixos/modules/tasks/filesystems/jfs.nix index b7091ce9b18..fc3905c7dc2 100644 --- a/nixos/modules/tasks/filesystems/jfs.nix +++ b/nixos/modules/tasks/filesystems/jfs.nix @@ -13,7 +13,7 @@ in boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ]; boot.initrd.extraUtilsCommands = mkIf inInitrd '' - cp -v ${pkgs.jfsutils}/sbin/fsck.jfs "$out/bin/" + copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs ''; }; } diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix index a3bfb3fed8e..900e2eb7575 100644 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/nixos/modules/tasks/filesystems/reiserfs.nix @@ -17,8 +17,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' - cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin - ln -sv reiserfsck $out/bin/fsck.reiserfs + copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck ''; }; diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index fe195e0db0b..3e38bffa3ba 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -7,9 +7,8 @@ boot.initrd.kernelModules = [ "fuse" ]; boot.initrd.extraUtilsCommands = '' - cp -v ${pkgs.fuse}/lib/libfuse* $out/lib - cp -v ${pkgs.fuse}/sbin/mount.fuse $out/bin - cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin + copy_bin_and_libs ${pkgs.fuse}/sbin/mount.fuse + copy_bin_and_libs ${pkgs.unionfs-fuse}/bin/unionfs substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \ --replace '${pkgs.bash}/bin/bash' /bin/sh \ --replace '${pkgs.fuse}/sbin' /bin \ diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index 4cfe6e208f7..8ebdf0d12f8 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -17,8 +17,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' - cp -v ${pkgs.dosfstools}/sbin/dosfsck $out/bin - ln -sv dosfsck $out/bin/fsck.vfat + copy_bin_and_libs ${pkgs.dosfstools}/sbin/dosfsck ''; }; diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix index 5225b62a88c..d7c3930f4a3 100644 --- a/nixos/modules/tasks/filesystems/xfs.nix +++ b/nixos/modules/tasks/filesystems/xfs.nix @@ -17,7 +17,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' - cp -v ${pkgs.xfsprogs}/sbin/fsck.xfs $out/bin + copy_bin_and_libs ${pkgs.xfsprogs}/sbin/fsck.xfs ''; # Trick just to set 'sh' after the extraUtils nuke-refs. diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1ac89c4c255..d4b10e9ed09 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -203,11 +203,14 @@ in kernelModules = [ "spl" "zfs" ]; extraUtilsCommands = '' - cp -v ${zfsUserPkg}/sbin/zfs $out/bin - cp -v ${zfsUserPkg}/sbin/zdb $out/bin - cp -v ${zfsUserPkg}/sbin/zpool $out/bin - cp -pdv ${zfsUserPkg}/lib/lib*.so* $out/lib - cp -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib + copy_bin_and_libs ${zfsUserPkg}/sbin/zfs + copy_bin_and_libs ${zfsUserPkg}/sbin/zdb + copy_bin_and_libs ${zfsUserPkg}/sbin/zpool + ''; + extraUtilsCommandsTest = mkIf inInitrd + '' + $out/bin/zfs --help >/dev/null 2>&1 + $out/bin/zpool --help >/dev/null 2>&1 ''; postDeviceCommands = concatStringsSep "\n" (['' ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 0473c2454e2..600a29f31bc 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -165,7 +165,7 @@ in boot.initrd.extraUtilsCommands = '' # We need swapon in the initrd. - cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin + copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon ''; # Don't put old configurations in the GRUB menu. The user has no diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a5a133dfa5d..8c7e840910d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -346,7 +346,7 @@ in boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs ''; boot.initrd.postDeviceCommands = diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index b2b1ec87779..febe0923ba2 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -39,9 +39,8 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let ]; boot.initrd.extraUtilsCommands = '' - cp -av -t "$out/bin/" \ - "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" \ - "${pkgs.utillinux}/bin/unshare" + copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" + copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" ${(attrs.extraUtilsCommands or (const "")) pkgs} ''; From c379847fdaeb6549dfdb2c29b84465cb402ced79 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 28 Mar 2015 19:06:43 -0700 Subject: [PATCH 703/947] nixos/vfat: Readd fsck.vfat --- nixos/modules/tasks/filesystems/vfat.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index 8ebdf0d12f8..958e27ae8a3 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -18,6 +18,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' copy_bin_and_libs ${pkgs.dosfstools}/sbin/dosfsck + ln -sv dosfsck $out/bin/fsck.vfat ''; }; From 9718561589dd41aa28c4bef1476c60ad78e881c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 28 Mar 2015 19:07:45 -0700 Subject: [PATCH 704/947] nixos/vfat: Readd fsck.reiserfs --- nixos/modules/tasks/filesystems/reiserfs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix index 900e2eb7575..ab4c43e2ab8 100644 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/nixos/modules/tasks/filesystems/reiserfs.nix @@ -18,6 +18,7 @@ in boot.initrd.extraUtilsCommands = mkIf inInitrd '' copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck + ln -s reiserfsck $out/bin/fsck.reiserfs ''; }; From 00b57f47c7272693a5272dd5d384ec99560d4b22 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 28 Mar 2015 23:13:45 -0500 Subject: [PATCH 705/947] Update versions of skarnet.org packages skalibs 2.3.2.0 execline 2.1.1.0 s6 2.1.3.0 st-portable-utils 2.0.4.0 s6-linux-utils 2.0.2.0 s6-networking 2.1.0.0 Also change path to s6 static library in s6-networking build. --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++-- pkgs/servers/s6/default.nix | 6 +++--- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 67c1c74e6cf..fa1d4f4f984 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.0.0"; + version = "2.3.2.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn"; + sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 42a4357c74c..9bccedb0120 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.0"; + version = "2.0.2.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "0lfgfwnk81vjlkvmr1gzknz9swgcrp5s7x19dfkw6shvi95fyirh"; + sha256 = "0y6dq4wb5v1c6ps6a7jyq08r2pjksrvz6n3dnfa9c91gzm4m1dxb"; }; dontDisableStatic = true; diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 1452f82573e..73843b8c114 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.0"; + version = "2.1.3.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d"; + sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; }; dontDisableStatic = true; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { "--with-lib=${execline}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ]; + ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 320115b4f2d..a2edb1f842e 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.1"; + version = "2.1.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "06fn4fb8hp68pffgfc55l5raph3bk9v0gngbgxfyzkmwbb1gxhll"; + sha256 = "0yhxyih8p6p9135nifi655qk4gnhdarjzfp1lb4pxx9ar9ay5q7w"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 755cfce3d8b..9aaf928b7b0 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.0"; + version = "2.0.4.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "1vszqaqkyhz1v69pxls3c7y1qs8wjkdylpg0yz183xlirywimwwk"; + sha256 = "0gl4v6hslqkxdfxj3qzi1xpiiw52ic8y8l9nkl2z5gp893qb6yvx"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index e8857e35e67..d2c7ebd0345 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.0"; + version = "2.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya"; + sha256 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c"; }; dontDisableStatic = true; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { "--with-include=${s6Dns}/include" "--with-lib=${skalibs}/lib" "--with-lib=${execline}/lib" - "--with-lib=${s6}/lib" + "--with-lib=${s6}/lib/s6" "--with-lib=${s6Dns}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" From 028779fb401cce8f087a41a929b97441b96ac356 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Mar 2015 11:02:31 +0200 Subject: [PATCH 706/947] ghcWithPackages: fix isGhcjs evaluation even some more This is harder than I would have thought. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index be708e7da57..be3e2e22a13 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -29,9 +29,10 @@ assert versionOlder "6.12" ghc.version; # fi let - ghc761OrLater = ghc.isGhcjs || versionOlder "7.6.1" ghc.version; + isGhcjs = ghc.isGhcjs or false; + ghc761OrLater = isGhcjs || versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand = if ghc.isGhcjs then "ghcjs" else "ghc"; + ghcCommand = if isGhcjs then "ghcjs" else "ghc"; libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; @@ -51,7 +52,7 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${optionalString (ghc.isGhcjs or false) '' + ${optionalString isGhcjs '' cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ ''} From da26c13df525772d6d84fc90ae6e95870d6a1174 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 29 Mar 2015 11:40:35 +0200 Subject: [PATCH 707/947] rdiff-backup: Fix build with a ArchLinux patch. --- pkgs/tools/backup/rdiff-backup/default.nix | 3 ++- .../fix-librsync-rs_default_strong_len.patch | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 47db1a5d4b2..bcbc8a84647 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; - phases = "unpackPhase installPhase"; + patches = [ ./fix-librsync-rs_default_strong_len.patch ]; + installPhase = '' python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ diff --git a/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch b/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch new file mode 100644 index 00000000000..ce23c8a8124 --- /dev/null +++ b/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch @@ -0,0 +1,20 @@ +Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with +librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be +found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity). + +--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100 +@@ -59,8 +59,13 @@ + if (sm == NULL) return NULL; + sm->x_attr = NULL; + ++#ifdef RS_DEFAULT_STRONG_LEN + sm->sig_job = rs_sig_begin((size_t)blocklen, + (size_t)RS_DEFAULT_STRONG_LEN); ++#else ++ sm->sig_job = rs_sig_begin((size_t)blocklen, ++ (size_t)8, RS_MD4_SIG_MAGIC); ++#endif + return (PyObject*)sm; + } + From c7a0925ac2404c6d13cf1180c9a6b8edd72cf469 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 04:56:42 +0300 Subject: [PATCH 708/947] yEd: update --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a9ced83cfae..6e9a1fdeb09 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14"; + name = "yEd-3.14.1"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471"; + sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2"; }; nativeBuildInputs = [ unzip makeWrapper ]; From cdba27ae9b65f4c48873e0ac1d10be0c5de64208 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 04:56:54 +0300 Subject: [PATCH 709/947] urxvt-perls: update --- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 98f2e0d6108..8c8b1947bc0 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "urxvt-perls"; src = fetchgit { - url = "https://github.com/muennich/urxvt-perls"; - rev = "4dec629b3631297d17855c35be1b723e2d9e7591"; - sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f"; + url = "git://github.com/muennich/urxvt-perls"; + rev = "e4dbde31edd19e2f4c2b6c91117ee91e2f83ddd7"; + sha256 = "1f8a27c3d54377fdd4ab0be2f4efb8329d4900bb1c792b306dc23b5ee59260b1"; }; installPhase = '' From dd359e6ef7d3a53ed7e350dc9385056c4e5ad3d9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 04:57:12 +0300 Subject: [PATCH 710/947] urxvt-perls: update --- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c8b1947bc0..c0cc702c986 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -23,4 +23,4 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = maintainers.abbradar; }; -} \ No newline at end of file +} From 5d7847f2337ac9584b84f870ed30348548639bcc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 04:57:22 +0300 Subject: [PATCH 711/947] bomi: update --- pkgs/applications/video/bomi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 521f50432ff..d2a293104db 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3 +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -32,13 +32,13 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.0"; + version = "0.9.5"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "12xyz40kl03h1m8g7d7s0wf74l2c70v6bd1drhww7ky48hxi0z14"; + sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; }; buildInputs = with stdenv.lib; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl which ]; enableParallelBuilding = true; From be11af03b39cf486a16ec0a0f248ad9b2da2b065 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:01:53 +0300 Subject: [PATCH 712/947] cmmzmq: update --- pkgs/development/libraries/cppzmq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index a7b70615d93..fc2d04e649b 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { name = "cppzmq"; src = fetchgit { - url = "https://github.com/zeromq/cppzmq"; - rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819"; - sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da"; + url = "git://github.com/zeromq/cppzmq"; + rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a"; + sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398"; }; installPhase = '' From 731a4019d0e3ff67974a5a5f295ff7ea6f2c00e5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:02:02 +0300 Subject: [PATCH 713/947] folly: update --- pkgs/development/libraries/folly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index e2ac798d203..180de724d95 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.32.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca"; + sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh"; }; buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A YAML parser and emitter for C++"; - homepage = https://code.google.com/p/yaml-cpp/; + description = "An open-source C++ library developed and used at Facebook"; + homepage = https://github.com/facebook/folly; license = licenses.mit; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; From aa652e09d2de775036041d485212ed6a47b52b89 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:02:42 +0300 Subject: [PATCH 714/947] libfprint: update, remove git version --- .../libraries/libfprint/default.nix | 8 +++--- .../libraries/libfprint/master.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/libfprint/master.nix diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index ffbed794599..aad6214f2d4 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, nss, nspr, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "libfprint-0.5.1"; + name = "libfprint-0.6.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1cwgaswqcvvbclahk2m2qr09k7lf7l8jwvgf3svq92w8j4xmc4kd"; + sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5"; }; - buildInputs = [ libusb glib nss nspr gdk_pixbuf ]; + buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/development/libraries/libfprint/master.nix b/pkgs/development/libraries/libfprint/master.nix deleted file mode 100644 index 06d033d0c02..00000000000 --- a/pkgs/development/libraries/libfprint/master.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchgit, libtool, autoconf, automake113x, pkgconfig, libusb, glib, nss, nspr, pixman }: - -stdenv.mkDerivation rec { - name = "libfprint"; - - src = fetchgit { - url = "git://anongit.freedesktop.org/libfprint/libfprint"; - rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0"; - sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi"; - }; - - buildInputs = [ libusb glib nss nspr pixman ]; - nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ]; - - configureScript = "./autogen.sh"; - - configureFlags = [ "--prefix=$(out)" "--disable-examples-build" "--disable-x11-examples-build" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; - - meta = with stdenv.lib; { - homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/"; - description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e099d17fb1..c42da184bd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6319,7 +6319,7 @@ let extraOnly = true; }; - libfprint = callPackage ../development/libraries/libfprint/master.nix { }; + libfprint = callPackage ../development/libraries/libfprint { }; libfpx = callPackage ../development/libraries/libfpx { }; From d5d8efa0b831f7fd6da484da70f641b2e862235c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:03:10 +0300 Subject: [PATCH 715/947] ipopt: update --- pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 5443a53bc9c..544ab215345 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, blas, liblapack, gfortran }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.12.1"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "18p1ad64mpliba1hf6jkyyrd0srxsqivwbcnbrr09jfpn4jn4bbr"; + sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy"; }; preConfigure = '' From b366cb56d8c5f87d5d47b981459679f16174ce28 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:03:24 +0300 Subject: [PATCH 716/947] xlslib: new 'homepage' --- pkgs/development/libraries/xlslib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 602e7115017..82f1514cd3d 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://xlslib.sourceforge.net/; + homepage = http://sourceforge.net/projects/xlslib/files/; license = licenses.bsd2; platforms = platforms.unix; maintainers = maintainers.abbradar; From ac900ac7fb6e87c371436f247579b8fcef9e055a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:03:54 +0300 Subject: [PATCH 717/947] crawl: update --- pkgs/games/crawl/crawl_purify.patch | 31 ++++++++++++++++++++++++++ pkgs/games/crawl/default.nix | 17 ++++++++------ pkgs/games/crawl/makefile_fonts.patch | 20 ----------------- pkgs/games/crawl/makefile_sqlite.patch | 11 --------- 4 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 pkgs/games/crawl/crawl_purify.patch delete mode 100644 pkgs/games/crawl/makefile_fonts.patch delete mode 100644 pkgs/games/crawl/makefile_sqlite.patch diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch new file mode 100644 index 00000000000..0e2d335adac --- /dev/null +++ b/pkgs/games/crawl/crawl_purify.patch @@ -0,0 +1,31 @@ +diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile +index b7e2fbf..5ff23db 100644 +--- a/crawl-ref/source/Makefile ++++ b/crawl-ref/source/Makefile +@@ -273,7 +273,7 @@ endif + LIBZ := contrib/install/$(ARCH)/lib/libz.a + + ifndef CROSSHOST +- SQLITE_INCLUDE_DIR := /usr/include ++ SQLITE_INCLUDE_DIR := ${sqlite}/include + else + # This is totally wrong, works only with some old-style setups, and + # on some architectures of Debian/new FHS multiarch -- excluding, for +@@ -943,7 +943,7 @@ else + SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ + {\ + fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ +- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ ++ for dir in ${dejavu_fonts}/share/fonts;\ + do [ -d $$dir ] && echo $$dir; done;\ + } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) + ifneq (,$(SYS_PROPORTIONAL_FONT)) +@@ -968,7 +968,7 @@ else + SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ + {\ + fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ +- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ ++ for dir in ${dejavu_fonts}/share/fonts;\ + do [ -d $$dir ] && echo $$dir; done;\ + } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) + ifneq (,$(SYS_MONOSPACED_FONT)) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 7f971150c67..7b153eab869 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses +{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses , dejavu_fonts, libpng, SDL, SDL_image, mesa, freetype , tileMode ? true }: -let version = "0.15.2"; +let version = "0.16.1"; in stdenv.mkDerivation rec { name = "crawl-${version}" + (if tileMode then "-tiles" else ""); - src = fetchurl { - url = "mirror://sourceforge/crawl-ref/Stone%20Soup/${version}/stone_soup-${version}-nodeps.tar.xz"; - sha256 = "1qi1g8w0sxmwrv96hnay20gpwp1xn2xcq1cw9iwn1yq112484fp9"; + src = fetchFromGitHub { + owner = "crawl-ref"; + repo = "crawl-ref"; + rev = version; + sha256 = "0gciqaij05qr5bwkk5mblvk5k0p6bzjd58czk1b6x5xx5qcp6mmh"; }; - patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch ]; + patches = [ ./crawl_purify.patch ]; nativeBuildInputs = [ pkgconfig which perl ]; @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { [ libpng SDL SDL_image freetype mesa ]; preBuild = '' - cd source + cd crawl-ref/source + echo "${version}" > util/release_ver # Related to issue #1963 sed -i 's/-fuse-ld=gold//g' Makefile for i in util/*.pl; do diff --git a/pkgs/games/crawl/makefile_fonts.patch b/pkgs/games/crawl/makefile_fonts.patch deleted file mode 100644 index 6c73407b65c..00000000000 --- a/pkgs/games/crawl/makefile_fonts.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- old/source/Makefile 2013-11-28 01:03:54.000000000 +0000 -+++ new/source/Makefile 2014-02-05 14:04:32.531838188 +0000 -@@ -880,7 +880,7 @@ - INSTALL_FONTS += $(PROPORTIONAL_FONT) - endif - else -- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) -+ SYS_PROPORTIONAL_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - ifeq (,$(SYS_PROPORTIONAL_FONT)) - SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - endif -@@ -903,7 +903,7 @@ - INSTALL_FONTS += $(MONOSPACED_FONT) - endif - else -- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) -+ SYS_MONOSPACED_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - ifeq (,$(SYS_MONOSPACED_FONT)) - SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - endif diff --git a/pkgs/games/crawl/makefile_sqlite.patch b/pkgs/games/crawl/makefile_sqlite.patch deleted file mode 100644 index fbcb925d608..00000000000 --- a/pkgs/games/crawl/makefile_sqlite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/source/Makefile 2014-04-14 12:46:35.401956673 +0000 -+++ new/source/Makefile 2014-04-14 12:47:12.757006254 +0000 -@@ -259,7 +259,7 @@ - LIBZ := contrib/install/$(ARCH)/lib/libz.a - - ifndef CROSSHOST -- SQLITE_INCLUDE_DIR := /usr/include -+ SQLITE_INCLUDE_DIR := ${sqlite}/include - else - # This is totally wrong, works only with some old-style setups, and - # on some architectures of Debian/new FHS multiarch -- excluding, for From 602ff464034bd6c824eaa433221d9af0a5fed133 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:04:07 +0300 Subject: [PATCH 718/947] winetricks: update --- pkgs/misc/emulators/wine/winetricks.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index e65530e38c3..34a2a6efbbb 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchgit, wine, perl, which, coreutils, zenity, curl +{ stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : -stdenv.mkDerivation rec { - name = "winetricks-20150206"; +let version = "20150316"; +in stdenv.mkDerivation rec { + name = "winetricks-${version}"; - src = fetchgit { - url = "https://code.google.com/p/winetricks/"; - rev = "483056823093a90c9186b3d1a4867f481acf5fa1"; - sha256 = "8b86a2a130ced405886775f0f81e7a6b25eb1bc22f357d0fe705fead52fff829"; + src = fetchFromGitHub { + owner = "Winetricks"; + repo = "winetricks"; + rev = version; + sha256 = "00c55jpca6l3v3p02xc0gy5l4xb17gf90282hq5h85nh72kqsbrh"; }; buildInputs = [ perl which ]; From f0c54d671a0ae0444662f4648d38525cd5ba16a9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:04:18 +0300 Subject: [PATCH 719/947] android-udev-rules: update --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 534ba997004..b30e0f61b1b 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/M0Rf30/android-udev-rules"; - rev = "82f78561f388363a925e6663211988d9527de0c6"; - sha256 = "badd7a152acf92c75335917c07125ffb1b5fda0bed5ec1e474d76e48a8d9f0db"; + rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9"; + sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f"; }; installPhase = '' From fb8ed6efd4fd9ebcb589730588ad0298cf3f1075 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:04:44 +0300 Subject: [PATCH 720/947] ocz-toolbox: remove (obsoleted by SSD Guru) --- .../os-specific/linux/ocz-toolbox/default.nix | 37 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 39 deletions(-) delete mode 100644 pkgs/os-specific/linux/ocz-toolbox/default.nix diff --git a/pkgs/os-specific/linux/ocz-toolbox/default.nix b/pkgs/os-specific/linux/ocz-toolbox/default.nix deleted file mode 100644 index 4537cdac3e9..00000000000 --- a/pkgs/os-specific/linux/ocz-toolbox/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, libXrender, fontconfig, freetype, libXext, libX11 }: - -let arch = if stdenv.system == "x86_64-linux" then "64" - else if stdenv.system == "i686-linux" then "32" - else abort "OCZ Toolbox only support {x86-64,i686}-linux targets"; -in stdenv.mkDerivation rec { - version = "4.9.0.634"; - name = "ocz-toolbox-${version}"; - - src = fetchurl { - url = "http://ocz.com/consumer/download/firmware/OCZToolbox_v${version}_linux.tar.gz"; - sha256 = "0h51p5bg9h2smxxy1r4xkzzjjavhgql7yy12qmjk0vbh13flgx3y"; - }; - - prePatch = '' - cd linux${arch} - ''; - - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libXrender fontconfig freetype libXext libX11 ]; - - installPhase = '' - install -Dm755 OCZToolbox $out/bin/OCZToolbox - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$libPath" \ - $out/bin/OCZToolbox - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Update firmware and BIOS, secure erase, view SMART attributes, and view drive details of your OCZ SSD"; - homepage = "http://ocz.com/consumer/download/firmware"; - license = licenses.unfree; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c42da184bd0..5ffab19b26f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2179,8 +2179,6 @@ let obnam = callPackage ../tools/backup/obnam { }; - ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { }; - odt2txt = callPackage ../tools/text/odt2txt { }; odamex = callPackage ../games/odamex { }; From fefede9807aa944323a41ac03b1be050c4dd3ff8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:04:58 +0300 Subject: [PATCH 721/947] uwsgi: update --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 60903314bf1..bf168611f38 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -24,11 +24,11 @@ in assert builtins.filter (x: lib.all (y: y.name != x) available) plugins == []; stdenv.mkDerivation rec { - name = "uwsgi-2.0.9"; + name = "uwsgi-2.0.10"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "15c2j5myx1s54a1f6a7pjblvk7v96mz2kqlbj19mdfd8l2y8j17y"; + sha256 = "12q2sn35vf1ils5043svq8da0czy54k63ziybvl33a9dqbb83cy0"; }; nativeBuildInputs = [ python3 pkgconfig ]; From 9ed21f3a49b5fb7a290daddf2eb51f0a69e95a3c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:05:06 +0300 Subject: [PATCH 722/947] lbzip2: style fix --- pkgs/tools/compression/lbzip2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 73bc987908d..e1adefd2167 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "lbzip2-2.5"; From cb7eeca1478a43e9c54b519f376bab4967ec52ef Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:05:14 +0300 Subject: [PATCH 723/947] fprintd: update --- pkgs/tools/security/fprintd/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 3535aef39e0..fb72782abee 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, gtk_doc -, libfprint, intltool, glib, dbus_glib, polkit, nss, pam, systemd }: +{ stdenv, fetchurl, pkgconfig, intltool +, libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd"; + name = "fprintd-0.6.0"; - src = fetchgit { - url = "git://anongit.freedesktop.org/libfprint/fprintd"; - rev = "f7c51b0d585eb63702f0d005081e53f44325df86"; - sha256 = "1gmnn72ablfxvv13s0rms5f39hc4y2z97aq44d7l9hblnfn6wq12"; + src = fetchurl { + url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; + sha256 = "1by6nvlrqkwzcz2v2kyq6avi3h384vmlr42vj9s2yzcinkp64m1z"; }; buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; - nativeBuildInputs = [ automake libtool autoconf gtk_doc pkgconfig intltool ]; - - configureScript = "./autogen.sh"; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ]; From d98e0377744513f16e1851e22ba6e8c44f6d58db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Mar 2015 12:05:33 +0200 Subject: [PATCH 724/947] kodi: 14.1 -> 14.2 --- pkgs/applications/video/kodi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index c1b17cd89ca..f296ca3edcf 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,11 +43,11 @@ let }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "14.1"; + version = "14.2"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "1mjmf8ag8dg5brzxy7cmnz72b1b85p69zr1li28j71fgjbi5k053"; + sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr"; }; buildInputs = [ From fe263f4c7edff5850da6c036fb7842dbf3798773 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 24 Mar 2015 14:06:39 +0300 Subject: [PATCH 725/947] xl2tpd: add package --- pkgs/tools/networking/xl2tpd/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/xl2tpd/default.nix diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix new file mode 100644 index 00000000000..50b341778ee --- /dev/null +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libpcap }: + +let version = "1.3.6"; +in stdenv.mkDerivation { + name = "xl2tpd-${version}"; + + src = fetchFromGitHub { + owner = "xelerance"; + repo = "xl2tpd"; + rev = "v${version}"; + sha256 = "17lnsk9fsyfp2g5hha7psim6047wj9qs8x4y4w06gl6bbf36jm9z"; + }; + + buildInputs = [ libpcap ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.xelerance.com/software/xl2tpd/; + description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e099d17fb1..03b68e0f762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2965,6 +2965,8 @@ let welkin = callPackage ../tools/graphics/welkin {}; + xl2tpd = callPackage ../tools/networking/xl2tpd { }; + testdisk = callPackage ../tools/misc/testdisk { }; html2text = callPackage ../tools/text/html2text { }; From 0e8b27ea6d50a97bad73935daaed94055d4670b1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 24 Mar 2015 14:07:27 +0300 Subject: [PATCH 726/947] networkmanager-l2tp: add package --- .../network-manager/l2tp-purity.patch | 26 ++++++++++++ .../tools/networking/network-manager/l2tp.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/l2tp-purity.patch create mode 100644 pkgs/tools/networking/network-manager/l2tp.nix diff --git a/pkgs/tools/networking/network-manager/l2tp-purity.patch b/pkgs/tools/networking/network-manager/l2tp-purity.patch new file mode 100644 index 00000000000..c9117c5325b --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c +index d2c9dc4..e61d3d2 100644 +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -655,9 +655,7 @@ nm_find_ipsec (void) + { + static const char *ipsec_binary_paths[] = + { +- "/sbin/ipsec", +- "/usr/sbin/ipsec", +- "/usr/local/sbin/ipsec", ++ "@strongswan@/bin/ipsec", + NULL + }; + +@@ -677,9 +675,7 @@ nm_find_l2tpd (void) + { + static const char *l2tp_binary_paths[] = + { +- "/sbin/xl2tpd", +- "/usr/sbin/xl2tpd", +- "/usr/local/sbin/xl2tpd", ++ "@xl2tpd@/bin/xl2tpd", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix new file mode 100644 index 00000000000..a104f321c12 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, substituteAll, automake, autoconf, libtool, intltool, pkgconfig +, networkmanager, ppp, xl2tpd, strongswan +, withGnome ? true, gnome3 }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = "0.9.8.7"; + + src = fetchFromGitHub { + owner = "seriyps"; + repo = "NetworkManager-l2tp"; + rev = version; + sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; + }; + + buildInputs = [ networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; + + nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; + + configureScript = "./autogen.sh"; + + configureFlags = + if withGnome then "--with-gnome" else "--without-gnome"; + + postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + + patches = + [ ( substituteAll { + src = ./l2tp-purity.patch; + inherit xl2tpd strongswan; + }) + ]; + + meta = with stdenv.lib; { + description = "L2TP plugin for NetworkManager"; + inherit (networkmanager.meta) platforms; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b68e0f762..464d6a01f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2077,6 +2077,8 @@ let networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; From dcaee528c2ce7b5f548f3fbdc32facf134952260 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 24 Mar 2015 14:07:54 +0300 Subject: [PATCH 727/947] networkmanagerapplet: support l2tp --- pkgs/tools/networking/network-manager-applet/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d289695398c..56c0dd1363a 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -2,7 +2,8 @@ , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc -, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }: +, networkmanager_openconnect, networkmanager_pptp, networkmanager_l2tp +, udev, hicolor_icon_theme, dconf }: let pn = "network-manager-applet"; @@ -37,16 +38,19 @@ stdenv.mkDerivation rec { ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name + ln -s ${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name $out/etc/NetworkManager/VPN/nm-l2tp-service.name mkdir -p $out/lib/NetworkManager ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_l2tp}/lib/NetworkManager/* $out/lib/NetworkManager/ mkdir -p $out/libexec ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ ln -s ${networkmanager_pptp}/libexec/* $out/libexec/ + ln -s ${networkmanager_l2tp}/libexec/* $out/libexec/ ''; preFixup = '' From 16f047a60f93b221bae256b6331e632c82fc5b7b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 24 Mar 2015 14:08:05 +0300 Subject: [PATCH 728/947] nixos/networkmanager: support l2tp --- nixos/modules/services/networking/networkmanager.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3a64d3f09e0..f00c5d1f701 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -183,6 +183,9 @@ in { { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } + { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + target = "NetworkManager/VPN/nm-l2tp-service.name"; + } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; @@ -197,6 +200,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; @@ -240,6 +244,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; From 8943ffcd2b871f43112737d2b1342d289776c2ed Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 05:24:35 +0300 Subject: [PATCH 729/947] ghcWithPackages: restore old style (without 'with') --- .../haskell-modules/with-packages-wrapper.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index be3e2e22a13..22932eea665 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,11 +1,9 @@ -{ stdenv, ghc, llvmPackages, packages, buildEnv +{ stdenv, lib, ghc, llvmPackages, packages, buildEnv , makeWrapper , ignoreCollisions ? false, withLLVM ? false }: -with stdenv.lib; - # This wrapper works only with GHC 6.12 or later. -assert versionOlder "6.12" ghc.version; +assert lib.versionOlder "6.12" ghc.version; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -30,19 +28,19 @@ assert versionOlder "6.12" ghc.version; let isGhcjs = ghc.isGhcjs or false; - ghc761OrLater = isGhcjs || versionOlder "7.6.1" ghc.version; + ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = filter (x: x ? isHaskellLibrary) (closePropagation packages); - hasLibraries = any (x: x.isHaskellLibrary) paths; + paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); + hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html - llvm = makeSearchPath "bin" + llvm = lib.makeSearchPath "bin" ([ llvmPackages.llvm ] - ++ optional stdenv.isDarwin llvmPackages.clang); + ++ lib.optional stdenv.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else buildEnv { @@ -52,7 +50,7 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${optionalString isGhcjs '' + ${lib.optionalString isGhcjs '' cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ ''} @@ -71,7 +69,7 @@ buildEnv { --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" \ - ${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} + ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do @@ -89,7 +87,7 @@ buildEnv { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} $out/bin/${ghcCommand}-pkg check ''; } // { From 9fde4cc2f09baa1e2f77684a60f6da0f53dd07c6 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 28 Mar 2015 10:20:48 +0100 Subject: [PATCH 730/947] dovecot: Update from 2.2.15 to 2.2.16 --- pkgs/servers/mail/dovecot/2.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index c9776b34b9d..a774777709f 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,14 +2,14 @@ , inotifyTools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.15"; + name = "dovecot-2.2.16"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "17rr7krfvyk706j12y9wy6nf7wh5vppqjrgxjdf66z9nw9lpf3ni"; + sha256 = "1w6gg4h9mxg3i8faqpmgj19imzyy001b0v8ihch8ma3zl63i5kjn"; }; preConfigure = '' From 69874c27ec999ed80179a7d679f211e7c49146a5 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 29 Mar 2015 11:07:51 +0000 Subject: [PATCH 731/947] awesome manpage is broken in chroot builds, disable for now --- pkgs/applications/window-managers/awesome/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3b655b55c9c..3541743057c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -2,8 +2,9 @@ , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm -, which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 -, docbook_xsl }: +, which, dbus, nettools, git, asciidoc, doxygen +#, xmlto, docbook_xml_dtd_45 , docbook_xsl +}: let version = "3.5.6"; @@ -54,10 +55,10 @@ stdenv.mkDerivation rec { xlibs.xcbutilkeysyms xlibs.xcbutilrenderutil xlibs.xcbutilwm - xmlto docbook_xml_dtd_45 docbook_xsl + #xmlto docbook_xml_dtd_45 docbook_xsl ]; - cmakeFlags = "-DGENERATE_MANPAGES=ON"; + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; From f079de2dbfad62be3a991d852513ff64a142fc2c Mon Sep 17 00:00:00 2001 From: Andreas Baldeau Date: Sun, 29 Mar 2015 14:20:02 +0200 Subject: [PATCH 732/947] Added WebStorm IDE --- lib/maintainers.nix | 1 + pkgs/applications/editors/idea/default.nix | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 358cbda44e4..05fbad6634a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -5,6 +5,7 @@ alphabetically sorted. */ _1126 = "Christian Lask "; + abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; aforemny = "Alexander Foremny "; aherrmann = "Andreas Herrmann "; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 9c4683b8c9e..0d6851a79e8 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -160,6 +160,23 @@ let }; }); + buildWebStorm = { name, version, build, src, license, description }: + (mkIdeaProduct { + inherit name version build src; + product = "WebStorm"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/webstorm/"; + inherit description license; + longDescription = '' + WebStorm provides an editor for HTML, JavaScript (incl. Node.js), + and CSS with on-the-fly code analysis, error prevention and + automated refactorings for JavaScript code. + ''; + maintainers = with maintainers; [ abaldeau ]; + platforms = platforms.linux; + }; + }); + buildPycharm = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; @@ -288,4 +305,16 @@ in }; }; + webstorm = buildWebStorm rec { + name = "webstorm-${version}"; + version = "9.0.3"; + build = "139.1112"; + description = "Professional IDE for Web and JavaScript devlopment"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; + sha256 = "e4cfe7b5f1220b68d880c4f236df9c9df2b1efcc04775afad6149d949f45f0aa"; + }; + }; + } From 981dbc35d14676e804462136a7698c6fcfe694fc Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 28 Mar 2015 23:45:28 -0400 Subject: [PATCH 733/947] ghc-7.10.1: cherry-pick Cabal bugfix for GHCJS --- pkgs/development/compilers/ghc/7.10.1.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 629ac69d36f..5bec1fa3f55 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: let @@ -13,6 +13,13 @@ let ''} ''; + # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 + # This should be removed when GHC includes Cabal > 1.22.2.0 + cabalPatch = fetchpatch { + url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; + sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; + }; + in stdenv.mkDerivation rec { @@ -28,9 +35,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 + postPatch = '' + pushd libraries/Cabal + patch -p1 < ${cabalPatch} + popd + ''; + preConfigure = '' - sed -i 's/HcPkg.useSingleFileDb = .*/HcPkg.useSingleFileDb = False/' libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' From d68e2484185d5b738d8342116215fac2d1596667 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Sun, 29 Mar 2015 13:15:31 -0400 Subject: [PATCH 734/947] Fixed grsec-path.patch --- .../os-specific/linux/kernel/grsec-path.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch index 6f59cf8d80b..e409f4a1638 100644 --- a/pkgs/os-specific/linux/kernel/grsec-path.patch +++ b/pkgs/os-specific/linux/kernel/grsec-path.patch @@ -1,17 +1,18 @@ -diff --git a/kernel/kmod.c b/kernel/kmod.c -index 67f7981..03f127d 100644 ---- a/kernel/kmod.c -+++ b/kernel/kmod.c -@@ -246,9 +246,9 @@ static int ____call_usermodehelper(void *data) +diff --git a/a/kernel/kmod.c b/b/kernel/kmod.c +index a26e825..29baec1 100644 +--- a/a/kernel/kmod.c ++++ b/b/kernel/kmod.c +@@ -294,10 +294,9 @@ static int ____call_usermodehelper(void *data) out the path to be used prior to this point and are now operating on that copy */ - if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && - strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && +- strncmp(sub_info->path, "/usr/libexec/", 13) && - strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { -+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && -+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || -+ strstr(sub_info->path, "..")) { ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && ++ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || ++ strstr(sub_info->path, "..")) { printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path); retval = -EPERM; - goto fail; + goto out; From d567e12eb772e389d8a0f31b1b7b6e5bc93eb20d Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Sun, 29 Mar 2015 13:36:37 -0400 Subject: [PATCH 735/947] Fix grsec-path.patch (2) --- pkgs/os-specific/linux/kernel/grsec-path.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch index e409f4a1638..aaf7d80dc91 100644 --- a/pkgs/os-specific/linux/kernel/grsec-path.patch +++ b/pkgs/os-specific/linux/kernel/grsec-path.patch @@ -1,7 +1,7 @@ -diff --git a/a/kernel/kmod.c b/b/kernel/kmod.c +diff --git a/kernel/kmod.c b/kernel/kmod.c index a26e825..29baec1 100644 ---- a/a/kernel/kmod.c -+++ b/b/kernel/kmod.c +--- a/kernel/kmod.c ++++ b/kernel/kmod.c @@ -294,10 +294,9 @@ static int ____call_usermodehelper(void *data) out the path to be used prior to this point and are now operating on that copy From c31f1d99a51e97178db0dc642d63a2b534301286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 29 Mar 2015 21:40:57 +0200 Subject: [PATCH 736/947] fix linux 3.2/3.4 builds --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c38636ffac3..a2af42761b9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -302,7 +302,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices ''} - RT2800USB_RT55XX y + ${optionalString (versionAtLeast version "3.10") '' + RT2800USB_RT55XX y + ''} SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 553105310a5a1a2280fc2c40773ab1cf3fdfad98 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 13:20:27 -0700 Subject: [PATCH 737/947] nixos/stage-1: Fix the initrd builder for shell scripts --- nixos/modules/system/boot/stage-1.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index ec696d838cc..0bf5a2f3c80 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -45,8 +45,7 @@ let copy_bin_and_libs () { [ -f "$out/bin/$(basename $1)" ] && return 0 cp -pdv $1 $out/bin - LDD="$(ldd $1)" - [ "$?" -eq "1" ] && return 0 + LDD="$(ldd $1)" || return 0 LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" for LIB in $LIBS; do [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib From 299da40f9f1e00f9eb4e8e09c8456e91a83a424b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Mar 2015 22:34:28 +0100 Subject: [PATCH 738/947] iso: make efi FS size adaptive, make deterministic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #6795. This was co-authored with @bobvanderlinden. (cherry picked from commit e19ac248ae59fd327c32b1ae3e37792c22a7c7ac) Signed-off-by: Domen Kožar Conflicts: nixos/modules/installer/cd-dvd/iso-image.nix --- nixos/modules/installer/cd-dvd/iso-image.nix | 32 +++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 39db7d9b8f7..8f17e720aca 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -56,17 +56,28 @@ let echo "timeout 5" >> $out/loader/loader.conf ''; - efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools ]; } + efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } + # Be careful about determinism: du --apparent-size, + # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' - #Let's hope 15M is enough - dd bs=2048 count=7680 if=/dev/zero of="$out" - ${pkgs.dosfstools}/sbin/mkfs.vfat "$out" - mcopy -svi "$out" ${efiDir}/* :: - mmd -i "$out" boot - mcopy -v -i "$out" \ - ${config.boot.kernelPackages.kernel}/bzImage ::boot/bzImage - mcopy -v -i "$out" \ - ${config.system.build.initialRamdisk}/initrd ::boot/initrd + mkdir ./contents && cd ./contents + cp -rp "${efiDir}"/* . + mkdir ./boot + cp -p "${config.boot.kernelPackages.kernel}/bzImage" \ + "${config.system.build.initialRamdisk}/initrd" ./boot/ + touch --date=@0 ./* + + usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') + # Make the image 110% as big as the files need to make up for FAT overhead + image_size=$(( ($usage_size * 110) / 100 )) + # Make the image fit blocks of 1M + block_size=$((1024*1024)) + image_size=$(( ($image_size / $block_size + 1) * $block_size )) + echo "Usage size: $usage_size" + echo "Image size: $image_size" + truncate --size=$image_size "$out" + ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out" + mcopy -bpsvm -i "$out" ./* :: ''; # */ targetArch = if pkgs.stdenv.isi686 then @@ -155,7 +166,6 @@ in }; - config = { boot.loader.grub.version = 2; From a7d73f84bf6f2fd1af9ccecd852d51670edc75c5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 29 Mar 2015 15:26:09 -0500 Subject: [PATCH 739/947] add lsdvd-0.17 --- pkgs/tools/cd-dvd/lsdvd/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/cd-dvd/lsdvd/default.nix diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix new file mode 100644 index 00000000000..33677d5b10d --- /dev/null +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libdvdread, pkgconfig }: + +let + version = "0.17"; +in +stdenv.mkDerivation { + name = "lsdvd-${version}"; + src = fetchurl { + url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; + sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; + }; + + buildInputs = [ libdvdread ]; + nativeBuildInputs = [ pkgconfig ]; + + meta = { + homepage = "http://sourceforge.net/projects/lsdvd/"; + shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ffab19b26f..d8e6bdd6b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1771,6 +1771,8 @@ let logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; + lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; + kippo = callPackage ../servers/kippo { }; klavaro = callPackage ../games/klavaro {}; From b09a6573a081920e9f247f963a526d64f250bfa0 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 29 Mar 2015 14:26:07 -0430 Subject: [PATCH 740/947] indilib version advance; older sources no longer available --- pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 3 --- pkgs/desktops/kde-4.14/kdeedu/kstars.nix | 14 ------------ pkgs/development/libraries/indilib/0_9_9.nix | 21 ------------------ .../development/libraries/indilib/default.nix | 14 +++++++----- .../libraries/indilib/link-zlib.patch | 12 ---------- .../libraries/indilib/udev-dir.patch | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 19 insertions(+), 69 deletions(-) delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kstars.nix delete mode 100644 pkgs/development/libraries/indilib/0_9_9.nix delete mode 100644 pkgs/development/libraries/indilib/link-zlib.patch diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index b1673d4b4e8..a78041c5a0c 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -116,7 +116,6 @@ hashes=builtins.listToAttrs[ {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";} {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";} {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";} - {name="kstars";value="1pjvy476yjir4z6x1j7192xjr9m0zcxq3x3lpvsxf92pk3l4c73p";} {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";} {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";} {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";} @@ -288,7 +287,6 @@ versions=builtins.listToAttrs[ {name="ksnapshot";value="4.14.3";} {name="kspaceduel";value="4.14.3";} {name="ksquares";value="4.14.3";} - {name="kstars";value="4.14.3";} {name="ksudoku";value="4.14.3";} {name="ksystemlog";value="4.14.3";} {name="kteatime";value="4.14.3";} @@ -529,7 +527,6 @@ modules=[ { name="klettres"; } { name="kmplot"; } { name="kqtquickcharts"; } - { name="kstars"; } { name="ktouch"; } { name="kturtle"; } { name="kwordquiz"; } diff --git a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix deleted file mode 100644 index a5e9bee180e..00000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib_0_9_9, pkgconfig, qjson }: - -kde { - -# TODO: wcslib, astrometry - - buildInputs = [ kdelibs eigen xplanet indilib_0_9_9 qjson ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/development/libraries/indilib/0_9_9.nix b/pkgs/development/libraries/indilib/0_9_9.nix deleted file mode 100644 index f9447b14364..00000000000 --- a/pkgs/development/libraries/indilib/0_9_9.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }: - -stdenv.mkDerivation { - name = "indilib-0.9.9"; - - src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz; - sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039"; - }; - - propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - preConfigure = '' - cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d" - ''; - - meta = { - homepage = http://indi.sf.net; - }; -} diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index dd8207ffa2b..b060498d40a 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }: +{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova +, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-0.9.6"; + name = "indilib-1.0.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz; - sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4"; + url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; + sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; }; - patches = [ ./link-zlib.patch ./udev-dir.patch ]; + patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ]; + propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + libnova libjpeg gsl ]; meta = { homepage = http://indi.sf.net; diff --git a/pkgs/development/libraries/indilib/link-zlib.patch b/pkgs/development/libraries/indilib/link-zlib.patch deleted file mode 100644 index c051194a1b8..00000000000 --- a/pkgs/development/libraries/indilib/link-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430 -@@ -169,7 +169,7 @@ - # To link with main() and indibase classes ###### - ################################################## - add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS}) --target_link_libraries(indidriver ${LIBUSB_LIBRARIES}) -+target_link_libraries(indidriver z ${LIBUSB_LIBRARIES}) - if (NOVA_FOUND) - target_link_libraries(indidriver ${NOVA_LIBRARIES}) - endif(NOVA_FOUND) diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch index 2f6d03d6070..0f497419e70 100644 --- a/pkgs/development/libraries/indilib/udev-dir.patch +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,12 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430 -@@ -13,7 +13,7 @@ - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/") - set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d") +diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt +--- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 ++++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 +@@ -28,7 +28,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - IF(APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") + ################## Includes ################################ + Include (CheckCXXSourceCompiles) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e6bdd6b37..09d620c3823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6058,8 +6058,6 @@ let indilib = callPackage ../development/libraries/indilib { }; - indilib_0_9_9 = callPackage ../development/libraries/indilib/0_9_9.nix { }; - iniparser = callPackage ../development/libraries/iniparser { }; intltool = callPackage ../development/tools/misc/intltool { }; From ca149f2be05b677ccd4a1f8b502c242bc85747c6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 13:29:57 -0700 Subject: [PATCH 741/947] nixos/mysql: All versions of mysql have mysqld in /bin --- nixos/modules/services/databases/mysql.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index b94a3fbf3de..1e2400d84b3 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -10,8 +10,6 @@ let is55 = mysql.mysqlVersion == "5.5"; - mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec"; - pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -182,7 +180,7 @@ in chown -R ${cfg.user} ${cfg.pidDir} ''; - serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; postStart = '' From a5f065d708af26be86e1f639cee1dd68303f5339 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 29 Mar 2015 16:42:42 -0400 Subject: [PATCH 742/947] ffmpeg: improve cross platform support & fix licensing issues, resolves #7013 + Removed asserts for (l)gpl & (l)gpl3 making it easier to enable and disable all (l)gpl & (l)gpl3 portions + Fix build inputs so that nonfree software isn't pulled in when building ffmpeg + Fix compiler on systems with clang + Disable libraries that fail on darwin until they can be fixed + Fix linux only build inputs so that they aren't pulled in on other platforms + Fix optional build inputs + Opencv causes circular dependency issues so it is disabled until it can be resolved --- pkgs/development/libraries/ffmpeg/generic.nix | 125 +++++++++--------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1a46a0e5386..329b44d0999 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -103,7 +103,7 @@ , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code #, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -, opencv ? null # Video filtering +#, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder @@ -156,14 +156,19 @@ * * Packages with errors: * flite ilbc schroedinger + * opencv - circular dependency issue * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * + * Need fixes to support Darwin: + * frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1, + * pulseaudio, rtmpdump, samba, vit-stab, wavpack, x265. xavs + * * Not supported: - * stagehright-h264(android only) + * stagefright-h264(android only) * * Known issues: * 0.5 - libgsm: configure fails to find library (fix: disable for 0.5) @@ -203,7 +208,12 @@ let # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1) chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag; + # Disable dependency that needs fixes before it will work on Darwin + disDarwinFix = origArg: if stdenv.isDarwin then false else origArg; + isCygwin = stdenv.isCygwin; + isDarwin = stdenv.isDarwin; + isLinux = stdenv.isLinux; in /* @@ -239,38 +249,26 @@ assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avresampleLibrary && reqMin "0.11" -> avutilLibrary; -assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary; +assert postprocLibrary && reqMin "0.5" -> avutilLibrary; assert swresampleLibrary && reqMin "0.9" -> soxr != null; assert swscaleLibrary && reqMin "0.5" -> avutilLibrary; /* * External libraries */ #assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing; -#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing; #assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null # && !isCygwin && multithreadBuild # POSIX threads required # && nonfreeLicensing; assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing; -assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing; -assert frei0r != null && reqMin "0.7" -> gplLicensing; +assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && nonfreeLicensing; assert gnutls != null && reqMin "0.9" -> !opensslExtlib; assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null; -#assert opencore-amr != null && reqMin "0.5" -> version3Licensing; assert openglExtlib && reqMin "2.2" -> mesa != null; -assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing; -assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing; -#assert utvideo != null && reqMin "0.9" -> gplLicensing; -assert vid-stab != null && reqMin "2.0" -> gplLicensing; -#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing; -#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing; -assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing; -assert x264 != null && reqMin "0.5" -> gplLicensing; -assert x265 != null && reqMin "2.2" -> gplLicensing; -assert xavs != null && reqMin "0.7" -> gplLicensing; -assert xvidcore != null && reqMin "0.5" -> gplLicensing; -#assert zvbi != null && reqMin "2.1" -> gplLicensing; +assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && nonfreeLicensing; +assert sambaExtlib && reqMin "2.3" -> samba != null && !isDarwin; +assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -295,9 +293,10 @@ stdenv.mkDerivation rec { /* * Build flags */ - # One some ARM platforms --enable-thumb + # On some ARM platforms --enable-thumb "--enable-shared --disable-static" (mkFlag true "0.6" "pic") + (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null) (mkFlag smallBuild "0.5" "small") (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect") (mkFlag grayBuild "0.5" "gray") @@ -334,7 +333,7 @@ stdenv.mkDerivation rec { (mkFlag avformatLibrary "0.6" "avformat") (mkFlag avresampleLibrary "1.0" "avresample") (mkFlag avutilLibrary "1.1" "avutil") - (mkFlag postprocLibrary "0.5" "postproc") + (mkFlag (postprocLibrary && gplLicensing) "0.5" "postproc") (mkFlag swresampleLibrary "0.9" "swresample") (mkFlag swscaleLibrary "0.5" "swscale") /* @@ -359,18 +358,18 @@ stdenv.mkDerivation rec { #(mkFlag decklinkExtlib "2.2" "decklink") (mkFlag faacExtlib "0.5" "libfaac") (depFlag faad2Extlib "0.5" "0.6" "libfaad") - (mkFlag fdk-aacExtlib "1.0" "libfdk-aac") + (mkFlag (fdk-aacExtlib && gplLicensing) "1.0" "libfdk-aac") #(mkFlag (flite != null) "1.0" "libflite") (if reqMin "1.0" then # Force disable until a solution is found "--disable-libflite" else null) (mkFlag (fontconfig != null) "1.0" "fontconfig") (mkFlag (freetype != null) "0.7" "libfreetype") - (mkFlag (frei0r != null) "0.7" "frei0r") + (mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r") (mkFlag (fribidi != null) "2.3" "libfribidi") - (mkFlag (game-music-emu != null) "2.2" "libgme") + (mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme") (mkFlag (gnutls != null) "0.9" "gnutls") - (verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm") + (verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm") #(mkFlag (ilbc != null) "1.0" "libilbc") (mkFlag (ladspaH !=null) "2.1" "ladspa") (mkFlag (lame != null) "0.5" "libmp3lame") @@ -379,20 +378,20 @@ stdenv.mkDerivation rec { (mkFlag (libbluray != null) "1.0" "libbluray") (mkFlag (libbs2b != null) "2.3" "libbs2b") (mkFlag (libcaca != null) "1.0" "libcaca") - #(mkFlag (cdio-paranoia != null) "0.9" "libcdio") - (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") + #(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio") + (mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394") (mkFlag (libiconv != null) "1.2" "iconv") - #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") + #(mkFlag (if !isLinux then false else libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") #(mkFlag (libmfx != null) "2.6" "libmfx") - (mkFlag (libmodplug != null) "0.9" "libmodplug") + (mkFlag (disDarwinFix (libmodplug != null)) "0.9" "libmodplug") #(mkFlag (libnut != null) "0.5" "libnut") (mkFlag (libopus != null) "1.0" "libopus") - (mkFlag (libssh != null) "2.1" "libssh") + (mkFlag (disDarwinFix (libssh != null)) "2.1" "libssh") (mkFlag (libtheora != null) "0.5" "libtheora") - (mkFlag (libva != null) "0.6" "vaapi") + (mkFlag (if isDarwin then false else libva != null) "0.6" "vaapi") (mkFlag (libvdpau != null) "0.5" "vdpau") (mkFlag (libvorbis != null) "0.5" "libvorbis") - (mkFlag (libvpx != null) "0.6" "libvpx") + (mkFlag (disDarwinFix (libvpx != null)) "0.6" "libvpx") (mkFlag (libwebp != null) "2.2" "libwebp") (mkFlag (libX11 != null && libXv != null) "2.3" "xlib") (mkFlag (libxcb != null) "2.5" "libxcb") @@ -401,39 +400,38 @@ stdenv.mkDerivation rec { (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") (mkFlag (lzma != null) "2.4" "lzma") #(mkFlag nvenc "2.6" "nvenc") - (mkFlag (openal != null) "0.9" "openal") + (mkFlag (disDarwinFix (openal != null)) "0.9" "openal") #(mkFlag opencl "2.2" "opencl") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb") - (mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 + #(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb") + #(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 (mkFlag openglExtlib "2.2" "opengl") #(mkFlag (openh264 != null) "2.6" "openh264") - (mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg") - (mkFlag opensslExtlib "0.9" "openssl") - (mkFlag (pulseaudio != null) "0.9" "libpulse") + (mkFlag (disDarwinFix (openjpeg_1 != null)) "0.5" "libopenjpeg") + (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") + (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") #(mkFlag quvi "2.0" "libquvi") - (mkFlag (rtmpdump != null) "0.6" "librtmp") + (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp") #(mkFlag (schroedinger != null) "0.5" "libschroedinger") #(mkFlag (shine != null) "2.0" "libshine") - (mkFlag sambaExtlib "2.3" "libsmbclient") + (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then (mkFlag (soxr != null) "1.2" "libsoxr") (mkFlag (speex != null) "0.5" "libspeex") #(mkFlag (twolame != null) "1.0" "libtwolame") - #(mkFlag (utvideo != null) "0.9" "libutvideo") - (mkFlag (v4l_utils != null) "0.9" "libv4l2") - (mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0 - #(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc") - #(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc") - (mkFlag (wavpack != null) "2.0" "libwavpack") - (mkFlag (x11grabExtlib) "0.5" "x11grab") - (mkFlag (x264 != null) "0.5" "libx264") - (mkFlag (x265 != null) "2.2" "libx265") - (mkFlag (xavs != null) "0.7" "libxavs") - (mkFlag (xvidcore != null) "0.5" "libxvid") + #(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo") + (mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2") + (mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0 + #(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc") + #(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc") + (mkFlag (disDarwinFix (wavpack != null)) "2.0" "libwavpack") + (mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab") + (mkFlag (x264 != null && gplLicensing) "0.5" "libx264") + (mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265") + (mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs") + (mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid") (mkFlag (zeromq4 != null) "2.0" "libzmq") (mkFlag (zlib != null) "0.5" "zlib") - #(mkFlag (zvbi != null) "2.1" "libzvbi") + #(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi") /* * Developer flags */ @@ -449,14 +447,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi - game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b - libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora - libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes - libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump - samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore - zeromq4 zlib - ] ++ optional faacExtlib faac; + bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray + libbs2b libcaca libdc1394 libogg libopus libtheora libvdpau libvorbis + libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264 + xvidcore zeromq4 zlib + ] ++ optional (disDarwinFix sambaExtlib) samba + ++ optional openglExtlib mesa + ++ optionals x11grabExtlib [ libXext libXfixes ] + ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] + ++ optionals (!isDarwin) [ + frei0r game-music-emu gsm jack2 libmodplug libssh libvpx openal + openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 xavs + ] ++ optional (!isDarwin && !isCygwin) libva + ++ optionals isLinux [ alsaLib libraw1394 v4l_utils ]; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; From eb22e54243cbd7e63f17a56a6bb73526d8112ed2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 14:06:56 -0700 Subject: [PATCH 743/947] libftdi: 1.1 -> 1.2 --- pkgs/development/libraries/libftdi/1.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 273bdb3136e..cd0a2a3c473 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null; assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "libftdi1-1.1"; + name = "libftdi1-1.2"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "088yh8pxd6q53ssqndydcw1dkq51cjqyahc03lm6iip22cdazcf0"; + sha256 = "1ml8hiahnqm4z0xzyjv8kyrkzvhw6l431c3jndg026cjh9f7ksm6"; }; buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] From 6ac68a4c5929c0f3184067af20243829f804a631 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:05:16 +0000 Subject: [PATCH 744/947] sylpheed: cleanup --- .../networking/mailreaders/sylpheed/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 0f8b4f00c8b..ac7846836ff 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,8 +1,9 @@ -{ sslSupport ? true -, gpgSupport ? false -, stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk + , openssl ? null , gpgme ? null +, sslSupport ? true +, gpgSupport ? true }: with stdenv.lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d620c3823..75106a639b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11793,10 +11793,7 @@ let swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { - sslSupport = true; - gpgSupport = true; - }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; symlinks = callPackage ../tools/system/symlinks { }; From c283fddea648f3fed0a0dbd89233048009dce8ea Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Mar 2015 17:13:32 +0000 Subject: [PATCH 745/947] mplayer: cleanup --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75106a639b0..0149d894496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11188,10 +11188,9 @@ let normalize = callPackage ../applications/audio/normalize { }; - mplayer = callPackage ../applications/video/mplayer { + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; - vdpauSupport = config.mplayer.vdpauSupport or false; - }; + } // (config.mplayer or {})); mplayer2 = callPackage ../applications/video/mplayer2 { ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 From dee84264f1e54003e53589478c425aa6fc5bd861 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 29 Mar 2015 21:43:20 +0000 Subject: [PATCH 746/947] MPlayerPlugin: use callPackage --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0149d894496..b210dd82a82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11197,9 +11197,8 @@ let }; MPlayerPlugin = browser: - import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { + callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; - inherit fetchurl stdenv pkgconfig gettext; inherit (xlibs) libXpm; # !!! should depend on MPlayer }; From 8591b7b48cc870a75ce560f4c2a2346221a7e566 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 18:59:51 +0000 Subject: [PATCH 747/947] conky: add lua-imlib2 and lua-cairo support, add more options, rename old ones so that they would conform to a common standard, make the defaults for a "normal desktop user" --- pkgs/os-specific/linux/conky/default.nix | 111 ++++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 81 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 52e5d95346e..c54d4aa6319 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,31 +1,59 @@ { stdenv, fetchurl, pkgconfig # dependencies -, glib, ncurses +, glib # optional features without extra dependencies -, mpdSupport ? true +, mpdSupport ? true +, ibmSupport ? true # IBM/Lenovo notebooks + +# This should be optional, but it is not due to a bug in conky +# Please, try to make it optional again on update +, ncurses +#, ncursesSupport ? true , ncurses ? null # optional features with extra dependencies -, x11Support ? false, x11 ? null -, xdamage ? false, libXdamage ? null -, wireless ? false, wirelesstools ? null -, luaSupport ? false, lua5 ? null +, x11Support ? true , x11 ? null +, xdamageSupport ? x11Support, libXdamage ? null +, imlib2Support ? x11Support, imlib2 ? null +, luaSupport ? true , lua ? null -, rss ? false -, weatherMetar ? false -, weatherXoap ? false -, curl ? null, libxml2 ? null +, luaImlib2Support ? luaSupport && imlib2Support +, luaCairoSupport ? luaSupport && x11Support, cairo ? null +, toluapp ? null + +, alsaSupport ? true , alsaLib ? null + +, wirelessSupport ? true , wirelesstools ? null + +, curlSupport ? true , curl ? null +, rssSupport ? curlSupport +, weatherMetarSupport ? curlSupport +, weatherXoapSupport ? curlSupport +, libxml2 ? null }: -assert luaSupport -> lua5 != null; -assert wireless -> wirelesstools != null; -assert x11Support -> x11 != null; -assert xdamage -> x11Support && libXdamage != null; +#assert ncursesSupport -> ncurses != null; -assert rss -> curl != null && libxml2 != null; -assert weatherMetar -> curl != null; -assert weatherXoap -> curl != null && libxml2 != null; +assert x11Support -> x11 != null; +assert xdamageSupport -> x11Support && libXdamage != null; +assert imlib2Support -> x11Support && imlib2 != null; +assert luaSupport -> lua != null; +assert luaImlib2Support -> luaSupport && imlib2Support + && toluapp != null; +assert luaCairoSupport -> luaSupport && toluapp != null + && cairo != null; +assert luaCairoSupport || luaImlib2Support + -> lua.luaversion == "5.1"; + +assert alsaSupport -> alsaLib != null; + +assert wirelessSupport -> wirelesstools != null; + +assert curlSupport -> curl != null; +assert rssSupport -> curlSupport && libxml2 != null; +assert weatherMetarSupport -> curlSupport; +assert weatherXoapSupport -> curlSupport && libxml2 != null; with stdenv.lib; @@ -39,30 +67,47 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib ncurses ] - ++ optional luaSupport lua5 - ++ optional wireless wirelesstools - ++ optional x11Support x11 - ++ optional xdamage libXdamage + buildInputs = [ pkgconfig glib ] + ++ [ ncurses ] + #++ optional ncursesSupport ncurses + ++ optional x11Support x11 + ++ optional xdamageSupport libXdamage + ++ optional imlib2Support imlib2 + ++ optional luaSupport lua + ++ optionals luaImlib2Support [ toluapp imlib2 ] + ++ optionals luaCairoSupport [ toluapp cairo ] - ++ optionals rss [ curl libxml2 ] - ++ optional weatherMetar curl - ++ optionals weatherXoap [ curl libxml2 ] + ++ optional alsaSupport alsaLib + + ++ optional wirelessSupport wirelesstools + + ++ optional curlSupport curl + ++ optional rssSupport libxml2 + ++ optional weatherXoapSupport libxml2 ; configureFlags = let flag = state: flags: if state then map (x: "--enable-${x}") flags else map (x: "--disable-${x}") flags; - in flag mpdSupport [ "mpd" ] + in flag mpdSupport [ "mpd" ] + ++ flag ibmSupport [ "ibm" ] - ++ flag luaSupport [ "lua" ] - ++ flag wireless [ "wlan" ] - ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window - ++ flag xdamage [ "xdamage" ] + #++ flag ncursesSupport [ "ncurses" ] + ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window + ++ flag xdamageSupport [ "xdamage" ] + ++ flag imlib2Support [ "imlib2" ] + ++ flag luaSupport [ "lua" ] + ++ flag luaImlib2Support [ "lua-imlib2" ] + ++ flag luaCairoSupport [ "lua-cairo" ] - ++ flag rss [ "rss" ] - ++ flag weatherMetar [ "weather-metar" ] - ++ flag weatherXoap [ "weather-xoap" ] + ++ flag alsaSupport [ "alsa" ] + + ++ flag wirelessSupport [ "wlan" ] + + ++ flag curlSupport [ "curl" ] + ++ flag rssSupport [ "rss" ] + ++ flag weatherMetarSupport [ "weather-metar" ] + ++ flag weatherXoapSupport [ "weather-xoap" ] ; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d620c3823..0751ffc3f2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8702,7 +8702,9 @@ let cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; - conky = callPackage ../os-specific/linux/conky (config.conky or {}); + conky = callPackage ../os-specific/linux/conky ({ + lua = lua5_1; # conky can use 5.2, but toluapp can not + } // config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; From 6b9bb7231958340d21ed15c3b5e730710a3b9d14 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:01:52 +0000 Subject: [PATCH 748/947] gnupg: add x11Support option --- pkgs/tools/security/gnupg/20.nix | 12 ++++++++---- pkgs/tools/security/gnupg/21.nix | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index cf11ecb8232..a5fdc2e2692 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,10 +1,16 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan , libksba, coreutils, libiconv, pcsclite + # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, pinentry ? null, x11Support ? true +, openldap ? null, bzip2 ? null, libusb ? null, curl ? null }: +with stdenv.lib; + +assert x11Support -> pinentry != null; + stdenv.mkDerivation rec { name = "gnupg-2.0.27"; @@ -27,9 +33,7 @@ stdenv.mkDerivation rec { patch gl/stdint_.h < ${./clang.patch} ''; - configureFlags = - if pinentry != null then "--with-pinentry-pgm=${pinentry}/bin/pinentry" - else ""; + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 440d2294b0d..fc5da48a1b9 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,10 +1,17 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth -, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo -, pcsclite +, autoreconfHook, gettext, texinfo, pcsclite + +# Each of the dependencies below are optional. +# Gnupg can be built without them at the cost of reduced functionality. +, pinentry ? null, x11Support ? true +, adns ? null, gnutls ? null, libusb ? null, openldap ? null +, readline ? null, zlib ? null, bzip2 ? null }: with stdenv.lib; + +assert x11Support -> pinentry != null; + stdenv.mkDerivation rec { name = "gnupg-2.1.2"; @@ -21,12 +28,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth - readline libusb gnutls adns openldap zlib bzip2 autoreconfHook gettext texinfo + readline libusb gnutls adns openldap zlib bzip2 ]; - configureFlags = - optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; meta = with stdenv.lib; { homepage = http://gnupg.org; From 1ddc9e4be3662955e0fdd3e7afd4b59f23a085ac Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:57:01 +0000 Subject: [PATCH 749/947] pass: rename withX into x11Support, cleanup a bit --- pkgs/tools/security/pass/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 0e37443c3ed..1aa5e0b51f1 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl , coreutils, gnused, getopt, pwgen, git, tree, gnupg , makeWrapper -, withX ? true, xclip, xdotool, dmenu + +, xclip ? null, xdotool ? null, dmenu ? null +, x11Support ? true }: -assert withX -> xclip != null; -assert withX -> xdotool != null; -assert withX -> dmenu != null; +assert x11Support -> xclip != null + && xdotool != null + && dmenu != null; stdenv.mkDerivation rec { version = "1.6.5"; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - ${if withX then '' + ${if x11Support then '' cp "contrib/dmenu/passmenu" "$out/bin/" '' else ""} ''; @@ -64,9 +66,9 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ - --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if withX then ":${xclip}/bin" else ""}" + --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if x11Support then ":${xclip}/bin" else ""}" - ${if withX then '' + ${if x11Support then '' wrapProgram $out/bin/passmenu \ --prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin" '' else ""} From 380ee53fff55a7880ba2e974831b76c068542421 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 00:49:31 +0000 Subject: [PATCH 750/947] dbus: rename useX11 option into x11Support, cleanup a bit --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 47393c9d3f5..13477337bda 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -27,6 +27,6 @@ with lib; fonts.fontconfig.enable = false; nixpkgs.config.packageOverrides = pkgs: - { dbus = pkgs.dbus.override { useX11 = false; }; }; + { dbus = pkgs.dbus.override { x11Support = false; }; }; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8fc75721c23..ad836ac732d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: +, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: + +assert x11Support -> libX11 != null + && libICE != null + && libSM != null; let version = "1.8.16"; @@ -8,7 +12,7 @@ let inherit (stdenv) lib; - buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ]; # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; @@ -57,7 +61,7 @@ let "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ] ++ lib.optional (!useX11) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x"; enableParallelBuilding = true; From a3e00bf6c4531e169621a7a0deedb3015f3fc0cb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 00:50:56 +0000 Subject: [PATCH 751/947] python 2.7: add x11Support option --- .../interpreters/python/2.7/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 0d7490d910c..8b24fe00463 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: +{ stdenv, fetchurl, self, callPackage +, bzip2, openssl + +, includeModules ? false + +, db, gdbm, ncurses, sqlite, readline + +, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true +, zlib ? null, zlibSupport ? true +}: assert zlibSupport -> zlib != null; +assert x11Support -> tcl != null + && tk != null + && x11 != null + && libX11 != null; with stdenv.lib; @@ -28,7 +40,7 @@ let # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch ]; - + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do @@ -48,7 +60,11 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + [ bzip2 openssl ] + ++ optionals includeModules ( + [ db gdbm ncurses sqlite readline + ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ) ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have @@ -87,7 +103,7 @@ let ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} - + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; @@ -192,11 +208,15 @@ let deps = [ sqlite ]; }; + } // optionalAttrs x11Support { + tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; }; + } // { + readline = buildInternalPythonModule { moduleName = "readline"; internalName = "readline"; From 29133753c8dbcdaa22a987a85e9fdf919f63255c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 19 Mar 2015 01:00:55 +0000 Subject: [PATCH 752/947] gcc 4.8: add x11Support option so that it would stop evaluating gtk by default --- pkgs/development/compilers/gcc/4.8/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 86d4aa30267..0958ce7b1c9 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -15,10 +15,12 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava , gnatboot ? null , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins @@ -91,7 +93,7 @@ let version = "4.8.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && x11Support; /* Platform flags */ platformFlags = let @@ -200,7 +202,7 @@ let version = "4.8.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; From 522a9c5cb0c47302355ea967adea2a67dfbdea53 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 Mar 2015 15:34:22 +0100 Subject: [PATCH 753/947] Electrum: 2.0.3 -> 2.0.4 Version 2.0.4 contains UI improvements. Also, change postPatch to preInstall, remove a redundant attribute, and cleanup meta. --- pkgs/applications/misc/electrum/default.nix | 24 ++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 2638594d7e5..0f7b85e055b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: buildPythonPackage rec { - namePrefix = ""; name = "electrum-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "1kzrbnkl5jps0kf0420vzpiqjk3v1jxvlrxwhc0f58xbqyc7l4mj"; + sha256 = "0q9vrrzy2iypfg2zvs3glzvqyq65dnwn1ijljvfqfwrkpvpp0zxp"; }; propagatedBuildInputs = with pythonPackages; [ @@ -24,16 +23,21 @@ buildPythonPackage rec { tlslite ]; - postPatch = '' + preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py ''; - meta = { - description = "Bitcoin thin-wallet"; - long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; - homepage = "https://electrum.org"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ "emery@vfemail.net" stdenv.lib.maintainers.joachifm ]; + meta = with stdenv.lib; { + description = "Bitcoin thin-client"; + longDescription = '' + An easy-to-use Bitcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = https://electrum.org; + license = licenses.gpl3; + maintainers = with maintainers; [ emery joachifm ]; }; } From 43e0554e254c2d0a057c4787edb13fdd03943feb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:00:33 -0700 Subject: [PATCH 754/947] pv: 1.5.7 -> 1.6.0 --- pkgs/tools/misc/pv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index a94cdea1339..a2d8c535d06 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.5.7"; + name = "pv-1.6.0"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "15srxzyssr8l25bl3rws476nx3fl58bdlh55gyv8cc3hpdhm0ly8"; + sha256 = "13gg6r84pkvznpd1l11qw1jw9yna40gkgpni256khyx21m785khf"; }; meta = { From f518b8837160bb1bd83c342453a6ecd9aa86b5db Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:02:29 -0700 Subject: [PATCH 755/947] xterm: 312 -> 317 --- pkgs/applications/misc/xterm/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 3365e62f8be..1caa78d580d 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-312"; + name = "xterm-317"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0vpkhls3i12ly4r68igz91vh6s9179wihjkdy0gvwr752hdqxm7s"; + sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj"; }; buildInputs = @@ -13,12 +13,16 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit ]; - configureFlags = - '' - --enable-wide-chars --enable-256-color - --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit - --enable-mini-luit --with-tty-group=tty - ''; + configureFlags = [ + "--enable-wide-chars" + "--enable-256-color" + "--enable-load-vt-fonts" + "--enable-i18n" + "--enable-doublechars" + "--enable-luit" + "--enable-mini-luit" + "--with-tty-group=tty" + ]; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; From c460fa95fb033cde456591409d755eb472a29f3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 04:03:55 +0200 Subject: [PATCH 756/947] haskell-mtl-compat: fix build with ghc 7.6.x. --- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index d853e9265ba..5285484d2ff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -70,4 +70,7 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); + # The compat library is empty in the presence of mtl 2.2.x. + mtl-compat = dontHaddock super.mtl-compat; + } From b058f829d2ffd48d51d03761300d18742835fca1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:37:30 -0700 Subject: [PATCH 757/947] ImageMagick: Disable HDRI for now --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 35e12e8a8c7..f7552c8b286 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (mkEnable (libcl != null) "opencl") (mkWith true "modules") (mkWith true "gcc-arch=${arch}") - (mkEnable true "hdri") + #(mkEnable true "hdri") This breaks some dependencies (mkWith (perl != null) "perl") (mkWith (jemalloc != null) "jemalloc") (mkWith true "frozenpaths") From 568d47b2a0125eb2084ee741a9725d13fff9c3c7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:37:45 -0700 Subject: [PATCH 758/947] PerlMagick: 6.87 -> 6.89-1 --- 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 ef3f2409041..cdf6a688a16 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7430,12 +7430,12 @@ let self = _self // overrides; _self = with self; { }; PerlMagick = buildPerlPackage rec { - name = "PerlMagick-6.87"; + name = "PerlMagick-6.89-1"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz"; - sha256 = "1bf2g80wdny2dfrrmfgk7cqrxzflx3qp1dnd3919grvrqdviyh16"; + sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; }; - buildInputs = [pkgs.imagemagick]; + buildInputs = [ pkgs.imagemagick ]; preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL From 442900fd5fc5f921a5d257864b6ae3a49141da3d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:42:25 -0700 Subject: [PATCH 759/947] libressl: 2.1.5 -> 2.1.6 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index aa138613ec4..ef4638eea27 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8"; + sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg"; }; enableParallelBuilding = true; From 0ff1fcf1f111b0044f5d14db494aa1c1b0b2c517 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 19:45:12 -0700 Subject: [PATCH 760/947] duplicity: 0.6.25 -> 0.7.02 --- pkgs/tools/backup/duplicity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 41e40e79954..79f394c2aac 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,14 +2,14 @@ , lockfile, setuptools }: let - version = "0.6.25"; + version = "0.7.02"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "098p5j7clbaya3yq7q05n6xv7h1qs8iffxwvlisyfpqwpi5g8i5c"; + url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz"; + sha256 = "0fh3xl4xc7cpi7iam34qd0ndqp1641kfw2609yp40lr78fx65530"; }; installPhase = '' From 6b3cf366d7a6f660797b171fe9339f0ca9576632 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 21:26:39 -0700 Subject: [PATCH 761/947] nixos/initrd: Allow overriding of binaries --- nixos/modules/system/boot/stage-1.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 0bf5a2f3c80..47d6dd2bf54 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -43,7 +43,7 @@ let cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib copy_bin_and_libs () { - [ -f "$out/bin/$(basename $1)" ] && return 0 + [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)" cp -pdv $1 $out/bin LDD="$(ldd $1)" || return 0 LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" @@ -110,11 +110,11 @@ let echo "testing patched programs..." $out/bin/ash -c 'echo hello world' | grep "hello world" export LD_LIBRARY_PATH=$out/lib - $out/bin/mount --help 2>&1 | grep "BusyBox" - $out/bin/blkid >/dev/null + $out/bin/mount --help 2>&1 | grep -q "BusyBox" + $out/bin/blkid --help 2>&1 | grep -q 'libblkid' $out/bin/udevadm --version - $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:" - LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM" + $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:" + LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM" $out/bin/mdadm --version ${config.boot.initrd.extraUtilsCommandsTest} From 113c6c8f6a5be89dd8aee845a04a5e713e285d4c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 29 Mar 2015 21:53:25 -0700 Subject: [PATCH 762/947] nixos/initrd: Do a lazy library copy in hopes to save some space for replaced binaries --- nixos/modules/system/boot/stage-1.nix | 38 +++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 47d6dd2bf54..8b58eccdcec 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -39,26 +39,9 @@ let mkdir -p $out/bin $out/lib ln -s $out/bin $out/sbin - # Copy ld manually since it isn't detected correctly - cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib - copy_bin_and_libs () { [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)" cp -pdv $1 $out/bin - LDD="$(ldd $1)" || return 0 - LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" - for LIB in $LIBS; do - [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib - while [ "$(readlink $LIB)" != "" ]; do - LINK="$(readlink $LIB)" - if [ "${LINK:0:1}" != "/" ]; then - LINK="$(dirname $LIB)/$LINK" - fi - LIB="$LINK" - [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib - done - done - return 0 } # Copy BusyBox. @@ -89,6 +72,27 @@ let ${config.boot.initrd.extraUtilsCommands} + # Copy ld manually since it isn't detected correctly + cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib + + # Copy all of the needed libraries for the binaries + for BIN in $(find $out/{bin,sbin} -type f); do + echo "Copying libs for bin $BIN" + LDD="$(ldd $BIN)" || continue + LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" + for LIB in $LIBS; do + [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib + while [ "$(readlink $LIB)" != "" ]; do + LINK="$(readlink $LIB)" + if [ "${LINK:0:1}" != "/" ]; then + LINK="$(dirname $LIB)/$LINK" + fi + LIB="$LINK" + [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib + done + done + done + # Strip binaries further than normal. chmod -R u+w $out stripDirs "lib bin" "-s" From 70a1e3c8377306e19789fa6f279bf45f98883231 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 30 Mar 2015 08:46:16 +0300 Subject: [PATCH 763/947] propagate many inputs in imagemagick: otherwise dependent builds fail --- pkgs/applications/graphics/ImageMagick/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index f7552c8b286..7ae24b38c01 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -79,6 +79,18 @@ stdenv.mkDerivation rec { libxml2 ]; + propagatedBuildInputs = [] + ++ (stdenv.lib.optional (lcms2 != null) lcms2) + ++ (stdenv.lib.optional (liblqr1 != null) liblqr1) + ++ (stdenv.lib.optional (fftw != null) fftw) + ++ (stdenv.lib.optional (libtool != null) libtool) + ++ (stdenv.lib.optional (jemalloc != null) jemalloc) + ++ (stdenv.lib.optional (libXext != null) libXext) + ++ (stdenv.lib.optional (libX11 != null) libX11) + ++ (stdenv.lib.optional (libXt != null) libXt) + ++ (stdenv.lib.optional (bzip2 != null) bzip2) + ; + postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; meta = with stdenv.lib; { From 497eba7bcb902f6572bab1a75ab02df51643f0a9 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Mon, 30 Mar 2015 00:10:29 -0700 Subject: [PATCH 764/947] add obs-studio Open Broadcaster Software is free and open source software for video recording and live streaming https://obsproject.com/ --- .../applications/video/obs-studio/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/default.nix diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix new file mode 100644 index 00000000000..a600fe8bb78 --- /dev/null +++ b/pkgs/applications/video/obs-studio/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, cmake +, ffmpeg +, jansson +, libxkbcommon +, qt5 +, libv4l +, x264 +}: + +stdenv.mkDerivation rec { + name = "obs-studio"; + version = "0.9.1"; + + src = fetchurl { + url = "https://github.com/jp9000/${name}/archive/${version}.tar.gz"; + sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + }; + + buildInputs = [ cmake + ffmpeg + jansson + libv4l + libxkbcommon + qt5 + x264 + ]; + + # obs attempts to dlopen libobs-opengl, it fails unless we make sure + # DL_OPENGL is an explicit path. Not sure if there's a better way + # to handle this. + cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; + + meta = with stdenv.lib; { + description = "Free and open source software for video recording and live streaming"; + longDescription = '' + This project is a rewrite of what was formerly known as "Open Broadcaster + Software", software originally designed for recording and streaming live + video content, efficiently + ''; + homepage = "https://obsproject.com"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d620c3823..be53346f281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11345,6 +11345,8 @@ let inherit (gnome) libglade; }; + obs-studio = callPackage ../applications/video/obs-studio { }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; From 33120d9891e9a3cb7d55626675aa1fd9cd9b57d2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 30 Mar 2015 11:03:23 +0300 Subject: [PATCH 765/947] Add gccgo build for GCC 4.9 --- pkgs/top-level/all-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e099d17fb1..5b071a63cad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3573,6 +3573,14 @@ let langGo = true; }); + gccgo49 = wrapCC (gcc49.cc.override { + name = "gccgo49"; + langCC = true; #required for go. + langC = true; + langGo = true; + profiledCompiler = false; + }); + ghdl = wrapCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl gmp mpfr noSysDirs gnat; texinfo = texinfo4; From 3661c7a8421a57a43a595db50dd7190064da0097 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 29 Mar 2015 18:04:53 -0430 Subject: [PATCH 766/947] kde-4.14 smokegen: prevent cmake from removing rpath on install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Domen Kožar --- .../smokegen-CMakeLists.txt-nix.patch | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch index f0811d335a7..7436b6112d5 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch +++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch @@ -1,13 +1,16 @@ ---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000 -@@ -36,6 +36,10 @@ - set (CMAKE_SKIP_BUILD_RPATH FALSE) - set (CMAKE_SKIP_RPATH FALSE) - +diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt +--- smokegen-4.14.3-upstream/CMakeLists.txt 2014-09-15 13:23:01.000000000 -0430 ++++ smokegen-4.14.3/CMakeLists.txt 2015-03-29 16:41:59.295598992 -0430 +@@ -32,9 +32,9 @@ + type.cpp + ) + +-# force RPATH so that the binary is usable from within the build tree +-set (CMAKE_SKIP_BUILD_RPATH FALSE) +-set (CMAKE_SKIP_RPATH FALSE) +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ ++set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - - add_executable(smokegen ${generator_SRC}) \ No newline at end of file + From eac32cf697fa714272044da1b1318df8da8950a8 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 30 Mar 2015 13:45:07 +0200 Subject: [PATCH 767/947] Revert "Merge pull request #7032 from flosse/change-option-names" This reverts commit c265aafb555d172baa56e22b2c371d0b6fbe4952, reversing changes made to c9bbf2228f7a71f6bdec51a0c7bbb9ba7206c1ff. Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471 --- nixos/modules/rename.nix | 3 --- nixos/modules/services/networking/prosody.nix | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 840188f89f8..e820b2cb9ce 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -122,9 +122,6 @@ in zipModules ([] ++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] -# Prosody -++ deprecated [ "services" "prosody" "virtualHosts" "enabled" ] [ "services" "prosody" "virtualHosts" "enable" ] - # Multiple efi bootloaders now ++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ] diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 4e9199f0fcf..f82f8bfddbb 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -113,7 +113,7 @@ let description = "Domain name"; }; - enable = mkOption { + enabled = mkOption { default = false; description = "Whether to enable the virtual host"; }; @@ -169,14 +169,14 @@ in example = { myhost = { domain = "my-xmpp-example-host.org"; - enable = true; + enabled = true; }; }; default = { localhost = { domain = "localhost"; - enable = true; + enabled = true; }; }; @@ -214,6 +214,7 @@ in pidfile = "/var/lib/prosody/prosody.pid" + log = "*syslog" data_path = "/var/lib/prosody" @@ -243,7 +244,7 @@ in ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" - enabled = ${if v.enable then "true" else "false"}; + enabled = ${if v.enabled then "true" else "false"}; ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } ${ v.extraConfig } '') cfg.virtualHosts) } From 1bf09248ebd15c06e5944432d5de44f8164e0c69 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 26 Mar 2015 14:00:48 +0000 Subject: [PATCH 768/947] add packages for celery and its dependencies --- pkgs/top-level/python-packages.nix | 120 +++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1e7e2b3352..7d88df32830 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -379,6 +379,27 @@ let }; + amqp = buildPythonPackage rec { + name = "amqp-${version}"; + version = "1.4.6"; + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/amqp/${name}.tar.gz"; + sha256 = "0h76dnqfbc6fslwr7lx86n2gyslfv2x1vl8lpbszjs2svrkwikzb"; + md5 = "a061581b6864f838bffd62b6a3d0fb9f"; + }; + + buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; + + meta = { + homepage = http://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project."; + license = licenses.lgpl21; + }; + }; + + amqplib = buildPythonPackage rec { name = "amqplib-0.6.1"; @@ -967,6 +988,31 @@ let }; + billiard = buildPythonPackage rec { + name = "billiard-${version}"; + version = "3.3.0.19"; + + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/billiard/${name}.tar.gz"; + sha256 = "06bs1kl7dji6lwpj3dkfi61mmrfq2mi7wz3ka683i2avwk38wsvf"; + md5 = "7e473b9da01956ce91a650f99fe8d4ad"; + }; + + buildInputs = with self; [ nose unittest2 mock ]; + + # i can't imagine these were intentionally installed + postInstall = "rm -r $out/${python.sitePackages}/funtests"; + + meta = { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; + }; + + bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; @@ -1441,6 +1487,33 @@ let }; }; + + celery = buildPythonPackage rec { + name = "celery-${version}"; + version = "3.1.17"; + + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/celery/${name}.tar.gz"; + sha256 = "0qh38xnbgbj7awpjxxvjlddyafxyyy3fhxcas3i8dmcb4r9vdqng"; + md5 = "e37f5d93b960bf68fc26c1325f30fd16"; + }; + + buildInputs = with self; [ mock nose unittest2 ]; + propagatedBuildInputs = with self; [ kombu billiard pytz anyjson ]; + + # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 + doCheck = pythonAtLeast "2.7"; + + meta = { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; + }; + + certifi = buildPythonPackage rec { name = "certifi-${version}"; version = "14.05.14"; @@ -5666,6 +5739,34 @@ let }; }; + kombu = buildPythonPackage rec { + name = "kombu-${version}"; + version = "3.0.24"; + + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz"; + sha256 = "13dzybciispin9c4znpiyvgha354mz124lgx06ksw4vic0vh9zxr"; + md5 = "37c8b5084ac83b8a6f5ff9f157cac0e9"; + }; + + buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ]; + + propagatedBuildInputs = with self; [ amqp ] ++ + (optionals (pythonOlder "2.7") [ importlib ordereddict ]); + + # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 + # tests also appear to depend on anyjson, which has Py3k problems + doCheck = (pythonAtLeast "2.7") && !isPy3k ; + + meta = with stdenv.lib; { + description = "Messaging library for Python"; + homepage = "http://github.com/celery/kombu"; + license = licenses.bsd3; + }; + }; + konfig = buildPythonPackage rec { name = "konfig-${version}"; version = "0.9"; @@ -6822,6 +6923,25 @@ let doCheck = false; }); + nose-cover3 = buildPythonPackage rec { + name = "nose-cover3-${version}"; + version = "0.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nose-cover3/${name}.tar.gz"; + sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; + md5 = "82f981eaa007b430679899256050fa0c"; + }; + + propagatedBuildInputs = with self; [ nose ]; + + meta = { + description = "Coverage 3.x support for Nose"; + homepage = https://github.com/ask/nosecover3; + license = stdenv.lib.licenses.lgpl21; + }; + }; + nosexcover = buildPythonPackage (rec { name = "nosexcover-1.0.10"; From 3061ce63aa974eb2976d74e85ebeb67daf4e9c64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 23:27:31 +0100 Subject: [PATCH 769/947] haskell-llvm-base: deprecated package (that doesn't compile) --- .../development/haskell-modules/configuration-common.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 51cd53476ff..97854606f08 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -430,15 +430,18 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; # Help the test suite find system timezone data. tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + # Deprecated upstream and doesn't compile. + llvm-base = markBroken super.llvm-base; + bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm); + objectid = dontDistribute super.objectid; + saltine-quickcheck = dontDistribute super.saltine-quickcheck; + # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; From 67950f036ed639d5cb6eb4ae9a953bea87d73d85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 23:23:49 +0100 Subject: [PATCH 770/947] haskell-marquise fails its test suite. --- 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 97854606f08..3faf2ddfecc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -237,6 +237,7 @@ self: super: { hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; + marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 memcached-binary = dontCheck super.memcached-binary; persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; From 834f2dc27b86cb1a89666f0a0cd9ea14c13efc65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 20:46:54 +0100 Subject: [PATCH 771/947] haskell-integer-gmp: don't try to build this package --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3faf2ddfecc..5a5652b7df7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -176,9 +176,10 @@ self: super: { # Obsolete: https://github.com/massysett/prednote/issues/1. prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test; - # Doesn't compile: . - integer-gmp_0_5_1_0 = markBroken super.integer-gmp_0_5_1_0; + # Doesn't compile: "Setup: can't find include file ghc-gmp.h" + integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0; + # Obsolete. lushtags = markBrokenVersion "0.0.1" super.lushtags; # https://github.com/haskell/bytestring/issues/41 From 83db889148937ea9672d0d09ecbc4a7ba9448b74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 20:44:13 +0100 Subject: [PATCH 772/947] haskell-base: don't try to build this package --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a5652b7df7..0259c202070 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -170,8 +170,8 @@ self: super: { ''; }); - # Does not compile: . - base_4_7_0_2 = markBroken super.base_4_7_0_2; + # Does not compile: "fatal error: ieee-flpt.h: No such file or directory" + base_4_8_0_0 = markBroken super.base_4_8_0_0; # Obsolete: https://github.com/massysett/prednote/issues/1. prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test; From e42e1ea6dedd77cbe12c7c4c3f92c382b08b55ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Mar 2015 03:47:46 +0200 Subject: [PATCH 773/947] hackage-packages.nix: re-generate from Hackage 2015-03-29T03:47:46+0200 --- .../haskell-modules/hackage-packages.nix | 857 ++++++++++++------ 1 file changed, 556 insertions(+), 301 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9fa2b6bc12c..86811ccc7dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4917,14 +4917,13 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.5"; - sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; + version = "0.8.6"; + sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3"; buildDepends = [ array base bytestring containers directory filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; - jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -8376,8 +8375,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "0.6.0.0"; - sha256 = "1vrvjj3kvlrf8mgfxdz8rs3f0b5my82zncddyqzs8b2sccgiya12"; + version = "0.6.0.1"; + sha256 = "199pgv4y3932i585ak4sa78zvy1w49699lcs18836brvy10b2ch0"; buildDepends = [ attoparsec base iproute network network-info random text ]; @@ -8726,6 +8725,7 @@ self: { base binary bytestring containers deepseq mtl primitive transformers vector zlib ]; + jailbreak = true; homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; @@ -9341,10 +9341,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.1.1"; - revision = "1"; - sha256 = "00xap58zfcwndjnmciff8d65pgb7j08pa9gmpk4cqi50vmphaf5i"; - editedCabalFile = "390eff2095f519c59ac828108509047f29313ca894bc3355e6d79e943a035b50"; + version = "4.2.0"; + sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg"; buildDepends = [ array base bytestring containers dlist fmlist text vector ]; @@ -11026,8 +11024,8 @@ self: { ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.4.0.0"; - sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + version = "2.4.1.0"; + sha256 = "0xikg3jvmh1q514r2vnabw6d481h4qj93zpkp157wd155c7b0vjl"; buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -12736,14 +12734,20 @@ self: { }) {}; "SHA" = callPackage - ({ mkDerivation, array, base, binary, bytestring }: + ({ mkDerivation, array, base, binary, bytestring, directory + , QuickCheck, test-framework, test-framework-quickcheck2 + }: mkDerivation { pname = "SHA"; - version = "1.6.4.1"; - sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; + version = "1.6.4.2"; + sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"; isLibrary = true; isExecutable = true; - buildDepends = [ array base binary bytestring ]; + buildDepends = [ array base binary bytestring directory ]; + testDepends = [ + array base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Implementations of the SHA suite of message digest functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -13067,8 +13071,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.3.5"; - sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; + version = "0.3.6"; + sha256 = "0313i6h9m57g1ly5jviczvgbcvv8wdy0fi6hrws879zb745rb7zi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15938,6 +15942,7 @@ self: { accelerate accelerate-cuda accelerate-cufft accelerate-fftw accelerate-fourier base criterion ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; @@ -17168,8 +17173,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "3.1"; - sha256 = "0q9w4lwf2k6r36vb452z2ykkdz4z4xcc7x4kgjrjfcxfca7m0l50"; + version = "4.0"; + sha256 = "1narrw9xy7xv7jvb94c0pvbgx22zcxjg78a78gc1b4kg9dh5gyjc"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -19769,6 +19774,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arion" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, fsnotify + , hspec, process, regex-posix, safe, split, system-filepath, text + , time, transformers + }: + mkDerivation { + pname = "arion"; + version = "0.1.0.5"; + sha256 = "0b1nva5iyls8xn84sgf0azc8cs6s0sdila77hgs13crksf4qnyvx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filemanip fsnotify process regex-posix + safe split system-filepath text transformers + ]; + testDepends = [ + base containers directory filemanip fsnotify hspec process + regex-posix safe split system-filepath text time + ]; + homepage = "http://github.com/karun012/arion"; + description = "Watcher and runner for Hspec"; + license = stdenv.lib.licenses.mit; + }) {}; + "arith-encode" = callPackage ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers , fgl, hashable, HUnit-Plus, unordered-containers @@ -19808,15 +19837,13 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.4.1.1"; - revision = "2"; - sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; + version = "0.4.1.2"; + sha256 = "0i0cndldf426cc8dv6swqfnljv9lgba9vp1ac4xk0vdbmbwqan9m"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - homepage = "https://bitbucket.org/dafis/arithmoi"; + homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; }) {}; @@ -20684,7 +20711,9 @@ self: { mkDerivation { pname = "atto-lisp"; version = "0.2.2"; + revision = "1"; sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; + editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa"; buildDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -20705,8 +20734,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.12.1.3"; - sha256 = "1m5sk60k9x4hs0qpglj5adr3n5zwpvarpylkjkx2xx63p74cj82f"; + version = "0.12.1.5"; + sha256 = "131l2qax0qnc157r9llp3lbwy7390g8r3ckzvdqbif6lfy0zg2rq"; buildDepends = [ array base bytestring containers deepseq scientific text ]; @@ -21162,8 +21191,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.2"; - sha256 = "1wbsxr15jqq6fn158qglpzhx98ybgba8xxahlqjmi845iq3qys63"; + version = "0.0.3"; + sha256 = "0y58qixd9kjm0wp5spachm581mshp15pcvlyv48nsrabrzssn3ng"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring containers cryptohash inflections influxdb MonadRandom mtl network @@ -22176,13 +22205,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_7_0_2" = callPackage - ({ mkDerivation, ghc-prim, integer-gmp, rts }: + "base_4_8_0_0" = callPackage + ({ mkDerivation, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.7.0.2"; - sha256 = "09rp0syv5arj7wmyksmn07g7vps1kwh2k4z1ar1dp7jsav8gxsjp"; - buildDepends = [ ghc-prim integer-gmp rts ]; + version = "4.8.0.0"; + sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44"; + buildDepends = [ ghc-prim rts ]; + jailbreak = true; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23207,8 +23237,8 @@ self: { }: mkDerivation { pname = "binary-list"; - version = "1.0.1.0"; - sha256 = "1d83ka79nnq5pw4djs6x3ccgygkq89q9wakgykx4wvyf7l0xj7d9"; + version = "1.1.0.2"; + sha256 = "006a46yw1jcdw2yhpwimbjcpls0vrhzrhiylxh6vc136w2kb6qcd"; buildDepends = [ base binary bytestring deepseq phantom-state transformers ]; @@ -25275,18 +25305,18 @@ self: { "blunt" = callPackage ({ mkDerivation, aeson, array, base, bytestring, clay, containers , haskell-src-exts, http-types, jmacro, lucid, pointful, text - , transformers, wai, warp, wl-pprint-text + , transformers, wai, wai-extra, warp, wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.13"; - sha256 = "1mawchdfywhs7gqfy1p91drfc4l31c2m2v8nkma5bg9i5zb81kyr"; + version = "0.0.14"; + sha256 = "0qg5jy2f005kah4309ddg0xcyzfgkm7baz6ms8bcn4lsd74agm7k"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring clay containers haskell-src-exts - http-types jmacro lucid pointful text transformers wai warp - wl-pprint-text + http-types jmacro lucid pointful text transformers wai wai-extra + warp wl-pprint-text ]; homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; @@ -25549,6 +25579,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bound-gen" = callPackage + ({ mkDerivation, base, bound, monad-gen, mtl }: + mkDerivation { + pname = "bound-gen"; + version = "0.1.0.2"; + sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp"; + buildDepends = [ base bound monad-gen mtl ]; + jailbreak = true; + description = "Unwrap Scope's with globally fresh values"; + license = stdenv.lib.licenses.mit; + }) {}; + "bounded-tchan" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -26663,8 +26705,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.24.1"; - sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; + version = "0.25.1"; + sha256 = "1wf504kb5qcy3l2kd2fmhg78nb39fpcmv2fysh5daqh956q6dbr7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26945,17 +26987,20 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , filepath, mtl, process, template-haskell, temporary, transformers + , filepath, ghc-prim, mtl, process, template-haskell, temporary + , transformers }: mkDerivation { pname = "cabal-helper"; - version = "0.2.0.0"; - sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; + version = "0.3.0.0"; + revision = "1"; + sha256 = "1yrv5amv8g4r07z47j7082xhxhfim6d089ib2dnv0b6iik3xfyfv"; + editedCabalFile = "dc30481b4261dae5151f3f4d6fba41c8c2e6415b8cc4dc7df9c08284febb453d"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring Cabal data-default directory filepath mtl process - template-haskell temporary transformers + base bytestring Cabal data-default directory filepath ghc-prim mtl + process template-haskell temporary transformers ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; @@ -27094,8 +27139,8 @@ self: { }: mkDerivation { pname = "cabal-meta"; - version = "0.4.1.2"; - sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk"; + version = "0.4.1.3"; + sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6"; isLibrary = true; isExecutable = true; buildDepends = [ base shelly system-fileio system-filepath text ]; @@ -27105,6 +27150,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-mon" = callPackage + ({ mkDerivation, base, containers, directory, filepath, process + , simple-get-opt, vty + }: + mkDerivation { + pname = "cabal-mon"; + version = "1.0.1"; + sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filepath process simple-get-opt vty + ]; + description = "A monitor for cabal builds"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-nirvana" = callPackage ({ mkDerivation, base, bytestring, containers, directory, HTTP , process, tar @@ -27969,8 +28031,8 @@ self: { }: mkDerivation { pname = "caramia"; - version = "0.7.2.0"; - sha256 = "0jndbw3xr5h9r0f8z4fplqxw02icfakr4j41yvfsw398yb94i8f0"; + version = "0.7.2.1"; + sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28045,8 +28107,8 @@ self: { }: mkDerivation { pname = "cartel"; - version = "0.14.2.4"; - sha256 = "14xsvy0s4bz8lfbiwys90iz3bvcd5f6np2pspz3p6camzfl2xdyp"; + version = "0.14.2.6"; + sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; @@ -28513,8 +28575,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.2.0"; - sha256 = "14ly2sfdk3gjxv2s4r9pfvaq4fdpz4xir4zglpjnqsik4bhwbk69"; + version = "0.1.2.1"; + sha256 = "0c2n37p8530awkpwnygrpz7zssv22ycjjml2623f61x7q8ilb8p6"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -28889,8 +28951,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.2.2.0"; - sha256 = "0zl1ib0i0sh6ll3mrakaargjxyr3v2kxzzdfqpjnr57pg7isrjx9"; + version = "3001.2.2.1"; + sha256 = "1cpljh62mw2fim5gwpd0ag9ais9953iyiiwqfbd2nb6swy5k1z1m"; buildDepends = [ base bytestring containers exceptions mtl multipart network network-uri old-locale old-time parsec xhtml @@ -29333,8 +29395,8 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.4"; - sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd"; + version = "0.2.5"; + sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; buildDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; @@ -30118,7 +30180,7 @@ self: { "classy-prelude" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, enclosed-exceptions, exceptions + , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl , mutable-containers, old-locale, primitive, QuickCheck, semigroups , stm, system-filepath, text, time, transformers @@ -30126,11 +30188,11 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.10.5"; - sha256 = "1s9hydjs7x522w9hgrxjzx1d2zir80g140y4vdqd7mizv0yzisy3"; + version = "0.11.0"; + sha256 = "07fqmmsirf83xkb1mc3jaklq47cbdx3slp4f60m6bhnmlg7zjdnf"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers - enclosed-exceptions exceptions ghc-prim hashable lifted-base + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base mono-traversable mtl mutable-containers old-locale primitive semigroups stm system-filepath text time transformers unordered-containers vector vector-instances @@ -30150,8 +30212,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.10.5"; - sha256 = "1dy9jj260hn571z1wdm0v5zpgalwgij99clmh541b41h6pjbism2"; + version = "0.11.0"; + sha256 = "1ahz02q5qc7abax85m28d7gjnppghf772bqy0wlw39ngp3z6ch81"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet system-fileio transformers void @@ -30171,8 +30233,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.10.5"; - sha256 = "0phaczjsn3blca3y6cwnqwhd9wrl7im1r2kh4i6a83c9kirsa5cx"; + version = "0.11.0"; + sha256 = "1i0s0hgc57dizbw5s17f894ssdmglh6sw8jwpxcsh8hzqdw7jrqc"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -32080,8 +32142,8 @@ self: { }: mkDerivation { pname = "conceit"; - version = "0.2.2.0"; - sha256 = "0h477bn361b0g3iq1nzx88pii8zhkc41vk1f0ggndhidnzddrlb8"; + version = "0.2.2.1"; + sha256 = "0phr04cp36n5r137la3vh92v7wbc5a56grpfynn2vjiyacmrw0b4"; buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; @@ -32653,6 +32715,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "config-value" = callPackage + ({ mkDerivation, alex, array, base, bytestring, happy, pretty, text + }: + mkDerivation { + pname = "config-value"; + version = "0.1.1"; + sha256 = "04f3n8hq82zwlh6ny0wv8wxq6j0ngq4daw82znss9373b1v99bl8"; + buildDepends = [ array base bytestring pretty text ]; + buildTools = [ alex happy ]; + homepage = "https://github.com/glguy/config-value"; + description = "Simple, layout-based value language similar to YAML or JSON"; + license = stdenv.lib.licenses.mit; + }) {}; + "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, either, hspec, hspec-discover, mtl @@ -32970,6 +33046,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "consul-haskell" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , http-client, HUnit, network, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "consul-haskell"; + version = "0.1"; + sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6"; + buildDepends = [ + aeson base base64-bytestring bytestring http-client network text + transformers + ]; + testDepends = [ base http-client HUnit network tasty tasty-hunit ]; + homepage = "https://github.com/alphaHeavy/consul-haskell"; + description = "A consul client for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "container-classes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -34085,8 +34180,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "3.0.1"; - sha256 = "02jgr0mm95hka82n2f3kg6ipyadz7gqgj2n4f7qxw27s5nszmz24"; + version = "3.0.2"; + sha256 = "0arp3nf6w7rqb1jxv2j20k4hps3zmdbz97qz500n7h5xx2s8p5c3"; buildDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid @@ -34108,15 +34203,14 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.13.1"; - sha256 = "18vnwncpf18076bjqajrh6n0pkr9bmpcspf7v0s31df1lm6kxhcf"; + version = "0.13.2"; + sha256 = "155vz9ndwf6d7z94iq9kshbpxcqyf82lszg03x8qflmkn21i85kg"; buildDepends = [ async auto-update base bytestring containers cql data-default-class exceptions hashable iproute lens monad-control mtl mwc-random network semigroups stm text time tinylog transformers transformers-base uuid vector ]; - jailbreak = true; homepage = "https://github.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = "unknown"; @@ -34476,23 +34570,23 @@ self: { "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, containers, deepseq, directory, either, filepath, Glob - , hastache, HUnit, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , vector-algorithms + , cassava, containers, deepseq, directory, filepath, Glob, hastache + , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.0.2.0"; - sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; + version = "1.1.0.0"; + sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw"; isLibrary = true; isExecutable = true; buildDepends = [ aeson ansi-wl-pprint base binary bytestring cassava containers - deepseq directory either filepath Glob hastache mtl mwc-random + deepseq directory filepath Glob hastache mtl mwc-random optparse-applicative parsec statistics text time transformers - vector vector-algorithms + transformers-compat vector vector-algorithms ]; testDepends = [ base bytestring HUnit QuickCheck statistics test-framework @@ -41704,6 +41798,7 @@ self: { version = "0.1.0.2"; sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn"; buildDepends = [ base primitive vector ]; + jailbreak = true; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; @@ -42194,8 +42289,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.4"; - sha256 = "1qsr8xsv3hhk3m97zlzmpspjx9b4aghg0axyriwfy5mkbl3kqy93"; + version = "0.1.0.5"; + sha256 = "0vji28kyx20a93661x3c9sbp9vq2z5i4f0mjvpk55xyls5mkldrw"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -42421,6 +42516,7 @@ self: { sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; + jailbreak = true; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -43400,8 +43496,8 @@ self: { }: mkDerivation { pname = "epic"; - version = "0.9.3.2"; - sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; + version = "0.9.3.3"; + sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m"; isLibrary = true; isExecutable = true; buildDepends = [ array base Cabal directory mtl process ]; @@ -44985,8 +45081,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.3.0"; - sha256 = "1ii4wkpsi5w2230bzhnzcpgckd5gkawckws2vyggw78b91dw9dc5"; + version = "2.3.1"; + sha256 = "02smmj62jir0c4ix929xy7zsd03djp53hxps0wgqga1f123gksri"; buildDepends = [ array auto-update base bytestring bytestring-builder directory filepath text @@ -45145,8 +45241,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.1"; - sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; + version = "0.23.1.2"; + sha256 = "0cdj2id0wb1j8v03rwvyqw9z3plhn6myqhyyf9c7r0w5r462pcyx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -45183,8 +45279,8 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.3"; - sha256 = "1kkx6abrvbd2cdwpgdx7cpwyfqpk31zwrxfw9kr1ngayf7sgzc9s"; + version = "0.2.0.4"; + sha256 = "0x1y9d2hgi3ky7f7ydc43dyd54dsmqcgxj6g8n2x3yfrcjkljq05"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -45657,8 +45753,8 @@ self: { ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; - version = "1.0.2"; - sha256 = "08rhkfwh7dq7x42g9mnil5naamvxn5p2mihssmqyhj8g84safrja"; + version = "1.0.3"; + sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b"; buildDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -45944,18 +46040,20 @@ self: { }) {}; "filecache" = callPackage - ({ mkDerivation, base, directory, hashable, hinotify, lens, mtl - , stm, strict-base-types, temporary, unordered-containers + ({ mkDerivation, base, directory, exceptions, hashable, hinotify + , lens, mtl, stm, strict-base-types, temporary + , unordered-containers }: mkDerivation { pname = "filecache"; - version = "0.2.5"; - sha256 = "0yx255yl8v8knhbnzahx2v606y23nmgh5hs65dqcxmhyh53wawda"; + version = "0.2.7"; + sha256 = "090anxbwsgzqvm6shvg0v5kfvrj14mj9b7jmw916kk8ig5gmz17v"; buildDepends = [ - base hashable hinotify lens mtl stm strict-base-types + base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers ]; testDepends = [ base directory temporary unordered-containers ]; + jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "A Linux-only cache system associating values to files"; license = stdenv.lib.licenses.bsd3; @@ -46110,10 +46208,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.0.0"; - sha256 = "0hxnfjmwv1p1izxr5h7qrd5zdynj2c8k4zh198pinav5skf6v3kd"; + version = "0.1.0.1"; + sha256 = "09991344v0pg4kcws41slqaaj9c26anp44qzjwvfhwcfj1xy6zpg"; buildDepends = [ base ]; - jailbreak = true; description = "Class of filtrable containers"; license = "unknown"; }) {}; @@ -46162,8 +46259,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.0.1"; - sha256 = "02448wi1z0zxiin749w00z55pjm8d1wkhx53rmmfwq2vjzr8akvx"; + version = "0.1.0.2"; + sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6"; buildDepends = [ base ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -47039,6 +47136,7 @@ self: { buildDepends = [ base bytestring containers primitive text transformers vector ]; + jailbreak = true; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47937,6 +48035,7 @@ self: { 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; @@ -49173,8 +49272,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.1.1.1"; - sha256 = "1g532p1k8df7vfwfh4zwj4s020k4c9ncvc68xy0hniijy61ncc5n"; + version = "0.1.1.2"; + sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7"; buildDepends = [ base ghc-prim template-haskell ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -49884,12 +49983,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prim_0_3_1_0" = callPackage + "ghc-prim_0_4_0_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.3.1.0"; - sha256 = "1726hddr7lyklagni1f7m27yak35ailn1zy6401ripppj3m0f03b"; + version = "0.4.0.0"; + sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31"; buildDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -49910,10 +50009,8 @@ self: { ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { pname = "ghc-srcspan-plugin"; - version = "0.2.0.0"; - revision = "1"; - sha256 = "14p2c20xsng1h7129fadvhxs2yy2c865x19vybmzsj5ibjrzrqk2"; - editedCabalFile = "540c5844d127af020f38cde32f12c531f2c4953fca5e896faf2a25f33d2a3e94"; + version = "0.2.1.0"; + sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi"; buildDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -50243,15 +50340,14 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.1.0.1"; - sha256 = "1za5pgnkyq0lf7fj5fdajz326kjvribd719ba21nzn2ixfzp7lri"; + version = "0.1.0.2"; + sha256 = "0d3pbssndmlzmhk88214mz77jmgqh3ca2l8si9fr5v9wi0v5d8yz"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -50316,8 +50412,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150317"; - sha256 = "1n57h97z6jw1pqxmkgfy7s24f88ypskgvsw3gcfyah9inkx1rhr5"; + version = "5.20150327"; + sha256 = "1yhqb6iig5ny90dg5ql0wbpdjza0qn8l6005d20k9dkyc9k98c0y"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -50676,6 +50772,18 @@ self: { license = "unknown"; }) {}; + "github-utils" = callPackage + ({ mkDerivation, base, basic-prelude, github, text }: + mkDerivation { + pname = "github-utils"; + version = "0.1.0"; + sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5"; + buildDepends = [ base basic-prelude github text ]; + homepage = "https://github.com/greenrd/github-utils"; + description = "Useful functions that use the GitHub API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -54351,8 +54459,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.4.4"; - sha256 = "02mif1k12aq2incn8rjgn48c7rpjmxlgncyr5l7w1k1mav0p02hd"; + version = "0.4.5"; + sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -54407,8 +54515,8 @@ self: { }: mkDerivation { pname = "haddock"; - version = "2.15.0.2"; - sha256 = "07mbdjjr0q7k6f86xdlx4a998ly4g8c44m54am1a5jl07cwv9fxx"; + version = "2.16.0"; + sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; isLibrary = false; isExecutable = true; buildDepends = [ base haddock-api ]; @@ -54426,12 +54534,13 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.15.0.2"; - sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7"; + version = "2.16.0"; + sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; buildDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml ]; + jailbreak = true; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -54459,15 +54568,15 @@ self: { "haddock-library" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , QuickCheck + , QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; - version = "1.1.1"; - sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m"; - buildDepends = [ base bytestring deepseq ]; + version = "1.2.0"; + sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + buildDepends = [ base bytestring deepseq transformers ]; testDepends = [ - base base-compat bytestring deepseq hspec QuickCheck + base base-compat bytestring deepseq hspec QuickCheck transformers ]; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; @@ -56879,6 +56988,7 @@ self: { text unordered-containers ]; testDepends = [ base ]; + jailbreak = true; homepage = "http://github.com/chrisdone/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; @@ -59492,19 +59602,20 @@ self: { "hdocs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, ghc, ghc-paths, haddock-api, MonadCatchIO-transformers - , mtl, network, process, text, transformers + , filepath, ghc, ghc-paths, haddock-api, haddock-library + , MonadCatchIO-transformers, mtl, network, process, text + , transformers }: mkDerivation { pname = "hdocs"; - version = "0.4.1.2"; - sha256 = "1dg4cnj3cnv2f12ibvfg451rhsgawhsj0brjmaxm73bfvbxl25vi"; + version = "0.4.2.0"; + sha256 = "1qsahvm24hxjzfd0qvyfsasdplh2hbg9fkxcdkysgqxpzq8kx4gb"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aeson-pretty base bytestring containers filepath ghc - ghc-paths haddock-api MonadCatchIO-transformers mtl network process - text transformers + ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl + network process text transformers ]; testDepends = [ base containers mtl ]; homepage = "https://github.com/mvoidex/hdocs"; @@ -60464,12 +60575,11 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.2"; - sha256 = "1k4ixqwpsa4mnywd1fcfrmy2dbcpkna0hg0sxjlfp0qbhy1ik7v7"; + version = "0.1.3"; + sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr"; buildDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; - jailbreak = true; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; }) {}; @@ -61145,8 +61255,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.12"; - sha256 = "0igcph3icmskf2g861fmxwgjdgrm52r5zazviiv82wck8nvmkh0i"; + version = "0.5.14"; + sha256 = "0hpg2f660s035gj0fzy42s52adgqlgssn7pf2k0bcxml3qxf3jnr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61841,15 +61951,15 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.1.0.1"; - sha256 = "03c0hl4hzgihkqla7kqkjk5s1k68pnblqpisjrzf4bzjl8z1z6hw"; + version = "0.2.0.0"; + sha256 = "050mmc307h45k3i2kwlx0rw9n42rwchscrzhpvrkkzhi335g3vag"; buildDepends = [ aeson base text unordered-containers vector ]; testDepends = [ aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library for Haskell"; + description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; }) {}; @@ -61861,10 +61971,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.5.2.1"; - sha256 = "0kff73g9gjvc035lw3420mxz9mp7pd1yl941wr3jagqnh6g1s85m"; - isLibrary = true; - isExecutable = true; + version = "0.5.2.2"; + sha256 = "1bpl8z2gsfa6gv02k9qjya428xga85zwsbjk2gzcwcdj4d2yhmia"; buildDepends = [ aeson base bytestring file-embed hashable hjsonpointer http-conduit http-types regexpr scientific text unordered-containers vector @@ -62174,8 +62282,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.18"; - sha256 = "03wdfl0jmb5szcv61dd8cm0xh5z6qhpy0d5xf6wh3lybma9pjmsb"; + version = "1.9.19"; + sha256 = "07wibincqgz0sqvc00c06r5am2iyiknrrnywc8023rafajv3079p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62234,7 +62342,9 @@ self: { mkDerivation { pname = "hlwm"; version = "0.1.0.1"; + revision = "1"; sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi"; + editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e"; isLibrary = true; isExecutable = true; buildDepends = [ base monads-tf stm transformers unix X11 ]; @@ -63353,8 +63463,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.38"; - sha256 = "0ijd23chnkcmymn1yf4rb7jbsbdnjxjvld7wsikp85ar1l3s858a"; + version = "4.2.39"; + sha256 = "0n3sh13lhg9aip1390by0wfdfsrnqz61zgs6ji143ak7fdff1559"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64351,14 +64461,14 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.2.8"; - sha256 = "1gwz8fncwrga8qpin2799pfr5x34k01fvav8g3d9n6ibn24ah7f0"; + version = "0.3.1"; + sha256 = "1w13j70r6b66nyjj2fsa1z1m5p8v0zil6jf31x0h0f222x4fvmih"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; - description = "Embed Ruby in your Haskell program"; + description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -64571,6 +64681,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-inspector" = callPackage + ({ mkDerivation, base, haskell-src, hspec }: + mkDerivation { + pname = "hs-inspector"; + version = "0.1.0.0"; + sha256 = "1vphymvkzm1gjs0dkazcbkifshiwwdh9rmnblpz59n4982wly6fp"; + buildDepends = [ base haskell-src ]; + testDepends = [ base haskell-src hspec ]; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-java" = callPackage ({ mkDerivation, array, base, binary, binary-state, bytestring , containers, control-monad-exception, data-binary-ieee754 @@ -68219,8 +68340,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "0.9.0"; - sha256 = "117s8kjbqhd034f483j2x3m2kkjl895b1bc1lxj35b6ar326fp2b"; + version = "0.9.1"; + sha256 = "1aqc8rhnh1l3f3fq6n9vjgamxjxjip52f9j01caaccrylahy57mm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69164,6 +69285,7 @@ self: { version = "0.1.2.1"; sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59"; buildDepends = [ base deepseq primitive vector ]; + jailbreak = true; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = stdenv.lib.licenses.bsd3; @@ -70038,6 +70160,7 @@ self: { system-filepath tar text transformers unix unordered-containers utf8-string uuid vector ]; + jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -71071,13 +71194,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_0_5_1_0" = callPackage + "integer-gmp_1_0_0_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "0.5.1.0"; - sha256 = "04nklslbl336vd73lqfw7mvmlkd2wa19qwq3j14admzk3k5a0j3j"; + version = "1.0.0.0"; + revision = "1"; + sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f"; + editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663"; buildDepends = [ ghc-prim ]; + jailbreak = true; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71511,6 +71637,7 @@ self: { transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; + jailbreak = true; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71586,8 +71713,8 @@ self: { ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; - version = "0.5.0.0"; - sha256 = "1yn68f7d41818mc8m4zpfy66xz8imgfw1mw0wgfwgiapmr0liwvw"; + version = "0.5.0.1"; + sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4"; isLibrary = false; isExecutable = true; buildDepends = [ base cmdargs IPv6Addr text ]; @@ -72919,8 +73046,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc-happstack"; - version = "0.3"; - sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa"; + version = "0.3.1"; + sha256 = "0b77nrvrh1wzsp6djji0hkgl6flyl664l7kzbf5kpi30mqh45a6a"; buildDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -73076,8 +73203,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.1.1"; - sha256 = "0myldbliixd45h1fklzjn7r4gdw5nsl1swp3h14wdl1lck4zd7fq"; + version = "0.4.2"; + sha256 = "1vz32w4yd5yfk3wcsdicfy3qczwcf9hldx19jwf4ihsfyk4hdpzr"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -74106,6 +74233,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "keycode" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "keycode"; + version = "0.1"; + sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv"; + buildDepends = [ base containers ]; + homepage = "https://github.com/RyanGlScott/keycode"; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keyring" = callPackage ({ mkDerivation, base, udbus }: mkDerivation { @@ -74437,8 +74576,8 @@ self: { }: mkDerivation { pname = "koofr-client"; - version = "1.0.0.2"; - sha256 = "094rhsf910ifzazy3j937hgdkibvwjc5x69yxvglmizc3xl6qqfv"; + version = "1.0.0.3"; + sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia"; buildDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -74516,8 +74655,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.8"; - sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; + version = "2.16.10"; + sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -75684,8 +75823,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.6.3.1"; - sha256 = "11q59pbl7bjx4x8xn07lq09a235l1sgw510s9lb89q35mm0mravi"; + version = "0.6.3.2"; + sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6"; buildDepends = [ array base deepseq mtl parsec safe ]; testDepends = [ base deepseq directory filepath parsec QuickCheck tasty tasty-hunit @@ -75793,6 +75932,7 @@ self: { ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; + jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -76453,6 +76593,7 @@ self: { base conduit conduit-extra hslogger HUnit process resourcet transformers ]; + jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; @@ -76490,6 +76631,7 @@ self: { test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; + jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; @@ -76674,13 +76816,13 @@ self: { "leveldb-haskell" = callPackage ({ mkDerivation, async, base, bytestring, data-default, directory - , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, snappy - , tasty, tasty-quickcheck, temporary, transformers + , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty + , tasty-quickcheck, temporary, transformers }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.1"; - sha256 = "1pc6fzjac4dxk0rspvb4ifiinx4da1ms37mwm6vc05140r0hqvbw"; + version = "0.6.2"; + sha256 = "0gx9rn5vbmy5nq1n2ga1v5v7b7p11d0rxhdh75pz4dqgazxyjlax"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76691,12 +76833,11 @@ self: { base bytestring data-default directory exceptions mtl QuickCheck tasty tasty-quickcheck temporary transformers ]; - extraLibraries = [ leveldb snappy ]; - jailbreak = true; + extraLibraries = [ leveldb ]; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + }) { inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage ({ mkDerivation, async, base, bytestring, data-default, filepath @@ -77072,8 +77213,8 @@ self: { }: mkDerivation { pname = "libjenkins"; - version = "0.8.0"; - sha256 = "0dndz0ja6h50ix5r93ln2s5n7ymjariflxi0g7pfy850gyyimv27"; + version = "0.8.1"; + sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z"; buildDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -78172,8 +78313,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.1"; - sha256 = "0gjndhrd0cjwmvl2ligklvmqr64p50m42rvxb79i13jk2jb16pg5"; + version = "0.2.3.2"; + sha256 = "0gm2cy4a1l6kh65cwj3ssv9r9ry4nk2sjr3cqhkp5i7mhmpc6q58"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78329,10 +78470,8 @@ self: { ({ mkDerivation, base, binary, containers, dlist }: mkDerivation { pname = "list-tries"; - version = "0.5.2"; - revision = "1"; - sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; - editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e"; + version = "0.6.0"; + sha256 = "0raf2rdfq2kn7sif3czihj0mpgjrp63x0vf7wisb6hl9ipzn9x4s"; isLibrary = true; isExecutable = true; buildDepends = [ base binary containers dlist ]; @@ -81274,6 +81413,7 @@ self: { sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; + jailbreak = true; description = "A native implementation of matrix operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81471,6 +81611,7 @@ self: { buildDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; + jailbreak = true; description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82173,8 +82314,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.2.4"; - sha256 = "0s150iwzvx1y1yfli9187lr23l3q0bxah48n27v2k0vvl0jsr69v"; + version = "3.2.5"; + sha256 = "1f1zjp956k0xs1wyckk216i71mmr17ffl66d4y1cmfxm0wrcdnh8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -82272,8 +82413,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.8.1"; - sha256 = "01das7dv5xrvbbmhz2jkd8s3nbp93vz89dnliz3q04aqc5wvdbh5"; + version = "0.4.8.2"; + sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -83032,6 +83173,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes" = callPackage + ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph + , monad-control, peano, reflection, tasty, tasty-hunit + , transformers, transformers-base, transformers-compat + }: + mkDerivation { + pname = "monad-classes"; + version = "0.3.1.1"; + sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c"; + buildDepends = [ + base ghc-prim mmorph monad-control peano reflection transformers + transformers-base transformers-compat + ]; + testDepends = [ + base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit + transformers + ]; + homepage = "https://github.com/strake/monad-classes.hs"; + description = "more flexible mtl"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { @@ -84757,8 +84920,8 @@ self: { }: mkDerivation { pname = "multiarg"; - version = "0.30.0.6"; - sha256 = "0zikmmspyk9klw44zf39qfg8c72cq9aipsdcxaldim2wzajfxrlx"; + version = "0.30.0.8"; + sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; @@ -85355,8 +85518,8 @@ self: { }: mkDerivation { pname = "mutable-containers"; - version = "0.2.1.2"; - sha256 = "1j1dzx8iniq3arpjrndkpvkjad175hl4ijjryaf3s59pzpbz17y8"; + version = "0.3.0"; + sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c"; buildDepends = [ base containers ghc-prim mono-traversable primitive vector ]; @@ -87738,8 +87901,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.0"; - sha256 = "1cwxnkral8d33xgpjlqrv0d5q5c046siw9z56bhp53qpk40ihn81"; + version = "0.1.0.1"; + sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi"; buildDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -87752,6 +87915,7 @@ self: { version = "0.3.7"; sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b"; buildDepends = [ base primitive vector ]; + jailbreak = true; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; }) {}; @@ -89776,7 +89940,9 @@ self: { mkDerivation { pname = "packunused"; version = "0.1.1.4"; + revision = "1"; sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8"; + editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -91047,6 +91213,7 @@ self: { sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; + jailbreak = true; homepage = "http://github.com/cchalmers/pcg-random"; description = "Haskell bindings to the PCG random number generator"; license = stdenv.lib.licenses.bsd3; @@ -91112,8 +91279,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.4"; - sha256 = "1kvasljlrfmlskqzzglm6swkfmfrqycv0j0hswck0lcfzd8nxkna"; + version = "0.1.5"; + sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69"; buildDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -91275,6 +91442,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "peano" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "peano"; + version = "0.1.0.1"; + sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; + buildDepends = [ base ]; + description = "Peano numbers"; + license = "unknown"; + }) {}; + "peano-inf" = callPackage ({ mkDerivation, base, containers, lazysmallcheck }: mkDerivation { @@ -92372,8 +92550,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.4"; - sha256 = "0vn5fy15yshr9ypz8qagnqsgkkn33qv19ayqp4fy5x5bv68y7a0b"; + version = "0.6"; + sha256 = "1fsv480mkj216f3v0080wv1d6h812dh8s9yrh21kinz9dnj7rfgf"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -94570,8 +94748,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.32.0.4"; - sha256 = "1w7p8f8xqwkqbhf9a59g2y31rkd84290hsprxvhrn6qka6bfxfcf"; + version = "0.32.0.6"; + sha256 = "0ammlm2dfhjmgy2ackrk4gvwgxz8sph8d2n4pwk2vl17hy024dbj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94963,14 +95141,12 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; - version = "0.5.4.0"; - revision = "1"; - sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; - editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; - buildDepends = [ base ghc-prim ]; + version = "0.6"; + sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l"; + buildDepends = [ base ghc-prim transformers ]; testDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; @@ -95291,8 +95467,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.0.1"; - sha256 = "1dnarvm26xwrys8wjh43757r59pby41w5cizqwyg1zcr2qk7awd8"; + version = "0.7.0.2"; + sha256 = "07d9bhcl62ca6vjcqm783p1fknzzbw9jkm8grrkn67pncx107iin"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -95458,8 +95634,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.1.2.2"; - sha256 = "11h4hgwwh8vq96vkca2w1rc5l0aikfhp6550x5ax04k4p3l9lzhy"; + version = "0.2.0.0"; + sha256 = "0pgjd7a8xflnk0v2r2smc5qb7j8zsr5qrlxkdk36547plfjfvnv4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -95491,7 +95667,9 @@ self: { mkDerivation { pname = "profunctors"; version = "4.4.1"; + revision = "1"; sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; + editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -96786,6 +96964,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quantfin" = callPackage + ({ mkDerivation, base, containers, mersenne-random-pure64, mtl + , random-fu, rvar, transformers, vector + }: + mkDerivation { + pname = "quantfin"; + version = "0.1.0.1"; + sha256 = "1rx8jrdhlqnbj28d2yi7vb3x1z7g5qrvzrhfx44zdiqlgw215f05"; + buildDepends = [ + base containers mersenne-random-pure64 mtl random-fu rvar + transformers vector + ]; + homepage = "https://github.com/boundedvariation/quantfin"; + description = "Quant finance library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, regex-compat @@ -97330,8 +97525,8 @@ self: { ({ mkDerivation, base, bytestring, process, QuickCheck, text }: mkDerivation { pname = "rainbow"; - version = "0.22.0.0"; - sha256 = "0357yn0dqhmcpy6k661xwlyj7a3nfmj3qci55dkc126mdl66ibf1"; + version = "0.22.0.2"; + sha256 = "0bzjh7j0ckdzvmfb29pi1l7h28hg77rykwj4bndzi55mbqkabrs9"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring process text ]; @@ -99846,6 +100041,7 @@ self: { base bytestring containers directory filepath primitive repa-array repa-eval repa-stream text vector ]; + jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Data-parallel data flows"; license = stdenv.lib.licenses.bsd3; @@ -100307,8 +100503,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.0.0"; - sha256 = "0clhqp78i6823sxfj5xahajg450s15qqf7l2kc9dpfirz49xxpva"; + version = "0.5.0.1"; + sha256 = "1dnf0ain1dprpv736r78qbi0hyfm8jwkjgmfb7vphk0qff6j2alw"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils @@ -100381,8 +100577,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.1"; - sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; + version = "0.17.0.2"; + sha256 = "09jvhmk3bkdz7mwjm9qdmr4kn2mzx2dmzpjv4ryqi7bshf52rdsw"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -103914,8 +104110,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.3"; - sha256 = "1gc4g4qva3w4vrxh1pca49rm0s245zq81bg1qxyfbbp29f7zp5ay"; + version = "0.3.3.1"; + sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -104698,6 +104894,7 @@ self: { sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x"; editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4"; buildDepends = [ base bytestring entropy primitive ]; + jailbreak = true; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; license = stdenv.lib.licenses.bsd3; @@ -105590,6 +105787,7 @@ self: { version = "0.1.0.1"; sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m"; buildDepends = [ base ghc-prim primitive vector ]; + jailbreak = true; homepage = "http://github.com/mikeizbicki/simd"; description = "simple interface to GHC's SIMD instructions"; license = stdenv.lib.licenses.bsd3; @@ -105851,18 +106049,18 @@ self: { "simple-log" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath - , MonadCatchIO-transformers, mtl, old-locale, SafeSemaphore, text - , time, transformers + , MonadCatchIO-transformers, mtl, SafeSemaphore, text, time + , transformers }: mkDerivation { pname = "simple-log"; - version = "0.3.1"; - sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; + version = "0.3.2"; + sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0"; buildDepends = [ base containers deepseq directory filepath - MonadCatchIO-transformers mtl old-locale SafeSemaphore text time - transformers + MonadCatchIO-transformers mtl SafeSemaphore text time transformers ]; + jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -109816,8 +110014,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.7.0.1"; - sha256 = "0w1z3h10vwinvjqkgbiq12fslqxd3ix3br004jz54vscs5i81dch"; + version = "0.7.0.2"; + sha256 = "1wh2gv6hfzm58817q5m2df9dqbiacy7wl8554r6wfmpl6jbn4vn2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110166,6 +110364,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "statistics-hypergeometric-genvar" = callPackage + ({ mkDerivation, base, math-functions, mwc-random, primitive + , statistics + }: + mkDerivation { + pname = "statistics-hypergeometric-genvar"; + version = "0.1.0.0"; + sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m"; + buildDepends = [ + base math-functions mwc-random primitive statistics + ]; + jailbreak = true; + homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + "statistics-linreg" = callPackage ({ mkDerivation, base, MonadRandom, random, random-shuffle, safe , statistics, vector @@ -111259,8 +111474,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { pname = "stringsearch"; - version = "0.3.6.5"; - sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq"; + version = "0.3.6.6"; + sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; buildDepends = [ array base bytestring containers ]; homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; @@ -111435,6 +111650,7 @@ self: { QuickCheck semigroups tasty tasty-quickcheck tasty-th unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/structures"; description = "\"Advanced\" Data Structures"; license = stdenv.lib.licenses.bsd3; @@ -113873,6 +114089,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tce-conf" = callPackage + ({ mkDerivation, base, containers, HUnit }: + mkDerivation { + pname = "tce-conf"; + version = "1.1"; + sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh"; + buildDepends = [ base containers ]; + testDepends = [ base containers HUnit ]; + homepage = "http://hub.darcs.net/dino/tce-conf"; + description = "Very simple config file reading"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tconfig" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -114008,13 +114237,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "template-haskell_2_9_0_0" = callPackage - ({ mkDerivation, base, containers, pretty }: + "template-haskell_2_10_0_0" = callPackage + ({ mkDerivation, base, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.9.0.0"; - sha256 = "0mqphyd77jw87n648zpizh2cggm0958y47jjl84r55s1ndhm7j54"; - buildDepends = [ base containers pretty ]; + version = "2.10.0.0"; + sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im"; + buildDepends = [ base pretty ]; + jailbreak = true; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115026,8 +115256,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }: mkDerivation { pname = "text-manipulate"; - version = "0.1.3"; - sha256 = "0f8xfgsvj50x1br9r4szc94y9hycwgdnjmpwn2h4840kdcpds780"; + version = "0.1.3.1"; + sha256 = "0k7mh9p6c8yif8sbfgqclk9v9jzymhlpv66bypn0z1y3p4ywfgjc"; buildDepends = [ base text text-format ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/text-manipulate"; @@ -115100,21 +115330,21 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, nats - , QuickCheck, quickcheck-instances, semigroups, silently, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , transformers, transformers-compat, void + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers + , transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.7"; - sha256 = "088fbm7zg0gvw4w232qfmlv1nbc0wxxrjni7wf39y4dinhd9wkwl"; + version = "0.7.0.1"; + sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a"; buildDepends = [ array base bytestring ghc-prim nats semigroups template-haskell text transformers void ]; testDepends = [ array base bytestring ghc-prim nats QuickCheck quickcheck-instances - silently tasty tasty-hunit tasty-quickcheck text transformers + tasty tasty-hunit tasty-quickcheck text transformers transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; @@ -115132,8 +115362,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "0.3"; - sha256 = "13vz9s2q8qahm1d957wzi8yz3dh7wqpgxqsg3b8qaaym59h2brak"; + version = "0.3.0.1"; + sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p"; buildDepends = [ base binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups tagged @@ -117135,12 +117365,11 @@ self: { ({ mkDerivation, base, cmdargs, directory, process, time }: mkDerivation { pname = "touched"; - version = "0.1.0.3"; - sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + version = "0.2.0.1"; + sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs directory process time ]; - jailbreak = true; description = "Library (and cli) to execute a procedure on file change"; license = stdenv.lib.licenses.mit; }) {}; @@ -119102,8 +119331,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.0.0.9"; - sha256 = "0ak54chjaw1vnwb7jd8fki2qvpdry5ycwh5ap9wjv61zbdscw74k"; + version = "0.0.0.10"; + sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm"; buildDepends = [ base binary bytestring containers deepseq template-haskell time tzdata vector @@ -119301,20 +119530,18 @@ self: { "uhc-light" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, uhc-util, uulib, vector + , primitive, process, syb, transformers, uhc-util, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.8.7"; - revision = "1"; - sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; - editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; + version = "1.1.8.10"; + sha256 = "12rrcvmqpani5pp9qpf4yqsgvbzx4xwj87nfw0kl4mrhl4gd8c8d"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb uhc-util - uulib vector + hashable mtl network old-locale primitive process syb transformers + uhc-util uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -119323,18 +119550,18 @@ self: { "uhc-util" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, hashable, ListLike, mtl, process, syb, time - , time-compat, uulib + , directory, fclabels, fgl, hashable, ListLike, mtl, process, syb + , time, time-compat, uulib }: mkDerivation { pname = "uhc-util"; - version = "0.1.5.0"; - sha256 = "1im2hn285lmi2gvlhyi78hhhq0mb72hv74jn2cwrzqb03lav8q52"; + version = "0.1.5.1"; + sha256 = "0ipqs9lli10y5nyr0gw91wih9kqlgsxipq7xn8pq3zivmbwswm54"; buildDepends = [ - array base binary bytestring containers directory fgl hashable - ListLike mtl process syb time time-compat uulib + array base binary bytestring containers directory fclabels fgl + hashable ListLike mtl process syb time time-compat uulib ]; - homepage = "https://github.com/UU-ComputerScience/uhc-utils"; + homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121189,8 +121416,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.0.0"; - sha256 = "1ai61r0sdi900anwl767v3j1zykgh80m3xqzr05hp6k16d0j38ms"; + version = "0.1.1.0"; + sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; buildDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -121290,8 +121517,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.16"; - sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3"; + version = "0.9.17"; + sha256 = "1rwfnq4xwkbh4xdphbqc86fischld476qnq3868mgr1csmzc04gf"; buildDepends = [ base ghc-prim ]; homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; @@ -121858,6 +122085,7 @@ self: { version = "0.10.9.3"; sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ base deepseq ghc-prim primitive ]; + jailbreak = true; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -121870,8 +122098,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.10.12.2"; - sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; + version = "0.10.12.3"; + sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg"; buildDepends = [ base deepseq ghc-prim primitive ]; testDepends = [ base QuickCheck random template-haskell test-framework @@ -121894,6 +122122,7 @@ self: { isExecutable = true; buildDepends = [ base bytestring mtl mwc-random primitive vector ]; testDepends = [ base bytestring containers QuickCheck vector ]; + jailbreak = true; homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; @@ -122004,6 +122233,7 @@ self: { sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0"; buildDepends = [ base primitive storable-complex vector ]; extraLibraries = [ fftw3 ]; + jailbreak = true; homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; @@ -122207,17 +122437,15 @@ self: { }) {}; "verilog" = callPackage - ({ mkDerivation, alex, array, base, happy, monadLib }: + ({ mkDerivation, alex, array, base, happy }: mkDerivation { pname = "verilog"; - version = "0.0.10"; - sha256 = "1kyhxxa1d1pqipq714nh60qh90pwb2b3a5wiy1h6yms77c2p4wq4"; - isLibrary = true; - isExecutable = true; - buildDepends = [ array base monadLib ]; + version = "0.0.11"; + sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46"; + buildDepends = [ array base ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; - description = "Verilog parser and DSL"; + description = "Verilog preprocessor, parser, and AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -122771,8 +122999,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.0.4"; - sha256 = "1f6dqlcxzw9m3flv9f14l0qgwhz2ywvn4i1hycywsvbdsj5ja4vh"; + version = "3.0.5"; + sha256 = "0ba0q8kr2sfw4ngvm3a4k7izvfpzjwch16mi410w84ax4nk6chz1"; buildDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -123120,8 +123348,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.2.3"; - sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w"; + version = "2.2.4"; + sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv"; buildDepends = [ auto-update base blaze-builder byteorder bytestring case-insensitive easy-file fast-logger http-types network unix @@ -123703,8 +123931,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.0.10"; - sha256 = "07xzc8m662zp14pqfmygjzpkafdklf776xc5ihsnqaxym7wpajds"; + version = "3.0.10.1"; + sha256 = "1v3fffc12psj22p3b98ax1q7gx4v3z75sl68g9b7gj5hgnb2jaxh"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network @@ -124203,11 +124431,40 @@ 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; }) {}; + "webcrank" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, either, exceptions, http-date, http-media + , http-types, lens, mtl, network-uri, QuickCheck, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "webcrank"; + version = "0.1"; + revision = "1"; + sha256 = "00jnarj4s9jsb7g03jazabpvnnscz7385yslyvvj9z2qryxwv9xk"; + editedCabalFile = "f4521a187e8f4fca8752ab6e53c38df6cafbdc2002397c521928ad69765c1864"; + buildDepends = [ + attoparsec base blaze-builder bytestring case-insensitive either + exceptions http-date http-media http-types lens mtl network-uri + semigroups text transformers unordered-containers utf8-string + ]; + testDepends = [ + attoparsec base bytestring case-insensitive either exceptions + http-date http-media http-types lens mtl QuickCheck tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + homepage = "https://github.com/webcrank/webcrank.hs"; + description = "Webmachine inspired toolkit for building http applications and services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webcrank-dispatch" = callPackage ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text , unordered-containers @@ -124858,8 +125115,8 @@ self: { }: mkDerivation { pname = "wizards"; - version = "1.0.1"; - sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca"; + version = "1.0.2"; + sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab"; buildDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -126686,10 +126943,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.11"; - revision = "1"; - sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; - editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b"; + version = "0.11.1"; + sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126733,8 +126988,8 @@ self: { }: mkDerivation { pname = "xmonad-contrib"; - version = "0.11.3"; - sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa"; + version = "0.11.4"; + sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3"; buildDepends = [ base containers directory extensible-exceptions mtl old-locale old-time process random unix utf8-string X11 X11-xft xmonad @@ -127535,6 +127790,7 @@ self: { base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell ]; + jailbreak = true; description = "Yet another array library"; license = stdenv.lib.licenses.mit; }) {}; @@ -127816,8 +128072,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.1.2"; - sha256 = "1qrb160jq5nniwvbv92hbsznxiwdcjbcxb6lcqdkj1ggfbhs3zp8"; + version = "1.4.2"; + sha256 = "0nzhwh9aka1a2fk9q7d1xy6wq1fvpl9kjsi4mxjqzvp61sjcmqrs"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -128561,20 +128817,19 @@ self: { "yesod-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , formatting, fsnotify, purescript, regex-tdfa, regex-tdfa-text - , shakespeare, system-fileio, system-filepath, template-haskell - , text, time, transformers, yesod-core + , formatting, fsnotify, mtl, purescript, regex-tdfa + , regex-tdfa-text, shakespeare, system-fileio, system-filepath + , template-haskell, text, time, transformers, yesod-core }: mkDerivation { pname = "yesod-purescript"; - version = "0.0.4.7"; - sha256 = "0x2mbc4ra6cn3jz3lsb0q40bwz1j7il2nly97m52n4nr18pw4fp9"; + version = "0.0.5"; + sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy"; buildDepends = [ aeson base bytestring containers data-default formatting fsnotify - purescript regex-tdfa regex-tdfa-text shakespeare system-fileio + mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; From d619392bdc944284707c400c97e0ed1502796c99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Mar 2015 11:23:44 +0200 Subject: [PATCH 774/947] hackage-packages.nix: don't update default version of 'primitive' yet --- .../haskell-modules/hackage-packages.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86811ccc7dc..de5bd42be58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8725,7 +8725,6 @@ self: { base binary bytestring containers deepseq mtl primitive transformers vector zlib ]; - jailbreak = true; homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; @@ -41798,7 +41797,6 @@ self: { version = "0.1.0.2"; sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn"; buildDepends = [ base primitive vector ]; - jailbreak = true; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; @@ -42516,7 +42514,6 @@ self: { sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; - jailbreak = true; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -47136,7 +47133,6 @@ self: { buildDepends = [ base bytestring containers primitive text transformers vector ]; - jailbreak = true; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -48035,7 +48031,6 @@ self: { 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; @@ -69285,7 +69280,6 @@ self: { version = "0.1.2.1"; sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59"; buildDepends = [ base deepseq primitive vector ]; - jailbreak = true; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = stdenv.lib.licenses.bsd3; @@ -71637,7 +71631,6 @@ self: { transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; - jailbreak = true; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76631,7 +76624,6 @@ self: { test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; @@ -81413,7 +81405,6 @@ self: { sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; description = "A native implementation of matrix operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81611,7 +81602,6 @@ self: { buildDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; - jailbreak = true; description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -87915,7 +87905,6 @@ self: { version = "0.3.7"; sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b"; buildDepends = [ base primitive vector ]; - jailbreak = true; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; }) {}; @@ -91213,7 +91202,6 @@ self: { sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; - jailbreak = true; homepage = "http://github.com/cchalmers/pcg-random"; description = "Haskell bindings to the PCG random number generator"; license = stdenv.lib.licenses.bsd3; @@ -95141,6 +95129,21 @@ self: { }) {}; "primitive" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "primitive"; + version = "0.5.4.0"; + revision = "1"; + sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; + editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; + buildDepends = [ base ghc-prim ]; + testDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive_0_6" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -100041,7 +100044,6 @@ self: { base bytestring containers directory filepath primitive repa-array repa-eval repa-stream text vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Data-parallel data flows"; license = stdenv.lib.licenses.bsd3; @@ -104894,7 +104896,6 @@ self: { sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x"; editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4"; buildDepends = [ base bytestring entropy primitive ]; - jailbreak = true; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; license = stdenv.lib.licenses.bsd3; @@ -105787,7 +105788,6 @@ self: { version = "0.1.0.1"; sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m"; buildDepends = [ base ghc-prim primitive vector ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/simd"; description = "simple interface to GHC's SIMD instructions"; license = stdenv.lib.licenses.bsd3; @@ -110375,7 +110375,6 @@ self: { buildDepends = [ base math-functions mwc-random primitive statistics ]; - jailbreak = true; homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; @@ -111650,7 +111649,6 @@ self: { QuickCheck semigroups tasty tasty-quickcheck tasty-th unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/structures"; description = "\"Advanced\" Data Structures"; license = stdenv.lib.licenses.bsd3; @@ -122085,7 +122083,6 @@ self: { version = "0.10.9.3"; sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ base deepseq ghc-prim primitive ]; - jailbreak = true; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -122122,7 +122119,6 @@ self: { isExecutable = true; buildDepends = [ base bytestring mtl mwc-random primitive vector ]; testDepends = [ base bytestring containers QuickCheck vector ]; - jailbreak = true; homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; @@ -122233,7 +122229,6 @@ self: { sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0"; buildDepends = [ base primitive storable-complex vector ]; extraLibraries = [ fftw3 ]; - jailbreak = true; homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; @@ -124431,7 +124426,6 @@ 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; @@ -127790,7 +127784,6 @@ self: { base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell ]; - jailbreak = true; description = "Yet another array library"; license = stdenv.lib.licenses.mit; }) {}; From b9dd22f1cbd2bacba3482a1a9f185f42779edaee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Mar 2015 19:07:41 +0200 Subject: [PATCH 775/947] haskell-haddock-library fails its 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 0259c202070..df458053522 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -657,6 +657,9 @@ self: super: { postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; }); + # https://github.com/haskell/haddock/issues/378 + haddock-library = dontCheck super.haddock-library; + } // { # Not on Hackage. From d75bcc16f78506d09b3c80fb464c8d6dbdaa1fb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 03:09:11 +0200 Subject: [PATCH 776/947] haskell-stringsearch no longer needs patching for GHC 7.10.x. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 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 82566d2a8db..ac5d80bbe5d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -141,10 +141,6 @@ self: super: { sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw"; stripLen = 1; }); - stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { - url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; - }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h"; From 6306f9a761c94cd82fef528a52f2143ee4277f55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 03:50:53 +0200 Subject: [PATCH 777/947] hackage-packages.nix: re-generate with recent hackage2nix --- pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index de5bd42be58..681ee00fc60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -76566,8 +76566,8 @@ self: { , binary-shared, bytestring, Cabal, conduit, conduit-extra , containers, deepseq, directory, executable-path, filepath, ghc , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri - , parsec, pretty, process, process-leksah, resourcet, strict, text - , time, transformers, unix + , parsec, pretty, process, resourcet, strict, text, time + , transformers, unix }: mkDerivation { pname = "leksah-server"; @@ -76579,8 +76579,8 @@ self: { attoparsec attoparsec-conduit base binary binary-shared bytestring Cabal conduit conduit-extra containers deepseq directory executable-path filepath ghc haddock-api hslogger HTTP ltk network - network-uri parsec pretty process process-leksah resourcet strict - text time transformers unix + network-uri parsec pretty process resourcet strict text time + transformers unix ]; testDepends = [ base conduit conduit-extra hslogger HUnit process resourcet From e568408367db74b1a09cb790b83d80427d86fef0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 14:39:11 +0200 Subject: [PATCH 778/947] Nomyx has been fixed upstream. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index df458053522..5332ca6df42 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -644,11 +644,6 @@ self: super: { # https://github.com/fumieval/audiovisual/issues/1 audiovisual = markBroken super.audiovisual; - # https://github.com/cdupont/Nomyx/issues/85 - Nomyx-Core = markBroken super.Nomyx-Core; - Nomyx-Web = dontDistribute super.Nomyx-Web; - Nomyx = dontDistribute super.Nomyx; - # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); From 179f1b788f978ca2e2f445eea8375ff5463300ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 14:47:06 +0200 Subject: [PATCH 779/947] hackage-packages.nix: downgrade blaze-html and haddock-library to fix Pandoc build --- .../haskell-modules/hackage-packages.nix | 74 +++++++++++++++---- 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 681ee00fc60..72e37fe18cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19127,7 +19127,6 @@ self: { 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; @@ -24899,7 +24898,6 @@ self: { version = "0.1.0.0"; sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw"; buildDepends = [ base blaze-html text ]; - jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; @@ -24979,6 +24977,26 @@ self: { }) {}; "blaze-html" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.7.1.0"; + sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-html_0_8_0_2" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -24993,6 +25011,7 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25046,6 +25065,25 @@ self: { }) {}; "blaze-markup" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.6.3.0"; + sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-markup_0_7_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -29299,7 +29337,6 @@ self: { aeson base blaze-html bytestring containers data-default http-types mtl syb text uniplate wai wai-extra xss-sanitize ]; - jailbreak = true; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; @@ -39364,7 +39401,6 @@ self: { base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text ]; - jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; }) {}; @@ -54562,6 +54598,23 @@ self: { }) {}; "haddock-library" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , QuickCheck + }: + mkDerivation { + pname = "haddock-library"; + version = "1.1.1"; + sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m"; + buildDepends = [ base bytestring deepseq ]; + testDepends = [ + base base-compat bytestring deepseq hspec QuickCheck + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haddock-library_1_2_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers }: @@ -55588,7 +55641,6 @@ self: { safecopy text time unordered-containers web-routes web-routes-happstack ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -58713,7 +58765,6 @@ self: { base blaze-html directory filepath HaTeX parsec text time transformers ]; - jailbreak = true; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59613,6 +59664,7 @@ self: { network process text transformers ]; testDepends = [ base containers mtl ]; + jailbreak = true; homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; @@ -70328,7 +70380,6 @@ self: { base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; - jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -78525,7 +78576,6 @@ self: { base blaze-html blaze-markup cheapskate directory filepath highlighting-kate parsec text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/cdosborn/lit"; description = "A simple tool for literate programming"; license = "GPL"; @@ -90112,7 +90162,6 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; - jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -95504,7 +95553,6 @@ self: { multiset QuickCheck quickcheck-instances template-haskell text transformers ]; - jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98969,7 +99017,6 @@ self: { version = "0.2.3"; sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; buildDepends = [ base blaze-html blaze-markup reform text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; license = stdenv.lib.licenses.bsd3; @@ -98982,7 +99029,6 @@ self: { version = "0.0.4"; sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg"; buildDepends = [ base blaze-markup reform shakespeare text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -107277,7 +107323,6 @@ self: { version = "0.2.1.2"; sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh"; buildDepends = [ base blaze-html snap-core ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; license = stdenv.lib.licenses.bsd3; @@ -117894,7 +117939,6 @@ self: { testDepends = [ base directory doctest filepath parsers QuickCheck ]; - jailbreak = true; homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; @@ -126348,7 +126392,6 @@ self: { testDepends = [ base blaze-markup bytestring old-locale text time zip-archive ]; - jailbreak = true; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -128610,7 +128653,6 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; From aba61babe3247db73d0d73a3e9390c7f132e76b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Mar 2015 15:35:36 +0200 Subject: [PATCH 780/947] haskell-pandoc: disable test suite to fix the build The errors look harmless. Reported upstream at https://github.com/jgm/pandoc/issues/2036. --- 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 5332ca6df42..d3363703f7a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -601,6 +601,9 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; + # https://github.com/jgm/pandoc/issues/2045 + pandoc = dontCheck super.pandoc; + # Broken by GLUT update. Monadius = markBroken super.Monadius; From dee2a5dda3eac6be68131c3620b532ecbc17b4fe Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 30 Mar 2015 17:37:13 +0200 Subject: [PATCH 781/947] obs-studio: fix derivation name --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a600fe8bb78..87e3047ed19 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "obs-studio"; + name = "obs-studio-${version}"; version = "0.9.1"; src = fetchurl { - url = "https://github.com/jp9000/${name}/archive/${version}.tar.gz"; + url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; }; From a2b584ba5f615a7ce7bde7cf58168d298b2c6691 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Mon, 30 Mar 2015 18:47:38 +0200 Subject: [PATCH 782/947] haskell-uhc: New version, disable broken platforms. --- pkgs/development/compilers/uhc/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index ce3f805bec3..d2b9ec63a73 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -5,13 +5,13 @@ let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.8.7"; + version = "1.1.8.10"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f"; - sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl"; + rev = "449d9578e06af1362d7f746798f0aed57ab6ca88"; + sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { homepage = "http://www.cs.uu.nl/wiki/UHC"; description = "Utrecht Haskell Compiler"; maintainers = [ maintainers.phausmann ]; - platforms = stdenv.lib.platforms.unix; + + # UHC i686 support is broken, see + # https://github.com/UU-ComputerScience/uhc/issues/52 + # + # Darwin build is broken as well at the moment. + # On Darwin, the GNU libtool is used, which does not + # support the -static flag and thus breaks the build. + platforms = ["x86_64-linux"]; }; } From 1345a65765d8fa5fd72e4d99de70c67fddc097ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Mar 2015 14:50:12 +0200 Subject: [PATCH 783/947] Remove XBMC expressions in favor of the Kodi ones --- nixos/modules/rename.nix | 5 +- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/xbmc.nix | 31 ----- ...iDoubleTapTimeoutMs-in-the-new-libCE.patch | 32 ----- pkgs/applications/video/xbmc/default.nix | 114 ------------------ pkgs/applications/video/xbmc/plugins.nix | 108 ----------------- pkgs/applications/video/xbmc/wrapper.nix | 53 -------- .../retroarch/xbmc-advanced-launchers.nix | 39 ------ pkgs/top-level/all-packages.nix | 33 +---- 9 files changed, 10 insertions(+), 407 deletions(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/xbmc.nix delete mode 100644 pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch delete mode 100644 pkgs/applications/video/xbmc/default.nix delete mode 100644 pkgs/applications/video/xbmc/plugins.nix delete mode 100644 pkgs/applications/video/xbmc/wrapper.nix delete mode 100644 pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e820b2cb9ce..07fe568697b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -107,7 +107,6 @@ in zipModules ([] ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ] ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ] ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ] -++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] @@ -136,6 +135,10 @@ in zipModules ([] ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ] +# XBMC +++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] +++ obsolete [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] + # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] ++ obsolete' [ "boot" "initrd" "luks" "enable" ] diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 9165658a7be..998bcd354c5 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./e19.nix ./gnome3.nix ./xbmc.nix ./kodi.nix + ./e19.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/xbmc.nix b/nixos/modules/services/x11/desktop-managers/xbmc.nix deleted file mode 100644 index 97e966ca019..00000000000 --- a/nixos/modules/services/x11/desktop-managers/xbmc.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.desktopManager.xbmc; -in - -{ - options = { - services.xserver.desktopManager.xbmc = { - enable = mkOption { - default = false; - example = true; - description = "Enable the xbmc multimedia center."; - }; - }; - }; - - config = mkIf cfg.enable { - services.xserver.desktopManager.session = [{ - name = "xbmc"; - start = '' - ${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone & - waitPID=$! - ''; - }]; - - environment.systemPackages = [ pkgs.xbmc ]; - }; -} \ No newline at end of file diff --git a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 91811194c9b..00000000000 --- a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix deleted file mode 100644 index 7a6840baee3..00000000000 --- a/pkgs/applications/video/xbmc/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper -, pkgconfig, cmake, gnumake, yasm, pythonFull -, boost, avahi, libdvdcss, lame, autoreconfHook -, gettext, pcre, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xproto, inputproto, libxml2 -, libXt, libXmu, libXext, xextproto -, libXinerama, libXrandr, randrproto -, libXtst, libXfixes, fixesproto, systemd -, SDL, SDL_image, SDL_mixer, alsaLib -, mesa, glew, fontconfig, freetype, ftgl -, libjpeg, jasper, libpng, libtiff -, ffmpeg, libmpeg2, libsamplerate, libmad -, libogg, libvorbis, flac, libxslt -, lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva -, curl, bzip2, zip, unzip, glxinfo, xdpyinfo -, dbus_libs ? null, dbusSupport ? true -, udev, udevSupport ? true -, libusb ? null, usbSupport ? false -, samba ? null, sambaSupport ? true -, libmicrohttpd -# TODO: would be nice to have nfsSupport (needs libnfs library) -, rtmpdump ? null, rtmpSupport ? true -, libvdpau ? null, vdpauSupport ? true -, pulseaudio ? null, pulseSupport ? true -, libcec ? null, cecSupport ? true -}: - -assert dbusSupport -> dbus_libs != null; -assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable -assert sambaSupport -> samba != null; -assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; -assert pulseSupport -> pulseaudio != null; -assert cecSupport -> libcec != null; - -stdenv.mkDerivation rec { - name = "xbmc-13.2"; - - src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz"; - sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc"; - }; - - buildInputs = [ - makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm pythonFull - boost libmicrohttpd autoreconfHook - gettext pcre yajl fribidi libva - openssl gperf tinyxml2 taglib libssh swig jre - libX11 xproto inputproto which - libXt libXmu libXext xextproto - libXinerama libXrandr randrproto - libXtst libXfixes fixesproto - SDL SDL_image SDL_mixer alsaLib - mesa glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff - ffmpeg libmpeg2 libsamplerate libmad - libogg libvorbis flac libxslt systemd - lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame - curl bzip2 zip unzip glxinfo xdpyinfo - ] - ++ lib.optional dbusSupport dbus_libs - ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb - ++ lib.optional sambaSupport samba - ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio - ++ lib.optional cecSupport libcec - ++ lib.optional rtmpSupport rtmpdump; - - dontUseCmakeConfigure = true; - - patches = [ ./0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch ]; - - preConfigure = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ - --replace 'usr/share/zoneinfo' 'etc/zoneinfo' - ./bootstrap - ''; - - configureFlags = [ - "--enable-external-libraries" - ] - ++ lib.optional (! sambaSupport) "--disable-samba" - ++ lib.optional vdpauSupport "--enable-vdpau" - ++ lib.optional pulseSupport "--enable-pulse" - ++ lib.optional rtmpSupport "--enable-rtmp"; - - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" "${pythonFull}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ - --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" - done - ''; - - meta = with stdenv.lib; { - homepage = http://xbmc.org/; - description = "Media center"; - license = stdenv.lib.licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.iElectric maintainers.titanous ]; - }; -} diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix deleted file mode 100644 index f1d4d50f37d..00000000000 --- a/pkgs/applications/video/xbmc/plugins.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchFromGitHub, xbmc }: - -let - - pluginDir = "/lib/xbmc/plugin"; - - mkXBMCPlugin = { plugin, namespace, version, src, meta, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta; - name = "xbmc-plugin-${plugin}-${version}"; - passthru = { - xbmcPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; - installPhase = '' - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d - ''; - }; - -in -{ - - advanced-launcher = mkXBMCPlugin rec { - - plugin = "advanced-launcher"; - namespace = "plugin.program.advanced.launcher"; - version = "2.5.7"; - - src = fetchFromGitHub { - owner = "Angelscry"; - repo = namespace; - rev = "f6f7980dc66d041e1635bb012d79aa8b3a8790ba"; - sha256 = "0wk41lpd6fw504q5x1h76hc99vw4jg4vq44bh7m21ism85ds0r47"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=85724"; - description = "A program launcher for XBMC"; - longDescription = '' - Advanced Launcher allows you to start any Linux, Windows and - OS X external applications (with command line support or not) - directly from the XBMC GUI. Advanced Launcher also give you - the possibility to edit, download (from Internet resources) - and manage all the meta-data (informations and images) related - to these applications. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - genesis = mkXBMCPlugin rec { - - plugin = "genesis"; - namespace = "plugin.video.genesis"; - version = "2.1.3"; - - src = fetchFromGitHub { - owner = "lambda81"; - repo = "lambda-xbmc-addons"; - rev = "f8aa34064bf31fffbb3c264af32c66bbdaf0a59e"; - sha256 = "0d197fd6n3m9knpg38frnmfhqyabvh00ridpmikyw4vzk3hx11km"; - }; - - meta = with stdenv.lib; { - homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-xbmc-addons"; - description = "The origins of streaming"; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - svtplay = mkXBMCPlugin rec { - - plugin = "svtplay"; - namespace = "plugin.video.svtplay"; - version = "4.0.9"; - - src = fetchFromGitHub { - owner = "nilzen"; - repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=67110"; - description = "Watch content from SVT Play"; - longDescription = '' - With this addon you can stream content from SVT Play - (svtplay.se). The plugin fetches the video URL from the SVT - Play website and feeds it to the XBMC video player. HLS (m3u8) - is the preferred video format by the plugin. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - -} \ No newline at end of file diff --git a/pkgs/applications/video/xbmc/wrapper.nix b/pkgs/applications/video/xbmc/wrapper.nix deleted file mode 100644 index 90413c1769a..00000000000 --- a/pkgs/applications/video/xbmc/wrapper.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, makeWrapper, xbmc, plugins }: - -let - - p = builtins.parseDrvName xbmc.name; - -in - -stdenv.mkDerivation { - - name = "xbmc-" + p.version; - version = p.version; - - buildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/share/xbmc/addons/packages - ${stdenv.lib.concatMapStrings - (plugin: "ln -s ${plugin.out - + plugin.xbmcPlugin - + "/" + plugin.namespace - } $out/share/xbmc/addons/.;") plugins} - $(for plugin in ${xbmc}/share/xbmc/addons/* - do - $(ln -s $plugin/ $out/share/xbmc/addons/.) - done) - $(for share in ${xbmc}/share/xbmc/* - do - $(ln -s $share $out/share/xbmc/.) - done) - $(for passthrough in icons xsessions applications - do - ln -s ${xbmc}/share/$passthrough $out/share/ - done) - $(for exe in xbmc{,-standalone} - do - makeWrapper ${xbmc}/bin/$exe $out/bin/$exe \ - --prefix XBMC_HOME : $out/share/xbmc; - done) - ''; - - preferLocalBuilds = true; - - meta = with xbmc.meta; { - inherit license homepage; - description = description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) - + ")"; - - }; - -} \ No newline at end of file diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix deleted file mode 100644 index 3ff15aa1258..00000000000 --- a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, pkgs, cores }: - -assert cores != []; - -with pkgs.lib; - -let - - script = exec: '' - #!${stdenv.shell} - nohup sh -c "sleep 1 && pkill -SIGSTOP xbmc" & - nohup sh -c "${exec} '$@' -f;pkill -SIGCONT xbmc" - ''; - scriptSh = exec: pkgs.writeScript ("xbmc-"+exec.name) (script exec.path); - execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores; - -in - -stdenv.mkDerivation rec { - name = "xbmc-retroarch-advanced-launchers-${version}"; - version = "0.2"; - - dontBuild = true; - - buildCommand = '' - mkdir -p $out/bin - ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/xbmc-${exec.name};") execs} - ''; - - meta = { - description = "XBMC retroarch advanced launchers"; - longDescription = '' - These retroarch launchers are intended to be used with - anglescry advanced launcher for XBMC since device input is - caught by both XBMC and the retroarch process. - ''; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d620c3823..db44de0e7de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10844,7 +10844,7 @@ let ghostscript = if stdenv.isDarwin then null else ghostscript; perl = null; # Currently Broken }; - + imagemagickBig = imagemagick; # Impressive, formerly known as "KeyJNote". @@ -12223,16 +12223,6 @@ let cores = retroArchCores; }; - wrapXBMC = { xbmc }: import ../applications/video/xbmc/wrapper.nix { - inherit stdenv lib makeWrapper xbmc; - plugins = let inherit (lib) optional; in with xbmcPlugins; - ([] - ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.xbmc.enableGenesis or false) genesis - ++ optional (config.xbmc.enableSVTPlay or false) svtplay - ); - }; - wrapKodi = { kodi }: import ../applications/video/kodi/wrapper.nix { inherit stdenv lib makeWrapper kodi; plugins = let inherit (lib) optional; in with kodiPlugins; @@ -12274,37 +12264,24 @@ let gtk = gtk2; }; - xbmcPlain = callPackage ../applications/video/xbmc { - ffmpeg = ffmpeg_1; - }; - - xbmcPlugins = recurseIntoAttrs (callPackage ../applications/video/xbmc/plugins.nix { - xbmc = xbmcPlain; - }); - - xbmc = wrapXBMC { - xbmc = xbmcPlain; - }; - kodiPlain = callPackage ../applications/video/kodi { }; + xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); + xbmcPlugins = kodiPlugins; kodi = wrapKodi { kodi = kodiPlain; }; - - xbmc-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix { - cores = retroArchCores; - }; + xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; From 703e43949d07258e9ef84992a6d3c4d92f457d50 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Mon, 30 Mar 2015 21:55:51 +0200 Subject: [PATCH 784/947] bump syncthing version to 0.10.30 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cb8d168c7db..a96fc5063d8 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.10.29"; + version = "0.10.30"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "0zpjcl4gr0r8c0qygvks58ly1k7gp2ngd4dn2d85ci4dddvmmxvj"; + sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a"; }; subPackages = [ "cmd/syncthing" ]; From 6daa2462c63f0682ea3e816ab4ed828f8576382c Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Mon, 30 Mar 2015 22:07:02 +0200 Subject: [PATCH 785/947] Enable syncthing for Mac OS X. Also requires enabling iana-etc. I'm shooting for "unix" platforms which seems reasonable. Not sure why this was restricted to linux originally -- the history doesn't tell. --- pkgs/applications/networking/syncthing/default.nix | 2 +- pkgs/data/misc/iana-etc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index a96fc5063d8..430ab70caa1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -27,6 +27,6 @@ buildGoPackage rec { description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with lib.licenses; mit; maintainers = with lib.maintainers; [ matejc ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index cc676d0b35d..6adb4575839 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sethwklein.net/projects/iana-etc/; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From cb9f2f850344fe0a533ec0d93614fce2565289f1 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 30 Mar 2015 23:30:57 +0300 Subject: [PATCH 786/947] merging ssd-guru: fix conflicts --- pkgs/tools/misc/ocz-ssd-guru/default.nix | 53 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/misc/ocz-ssd-guru/default.nix diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix new file mode 100644 index 00000000000..7ee6089c249 --- /dev/null +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -0,0 +1,53 @@ +{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: + +let + system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; +in +stdenv.mkDerivation rec { + name = "ocz-ssd-guru-${version}"; + version = "1.0.1170"; + + src = fetchurl { + url = "http://ocz.com/consumer/download/ssd-guru/SSDGuru_${version}.tar.gz"; + sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; + }; + + buildInputs = [ makeWrapper ]; + + libPath = stdenv.lib.makeLibraryPath [ + xlibs.libX11 + xlibs.libxcb + freetype + fontconfig + xlibs.libXext + xlibs.libXi + xlibs.libXrender + stdenv.cc.cc + glibc + mesa + ]; + + installPhase = '' + mkdir -p $out/bin + cp ${system}/SSDGuru $out/bin/ + rm -rf linux{32,64} + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath:$out \ + $out/bin/SSDGuru + + wrapProgram $out/bin/SSDGuru --prefix LD_LIBRARY_PATH : $libPath + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = { + homepage = http://ocz.com/ssd-guru; + description = "SSD Management Tool for OCZ disks"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3e424e326..dd7a26c9ec9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2483,6 +2483,8 @@ let sip = pythonPackages.sip_4_16; }; + ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; From b15078b579770e6ecf451416aac64604be8f942d Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Mon, 30 Mar 2015 23:54:21 +0200 Subject: [PATCH 787/947] Provide a basic package for sensu. The server currently starts without error messages (on OS X) if you also install redis and rabbitmq-server and start their processes without any further configuration: $ redis-server $ rabbitmq-server $ sensu-server Haven't tried much more yet, but will in a bit. (Amended: fix whitespace and string literal formatting issues, and superfluous dependencies created by the generator script. Thanks the-kenny!) --- lib/maintainers.nix | 1 + pkgs/servers/monitoring/sensu/Gemfile | 2 + pkgs/servers/monitoring/sensu/Gemfile.lock | 75 +++++++ pkgs/servers/monitoring/sensu/default.nix | 19 ++ pkgs/servers/monitoring/sensu/gemset.nix | 242 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 341 insertions(+) create mode 100644 pkgs/servers/monitoring/sensu/Gemfile create mode 100644 pkgs/servers/monitoring/sensu/Gemfile.lock create mode 100644 pkgs/servers/monitoring/sensu/default.nix create mode 100644 pkgs/servers/monitoring/sensu/gemset.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 05fbad6634a..7ec31f0aad3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -189,6 +189,7 @@ tailhook = "Paul Colomiets "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; + theuni = "Christian Theune "; thoughtpolice = "Austin Seipp "; titanous = "Jonathan Rudenberg "; tomberek = "Thomas Bereknyei "; diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/servers/monitoring/sensu/Gemfile new file mode 100644 index 00000000000..ebee9f25721 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'sensu' diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock new file mode 100644 index 00000000000..9f58be03b62 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -0,0 +1,75 @@ +GEM + remote: https://rubygems.org/ + specs: + amq-protocol (1.9.2) + amqp (1.5.0) + amq-protocol (>= 1.9.2) + eventmachine + async_sinatra (1.0.0) + rack (>= 1.4.1) + sinatra (>= 1.3.2) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + daemons (1.2.2) + em-redis-unified (0.6.0) + eventmachine (>= 0.12.10) + em-worker (0.0.2) + eventmachine + eventmachine (1.0.3) + ffi (1.9.8) + multi_json (1.11.0) + rack (1.6.0) + rack-protection (1.5.3) + rack + sensu (0.17.1) + async_sinatra (= 1.0.0) + em-redis-unified (= 0.6.0) + eventmachine (= 1.0.3) + multi_json (= 1.11.0) + sensu-em (= 2.4.1) + sensu-extension (= 1.1.2) + sensu-extensions (= 1.2.0) + sensu-logger (= 1.0.0) + sensu-settings (= 1.3.0) + sensu-spawn (= 1.1.0) + sensu-transport (= 2.4.0) + sinatra (= 1.3.5) + thin (= 1.5.0) + uuidtools (= 2.1.4) + sensu-em (2.4.1) + sensu-extension (1.1.2) + sensu-em + sensu-extensions (1.2.0) + multi_json + sensu-em + sensu-extension + sensu-logger + sensu-settings + sensu-logger (1.0.0) + multi_json + sensu-em + sensu-settings (1.3.0) + multi_json + sensu-spawn (1.1.0) + childprocess (= 0.5.3) + em-worker (= 0.0.2) + sensu-em + sensu-transport (2.4.0) + amqp (= 1.5.0) + sensu-em + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) + tilt (~> 1.3, >= 1.3.3) + thin (1.5.0) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + tilt (1.4.1) + uuidtools (2.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + sensu diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix new file mode 100644 index 00000000000..2785898bed5 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -0,0 +1,19 @@ + { lib, bundlerEnv, ruby }: + + bundlerEnv { + name = "sensu-0.17.1"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A monitoring framework that aims to be simple, malleable, +and scalable."; + homepage = http://sensuapp.org/; + license = with licenses; mit; + maintainers = with maintainers; [ theuni ]; + platforms = platforms.unix; + }; + } diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix new file mode 100644 index 00000000000..116bce9c4b5 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -0,0 +1,242 @@ +{ + "amq-protocol" = { + version = "1.9.2"; + source = { + type = "gem"; + sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r"; + }; + }; + "amqp" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c"; + }; + dependencies = [ + "amq-protocol" + "eventmachine" + ]; + }; + "async_sinatra" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a"; + }; + dependencies = [ + "rack" + "sinatra" + ]; + }; + "childprocess" = { + version = "0.5.3"; + source = { + type = "gem"; + sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww"; + }; + dependencies = [ + "ffi" + ]; + }; + "daemons" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3"; + }; + }; + "em-redis-unified" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0"; + }; + dependencies = [ + "eventmachine" + ]; + }; + "em-worker" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; + }; + dependencies = [ + "eventmachine" + ]; + }; + "eventmachine" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "rack" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + }; + }; + "rack-protection" = { + version = "1.5.3"; + source = { + type = "gem"; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + }; + dependencies = [ + "rack" + ]; + }; + "sensu" = { + version = "0.17.1"; + source = { + type = "gem"; + sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj"; + }; + dependencies = [ + "async_sinatra" + "em-redis-unified" + "eventmachine" + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-extensions" + "sensu-logger" + "sensu-settings" + "sensu-spawn" + "sensu-transport" + "sinatra" + "thin" + "uuidtools" + ]; + }; + "sensu-em" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy"; + }; + }; + "sensu-extension" = { + version = "1.1.2"; + source = { + type = "gem"; + sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24"; + }; + dependencies = [ + "sensu-em" + ]; + }; + "sensu-extensions" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81"; + }; + dependencies = [ + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-logger" + "sensu-settings" + ]; + }; + "sensu-logger" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93"; + }; + dependencies = [ + "multi_json" + "sensu-em" + ]; + }; + "sensu-settings" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga"; + }; + dependencies = [ + "multi_json" + ]; + }; + "sensu-spawn" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v"; + }; + dependencies = [ + "childprocess" + "em-worker" + "sensu-em" + ]; + }; + "sensu-transport" = { + version = "2.4.0"; + source = { + type = "gem"; + sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06"; + }; + dependencies = [ + "amqp" + "sensu-em" + ]; + }; + "sinatra" = { + version = "1.3.5"; + source = { + type = "gem"; + sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr"; + }; + dependencies = [ + "rack" + "rack-protection" + "tilt" + ]; + }; + "thin" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1"; + }; + dependencies = [ + "daemons" + "eventmachine" + "rack" + ]; + }; + "tilt" = { + version = "1.4.1"; + source = { + type = "gem"; + sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; + }; + }; + "uuidtools" = { + version = "2.1.4"; + source = { + type = "gem"; + sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd7a26c9ec9..3790c8891af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8546,6 +8546,8 @@ let seyren = callPackage ../servers/monitoring/seyren { }; + sensu = callPackage ../servers/monitoring/sensu { }; + shishi = callPackage ../servers/shishi { }; sipcmd = callPackage ../applications/networking/sipcmd { }; From fc3a714053df8f47a82e53b723528417da306d2e Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Fri, 27 Mar 2015 16:59:46 +0100 Subject: [PATCH 788/947] gnu-smalltalk: new package --- .../compilers/gnu-smalltalk/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/compilers/gnu-smalltalk/default.nix diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix new file mode 100644 index 00000000000..f001de2700d --- /dev/null +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, +gnutls, gnome, cairo, SDL, sqlite }: + +let # The gnu-smalltalk project has a dependency to the libsigsegv library. + # The project ships with sources for this library, but deprecated this option. + # Using the vanilla libsigsegv library results in error: "cannot relocate [...]" + # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags + # does not help, the error still occurs. The only solution is to build a + # shared version of libsigsegv. + libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: { + configureFlags = [ "--enable-shared" ]; + }); + +in stdenv.mkDerivation rec { + + version = "3.2.5"; + name = "gnu-smalltalk-${version}"; + + src = fetchurl { + url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; + sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"; + }; + + # The dependencies and their justification are explained at + # http://smalltalk.gnu.org/download + buildInputs = [ + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + cairo SDL sqlite + ]; + + configureFlags = [ "--without-emacs" ]; + + # For some reason the tests fail if executated with nix-build, but pass if + # executed within nix-shell --pure. + doCheck = false; + + meta = with stdenv.lib; { + description = "A free implementation of the Smalltalk-80 language"; + longDescription = '' + GNU Smalltalk is a free implementation of the Smalltalk-80 language. It + runs on most POSIX compatible operating systems (including GNU/Linux, of + course), as well as under Windows. Smalltalk is a dynamic object-oriented + language, well-versed to scripting tasks. + ''; + homepage = http://smalltalk.gnu.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6331aa8cadd..8fb9dc89865 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3556,6 +3556,8 @@ let inherit fetchurl stdenv; }); + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; + gccgo = gccgo48; gccgo48 = wrapCC (gcc48.cc.override { From 1129f6b0dbc3b7739972c9b0e53359633f32b31b Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 30 Mar 2015 23:48:25 +0100 Subject: [PATCH 789/947] mono 3.8.0 -> 3.12.1 monodevelop 5.1.4.0 -> 5.7.0.660 --- .../editors/monodevelop/default.nix | 62 +++++++++++++++---- pkgs/development/compilers/mono/default.nix | 6 +- .../libraries/gnome-sharp/default.nix | 2 + 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 737576a1da0..4e8e6079ff1 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,26 +1,61 @@ -{stdenv, fetchgit +{ stdenv, fetchurl, fetchgit , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome-sharp +, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip }: stdenv.mkDerivation rec { - version = "5.1.4.0"; - revision = "7d45bbe2ee22625f125d0c52548524f02d005cca"; + version = "5.7.0.660"; + revision = "6a74f9bdb90d9415b597064d815c9be38b401fee"; name = "monodevelop-${version}"; - src = fetchgit { - url = https://github.com/mono/monodevelop.git; - rev = revision; - sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b"; - }; + + srcs = [ + (fetchurl { + url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip"; + sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip"; + sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; + }) + (fetchgit { + url = "https://github.com/mono/nuget-binary.git"; + rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8"; + sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki"; + }) + ]; + + sourceRoot = "monodevelop-5.7"; + + 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 -v -p packages/NUnit.2.6.3/lib + cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib + mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib + cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib + + # cecil needs NUnit 2.5.10 - this is also missing from the tar + cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10 + + # the tar doesn't include the nuget binary, so grab it from github and copy it + # into the right place + cp -vfR ../nuget-binary-*/* external/nuget-binary/ + ''; buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp + mono gtk-sharp gnome-sharp unzip ]; preConfigure = "patchShebangs ./configure"; preBuild = '' - cat > ./main/buildinfo < ./buildinfo < export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${glib}/lib:${gnome.libgnomeui}/lib:${gnome.gnome_vfs}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH > EOF done @@ -43,5 +78,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 8137b2a3ab3..a9e0dd89e84 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "3.8.0"; + version = "3.12.1"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i"; + sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x"; }; buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5818726e345..59f97e46bef 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { patches = [ ./Makefile.in.patch ]; + dontStrip = true; + meta = with stdenv.lib; { homepage = http://www.mono-project.com/docs/gui/gtksharp/; description = "A .NET language binding for assorted GNOME libraries"; From be7f104502cf6c6e5ae95f3af8c624cb436c7fd1 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 30 Mar 2015 23:50:45 +0100 Subject: [PATCH 790/947] sg: add setuid wrapper. (newgrp is a symlink to sg and was already setuid). sudo: add ability for wheel users to change group (as well as user) --- nixos/modules/programs/shadow.nix | 2 +- nixos/modules/security/sudo.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 5c2ea07c554..895ecb122cb 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -100,7 +100,7 @@ in chgpasswd = { rootOK = true; }; }; - security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" + security.setuidPrograms = [ "passwd" "chfn" "su" "sg" "newgrp" "newuidmap" "newgidmap" # new in shadow 4.2.x ]; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index d42a8c7f7d2..bced2a6ed75 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -77,7 +77,7 @@ in root ALL=(ALL) SETENV: ALL # Users in the "wheel" group can do anything. - %wheel ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL + %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL ${cfg.extraConfig} ''; From c7362b6b039546ca1895e37d048697054cb4b8f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Mar 2015 21:04:30 +0200 Subject: [PATCH 791/947] netsniff-ng: 0.5.9-rc4-{49-g6f54288 -> 53-gdd5d906} Fixes a bug that prevented mz from working at all. --- 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 e8436c040fd..748f2ddebec 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -3,14 +3,14 @@ , pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.5.9-rc4-49-g6f54288"; + version = "v0.5.9-rc4-53-gdd5d906"; name = "netsniff-ng-${version}"; src = fetchFromGitHub rec { # Upstream recommends and supports git repo = "netsniff-ng"; owner = repo; - rev = "6f542884d002d55d517a50dd9892068e95400b25"; - sha256 = "0j7rqigfn9zazmzi8w3hapzi8028jr3q27lwyjw7k7lpnayj5iaa"; + rev = "dd5d906c40db5264d8d33c37565b39540f0258c8"; + sha256 = "0iwnfjbxiv10zk5mfpnvs2xb88f14hv1a156kn9mhasszknp0a57"; }; buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack From ee7c9bd86a8ab999b5a50f7c184aad4b85cbae2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 00:45:06 +0200 Subject: [PATCH 792/947] Add simple-scan 3.16.0.1 --- .../graphics/simple-scan/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/graphics/simple-scan/default.nix diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix new file mode 100644 index 00000000000..b47a8215fd4 --- /dev/null +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 +, makeWrapper, pkgconfig, saneBackends, systemd, vala }: + +let version = "3.16.0.1"; in +stdenv.mkDerivation rec { + name = "simple-scan-${version}"; + + src = fetchurl { + sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma"; + url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz"; + }; + + meta = with stdenv.lib; { + description = "Simple scanning utility"; + longDescription = '' + A really easy way to scan both documents and photos. You can crop out the + bad parts of a photo and rotate it if it is the wrong way round. You can + print your scans, export them to pdf, or save them in a range of image + formats. Basically a frontend for SANE - which is the same backend as + XSANE uses. This means that all existing scanners will work and the + interface is well tested. + ''; + homepage = https://launchpad.net/simple-scan; + license = with licenses; gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper + pkgconfig saneBackends systemd vala ]; + + enableParallelBuilding = true; + + doCheck = true; + + preFixup = '' + wrapProgram "$out/bin/simple-scan" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3790c8891af..224d2ca013d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11662,6 +11662,8 @@ let gtk = gtk3; }; + simple-scan = callPackage ../applications/graphics/simple-scan { }; + siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; From 6a4370f1ba45be5cc78375c2c3b2c2704e9270c1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 31 Mar 2015 01:50:47 +0200 Subject: [PATCH 793/947] qca2: Update to new upstream version 2.1.0. This also removes qca2_ossl, because it's now bundled with the main QCA package and we can now drop all those patches and build system fixes, because they have switched from autotools to cmake. Tested against a few builds like PSI and Tomahawk. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 3 +- pkgs/applications/misc/kdeconnect/default.nix | 8 ++--- .../instant-messengers/psi/default.nix | 7 ++-- pkgs/development/libraries/qca2/default.nix | 30 +++++------------ pkgs/development/libraries/qca2/gcc47.patch | 12 ------- pkgs/development/libraries/qca2/ossl.nix | 33 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 7 files changed, 14 insertions(+), 83 deletions(-) delete mode 100644 pkgs/development/libraries/qca2/gcc47.patch delete mode 100644 pkgs/development/libraries/qca2/ossl.nix diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index eb26e2b66c4..60e66b9f591 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ "${phonon_backend_vlc}/lib/kde4/plugins" - "${qca2_ossl}/lib/qt4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index dcb83d7a79d..51b7b90ca4e 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl +{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 , qjson }: @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ]; - - postInstall = '' - wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins - ''; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 5750476cc5c..784bda5e0cd 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib +, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib , libXScrnSaver, scrnsaverproto }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver + qca2 pkgconfig which glib scrnsaverproto libXScrnSaver ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" - PSI_QT_PLUGINS="$out/share/psi" - mkdir -p "$PSI_QT_PLUGINS"/crypto - ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; meta = { diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 952bdfa29ce..7890017b55b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,32 +1,18 @@ -{ stdenv, fetchurl, which, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.0.3"; - + name = "qca-2.1.0"; + src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2"; - sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld"; + url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz"; + sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92"; }; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ which ]; - preBuild = - '' - sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ - EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' - ''; - - patches = [ ./gcc47.patch ]; - - configureFlags = "--no-separate-debug-info"; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch deleted file mode 100644 index 08711884a57..00000000000 --- a/pkgs/development/libraries/qca2/gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html ---- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200 -+++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200 -@@ -214,7 +214,7 @@ - - SecureVector(u32bit n = 0) { MemoryRegion::init(true, n); } - SecureVector(const T in[], u32bit n) -- { MemoryRegion::init(true); set(in, n); } -+ { MemoryRegion::init(true); this->set(in, n); } - SecureVector(const MemoryRegion& in) - { MemoryRegion::init(true); set(in); } - SecureVector(const MemoryRegion& in1, const MemoryRegion& in2) diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix deleted file mode 100644 index d2b8778aa14..00000000000 --- a/pkgs/development/libraries/qca2/ossl.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}: - -stdenv.mkDerivation rec { - version = "2.0.0-beta3"; - name = "qca-ossl-${version}"; - src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; - sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; - }; - # SVN version has stabilized and has a lot of fixes for fresh OpenSSL - # Take the main source from there - git_src = fetchgit { - url = git://anongit.kde.org/qca; - rev = "0a8b9db6613f2282fe492ff454412f502a6be410"; - sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1"; - }; - buildInputs = [ qt4 qca2 openssl ]; - nativeBuildInputs = [ which ]; - dontAddPrefix = true; - configureFlags="--no-separate-debug-info --with-qca=${qca2} - --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; - preConfigure='' - cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp . - - configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" - ''; - meta = with stdenv.lib; { - description = "Qt Cryptographic Architecture OpenSSL plugin"; - license = "LGPL"; - homepage = http://delta.affinix.com/qca; - maintainers = [ maintainers.urkud ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 224d2ca013d..8b7a59cf378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7252,9 +7252,7 @@ let re2 = callPackage ../development/libraries/re2 { }; - qca2 = callPackage ../development/libraries/qca2 {}; - - qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; From 62ad004862f52181ce59f2cecbe28e076f5b2d51 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 31 Mar 2015 03:17:43 +0300 Subject: [PATCH 794/947] apulse: update --- pkgs/misc/apulse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 1a249cc6a2c..cb27a9bf0d3 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "i-rinat"; repo = "apulse"; rev = "v${version}"; - sha256 = "115z5a0n8lkcqfgz0cgvjw3p7d0nvzfxzd9g0h137ziflyx3ysh1"; + sha256 = "0ypirj7srdspbqhgi74a4blmb1g4sgvz96abw4m8y1fils4ysdgj"; }; buildInputs = From cde096f440b07a4eed2590c630f2cc92422e4004 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 31 Mar 2015 03:18:42 +0300 Subject: [PATCH 795/947] xkblayout-state: fix name --- pkgs/applications/misc/xkblayout-state/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index de1abff9c16..4ff838db653 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "xkblayout-state"; + name = "xkblayout-state-${version}"; version = "1b"; src = fetchurl { From f67ce9160d6ed42b3860a70d52be303b03f881e4 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Mon, 30 Mar 2015 22:59:04 -0400 Subject: [PATCH 796/947] pencil: v2.0.5 -> v2.0.8 Switch to actively developed fork. --- pkgs/applications/graphics/pencil/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 737baf375d1..c9f1fc91328 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,33 +1,32 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - name = "pencil-2.0.5"; + version = "2.0.8"; + name = "pencil-${version}"; src = fetchurl { - url = "http://evoluspencil.googlecode.com/files/${name}.tar.gz"; - sha256 = "0rn5nb08p8wph5s5gajkil6y06zgrm86p4gnjdgv76czx1fqazm0"; + url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; + sha256 = "3426d0222b213649e448b06384556718c833667394f442682ff66da3cda1b881"; }; - # Pre-built package - buildPhase = "true"; + buildPhase = ""; installPhase = '' mkdir -p "$out" cp -r usr/* "$out" - cp COPYING "$out/share/pencil" sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \ - -e "s|/usr/share/pencil|$out/share/pencil|" \ + -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ -i "$out/bin/pencil" sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ - -e "s|Icon=.*|Icon=$out/share/pencil/skin/classic/icon.svg|" \ + -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ -i "$out/share/applications/pencil.desktop" ''; meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = http://pencil.evolus.vn/; + homepage = http://github.com/prikhi/pencil; license = licenses.gpl2; # Commercial license is also available - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor prikhi ]; platforms = platforms.linux; }; } From a6303c724f75d9945f3bf906134f8ae660294877 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 16:05:22 -0500 Subject: [PATCH 797/947] libmad: build on Darwin --- pkgs/development/libraries/libmad/default.nix | 7 +- .../libraries/libmad/optimize.diff | 77 +++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libmad/optimize.diff diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 883ad072c7b..7739c3627ec 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; - patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]; + patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ] + # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad + # It is included here in order to fix a build failure in Clang + # But it may be useful to fix other, currently unknown problems as well + ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ]; nativeBuildInputs = [ autoconf ]; @@ -22,6 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libmad/optimize.diff b/pkgs/development/libraries/libmad/optimize.diff new file mode 100644 index 00000000000..1418dc92707 --- /dev/null +++ b/pkgs/development/libraries/libmad/optimize.diff @@ -0,0 +1,77 @@ +Index: libmad-0.15.1b/configure.ac +=================================================================== +--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000 ++++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000 +@@ -124,71 +124,7 @@ + + if test "$GCC" = yes + then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac ++ optimize="-O2" + fi + + case "$host" in From 54dab782bea50e03d31d241c72eda16b799b8deb Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 31 Mar 2015 01:11:57 -0400 Subject: [PATCH 798/947] twelf: fix by actually including the Twelf SML heap image in the package and referencing the SML interpreter so the smlnj package won't be gc'd --- pkgs/applications/science/logic/twelf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 4d97f0480bb..7d5724967c1 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - rsync -av bin/* $out/bin/ + rsync -av bin/{*,.heap} $out/bin/ + bin/.mkexec ${smlnj}/bin/sml $out/ twelf-server twelf-server mkdir -p $out/share/emacs/site-lisp/twelf/ rsync -av emacs/ $out/share/emacs/site-lisp/twelf/ From 40125355714cbf1edc707a9dee4c16c631d0f75b Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 01:27:36 -0400 Subject: [PATCH 799/947] Fix impurity in OpenEXR + IlmBase --- .../development/libraries/ilmbase/bootstrap.patch | 15 +++++++++++++++ pkgs/development/libraries/ilmbase/default.nix | 6 ++++-- .../development/libraries/openexr/bootstrap.patch | 15 +++++++++++++++ pkgs/development/libraries/openexr/default.nix | 2 ++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/ilmbase/bootstrap.patch create mode 100644 pkgs/development/libraries/openexr/bootstrap.patch diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch new file mode 100644 index 00000000000..db6af6daebd --- /dev/null +++ b/pkgs/development/libraries/ilmbase/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap +--- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 7f8147261ce..816a9c023e1 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openexr, automake, autoconf, libtool }: +{ stdenv, openexr, automake, autoconf, libtool, which }: stdenv.mkDerivation { name = "ilmbase-${openexr.source.version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { ./bootstrap ''; - buildInputs = [ automake autoconf libtool ]; + buildInputs = [ automake autoconf libtool which ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch new file mode 100644 index 00000000000..af6669c16a4 --- /dev/null +++ b/pkgs/development/libraries/openexr/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap +--- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index fcb27c2c0cc..63a8c11a341 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ ilmbase zlib ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; From d711528c8bbf36c91675a56365cf3c7578cea557 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 31 Mar 2015 05:36:28 +0000 Subject: [PATCH 800/947] pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level notmuch Looks like this is the only way to do what 6258728318fe55faef64285e614fe97edc7b9111 was expected to do that doesn't break things and doesn't look like a complete hack. The problem is that different `fetch`ers generate very different results (from archive files to plain source trees) and allowing overriding `src` in top-level derivation when there is a derived python package is no trivial matter. --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 43e04ed8a39..4304520383e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { name = "notmuch-0.19"; + passthru = { + pythonSourceRoot = "${name}/bindings/python"; + }; + src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d94481a524c..3b301cecd34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7075,7 +7075,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; + sourceRoot = pkgs.notmuch.pythonSourceRoot; buildInputs = with self; [ python pkgs.notmuch ]; From 20428cd90f2928c438283bc757a7f09ad0a73d9e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 31 Mar 2015 09:14:38 +0200 Subject: [PATCH 801/947] Add veriT. --- .../science/logic/verit/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/logic/verit/default.nix diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix new file mode 100644 index 00000000000..16a45cca644 --- /dev/null +++ b/pkgs/applications/science/logic/verit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gmp, flex, bison }: + +stdenv.mkDerivation rec { + name = "veriT-${version}"; + version = "201410"; + + src = fetchurl { + url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; + sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3"; + }; + + buildInputs = [ gmp flex bison ]; + + enableParallelBuilding = false; + + makeFlags = [ + "EXTERN=" # use system copy of gmp + ]; + + installPhase = '' + install -D -m0755 veriT $out/bin/veriT + ''; + + meta = with stdenv.lib; { + description = "An open, trustable and efficient SMT-solver"; + homepage = http://www.verit-solver.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b7a59cf378..593a2395319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13413,6 +13413,8 @@ let verifast = callPackage ../applications/science/logic/verifast {}; + veriT = callPackage ../applications/science/logic/verit {}; + why3 = callPackage ../applications/science/logic/why3 {}; yices = callPackage ../applications/science/logic/yices {}; From 3fe7f80ef28ae380f5d5676aa65430793105b47a Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 30 Mar 2015 14:15:04 -0430 Subject: [PATCH 802/947] symbola: advance to version 7.21, correcting hash error --- pkgs/data/fonts/symbola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 478c72a865c..d70fe3ca3f8 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "symbola-7.19"; + name = "symbola-7.21"; src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "1g7ngcxffrb9vqnmb0w9jmp349f48s0gsbi69b3g108vs8cacrmd"; + sha256 = "0sqmvq8c8wn4xq0p25gd2jfyjqi8jhiycqah19wzq1gqkaaw94nq"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "16f37fsi2zyy3ka409g3m5d9c09l0ba3rqkz912j90p4588dvk85"; + sha256 = "0jjjydb6c0glfb6krvdyi9kh5bsx9gz5w66j378bdqgkrvspl0d2"; }; buildInputs = [ unzip ]; From 7f573ee2c618f790522d9dacb9d78a31d15fdbfe Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Mon, 30 Mar 2015 12:52:16 +0100 Subject: [PATCH 803/947] Add nameparser python package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d94481a524c..11ca9f2d0df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6806,6 +6806,22 @@ 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; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + nbxmpp = buildPythonPackage rec { name = "nbxmpp-0.5.2"; From 2758e7c246279992e117c1bbf9e92bb1bb4bdafb Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 30 Mar 2015 23:47:18 -0430 Subject: [PATCH 804/947] gdal: add libpng (for mysql workbench support) --- pkgs/development/libraries/gdal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 579d22ad754..7722dd83183 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, libpng }: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -19,6 +20,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg}" "--with-libtiff=${libtiff}" # optional (without largetiff support) + "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" From 39a3fd145411fcdaa2d535b583d55ea839f8f98d Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 31 Mar 2015 01:50:31 -0430 Subject: [PATCH 805/947] pure: advance to version 0.64; use llvm 3.5 as 3.6 breaks the build --- pkgs/development/interpreters/pure/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index bfa47693de0..2860aceb383 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.63"; + version="0.64"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29"; + sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg"; }; buildInputs = [ bison flex makeWrapper ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { linux; license = lib.licenses.gpl3Plus; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 593a2395319..4d8e714554b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4592,7 +4592,9 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure { }; + pure = callPackage ../development/interpreters/pure { + llvm = llvm_35; + }; pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; python = python2; From ff1bccdbd57ca1254ba4c3ab4d538fb525293ba9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 01:37:05 +0200 Subject: [PATCH 806/947] python-packages: gdrivefs 0.14.2 -> 0.14.3 --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d94481a524c..f3dade7d0f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4939,13 +4939,15 @@ let }; gdrivefs = buildPythonPackage rec { - version = "0.14.2"; + version = "0.14.3"; name = "gdrivefs-${version}"; disabled = !isPy27; - src = pkgs.fetchurl { - url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; - sha256 = "0cfx9y1kqikrn3ngyl93k9f939hf1h7adqv0lpfri8m8glszhchz"; + src = pkgs.fetchFromGitHub { + sha256 = "1ljkh1871lwzn5lhhgbmbf2hfnbnajr3ddz3q5n1kid25qb3l086"; + rev = version; + repo = "GDriveFS"; + owner = "dsoprea"; }; buildInputs = with self; [ gipc greenlet httplib2 six ]; From 2032740ea628d3c6d1859e9323d41a79da0f27a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 02:25:27 +0200 Subject: [PATCH 807/947] gparted 0.21.0 -> 0.22.0 --- pkgs/tools/misc/gparted/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index e4557e6ae0b..e5c814faa4a 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -2,11 +2,11 @@ , pkgconfig, gtkmm, libxml2 }: stdenv.mkDerivation rec { - name = "gparted-0.21.0"; + name = "gparted-0.22.0"; src = fetchurl { + sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda"; url = "mirror://sourceforge/gparted/${name}.tar.bz2"; - sha256 = "1ab56pplnlnqnhvvgfx1s47g9iz78sb048xlwv7v7hzzx16c73rr"; }; configureFlags = "--disable-doc"; @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = with stdenv.lib; { description = "Graphical disk partitioning tool"; longDescription = '' From 6644bca846a8b67fe2ba4c3a9de51009e84c37fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Mar 2015 13:53:36 +0200 Subject: [PATCH 808/947] idris: fix build by providing appropriate versions of the build inputs Resolves https://github.com/NixOS/nixpkgs/issues/7014. --- .../configuration-ghc-7.8.x.nix | 8 +- .../haskell-modules/hackage-packages.nix | 75 +++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) 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 e53ea6fc4c8..5ca00b278fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -46,12 +46,14 @@ self: super: { # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + blaze-markup = self.blaze-markup_0_6_2_0; + blaze-html = self.blaze-html_0_7_0_3; + haskeline = self.haskeline_0_7_2_1; + lens = self.lens_4_7; + mtl = super.mtl_2_2_1; transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_2_1; - mtl = super.mtl_2_2_1; })) (drv: { - jailbreak = true; # idris is scared of lens 4.7 patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 72e37fe18cf..83bd636fc7d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24976,6 +24976,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_7_0_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.7.0.3"; + sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework @@ -25064,6 +25084,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_6_2_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.6.2.0"; + sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -76644,6 +76683,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens_4_7" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, comonad + , containers, contravariant, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, hlint, HUnit, mtl, nats, parallel, primitive + , profunctors, QuickCheck, reflection, semigroupoids, semigroups + , simple-reflect, split, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.7"; + revision = "2"; + sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; + editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; + buildDepends = [ + array base bifunctors bytestring comonad containers contravariant + distributive exceptions filepath free ghc-prim hashable mtl + parallel primitive profunctors reflection semigroupoids semigroups + split tagged template-haskell text transformers transformers-compat + unordered-containers vector void + ]; + testDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect split test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, comonad , containers, contravariant, deepseq, directory, distributive From f8c1aa96b8cec8c1769ec3ef15e0d12fdd96072e Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 31 Mar 2015 15:11:47 +0300 Subject: [PATCH 809/947] apulse: fix sha --- pkgs/misc/apulse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index cb27a9bf0d3..fc297ca9553 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "i-rinat"; repo = "apulse"; rev = "v${version}"; - sha256 = "0ypirj7srdspbqhgi74a4blmb1g4sgvz96abw4m8y1fils4ysdgj"; + sha256 = "0b384dr415flxk3n4abfwfljlh7vvr1g9gad15zc5fgbyxsinv12"; }; buildInputs = From bb383741583bbaff7180ed77530a62968d1eaddb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Mar 2015 14:10:01 +0200 Subject: [PATCH 810/947] haskell-xmonad-contrib: fix build --- 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 d3363703f7a..685dbc5f0e8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -658,6 +658,14 @@ self: super: { # https://github.com/haskell/haddock/issues/378 haddock-library = dontCheck super.haddock-library; + # Already fixed in upstream darcs repo. + xmonad-contrib = overrideCabal super.xmonad-contrib (drv: { + patchPhase = '' + sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs + sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs + ''; + }); + } // { # Not on Hackage. From 9ce8d10daef3cae718aa22f6ebce079a00e255d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Mar 2015 14:20:41 +0200 Subject: [PATCH 811/947] haskell-cartel supports GHC 7.10.1 now. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 1 file changed, 1 deletion(-) 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 ac5d80bbe5d..fb58da83f34 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -107,7 +107,6 @@ self: super: { # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. barecheck = doJailbreak super.barecheck; - cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; From 1a77b59a8520b4d4ecbd06508de323e0f76c8ca2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 15:54:06 +0200 Subject: [PATCH 812/947] Add geolite-legacy 2015-03-26 The geoip package only installs a GeoIP _library_ which is useless without a GeoIP _database_. The only package to currently install such a database is ntopng, which manually downloads Maxmind's GeoLite Legacy files to a private location. Provide these as a separate package so other packages can use them as well. --- pkgs/data/misc/geolite-legacy/builder.sh | 19 ++++++++++ pkgs/data/misc/geolite-legacy/default.nix | 43 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/data/misc/geolite-legacy/builder.sh create mode 100644 pkgs/data/misc/geolite-legacy/default.nix diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh new file mode 100644 index 00000000000..1886d144e48 --- /dev/null +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +source "$stdenv/setup" + +mkdir -p $out/share/GeoIP +cd $out/share/GeoIP + +# Iterate over all environment variable names beginning with "src": +for var in "${!src@}"; do + # Store the value of the variable with name $var in $src: + eval src="\$$var" + + # Copy $src to current directory, removing Nix hash from the filename: + dest="${src##*/}" + dest="${dest#*-}" + cp "$src" "$dest" +done + +gunzip -v *.gz diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix new file mode 100644 index 00000000000..c36e6f83106 --- /dev/null +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl }: + +# 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. +let version = "2015-03-26"; in +stdenv.mkDerivation { + name = "geolite-legacy-${version}"; + + srcGeoIP = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz; + sha256 = "01xw896n9wcm1pv7sixfbh4gv6isl6m1i6lwag1c2bbcx6ci1zvr"; + }; + srcGeoIPv6 = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz; + sha256 = "07l10hd7fkgk1nbw5gx4hjp61kdqqgri97fidn78dlk837rb02d0"; + }; + srcGeoLiteCity = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; + sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; + }; + srcGeoLiteCityv6 = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz; + sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; + }; + srcGeoIPASNum = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz; + sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; + }; + srcGeoIPASNumv6 = fetchurl { + url = https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz; + sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; + }; + + meta = with stdenv.lib; { + description = "GeoLite Legacy IP geolocation databases"; + homepage = https://geolite.maxmind.com/download/geoip; + license = with licenses; cc-by-sa-30; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + builder = ./builder.sh; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d8e714554b..31c2bb7d91b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9676,6 +9676,8 @@ let gentium = callPackage ../data/fonts/gentium {}; + geolite-legacy = callPackage ../data/misc/geolite-legacy { }; + gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; inherit (gnome3) gsettings_desktop_schemas; From b011d10cee253b5b9bfcbadc1b81e1b4f12b3ccc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 16:26:47 +0200 Subject: [PATCH 813/947] netsniff-ng: use new geolite-legacy package --- pkgs/tools/networking/netsniff-ng/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 748f2ddebec..196c176018a 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, libcli, libnet +{ stdenv, fetchFromGitHub, bison, flex, geoip, geolite-legacy, libcli, libnet , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0iwnfjbxiv10zk5mfpnvs2xb88f14hv1a156kn9mhasszknp0a57"; }; - buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack - libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; + buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl + libnetfilter_conntrack libpcap libsodium liburcu ncurses perl + pkgconfig zlib ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' @@ -25,9 +26,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Tries to install to /etc, but they're more like /share files anyway + # All files installed to /etc are just static data that can go in the store makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc"; + postInstall = '' + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCity.dat $out/etc/netsniff-ng/city4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCityv6.dat $out/etc/netsniff-ng/city6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat + rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible + ''; + meta = with stdenv.lib; { description = "Swiss army knife for daily Linux network plumbing"; longDescription = '' From 0d9ebe7535140c795738d9876f1792695a440af0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Mar 2015 16:27:09 +0200 Subject: [PATCH 814/947] ipv6calc: use new geolite-legacy package GeoIP look-ups now actually work. --- pkgs/tools/networking/ipv6calc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 6dcb6e7f317..9b676c6b72e 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, geoip, getopt, openssl, perl }: +{ stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }: stdenv.mkDerivation rec { version = "0.98.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; - buildInputs = [ geoip getopt openssl perl ]; + buildInputs = [ geoip geolite-legacy getopt openssl perl ]; patchPhase = '' for i in {,databases/}lib/Makefile.in; do @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --disable-dynamic-load --enable-shared --enable-geoip - --with-geoip-db=${geoip}/share/GeoIP + --with-geoip-db=${geolite-legacy}/share/GeoIP ''; enableParallelBuilding = true; From 146eb665d0fd660260992b7730ddab9af5801239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 31 Mar 2015 16:50:38 +0200 Subject: [PATCH 815/947] Revert "cups: 1.7.5 -> 2.0.2" This reverts commit 032859faba7174ef69f96b53bc07d544fba5e871. Conflicts: pkgs/misc/cups/default.nix Breaks nixos printing tests, see https://github.com/NixOS/nixpkgs/commit/032859faba7174ef69f96b53bc07d544fba5e871#commitcomment-10495609 --- pkgs/misc/cups/default.nix | 25 +++++-------------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d2170cfc332..e62cfcff832 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl, gmp -, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null -}: +, dbus, libusb, acl, gmp }: -let version = "2.0.2"; in +let version = "1.7.5"; in -with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -13,27 +10,15 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; + sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl gmp ]; - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-systemd=\${out}/lib/systemd/system" - "--enable-raw-printing" - "--enable-threads" - ] ++ optionals stdenv.isLinux [ - "--enable-dbus" - "--enable-pam" - ] ++ optional (libusb != null) "--enable-libusb" - ++ optional (gnutls != null) "--enable-ssl" - ++ optional (avahi != null) "--enable-avahi" - ++ optional (libpaper != null) "--enable-libpaper"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c2bb7d91b..ab11bf12bb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13578,9 +13578,7 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_filters = callPackage ../misc/cups/filters.nix { }; From b6932f56f8b997379ddde804f35da2c9da32536b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 08:36:19 -0500 Subject: [PATCH 816/947] Enable two modern features of GNU global --- pkgs/development/tools/misc/global/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6169c48a44..86856ab8d59 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, ncurses }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite, pythonPackages }: stdenv.mkDerivation rec { name = "global-6.3.4"; @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}''; + + ''--with-ncurses=${ncurses}'' + + ''--with-sqlite3=${sqlite}'' + + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; From 65b4013194b99c60f26fdaee6d7d26050d30f06f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 10:31:58 -0500 Subject: [PATCH 817/947] Add propagatedBuildInputs --- pkgs/development/tools/misc/global/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 86856ab8d59..fe119b266b5 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ncurses ]; + propagatedBuildInputs = [ libtool ncurses pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' From 227ebdc7cb5639398f632f042bdedbcdd7e31615 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 10:34:22 -0500 Subject: [PATCH 818/947] Remove unnecessary entries in propagatedBuildInputs --- pkgs/development/tools/misc/global/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fe119b266b5..b1e43597a27 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ncurses ]; - propagatedBuildInputs = [ libtool ncurses pythonPackages.pygments ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' From a87e2ae717667db69394634f580a948c86790a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 31 Mar 2015 18:20:43 +0200 Subject: [PATCH 819/947] fix eval --- nixos/release.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index e59b24d524a..899173b5ebc 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -310,10 +310,10 @@ in rec { tests.udisks2 = callTest tests/udisks2.nix {}; tests.virtualbox = callTest tests/virtualbox.nix {}; tests.xfce = callTest tests/xfce.nix {}; - tests.bootBiosCdrom = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootBiosCdrom); - tests.bootBiosUsb = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootBiosUsb); - tests.bootUefiCdrom = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootUefiCdrom); - tests.bootUefiUsb = forAllSystems (system: scrubDrv (import tests/boot.nix { inherit system; }).bootUefiUsb); + tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom); + tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb); + tests.bootUefiCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiCdrom); + tests.bootUefiUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiUsb); /* Build a bunch of typical closures so that Hydra can keep track of From 7a0fae2162d20e6cbbfa42a08ba919d9dfb6347a Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:57:25 -0500 Subject: [PATCH 820/947] libcroco: Enable building on Darwin --- pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix index e5f6a0aa9b8..1875c1491f9 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 glib ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } From 86d82df72b9951f6e16b7700bf7f1c0422b99371 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Tue, 31 Mar 2015 19:04:42 +0200 Subject: [PATCH 821/947] Update the ruby packaging docs to show how to bundle Ruby Gem-based applications using bundix. Fixes #5985 --- doc/language-support.xml | 42 ++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 5fb123ddfc1..f2b64c93d22 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -612,15 +612,45 @@ sed -i '/ = data_files/d' setup.py
Ruby - For example, to package yajl-ruby package, use gem-nix: + There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert + this into a nix expression that contains all Gem dependencies automatically. + + For example, to package sensu, we did: -$ nix-env -i gem-nix -$ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby -$ nix-build -A rubyPackages.yajl-ruby - -
+ Gemfile +source 'https://rubygems.org' +gem 'sensu' +$ bundler package --path /tmp/vendor/bundle +$ $(nix-build '&nixpkgs>' -A bundix)/bin/bundix +$ cat > default.nix +{ lib, bundlerEnv, ruby }: +bundlerEnv { + name = "sensu-0.17.1"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A monitoring framework that aims to be simple, malleable, +and scalable."; + homepage = http://sensuapp.org/; + license = with licenses; mit; + maintainers = with maintainers; [ theuni ]; + platforms = platforms.unix; + }; +}]]> + + +Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily. + + +
Go From d0ac04fbaa4fe19fd7ce6690afe4a690f4e2d81d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Mar 2015 16:46:07 +0200 Subject: [PATCH 822/947] hackage-packages.nix: re-generate from Hackage 2015-03-31T16:39:41+0200 --- .../haskell-modules/hackage-packages.nix | 930 +++++++++++------- 1 file changed, 601 insertions(+), 329 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 83bd636fc7d..c40226dc89a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2069,6 +2069,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Cabal-ide-backend" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal-ide-backend"; + version = "1.23.0.0"; + sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw"; + buildDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testDepends = [ + base bytestring Cabal containers directory extensible-exceptions + filepath HUnit old-time process QuickCheck regex-posix + test-framework test-framework-hunit test-framework-quickcheck2 unix + ]; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -3595,8 +3620,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, parsec }: mkDerivation { pname = "Dung"; - version = "1.0.0.1"; - sha256 = "12dlx4m3vqyc458bwjlh2i85b8k65wx5panibqc79p2ax5fvf2wz"; + version = "1.1"; + sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs containers parsec ]; @@ -5782,8 +5807,8 @@ self: { }: mkDerivation { pname = "HDBC"; - version = "2.4.0.0"; - sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y"; + version = "2.4.0.1"; + sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5831,8 +5856,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.2"; - sha256 = "0x42lf429dxjkz22jn5fybimlixxs20zq01ap40344qlwh01hd90"; + version = "2.3.2.3"; + sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -7250,8 +7275,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.16.1.0"; - sha256 = "0nnrfqgb0ndi1j3nrbj1alv4cq49prxsv3z5jk84qh6ny6hxm486"; + version = "3.16.1.1"; + sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p"; buildDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -8719,8 +8744,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.3"; - sha256 = "0nfq6c1kgmw1jj20686bp4rf52vpb8qc3whmz3jh0pwk489b2lwm"; + version = "3.2.3.1"; + sha256 = "1lq0v5z0kr2vbhj7xv07vygb6xqvp49sz8m9c20v394d2p5i2ai1"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10011,12 +10036,16 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, random, transformers }: + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: mkDerivation { pname = "MonadRandom"; - version = "0.3.0.1"; - sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; - buildDepends = [ base mtl random transformers ]; + version = "0.3.0.2"; + sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi"; + buildDepends = [ + base mtl random transformers transformers-compat + ]; description = "Random-number generation monad"; license = "unknown"; }) {}; @@ -14914,8 +14943,8 @@ self: { ({ mkDerivation, base, template-haskell, text, Win32 }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2"; - sha256 = "158p8130x1dmis08zaqm8zdhdhj0xjdmli5gn2w3f7rsz748rhvw"; + version = "0.2.2.1"; + sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; buildDepends = [ base template-haskell text Win32 ]; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; @@ -14941,8 +14970,8 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-junction-point"; - version = "0.2.1"; - sha256 = "0d2hpzrbcvqfaw6vp03n56k5zjs6kk582hr3pd25j93g3rcyc8mf"; + version = "0.2.1.1"; + sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941"; buildDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; @@ -15396,8 +15425,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "Yampa"; - version = "0.9.6"; - sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0"; + version = "0.9.6.1"; + sha256 = "14nssljqgpirdjl6rxb1x4xxl6rpq2rhldhcvsvc0qx31mb01df1"; buildDepends = [ base random ]; homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; @@ -15528,8 +15557,8 @@ self: { }: mkDerivation { pname = "Zora"; - version = "1.1.21"; - sha256 = "145mn0d9610hnc6p489s7b6ar63shbcm2rs83ij3ravdnp52ykjn"; + version = "1.1.22"; + sha256 = "0m49xfyxk92ddmh222h6drys05vncq7y374gnpgwpi4hrmzd0jbb"; buildDepends = [ base bytestring containers directory fgl graphviz random shelly text @@ -16029,8 +16058,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.12.3"; - sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; + version = "0.12.4"; + sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad"; buildDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -19066,6 +19095,7 @@ 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; @@ -19596,6 +19626,7 @@ self: { tasty-hunit time transformers unix utf8-string ]; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; @@ -19779,8 +19810,8 @@ self: { }: mkDerivation { pname = "arion"; - version = "0.1.0.5"; - sha256 = "0b1nva5iyls8xn84sgf0azc8cs6s0sdila77hgs13crksf4qnyvx"; + version = "0.1.0.7"; + sha256 = "15kr9dwiy415c2yn8pmgxqd8a7mwss3hkn25xk9kg1681qkhnn4z"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -21401,17 +21432,17 @@ self: { "aws-general" = callPackage ({ mkDerivation, aeson, attoparsec, aws, base, base16-bytestring , blaze-builder, byteable, bytestring, case-insensitive, charset - , cryptohash, directory, either, errors, hashable, http-types - , old-locale, parsers, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, text, time, transformers + , cryptohash, deepseq, directory, either, errors, hashable + , http-types, old-locale, parsers, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "aws-general"; - version = "0.2.1"; - sha256 = "11wfg657za7mbr7fkgwhv4nag2m6j245rj3rldy2fj4s0vhpi6l3"; + version = "0.2.2"; + sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj"; buildDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable - bytestring case-insensitive cryptohash hashable http-types + bytestring case-insensitive cryptohash deepseq hashable http-types old-locale parsers QuickCheck quickcheck-instances text time transformers ]; @@ -21427,19 +21458,20 @@ self: { "aws-kinesis" = callPackage ({ mkDerivation, aeson, aws, aws-general, base, base64-bytestring - , blaze-builder, bytestring, conduit, conduit-extra, errors - , http-conduit, http-types, mtl, parsers, QuickCheck + , blaze-builder, bytestring, conduit, conduit-extra, deepseq + , errors, http-conduit, http-types, mtl, parsers, QuickCheck , quickcheck-instances, resourcet, tagged, tasty, tasty-quickcheck , text, time, transformers }: mkDerivation { pname = "aws-kinesis"; - version = "0.1.4"; - sha256 = "0k0p7ivs6z6zqm45yjhlwcmrhqz83a66fi2f6i6p1a5r7c107dji"; + version = "0.1.5"; + sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz"; buildDepends = [ aeson aws aws-general base base64-bytestring blaze-builder - bytestring conduit conduit-extra http-conduit http-types parsers - QuickCheck quickcheck-instances resourcet text time transformers + bytestring conduit conduit-extra deepseq http-conduit http-types + parsers QuickCheck quickcheck-instances resourcet text time + transformers ]; testDepends = [ aeson aws aws-general base bytestring errors mtl QuickCheck tagged @@ -22216,14 +22248,12 @@ self: { }) {}; "base-compat" = callPackage - ({ mkDerivation, base, errorcall-eq-instance, hspec, QuickCheck - , setenv - }: + ({ mkDerivation, base, hspec, QuickCheck, setenv }: mkDerivation { pname = "base-compat"; - version = "0.5.0"; - sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1"; - buildDepends = [ base errorcall-eq-instance setenv ]; + version = "0.6.0"; + sha256 = "1ry85ymd0m99z2g45x7nlvpda699xa6zzn8l51im5bda6zsczlyv"; + buildDepends = [ base setenv ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -22245,8 +22275,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "0.1.16"; - sha256 = "1k7rbbmw6qjqql7408vaj3mcymlk66hyrd0l2xhksyalh1h4sbps"; + version = "0.1.19"; + sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; @@ -24948,14 +24978,15 @@ self: { "blaze-builder-enumerator" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, enumerator - , transformers + , streaming-commons, transformers }: mkDerivation { pname = "blaze-builder-enumerator"; - version = "0.2.0.6"; - sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp"; + version = "0.2.0.7"; + sha256 = "1ipfx99d3amgpl63lpby88qczgxb5wbw52srpy94phynw9xpxnvk"; buildDepends = [ - base blaze-builder bytestring enumerator transformers + base blaze-builder bytestring enumerator streaming-commons + transformers ]; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; @@ -25381,18 +25412,19 @@ self: { "blunt" = callPackage ({ mkDerivation, aeson, array, base, bytestring, clay, containers , haskell-src-exts, http-types, jmacro, lucid, pointful, text - , transformers, wai, wai-extra, warp, wl-pprint-text + , transformers, wai, wai-extra, wai-websockets, warp, websockets + , wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.14"; - sha256 = "0qg5jy2f005kah4309ddg0xcyzfgkm7baz6ms8bcn4lsd74agm7k"; + version = "0.0.15"; + sha256 = "122gic92hibcic7yrk3anp1rbwlpxkv87cigbz49zvxdjr9c7d6y"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring clay containers haskell-src-exts http-types jmacro lucid pointful text transformers wai wai-extra - warp wl-pprint-text + wai-websockets warp websockets wl-pprint-text ]; homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; @@ -26543,8 +26575,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.2.1"; - sha256 = "1g0i5ibk399kjdw8vmmv33bjw74z941hnj33fp0ch2by7z9fhgnn"; + version = "0.3.0"; + sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; homepage = "https://github.com/philopon/bytestring-read"; @@ -26781,8 +26813,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.25.1"; - sha256 = "1wf504kb5qcy3l2kd2fmhg78nb39fpcmv2fysh5daqh956q6dbr7"; + version = "0.25.2"; + sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26946,8 +26978,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.24.6"; - sha256 = "0v7l8pnh8gqcxbqy02635il0di21i82g8p97lydkfvjsj4c1w8sv"; + version = "4.24.8"; + sha256 = "13csdlk33ik0jskapy56i7fza6hxh59y2c2yy02ha3himvrm8q77"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -27446,9 +27478,10 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.4"; - sha256 = "012pl06x5jjiyhc98x5245zj1lcgkr9wcyv3rjc6z59y8mynv7ri"; + version = "0.1.6"; + sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi"; buildDepends = [ base Cabal QuickCheck ]; + jailbreak = true; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -28411,17 +28444,17 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, ghc-prim, HUnit, QuickCheck, test-framework + , containers, deepseq, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.4.2.2"; - sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; + version = "0.4.2.3"; + sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq - ghc-prim text unordered-containers vector + text unordered-containers vector ]; testDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -28560,8 +28593,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.3.0.0"; - sha256 = "1bjvnac5kyc70czx8vdld8whkgnygqz3i5yhfl315mall1xw7h1w"; + version = "0.4.0.0"; + sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; @@ -31037,12 +31070,13 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, mtl, text }: + ({ mkDerivation, base, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.0.1"; - sha256 = "1n73ya2r5dbsadmx9y6l931k7nhppqa69qqyv15pnm3w7823njj8"; - buildDepends = [ base mtl text ]; + version = "0.3.1"; + sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb"; + buildDepends = [ base text ]; + testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; @@ -32792,12 +32826,13 @@ self: { "config-value" = callPackage ({ mkDerivation, alex, array, base, bytestring, happy, pretty, text + , transformers }: mkDerivation { pname = "config-value"; - version = "0.1.1"; - sha256 = "04f3n8hq82zwlh6ny0wv8wxq6j0ngq4daw82znss9373b1v99bl8"; - buildDepends = [ array base bytestring pretty text ]; + version = "0.3"; + sha256 = "1p1bq93da6d28c1aw2s3rdl8lkn1v8zjy80cb25dvqplap0cxnza"; + buildDepends = [ array base bytestring pretty text transformers ]; buildTools = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; description = "Simple, layout-based value language similar to YAML or JSON"; @@ -34131,8 +34166,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.18.9"; - sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6"; + version = "1.19"; + sha256 = "0fiyqyy7zzzbp0jsgl3syvm5db8n42h88ps7qzayxbsycjz9fp70"; isLibrary = true; isExecutable = true; buildDepends = [ base directory old-locale old-time polyparse ]; @@ -35212,8 +35247,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "4.3"; - sha256 = "11qy08pc1h83yj6qaw529bxrynzs8453ddih6qn2cqs9m35hy9vs"; + version = "4.4"; + sha256 = "10xv10qndgcj43vyc94pb482773advv6pd2sklh1pwnzyp6wsvpb"; buildDepends = [ base Boolean colour csound-expression-opcodes csound-expression-typed data-default process @@ -35229,8 +35264,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.0"; - sha256 = "0vbvah8icjnc2bjp8w21x8a48ijy598q09wgx68al4d4nya7fj4v"; + version = "0.1.1"; + sha256 = "1jb4x6arpfskxwlhc5l1kggmzcsp0c7ygvywbzm7bqswmp5sdhvy"; buildDepends = [ array base Boolean containers data-default data-fix data-fix-cse transformers wl-pprint @@ -35262,8 +35297,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.6.1"; - sha256 = "1wqzh0gvb53410ingfvvja0yw4wbzn21sypmi0b13nssacbv1y7q"; + version = "0.0.7.0"; + sha256 = "1kd4fhlgkcc8d50rmkar1waniaqm5ip0g3nw47qkh7a668yfmfa4"; buildDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim stable-maps transformers wl-pprint @@ -35277,8 +35312,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.3.2"; - sha256 = "02gzrsqh0pvjdc5q33jm0psxr1yf7n81q73x200r2k416g0a5p7s"; + version = "0.0.4.0"; + sha256 = "03mymb5yk4hlf6nsmakxw0nyspvrs7882dmpx9r65lkpsvgnaxyp"; buildDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -36724,8 +36759,8 @@ self: { ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { pname = "data-fix-cse"; - version = "0.0.1"; - sha256 = "1jrkphyw1npj4f2vy7n6xap1v2h6glw0gwzjg0iyjnflhjgnfl2m"; + version = "0.0.2"; + sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; buildDepends = [ base containers data-fix transformers ]; homepage = "https://github.com/anton-k/data-fix-cse"; description = "Common subexpression elimination for the fixploint types"; @@ -41804,8 +41839,8 @@ self: { }: mkDerivation { pname = "dynamic-cabal"; - version = "0.3.4"; - sha256 = "080hynvyrc5jbfm4v5l04iby70rf6fqa3ynbpj1njdh6xjc4wnlv"; + version = "0.3.5"; + sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw"; buildDepends = [ base containers data-default directory filepath ghc ghc-paths haskell-generate haskell-src-exts time void @@ -42209,8 +42244,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.7"; - sha256 = "0b632c476md2wrz0mcxbkc9c8crz2dgl58nfz25zjagqhqylslk6"; + version = "0.2.8"; + sha256 = "1pzqjs7560xkw51aqpivm6sgysnxs6c5jy4fnalvds79gk37yryh"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -42362,8 +42397,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.5"; - sha256 = "0vji28kyx20a93661x3c9sbp9vq2z5i4f0mjvpk55xyls5mkldrw"; + version = "0.1.0.6"; + sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -43914,12 +43949,12 @@ self: { }) {}; "errorcall-eq-instance" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, base-compat, hspec, QuickCheck }: mkDerivation { pname = "errorcall-eq-instance"; - version = "0.1.0"; - sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; - buildDepends = [ base ]; + version = "0.2.0"; + sha256 = "1hq3f4m7hp6czyv5c9h3iwd99510vf88890kcd3kkw11id7sbj6n"; + buildDepends = [ base base-compat ]; testDepends = [ base hspec QuickCheck ]; description = "An orphan Eq instance for ErrorCall"; license = stdenv.lib.licenses.mit; @@ -44025,8 +44060,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.1.2.1"; - sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; + version = "2.1.2.2"; + sha256 = "1sklvl3fl7sq64i5k5jrhc6xvfa4a1a6dfbnzl2alq65x73jzna6"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -44839,8 +44874,8 @@ self: { ({ mkDerivation, base, binary, constraints, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.3.1"; - sha256 = "09vz1z2v2jgn0lrnb8pkgr3r5xbcqmpww671q75nyi74f308zn2n"; + version = "0.3.2"; + sha256 = "1fb027d14100s384mhl0g09jpjxqam85g6yh0pnwcn3g4fzq0fln"; buildDepends = [ base binary constraints template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; @@ -45305,27 +45340,26 @@ self: { "fay" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, ghc-paths, haskell-names, haskell-packages - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat, uniplate - , unordered-containers, utf8-string, vector + , data-lens-light, directory, filepath, ghc-paths, haskell-src-exts + , language-ecmascript, mtl, mtl-compat, optparse-applicative + , process, safe, sourcemap, split, spoon, syb, text, time + , transformers, transformers-compat, traverse-with-class, type-eq + , uniplate, unordered-containers, utf8-string, vector }: mkDerivation { pname = "fay"; - version = "0.23.1.2"; - sha256 = "0cdj2id0wb1j8v03rwvyqw9z3plhn6myqhyyf9c7r0w5r462pcyx"; + version = "0.23.1.3"; + sha256 = "0vxf76x0ply748vq25nd2h2620f1iyaswzdd3bwcqb6xh50zq1bi"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers data-default directory filepath - ghc-paths haskell-names haskell-packages haskell-src-exts - language-ecmascript mtl mtl-compat optparse-applicative process - safe sourcemap split spoon syb text time transformers - transformers-compat uniplate unordered-containers utf8-string - vector + aeson base bytestring containers data-default data-lens-light + directory filepath ghc-paths haskell-src-exts language-ecmascript + mtl mtl-compat optparse-applicative process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector ]; - jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; @@ -46118,14 +46152,13 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.2.7"; - sha256 = "090anxbwsgzqvm6shvg0v5kfvrj14mj9b7jmw916kk8ig5gmz17v"; + version = "0.2.8"; + sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf"; buildDepends = [ base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers ]; testDepends = [ base directory temporary unordered-containers ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "A Linux-only cache system associating values to files"; license = stdenv.lib.licenses.bsd3; @@ -46280,9 +46313,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.0.1"; - sha256 = "09991344v0pg4kcws41slqaaj9c26anp44qzjwvfhwcfj1xy6zpg"; + version = "0.1.0.2"; + sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5"; buildDepends = [ base ]; + homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; license = "unknown"; }) {}; @@ -47189,8 +47223,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "focus"; - version = "0.1.3"; - sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy"; + version = "0.1.4"; + sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; @@ -47203,8 +47237,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.8"; - sha256 = "1v8g1n17lwjwr2d1r3zam44qlm3jrr5j30d4cs4n4gf5pgxlrzvp"; + version = "1.0.9"; + sha256 = "10y9r4h6a6na0gpf5sy5mm34k94swisv6wbj2k210zyfvnrx9r36"; buildDepends = [ base bytestring containers primitive text transformers vector ]; @@ -49621,6 +49655,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "getopt-generics" = callPackage + ({ mkDerivation, base, generics-sop, hspec, safe, silently }: + mkDerivation { + pname = "getopt-generics"; + version = "0.1.1"; + sha256 = "1cf1mhc7wf8s0sbnq0a3xn8v5w1aw2py78flzanj9slz7cr02gqb"; + buildDepends = [ base generics-sop safe ]; + testDepends = [ base generics-sop hspec silently ]; + description = "Simple command line argument parsing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -50126,6 +50172,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, tasty, tasty-hunit }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.1"; + sha256 = "0c4kl0sz7dvyzf3hcwclcgxi631gvdmyr227d4p0v3zd4p2bs75k"; + buildDepends = [ base ghc ]; + testDepends = [ base tasty tasty-hunit ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk, mtl, svgcairo, text, transformers @@ -52070,8 +52130,8 @@ self: { }: mkDerivation { pname = "graph-core"; - version = "0.2.1.0"; - sha256 = "0xx99p2i1ng79rph0hkb2dp5r9y77s0y4v8njsywxyq4kbl3ly7f"; + version = "0.2.2.0"; + sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9"; buildDepends = [ base containers deepseq hashable mtl QuickCheck safe unordered-containers vector @@ -54320,7 +54380,9 @@ self: { mkDerivation { pname = "hackage-mirror"; version = "0.1.0.0"; + revision = "1"; sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg"; + editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54331,7 +54393,6 @@ self: { template-haskell temporary text thyme transformers unordered-containers ]; - jailbreak = true; homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; @@ -54597,6 +54658,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-api_2_15_0_2" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-paths, haddock-library + , xhtml + }: + mkDerivation { + pname = "haddock-api"; + version = "2.15.0.2"; + sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7"; + buildDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-paths haddock-library xhtml + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-paths, haddock-library @@ -56585,11 +56664,10 @@ self: { ({ mkDerivation, base, hashable, time }: mkDerivation { pname = "hashable-time"; - version = "0.1.0.0"; - sha256 = "0n6cp5amc0385qaii7xi54a3l0znnycrbn4zixidm5nixiig9sq3"; + version = "0.1.0.1"; + sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf"; buildDepends = [ base hashable time ]; - homepage = "https://github.com/w3rs/hashable-time"; - description = "Hashable instances for Data.Time types and Fixed"; + description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58583,15 +58661,15 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.2"; - sha256 = "1gxigzmsrn3kpp6nf4my3yz2215sgmr9021qnpvsq6mqnl6vqddg"; + version = "0.7.3"; + sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers transformers-base vector ]; testDepends = [ - base base-prelude either hasql-backend hasql-postgres hspec + base-prelude either hasql-backend hasql-postgres hspec monad-control mtl-prelude slave-thread text vector ]; homepage = "https://github.com/nikita-volkov/hasql"; @@ -58600,16 +58678,15 @@ self: { }) {}; "hasql-backend" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, either, free - , list-t, text, transformers, vector + ({ mkDerivation, base-prelude, bytestring, either, free, list-t + , text, transformers, vector }: mkDerivation { pname = "hasql-backend"; - version = "0.4.0"; - sha256 = "15jzz01lmh4s6y70b01yc7ffzbicm7nxna30krra8vlp0w32lnys"; + version = "0.4.1"; + sha256 = "037ibla582gwsi17fsfrwlc0azh54iyyfawvy0nlabzg6lc38snm"; buildDepends = [ - base base-prelude bytestring either free list-t text transformers - vector + base-prelude bytestring either free list-t text transformers vector ]; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; @@ -58626,10 +58703,10 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.2"; - sha256 = "0nw1xq9wfdhcm40qfx8d883nvgk7bfhwbwwb1r9jx7zlspx15vq5"; + version = "0.10.3"; + sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w"; buildDepends = [ - aeson attoparsec base base-prelude bytestring either free hashable + aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders postgresql-binary postgresql-libpq scientific template-haskell text time transformers uuid vector @@ -58646,15 +58723,14 @@ self: { }) {}; "hasql-postgres-options" = callPackage - ({ mkDerivation, base, base-prelude, hasql-postgres - , optparse-applicative + ({ mkDerivation, base-prelude, hasql-postgres, optparse-applicative }: mkDerivation { pname = "hasql-postgres-options"; - version = "0.1.3"; - sha256 = "05l38fm1s5n2vsqmxx8pywq0bpbwhc9hks381a70dqdas3jvv3cp"; + version = "0.1.4"; + sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4"; buildDepends = [ - base base-prelude hasql-postgres optparse-applicative + base-prelude hasql-postgres optparse-applicative ]; homepage = "https://github.com/nikita-volkov/hasql-postgres-options"; description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; @@ -62554,17 +62630,20 @@ self: { }) { inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, hmatrix, storable-complex }: + ({ mkDerivation, base, binary, blas, hmatrix, lapack + , storable-complex + }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.2"; - sha256 = "1xwl2qgji2ib0gml9hqljzwd4wrqfjpvnzm3iq2g7kcwwfg1q0dm"; + version = "0.2.1"; + sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj"; buildDepends = [ base binary hmatrix storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -63932,6 +64011,7 @@ self: { buildDepends = [ base cmdargs containers cpphs filepath haskell-src-exts ]; + jailbreak = true; homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; @@ -66034,23 +66114,24 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, bytestring, hmatrix - , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, mtl + ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix + , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl , storable-complex }: mkDerivation { pname = "hsignal"; - version = "0.2.6.1"; - sha256 = "013sswmhvww16kbfmm9mmb1iabzmd41jfq06ppl5fjs5amqlinsk"; + version = "0.2.7"; + sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0"; buildDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -68205,8 +68286,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.6.0"; - sha256 = "05vjlfa4z5g84y2vq9c4dhasjl8w55n0si0iy3fkl980jkx59771"; + version = "0.6.1"; + sha256 = "0x2smkccs64ll31adwj4n7kr1qalihyj28py2k5qwl2ynyygxbxq"; buildDepends = [ base bytestring case-insensitive containers ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck case-insensitive @@ -68345,8 +68426,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.7.2.5"; - sha256 = "0dabn3d9al9lvfqk7fg3nbddbygygq4am3j7wibp48zhy3vg8m0y"; + version = "0.7.2.6"; + sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -69899,6 +69980,72 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ide-backend" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, Cabal-ide-backend, containers, crypto-api + , data-accessor, data-accessor-mtl, deepseq, directory + , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit + , ide-backend-common, mtl, pretty-show, process, pureMD5, random + , regex-compat, stm, tagged, tasty, template-haskell, temporary + , test-framework, test-framework-hunit, text, time, transformers + , unix, unordered-containers, utf8-string + }: + mkDerivation { + pname = "ide-backend"; + version = "0.9.0.4"; + sha256 = "00an3pk1im5mhrmkaal4p6i4niwjy13clsnjkh13k8g6dbr42vfv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + Cabal-ide-backend containers crypto-api data-accessor + data-accessor-mtl directory executable-path filemanip filepath + fingertree ghc-prim ide-backend-common mtl pretty-show process + pureMD5 random tagged template-haskell temporary text time + transformers unix unordered-containers utf8-string + ]; + testDepends = [ + aeson async base binary bytestring Cabal-ide-backend containers + deepseq directory executable-path filemanip filepath HUnit + ide-backend-common process random regex-compat stm tagged tasty + template-haskell temporary test-framework test-framework-hunit text + unix utf8-string + ]; + description = "An IDE backend library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ide-backend-common" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, containers, crypto-api, data-accessor, directory + , filepath, fingertree, mtl, pretty-show, pureMD5, tagged + , template-haskell, temporary, text, transformers, unix + }: + mkDerivation { + pname = "ide-backend-common"; + version = "0.9.0"; + sha256 = "01hp54f9yhvv3w53n5l9508kkr9h4b0ns8b669bcw6nqg5vq8642"; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + containers crypto-api data-accessor directory filepath fingertree + mtl pretty-show pureMD5 tagged template-haskell temporary text + transformers unix + ]; + description = "Shared library used be ide-backend and ide-backend-server"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ide-backend-rts" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ide-backend-rts"; + version = "0.1.3.1"; + sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0"; + buildDepends = [ base ]; + description = "RTS for the IDE backend"; + license = stdenv.lib.licenses.mit; + }) {}; + "ideas" = callPackage ({ mkDerivation, array, base, cgi, containers, directory, filepath , parsec, QuickCheck, random, time, uniplate, wl-pprint @@ -70780,12 +70927,12 @@ self: { }) {}; "include-file" = callPackage - ({ mkDerivation, base, bytestring, random, template-haskell }: + ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "include-file"; - version = "0.1.0.1"; - sha256 = "18rzxhblr77vzhkjyyi85fkbrpy897jm04l97zf39v0bf3v5wskh"; - buildDepends = [ base bytestring random template-haskell ]; + version = "0.1.0.2"; + sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba"; + buildDepends = [ base bytestring template-haskell ]; testDepends = [ base bytestring ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; @@ -73463,8 +73610,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.9"; - sha256 = "0ajsxg515484bqmg94l9gmg4jpfvv6ykcbnyglkh1j86phggxrf2"; + version = "0.2.5.11"; + sha256 = "00m9i8fnbivqf2hdlq2gk8afdfrbgp2b3likdyz92qnjd1n2jl0y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73472,7 +73619,6 @@ self: { hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -73653,18 +73799,18 @@ self: { }) {}; "json-rpc-server" = callPackage - ({ mkDerivation, aeson, base, bytestring, HUnit, mtl + ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl , test-framework, test-framework-hunit, text, unordered-containers , vector }: mkDerivation { pname = "json-rpc-server"; - version = "0.1.4.0"; - sha256 = "1k909cxp63qvbbl916m6bk7i26np4aba2v87imfik134ii4h9pry"; + version = "0.1.5.0"; + sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring mtl text unordered-containers vector + aeson base bytestring deepseq mtl text unordered-containers vector ]; testDepends = [ aeson base bytestring HUnit mtl test-framework test-framework-hunit @@ -75656,6 +75802,7 @@ self: { base HUnit srcloc symbol test-framework test-framework-hunit ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; @@ -76697,9 +76844,9 @@ self: { mkDerivation { pname = "lens"; version = "4.7"; - revision = "2"; + revision = "3"; sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; + editedCabalFile = "c7b97e6b3dd9c3ad8ab0458579ac411c5b07119dfbda5f5bc989a07e026814d4"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -77735,8 +77882,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.6.0.1"; - sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf"; + version = "0.7.0"; + sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6"; buildDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -78884,8 +79031,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.5.0"; - sha256 = "19rvpy7hfgkfjkijnasajrvzbw75ij7sfwg9z4w080x6w39rgppr"; + version = "3.4.5.1"; + sha256 = "13fnr4dpflbfywmdq1r7fxv16lcywwv4a300j8z59xclcskvpajr"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -78910,8 +79057,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.5.0"; - sha256 = "0gb06b8bb5d7fmkjpbi3smjssjxk5xgmf3lv5axhm0rbndi6y9vc"; + version = "3.4.5.1"; + sha256 = "0j08pff3lrzbxpfz73ywxh27ps79c875qvp49swjm14zc6kbsyvy"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -79278,8 +79425,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.2"; - sha256 = "13kr1gwsrwyvnb5klcvl3h506y0l3sibks6cpszwjnz296i5kpf9"; + version = "0.13.3"; + sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -80478,10 +80625,10 @@ self: { ({ mkDerivation, base, containers, srcloc, text }: mkDerivation { pname = "mainland-pretty"; - version = "0.2.7.1"; - sha256 = "1ac7rig4hc7i3qv7j45442j0d7zhvlwg41a14wykr3fsi8vb1n5m"; + version = "0.2.7.2"; + sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd"; buildDepends = [ base containers srcloc text ]; - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81526,8 +81673,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.2"; - sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; + version = "0.3.4.3"; + sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -82014,8 +82161,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "memoize"; - version = "0.6"; - sha256 = "15ya80la5azkpdnlnd7n6x1z9z2nixg0rakp1bj4xsk1ad1hn6x7"; + version = "0.7"; + sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4"; buildDepends = [ base template-haskell ]; description = "A memoization library"; license = stdenv.lib.licenses.bsd3; @@ -83485,12 +83632,13 @@ self: { mkDerivation { pname = "monad-logger-syslog"; version = "0.1.0.0"; + revision = "1"; sha256 = "0q0m611nr20nxm4wj9ywgq3qakl3qvd820vld4nqxdp1lqsilcwz"; + editedCabalFile = "93ac892b3e81cc44a8fc5ab63f0c6c5d0127602448dcf0984d37d8dd9d92000e"; buildDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; testDepends = [ base monad-logger shelly ]; - jailbreak = true; homepage = "https://github.com/docmunch/monad-logger-rsyslog"; description = "rsyslog output for monad-logger"; license = stdenv.lib.licenses.mit; @@ -83745,6 +83893,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-skeleton" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "monad-skeleton"; + version = "0"; + sha256 = "0niv5pd3n87d1yqn13sam2qsha0dnnkclvn7wxha5zk66km56zyq"; + buildDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "An undead monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -84509,8 +84669,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.1.1"; - sha256 = "0daq0894kmd938k7qdbi7f1axih5gx5yrimx5pssfvhvw78bdqp4"; + version = "1.1.2"; + sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -85739,8 +85899,8 @@ self: { }: mkDerivation { pname = "mwc-random"; - version = "0.13.3.0"; - sha256 = "0navzgw1y1zm3n4zs7x0lk2nmnjysk5cpw0clpl0w7iwb75yrnjd"; + version = "0.13.3.2"; + sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c"; buildDepends = [ base primitive time vector ]; testDepends = [ base HUnit QuickCheck statistics test-framework @@ -85881,8 +86041,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.2.2.4"; - sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + version = "0.2.2.5"; + sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6"; buildDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -86526,6 +86686,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nero" = callPackage + ({ mkDerivation, base, bytestring, containers, doctest, Glob, lens + , safe, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "nero"; + version = "0.1.1"; + sha256 = "0wfrmdsmmwxashqdxxqc9nb3xr16m9ni05ypzq7ybyq0mgmaqzli"; + buildDepends = [ base bytestring containers lens safe text ]; + testDepends = [ + base bytestring doctest Glob lens tasty tasty-hunit text + ]; + homepage = "https://github.com/jdnavarro/nero"; + description = "Lens-based HTTP toolkit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nested-sets" = callPackage ({ mkDerivation, base, containers, hspec }: mkDerivation { @@ -87771,6 +87948,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nicovideo-translator" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, dns, http-client, http-types, iso639, lens + , lens-aeson, random, setlocale, text, wai, warp, wreq, xml-conduit + }: + mkDerivation { + pname = "nicovideo-translator"; + version = "0.1.0.0"; + sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers dns http-client + http-types iso639 lens lens-aeson random setlocale text wai warp + wreq xml-conduit + ]; + jailbreak = true; + homepage = "https://github.com/dahlia/nicovideo-translator"; + description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "nikepub" = callPackage ({ mkDerivation, base, containers, filepath, GoogleChart, haskell98 , haxr, hs-twitter, HStringTemplate, HTTP, hxt, json, network @@ -89927,6 +90126,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "overture" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "overture"; + version = "0.0.4"; + sha256 = "01zq2ja2vn0pvwf7rm51a0dmn5qdy83ysj656zm7wcwnlq6cfs3d"; + buildDepends = [ base ]; + testDepends = [ base doctest ]; + description = "An alternative to some of the Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "pack" = callPackage ({ mkDerivation, array, base, bytestring, lens, transformers , vector @@ -90217,7 +90428,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.13.2"; + revision = "1"; sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76"; + editedCabalFile = "31556fad86bf4c7daf43b7da7912a9f40b1e9ff79fdec46767e884d61da1d9f9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -90237,6 +90450,7 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; + jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -91322,8 +91536,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.1.0"; - sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; + version = "0.1.2.0"; + sha256 = "1h2ry2p1nnvh3prrl6xz18p3npccrb0p9qzq41lcn10sizfsgpzx"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -92071,8 +92285,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "0.3.1"; - sha256 = "1djwaahabjpj01hvg9hp6ldqxjn45hp1dl84bbgvini1f6ihh2bq"; + version = "0.3.2"; + sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k"; buildDepends = [ aeson attoparsec base binary bytestring hedis monad-control mtl path-pieces persistent scientific text time transformers @@ -92597,8 +92811,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.2"; - sha256 = "1h6d04h72h4cckxh6b16336v47mn7f3ybslzzimg8nmi2yldn0b9"; + version = "0.1.2.1"; + sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -92662,8 +92876,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.6"; - sha256 = "1fsv480mkj216f3v0080wv1d6h812dh8s9yrh21kinz9dnj7rfgf"; + version = "0.6.2.2"; + sha256 = "02913abxcqcr12v6nd0zmij2mq9bhhz4sqay6vkmvwfdc3mr6k4b"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -92680,8 +92894,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.1.4"; - sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb"; + version = "4.1.5"; + sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -92801,17 +93015,17 @@ self: { }) {}; "pipes-cliff" = callPackage - ({ mkDerivation, async, base, bytestring, pipes, pipes-concurrency - , pipes-safe, process + ({ mkDerivation, async, base, bytestring, pipes, pipes-safe + , process, stm }: mkDerivation { pname = "pipes-cliff"; - version = "0.6.0.0"; - sha256 = "1rlv19imipfjws9zhn0vf3vnnrfmx4laq5npz02fg41sk2gpincq"; + version = "0.10.0.0"; + sha256 = "1xzjw7bd96q7fg7q43rvcxv29p6ziknp6z08qzrnx5i4w9gjnk8s"; isLibrary = true; isExecutable = true; buildDepends = [ - async base bytestring pipes pipes-concurrency pipes-safe process + async base bytestring pipes pipes-safe process stm ]; homepage = "http://www.github.com/massysett/pipes-cliff"; description = "Streaming to and from subprocesses using Pipes"; @@ -94414,20 +94628,20 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bytestring, HTF - , loch-th, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, scientific, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base-prelude, bytestring, HTF, loch-th + , placeholders, postgresql-libpq, QuickCheck, quickcheck-instances + , scientific, text, time, transformers, uuid }: mkDerivation { pname = "postgresql-binary"; - version = "0.5.1"; - sha256 = "09y7llixrzqyl64zv2a40i6jsvq2c03szw8y7y8pz81awd6pid4q"; + version = "0.5.2"; + sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh"; buildDepends = [ - attoparsec base base-prelude bytestring loch-th placeholders - scientific text time transformers uuid + attoparsec base-prelude bytestring loch-th placeholders scientific + text time transformers uuid ]; testDepends = [ - base base-prelude bytestring HTF postgresql-libpq QuickCheck + base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; homepage = "https://github.com/nikita-volkov/postgresql-binary"; @@ -97848,6 +98062,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "random-hypergeometric" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, math-functions + , mwc-random, QuickCheck, random-fu, vector + }: + mkDerivation { + pname = "random-hypergeometric"; + version = "0.1.0.0"; + sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh"; + buildDepends = [ base math-functions random-fu ]; + testDepends = [ + base Cabal cabal-test-quickcheck math-functions mwc-random + QuickCheck random-fu vector + ]; + homepage = "https://github.com/srijs/random-hypergeometric"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + "random-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, random }: mkDerivation { @@ -100062,15 +100294,15 @@ self: { "repa-array" = callPackage ({ mkDerivation, base, bytestring, double-conversion, mtl - , primitive, repa-eval, repa-stream, text, vector + , primitive, repa-convert, repa-eval, repa-stream, text, vector }: mkDerivation { pname = "repa-array"; - version = "4.0.0.2"; - sha256 = "0169fqf07yqpx93n8qlq3yfnqv9rhc19r1a6rcvbrva7h8kh04nb"; + version = "4.1.0.1"; + sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank"; buildDepends = [ - base bytestring double-conversion mtl primitive repa-eval - repa-stream text vector + base bytestring double-conversion mtl primitive repa-convert + repa-eval repa-stream text vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -100092,6 +100324,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-convert" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "repa-convert"; + version = "4.1.0.1"; + sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6"; + buildDepends = [ base primitive vector ]; + homepage = "http://repa.ouroborus.net"; + description = "Packing and unpacking binary data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-devil" = callPackage ({ mkDerivation, base, libdevil, repa, transformers }: mkDerivation { @@ -100159,8 +100403,8 @@ self: { }: mkDerivation { pname = "repa-flow"; - version = "4.0.0.2"; - sha256 = "1kznd1dl4rxwbc0k9asrwqm4pygq97x95g3zmy9v6lhbm6p1kpsd"; + version = "4.1.0.1"; + sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7"; buildDepends = [ base bytestring containers directory filepath primitive repa-array repa-eval repa-stream text vector @@ -100237,8 +100481,8 @@ self: { ({ mkDerivation, base, mtl, primitive, vector }: mkDerivation { pname = "repa-stream"; - version = "4.0.0.1"; - sha256 = "0vvkgazq30skj9yr763vc5vs3zacjssvyqci721n99j7h8my7r9x"; + version = "4.1.0.1"; + sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm"; buildDepends = [ base mtl primitive vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -100620,20 +100864,19 @@ self: { "rest-client" = callPackage ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive , data-default, exceptions, http-conduit, http-types, hxt - , hxt-pickle-utils, monad-control, mtl, primitive, resourcet - , rest-types, tostring, transformers, transformers-base - , transformers-compat, uri-encode, utf8-string + , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types + , tostring, transformers, transformers-base, transformers-compat + , uri-encode, utf8-string }: mkDerivation { pname = "rest-client"; - version = "0.5.0.1"; - sha256 = "1dnf0ain1dprpv736r78qbi0hyfm8jwkjgmfb7vphk0qff6j2alw"; + version = "0.5.0.2"; + sha256 = "1sykmz3mms714sypkpbjhk6dapb0saqsvwjjxnr3cklxdhxhyvz6"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils - monad-control mtl primitive resourcet rest-types tostring - transformers transformers-base transformers-compat uri-encode - utf8-string + monad-control mtl resourcet rest-types tostring transformers + transformers-base transformers-compat uri-encode utf8-string ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; @@ -100675,8 +100918,8 @@ self: { }: mkDerivation { pname = "rest-example"; - version = "0.2.0.0"; - sha256 = "1442hi8av2vlbzr1ffjfn32plxs0i60bb0g0fnjrprjmcii7dzd5"; + version = "0.2.0.1"; + sha256 = "0pc8q6ky8flh0rz4s3fl7fyharg1p026v689s8h709mcf5q6kvkf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102949,19 +103192,22 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, download-curl, HUnit, regex-base - , regex-tdfa, tagsoup, text + ({ mkDerivation, base, bytestring, curl, download-curl, HUnit + , regex-base, regex-tdfa, tagsoup, text }: mkDerivation { pname = "scalpel"; - version = "0.1.1"; - sha256 = "0ypr6i4in1vvxjxi03r29q7mvig390bnpn2bcmjm9q1w51ypjdnr"; + version = "0.1.2"; + revision = "1"; + sha256 = "1h0fj56a3mppcc2pfjs7philm2jy1yb3vvzbvswsans5x4xvh8dv"; + editedCabalFile = "5062d07770eb7d265cd5c76dc7e3c90c36a2a4f6a7bc3e688d139cd8114a8f5c"; buildDepends = [ - base bytestring download-curl regex-base regex-tdfa tagsoup text + base bytestring curl download-curl regex-base regex-tdfa tagsoup + text ]; testDepends = [ - base bytestring download-curl HUnit regex-base regex-tdfa tagsoup - text + base bytestring curl download-curl HUnit regex-base regex-tdfa + tagsoup text ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; @@ -105575,18 +105821,19 @@ self: { "shelltestrunner" = callPackage ({ mkDerivation, base, cmdargs, Diff, directory, filemanip - , filepath, HUnit, parsec, process, regex-tdfa, test-framework - , test-framework-hunit, utf8-string + , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe + , test-framework, test-framework-hunit, utf8-string }: mkDerivation { pname = "shelltestrunner"; - version = "1.3.4"; - sha256 = "1gfx2l99v95i6amrlcs1qbk9p37qyz21px3a224h5hrr9svhrsqy"; + version = "1.3.5"; + sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs Diff directory filemanip filepath HUnit parsec process - regex-tdfa test-framework test-framework-hunit utf8-string + base cmdargs Diff directory filemanip filepath HUnit parsec + pretty-show process regex-tdfa safe test-framework + test-framework-hunit utf8-string ]; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; @@ -106376,8 +106623,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.4"; - sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp"; + version = "0.5.5"; + sha256 = "000jr1lq01yzjdn8wfzjs43gk7avqw51r6gx20sjc3d90vyx8j7s"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -107144,8 +107391,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "smartconstructor"; - version = "0.1.0.0"; - sha256 = "1iq9803ijx9497lc49mmvq8anm8r6ww0gysc693gq0ixf8ga2f8y"; + version = "0.2.0.0"; + sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/smartconstructor"; description = "A package exposing a helper function for generating smart constructors"; @@ -107458,8 +107705,8 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.6"; - sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8"; + version = "1.2.7"; + sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc"; buildDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers @@ -108116,17 +108363,16 @@ self: { "snaplet-recaptcha" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , configurator, heist, http-conduit, lens - , MonadCatchIO-transformers, mtl, snap, text + , MonadCatchIO-transformers, mtl, snap, text, transformers }: mkDerivation { pname = "snaplet-recaptcha"; - version = "1.0.1"; - sha256 = "05d5070z9ljxfp353q7q5nl46c7wx4bnsjm3hiw2258bnz2ih185"; + version = "1.0.3"; + sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26"; buildDepends = [ aeson base blaze-builder bytestring configurator heist http-conduit - lens MonadCatchIO-transformers mtl snap text + lens MonadCatchIO-transformers mtl snap text transformers ]; - jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -109867,8 +110113,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.4.1"; - sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; + version = "0.5.0"; + sha256 = "1a5233jkdhzjl9vnmaxyswbnkadrf5h6v66f957dakvmdhs1m13m"; buildDepends = [ base ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; @@ -110134,8 +110380,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.7.0.2"; - sha256 = "1wh2gv6hfzm58817q5m2df9dqbiacy7wl8554r6wfmpl6jbn4vn2"; + version = "0.7.0.3"; + sha256 = "0sc9q1h3v1hbxya7csrm9jffrvp91sa2mvdpndkcarfpn39jv09y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110726,8 +110972,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-chans"; - version = "3.0.0.2"; - sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh"; + version = "3.0.0.3"; + sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk"; buildDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -110775,24 +111021,22 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers + ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t + , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck + , transformers, unordered-containers }: mkDerivation { pname = "stm-containers"; - version = "0.2.8"; - sha256 = "0dqnhi99bq093zb815q8l0yhkvm0r27h230hcjmvcp01934xga0x"; + version = "0.2.9"; + sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52"; buildDepends = [ base-prelude focus hashable list-t loch-th placeholders primitive transformers ]; testDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers + base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude + placeholders primitive QuickCheck transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -111637,8 +111881,8 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.3.0"; - sha256 = "0crh5kmb3bql0ba8srs58hn68q6cl9iaxy2p4phmwzw4xzganawq"; + version = "0.1.3.1"; + sha256 = "0c0g1ixjja49ifdch06flsb1k233sazy7yybqskacv7xmb1bpixy"; buildDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl random text time transformers unordered-containers @@ -113925,8 +114169,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.3"; - sha256 = "0irqf7sx0s937ahjgjxdmxj4afxd4qvnflry538zazikgb9s51pz"; + version = "2.3.0.1"; + sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji"; buildDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary-rc @@ -115714,8 +115958,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.5.2"; - sha256 = "0kd5yn98nhji9yshnai4ffw7p8a1mn3xslbw57lvgmyln96sw096"; + version = "1.5.3"; + sha256 = "1bnbx5fpdnw24q3cjq1riccing8wadhl2xa588kf1qdf1nd9g7i0"; buildDepends = [ base containers mtl syb template-haskell th-lift th-orphans ]; @@ -117548,19 +117792,17 @@ self: { }) {}; "trace" = callPackage - ({ mkDerivation, base, containers, either, kan-extensions + ({ mkDerivation, base, containers, deepseq, either, kan-extensions , monad-control, mtl, profunctors, transformers, transformers-base , transformers-compat }: mkDerivation { pname = "trace"; - version = "0.1.0.4"; - revision = "1"; - sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn"; - editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef"; + version = "0.1.0.5"; + sha256 = "19l06mxw5n9r6mnygvgvrsrdkwyf2zxfjb0ky23v2bgrs5wjx4vc"; buildDepends = [ - base containers either kan-extensions monad-control mtl profunctors - transformers transformers-base transformers-compat + base containers deepseq either kan-extensions monad-control mtl + profunctors transformers transformers-base transformers-compat ]; description = "A monad transformer for tracing provenience of errors"; license = stdenv.lib.licenses.mit; @@ -118182,6 +118424,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ttrie" = callPackage + ({ mkDerivation, atomic-primops, base, hashable, primitive, stm }: + mkDerivation { + pname = "ttrie"; + version = "0.1.0.0"; + sha256 = "1lyz2hyi52fc0w1pix15g5h88y9x66wfw65k8bm4zc79irfv969h"; + buildDepends = [ atomic-primops base hashable primitive stm ]; + jailbreak = true; + homepage = "http://github.com/mcschroeder/ttrie"; + description = "Contention-free STM hash map"; + license = stdenv.lib.licenses.mit; + }) {}; + "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl @@ -120131,8 +120386,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.9.0"; - sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki"; + version = "0.10.0"; + sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b"; buildDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -122271,8 +122526,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-buffer"; - version = "0.4"; - sha256 = "00dr9fm91q091jv19b0fpzjq297fhh7b5xmpyypm26pkzzb7vqz7"; + version = "0.4.1"; + sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv"; buildDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; license = stdenv.lib.licenses.bsd3; @@ -122859,15 +123114,14 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.1.0.1"; + version = "0.1.0.3"; revision = "1"; - sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; - editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; + sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158"; + editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da"; buildDepends = [ base binary bytestring containers deepseq hashable mtl network split stm ]; - jailbreak = true; description = "Sound synthesis with SuperCollider"; license = "GPL"; }) {}; @@ -123438,6 +123692,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-lens" = callPackage + ({ mkDerivation, base, bytestring, http-types, lens, network, text + , vault, wai + }: + mkDerivation { + pname = "wai-lens"; + version = "0.1"; + sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x"; + buildDepends = [ + base bytestring http-types lens network text vault wai + ]; + homepage = "https://github.com/webcrank/wai-lens"; + description = "Lenses for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-lite" = callPackage ({ mkDerivation, base, bytestring, conduit, http-types, text , transformers, wai, wai-extra @@ -124540,7 +124810,9 @@ self: { mkDerivation { pname = "web-routing"; version = "0.6.1"; + revision = "1"; sha256 = "0lz81mdc0a2i1jpra1c7v1pva9nff2b35cm5snllnpkb7r898vgr"; + editedCabalFile = "5dec5fad0ea8297fe885bc149a175cf94765f668d3e698b4c5bc547f75ca5f7f"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -126147,8 +126419,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.1"; - sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; + version = "0.2.2"; + sha256 = "1h8rnpgzicn46i4narvmjgh4r46q90ch5wgwmxknksnqi55c7gs4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126831,21 +127103,20 @@ self: { "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl - , directory, hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup - , process, regex-posix, tagsoup, text, unordered-containers, vector + , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix + , tagsoup, text, unordered-containers, vector }: mkDerivation { pname = "xml-to-json"; - version = "1.0.1"; - sha256 = "098crnwdq96rzb0ixy1s5krbabfgc36dnxr1ygav3fpqr16ndrng"; + version = "2.0.1"; + sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers curl directory hashable hxt - hxt-curl hxt-expat hxt-tagsoup process regex-posix tagsoup text - unordered-containers vector + aeson base bytestring containers curl hashable hxt hxt-curl + hxt-expat hxt-tagsoup regex-posix tagsoup text unordered-containers + vector ]; - jailbreak = true; homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; @@ -126855,8 +127126,8 @@ self: { ({ mkDerivation, base, directory, process, tagsoup, text }: mkDerivation { pname = "xml-to-json-fast"; - version = "1.0.1"; - sha256 = "1gp32adky7pjspppkzz01rj3lpl2b8fvaqf7fg3j0p3cmlbhap7m"; + version = "2.0.0"; + sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx"; isLibrary = true; isExecutable = true; buildDepends = [ base directory process tagsoup text ]; @@ -128183,8 +128454,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.2"; - sha256 = "0nzhwh9aka1a2fk9q7d1xy6wq1fvpl9kjsi4mxjqzvp61sjcmqrs"; + version = "1.4.2.1"; + sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -128323,32 +128594,33 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , ghc, ghc-paths, http-client, http-conduit, http-reverse-proxy - , http-types, lifted-base, network, optparse-applicative, parsec - , process, project-template, resourcet, shakespeare, split - , streaming-commons, system-fileio, system-filepath, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, yaml - , zlib + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, system-fileio + , system-filepath, tar, template-haskell, text, time, transformers + , transformers-compat, unix-compat, unordered-containers, wai + , wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.4.5.1"; - sha256 = "0q5n2rcwz7qc5gs4r2kfc8dc7xg0khy9khzb1zgbfxl6bv9kvnk5"; + version = "1.4.6"; + sha256 = "1qr0bdnnmn13vyd6zx9d622lyhdpav9304yhc95fgzxz1cgbdza4"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class directory file-embed filepath fsnotify ghc ghc-paths http-client http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet shakespeare split streaming-commons system-fileio system-filepath tar template-haskell text time transformers transformers-compat - unix-compat unordered-containers wai wai-extra warp yaml zlib + unix-compat unordered-containers wai wai-extra warp warp-tls yaml + zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -129301,8 +129573,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.1.1"; - sha256 = "0h6cszsjffp4crkavr74lfna847pxc506nrqcw108awyjji803by"; + version = "0.1.1.1"; + sha256 = "0bwslcxb747krvpa4irnych4ddjik51542jf0bkzsyhagmakrjz8"; buildDepends = [ aeson ansi-terminal async base base-unicode-symbols bytestring case-insensitive configuration-tools deepseq either From f35b08ac3916e015a8f5adc8641ca77574dce27a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Mar 2015 17:48:23 +0200 Subject: [PATCH 823/947] haskell-csound-expression-dynamic: disable Haddock phase to fix the build https://github.com/anton-k/csound-expression-dynamic/issues/1 --- 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 685dbc5f0e8..310844c517c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -666,6 +666,9 @@ self: super: { ''; }); + # https://github.com/anton-k/csound-expression-dynamic/issues/1 + csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; + } // { # Not on Hackage. From f2f826e97aa6fc6575a6880bc81eece0b115ee7f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 30 Mar 2015 10:53:46 +0300 Subject: [PATCH 824/947] haskellng: fix some gtk- and webkit-related packages Fixes https://github.com/NixOS/nixpkgs/issues/7108. --- 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 310844c517c..41981c5f119 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -198,6 +198,11 @@ self: super: { glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk]; + gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + + # Need WebkitGTK, not just webkit. + webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; # https://github.com/jgm/zip-archive/issues/21 zip-archive = addBuildTool super.zip-archive pkgs.zip; From dda963caf1ec2bb91b04f1c46ce1d5f8a8b477f4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Mar 2015 04:58:16 +0300 Subject: [PATCH 825/947] gtksourceview: propagate gtk3 --- pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix index 8a89425a696..5779b6d0480 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; }; - buildInputs = [ pkgconfig atk cairo glib gtk3 pango + propagatedBuildInputs = [ gtk3 ]; + + buildInputs = [ pkgconfig atk cairo glib pango libxml2Python perl intltool gettext ]; preBuild = '' From f55393de94afc0226a15b337d0bfc638cb74fce9 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 14:08:27 -0400 Subject: [PATCH 826/947] pango: compile with gobjectIntrospection on Darwin Required to make .gir files needed by gtk3 --- pkgs/development/libraries/pango/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 45ca9cb98e8..87187667a92 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; }; - buildInputs = with stdenv.lib; - optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex + buildInputs = with stdenv.lib; [ gobjectIntrospection ] ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; From 89881105729464e6ad26f38a9cd9a3986baba65f Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 15:23:26 -0400 Subject: [PATCH 827/947] at-spi2-atk + at-spi2-core: build on Darwin --- pkgs/development/libraries/at-spi2-atk/default.nix | 2 +- pkgs/development/libraries/at-spi2-core/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 416a33b09a2..b562a2e5d3d 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index c27506fe588..7128e4d3f2b 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } From b29fc6bfafc716a399d7ec95992fb14c5d1eb11b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 16:09:40 -0500 Subject: [PATCH 828/947] global: add missing spaces to configureFlags --- 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 b1e43597a27..7dc27bcdb76 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}'' - + ''--with-sqlite3=${sqlite}'' + + ''--with-ncurses=${ncurses} '' + + ''--with-sqlite3=${sqlite} '' + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; From 5bf407ada4ff72b05df4ff1fc2d943d8a4ddb7de Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 31 Mar 2015 14:28:42 -0700 Subject: [PATCH 829/947] linux-testing: 4.0-rc4 -> 4.0-rc6 --- 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 1c2a3edf298..de13f8394d8 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.0-rc4"; - modDirVersion = "4.0.0-rc4"; + version = "4.0-rc6"; + modDirVersion = "4.0.0-rc6"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "01jn3mpxd1gly79psgh27l9ad24i07z9an0mw93pbs16nnncv0dn"; + sha256 = "1f6xqrc9lqssr2gyzd6d82dk2niikbr1swg68vfc250am0l55vw8"; }; features.iwlwifi = true; From b8d75c66ee5236bcbb47493ebd4409464f92c0e6 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 31 Mar 2015 16:07:43 -0700 Subject: [PATCH 830/947] haskell-ng: need to use haddock-api-2.15 on ghc-7.8 --- 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 5ca00b278fa..e89b793b141 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -43,6 +43,9 @@ self: super: { # Configure build for mtl 2.1.x. mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; + # haddock-api 2.16 requires ghc>=7.10 + haddock-api = super.haddock-api_2_15_0_2; + # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); From 5f231e7f08af1c813cede9ef4691c77dce82e140 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 31 Mar 2015 15:49:03 -0700 Subject: [PATCH 831/947] mysql51: Refactor --- pkgs/servers/sql/mysql/5.1.x.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index 3389f811489..caf6149e62c 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}: +{ stdenv, fetchurl, ps, ncurses, zlib, perl, openssl }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -10,16 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; - buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps; + buildInputs = [ ncurses zlib perl openssl ] ++ stdenv.lib.optional stdenv.isLinux ps; - configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" + - (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); + configureFlags = [ + "--enable-thread-safe-client" + "--with-ssl=${openssl}" + "--with-embedded-server" + "--with-plugins=max-no-ndb" + "--with-unix-socket-path=/run/mysqld/mysqld.sock" + ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") " --with-lib-ccflags=-fPIC"; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [./abi_check.patch]; + patches = [ ./abi_check.patch ]; postInstall = '' From b74833bc20109bbba932fef7608bcaca111bad7f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 31 Mar 2015 15:49:18 -0700 Subject: [PATCH 832/947] mysql55: 5.4.40 -> 5.4.42 --- pkgs/servers/sql/mysql/5.5.x.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 842d38e8dc5..d25882b826e 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.40"; + version = "5.5.42"; src = fetchurl { - url = "http://cdn.mysql.com/archives/mysql-5.5/${name}.tar.gz"; - sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; + url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -27,15 +27,19 @@ stdenv.mkDerivation rec { "-DWITH_EMBEDDED_SERVER=yes" "-DWITH_ZLIB=yes" "-DHAVE_IPV6=yes" - "-DINSTALL_DOCDIR=share/doc/mysql" - "-DINSTALL_DOCREADMEDIR=share/doc/mysql" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_INFODIR=share/doc/mysql" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" "-DINSTALL_MANDIR=share/man" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLPLUGINDIR=lib/mysql/plugin" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From 80283570848734d8473b6434141ce8f4406720e7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 31 Mar 2015 16:16:12 -0700 Subject: [PATCH 833/947] nixos/mysql: Cleanups --- nixos/modules/services/databases/mysql.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1e2400d84b3..05b13492052 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -8,7 +8,7 @@ let mysql = cfg.package; - is55 = mysql.mysqlVersion == "5.5"; + atLeast55 = versionAtLeast mysql.mysqlVersion "5.5"; pidFile = "${cfg.pidDir}/mysqld.pid"; @@ -22,7 +22,7 @@ let port = ${toString cfg.port} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${optionalString (cfg.replication.role == "slave" && !is55) + ${optionalString (cfg.replication.role == "slave" && !atLeast55) '' master-host = ${cfg.replication.masterHost} master-user = ${cfg.replication.masterUser} @@ -73,7 +73,7 @@ in }; pidDir = mkOption { - default = "/var/run/mysql"; + default = "/run/mysqld"; description = "Location of the file which stores the PID of the MySQL server"; }; @@ -178,6 +178,10 @@ in mkdir -m 0700 -p ${cfg.pidDir} chown -R ${cfg.user} ${cfg.pidDir} + + # Make the socket directory + mkdir -m 0700 -p /run/mysqld + chown -R ${cfg.user} /run/mysqld ''; serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; @@ -186,7 +190,7 @@ in '' # Wait until the MySQL server is available for use count=0 - while [ ! -e /tmp/mysql.sock ] + while [ ! -e /run/mysqld/mysqld.sock ] do if [ $count -eq 30 ] then @@ -220,7 +224,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "slave" && is55) + ${optionalString (cfg.replication.role == "slave" && atLeast55) '' # Set up the replication master From c7ce8c776886bb6f720cd604ffff0f2ae78c4330 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 20:52:53 -0500 Subject: [PATCH 834/947] global: make pygments visible to "gtags" binary --- pkgs/development/tools/misc/global/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7dc27bcdb76..4aff2ee4a0b 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite, pythonPackages }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { name = "global-6.3.4"; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; }; - buildInputs = [ libtool ncurses ]; + buildInputs = [ libtool ncurses makeWrapper ]; propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = @@ -24,6 +25,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" + + wrapProgram $out/bin/gtags \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; meta = with stdenv.lib; { From 80c6c5e9eca6ed6c570497317c27bbef2354b236 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 20:56:05 -0500 Subject: [PATCH 835/947] global: wrap "global" in the same fashion --- pkgs/development/tools/misc/global/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 4aff2ee4a0b..01d75a5bb01 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/gtags \ --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + wrapProgram $out/bin/global \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; meta = with stdenv.lib; { From bb363dd2f20ce6a5bd39498a3ec379dd031117d9 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 31 Mar 2015 19:58:19 -0700 Subject: [PATCH 836/947] fetchgitlocal: use output of `git show` and `git diff` to tell nix whether the source has changed. this is way more hacky than i was hoping... --- pkgs/build-support/fetchgitlocal/default.nix | 17 +++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 04e6aafc8a1..43fc4b1179d 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,6 +1,19 @@ -{ runCommand, git }: src: +{ runCommand, git, nix }: src: -runCommand "local-git-export" {} '' +let hash = import (runCommand "head-hash.nix" + { dummy = builtins.currentTime; + preferLocalBuild = true; } +'' + cd ${toString src} + (${git}/bin/git show && ${git}/bin/git diff) > $out + hash=$(${nix}/bin/nix-hash $out) + echo "\"$hash\"" > $out +''); in + +runCommand "local-git-export" + { dummy = hash; + preferLocalBuild = true; } +'' cd ${toString src} mkdir -p "$out" for file in $(${git}/bin/git ls-files); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab11bf12bb0..735faf76ddb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -330,7 +330,7 @@ let fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; fetchgitLocal = import ../build-support/fetchgitlocal { - inherit runCommand git; + inherit runCommand git nix; }; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); From edee502f81697bf719867c061d803da86416e585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Apr 2015 08:40:48 +0200 Subject: [PATCH 837/947] ngrep: fix build by using make-3 /cc maintainer @bjornfor. --- pkgs/tools/networking/ngrep/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 5c7840034b7..3c0b0d9278a 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap }: +{ stdenv, fetchurl, libpcap, gnumake3 }: stdenv.mkDerivation rec { name = "ngrep-1.45"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; }; - buildInputs = [ libpcap ]; + buildInputs = [ gnumake3 libpcap ]; preConfigure = '' # Fix broken test for BPF header file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 735faf76ddb..e92cff18e53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2093,7 +2093,9 @@ let newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; - ngrep = callPackage ../tools/networking/ngrep { }; + ngrep = callPackage ../tools/networking/ngrep { + inherit gnumake3; + }; ngrok = callPackage ../tools/misc/ngrok { }; From 56c0edca86bba44257313484a7b2d1e841abdb21 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Apr 2015 08:35:47 +0200 Subject: [PATCH 838/947] nixos/tests/swraid: Increase boot partition size. I'm increasing it to 100MB to make sure, any bootloader will fit with all its stages. Of course, right now the reason why GRUB doesn't fit into the partition is because of mdadm 3.3.2 and thus the initrd taking all the space, but in order to avoid confusion on why the *boot* loader fails in the VM tests, I've increased the size. Signed-off-by: aszlig --- nixos/tests/installer.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c7815bde3f5..af87705b927 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -327,12 +327,12 @@ in { $machine->succeed( "parted /dev/vda --" . " mklabel msdos" - . " mkpart primary ext2 1M 30MB" # /boot - . " mkpart extended 30M -1s" - . " mkpart logical 31M 1531M" # md0 (root), first device - . " mkpart logical 1540M 3040M" # md0 (root), second device - . " mkpart logical 3050M 3306M" # md1 (swap), first device - . " mkpart logical 3320M 3576M", # md1 (swap), second device + . " mkpart primary ext2 1M 100MB" # /boot + . " mkpart extended 100M -1s" + . " mkpart logical 102M 1602M" # md0 (root), first device + . " mkpart logical 1603M 3103M" # md0 (root), second device + . " mkpart logical 3104M 3360M" # md1 (swap), first device + . " mkpart logical 3361M 3617M", # md1 (swap), second device "udevadm settle", "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", From 1567f56a5a832fd5608101afa397f93e2e64535b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Apr 2015 08:42:00 +0200 Subject: [PATCH 839/947] nixos: Re-add swraid installer tests to releases. It has been removed by 71a197bc6e60c2c35687fc862cec9a0036a3877e. I'm reintroducing the test mainly because it actually *is* useful, because right now, machines with mdraid will not boot. In order to prevent such things from happening in the future, we should *not* remove this VM test again. If it really goes back to failing randomly, we should really try to fix it instead of removing it again. Of course it fails right now because of the mdraid bump in 7719f7f. Also, if you want to have additional info about the reasons, have a look at the commit message of 666cf992f05d20c537da7f495afe3622023495d2. Signed-off-by: aszlig --- nixos/release-combined.nix | 1 + nixos/release.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 22d14aa57a0..cb1c200ab47 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -57,6 +57,7 @@ in rec { (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) (all nixos.tests.installer.simpleProvided) + (all nixos.tests.installer.swraid) (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) diff --git a/nixos/release.nix b/nixos/release.nix index 899173b5ebc..4c2a1c76f1c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -260,6 +260,7 @@ in rec { 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); tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.swraid = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).swraid.test); tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test); tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); From 71b04c5b3a9c53ab185c22661b58d6ee32e0fb3a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Apr 2015 09:57:52 +0200 Subject: [PATCH 840/947] ocaml-fileutils: also install the API documentation --- pkgs/development/ocaml-modules/fileutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 8c3c4275837..2fbbabfd36b 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { createFindlibDestdir = true; + preInstall = "make doc"; + meta = { homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; platforms = ocaml.meta.platforms; From 3779aa07f5c0b4952d1c9e97f6537eac9067cac9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 12:05:13 +0200 Subject: [PATCH 841/947] ffmpeg: Reduce dependency bloat It was depending on Qt, MariaDB and PostgreSQL (via v4l-utils), causing the closure size to explode from 475 MB to 1.3 GB. http://hydra.nixos.org/job/nixpkgs/trunk/ffmpeg.x86_64-linux#tabs-charts Also disabled a bunch of other mostly obscure dependencies. --- pkgs/development/libraries/ffmpeg/generic.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 329b44d0999..9cb8f86d01d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -64,17 +64,17 @@ , freetype ? null # Needed for drawtext filter , frei0r ? null # frei0r video filtering , fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator +#, game-music-emu ? null # Game Music Emulator , gnutls ? null -, gsm ? null # GSM de/encoder +#, gsm ? null # GSM de/encoder #, ilbc ? null # iLBC de/encoder -, jack2 ? null # Jack audio (only version 2 is supported in this build) +#, jack2 ? null # Jack audio (only version 2 is supported in this build) , ladspaH ? null # LADSPA audio filtering , lame ? null # LAME MP3 encoder , libass ? null # (Advanced) SubStation Alpha subtitle rendering , libbluray ? null # BluRay reading , libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) +#, libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null @@ -100,7 +100,7 @@ , libXv ? null # Xlib support , lzma ? null # xz-utils #, nvenc ? null # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support +#, openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code #, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering @@ -127,9 +127,9 @@ , x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder +#, xavs ? null # AVS encoder , xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing +#, zeromq4 ? null # Message passing , zlib ? null #, zvbi ? null # Teletext support /* @@ -367,9 +367,9 @@ stdenv.mkDerivation rec { (mkFlag (freetype != null) "0.7" "libfreetype") (mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r") (mkFlag (fribidi != null) "2.3" "libfribidi") - (mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme") + #(mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme") (mkFlag (gnutls != null) "0.9" "gnutls") - (verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm") + #(verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm") #(mkFlag (ilbc != null) "1.0" "libilbc") (mkFlag (ladspaH !=null) "2.1" "ladspa") (mkFlag (lame != null) "0.5" "libmp3lame") @@ -377,7 +377,7 @@ stdenv.mkDerivation rec { #(mkFlag (libavc1394 != null) null null) (mkFlag (libbluray != null) "1.0" "libbluray") (mkFlag (libbs2b != null) "2.3" "libbs2b") - (mkFlag (libcaca != null) "1.0" "libcaca") + #(mkFlag (libcaca != null) "1.0" "libcaca") #(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio") (mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394") (mkFlag (libiconv != null) "1.2" "iconv") @@ -400,7 +400,7 @@ stdenv.mkDerivation rec { (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") (mkFlag (lzma != null) "2.4" "lzma") #(mkFlag nvenc "2.6" "nvenc") - (mkFlag (disDarwinFix (openal != null)) "0.9" "openal") + #(mkFlag (disDarwinFix (openal != null)) "0.9" "openal") #(mkFlag opencl "2.2" "opencl") #(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb") #(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { (mkFlag (speex != null) "0.5" "libspeex") #(mkFlag (twolame != null) "1.0" "libtwolame") #(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo") - (mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2") + #(mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2") (mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0 #(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc") #(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc") @@ -427,9 +427,9 @@ stdenv.mkDerivation rec { (mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab") (mkFlag (x264 != null && gplLicensing) "0.5" "libx264") (mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265") - (mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs") + #(mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs") (mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid") - (mkFlag (zeromq4 != null) "2.0" "libzmq") + #(mkFlag (zeromq4 != null) "2.0" "libzmq") (mkFlag (zlib != null) "0.5" "zlib") #(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi") /* @@ -448,18 +448,18 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray - libbs2b libcaca libdc1394 libogg libopus libtheora libvdpau libvorbis + libbs2b /* libcaca */ libdc1394 libogg libopus libtheora libvdpau libvorbis libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264 - xvidcore zeromq4 zlib + xvidcore /* zeromq4 */ zlib ] ++ optional (disDarwinFix sambaExtlib) samba ++ optional openglExtlib mesa ++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] ++ optionals (!isDarwin) [ - frei0r game-music-emu gsm jack2 libmodplug libssh libvpx openal - openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 xavs + frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ + openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */ ] ++ optional (!isDarwin && !isCygwin) libva - ++ optionals isLinux [ alsaLib libraw1394 v4l_utils ]; + ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; From b8ccb390b3b852946aff1cb3ae79a1fafbc68f13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 13:08:01 +0200 Subject: [PATCH 842/947] blender: Update to 2.74 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 27eced335dc..5e746716119 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.73a"; + name = "blender-2.74"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; + sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc"; }; patches = [ ./sm52.patch ]; From 4c8f0e8d1c362c125ecbbe07c6533e816fc63881 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 14:04:19 +0200 Subject: [PATCH 843/947] firefox: Update to 37.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ec7c6047ae4..111a704cec7 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "36.0.4"; in +let version = "37.0"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea"; + sha1 = "c23a3d36603edd9d2fbac51afe7a4825c0ac15d8"; }; buildInputs = From fbfec3fc356e5ef1af96c99c7e431948d00ef4da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 14:30:07 +0200 Subject: [PATCH 844/947] llvmPackages_34.dragonegg is broken because the required "ABIHack.inc" patch has disappeared upstream --- pkgs/development/compilers/llvm/3.4/dragonegg.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 8704d996424..2ebdc10654b 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } From 46103aa853fca5f0619ad065c5eba7833b84bf94 Mon Sep 17 00:00:00 2001 From: shak-mar Date: Wed, 1 Apr 2015 14:29:20 +0200 Subject: [PATCH 845/947] rxvt_unicode_with-plugins: add wrapper for urxvtd --- pkgs/applications/misc/rxvt_unicode/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 140113de64a..146ac9704f4 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -21,6 +21,8 @@ let fi wrapProgram $out/bin/urxvt \ --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; }; in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file From c958486eea989e47b5e0b2a4e674c5f185e12f74 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 1 Apr 2015 13:51:56 +0200 Subject: [PATCH 846/947] gnu-smalltalk: optional emacs support --- pkgs/development/compilers/gnu-smalltalk/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index f001de2700d..5d9ca621648 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome, cairo, SDL, sqlite }: +gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: + +assert emacsSupport -> (emacs != null); let # The gnu-smalltalk project has a dependency to the libsigsegv library. # The project ships with sources for this library, but deprecated this option. @@ -26,9 +28,12 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk cairo SDL sqlite - ]; + ] + ++ stdenv.lib.optional emacsSupport emacs; - configureFlags = [ "--without-emacs" ]; + configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + + installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; # For some reason the tests fail if executated with nix-build, but pass if # executed within nix-shell --pure. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8daf0f6ec3..4eb921b8442 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3574,7 +3574,9 @@ let inherit fetchurl stdenv; }); - gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { + emacsSupport = config.emacsSupport or false; + }; gccgo = gccgo48; From fdfe4b7cde2ab43c08eaf93d4b7946eaeedd6d00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 14:44:27 +0200 Subject: [PATCH 847/947] Remove unnecessary symlinks in /nix/var/nix/gcroots --- nixos/modules/services/misc/nix-daemon.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2da84c031a7..6d25fef4576 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -379,9 +379,6 @@ in /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ /nix/var/nix/gcroots/tmp - - ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/ - ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/ ''; }; From f1e2b02cd3ead076c434f2499bdf49206c76be20 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Apr 2015 08:53:00 -0400 Subject: [PATCH 848/947] Add Net::SMTP::TLS::ButMaintained perl package --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cdf6a688a16..b3ccf597728 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7043,6 +7043,15 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [IOSocketSSL DigestHMAC]; }; + NetSMTPTLSButMaintained = buildPerlPackage { + name = "Net-SMTP-TLS-ButMaintained-0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; + sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; + }; + propagatedBuildInputs = [NetSSLeay DigestHMAC IOSocketSSL]; + }; + NetSNMP = buildPerlPackage rec { name = "Net-SNMP-6.0.1"; src = fetchurl { From 98cedb3d22a580d8ee1804862d65a3198d9ee3ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 15:01:22 +0200 Subject: [PATCH 849/947] Remove obsolete .../sbin directories from $PATH --- nixos/modules/config/system-path.nix | 1 - nixos/modules/programs/environment.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index f3e86bfd201..ed7b949ecc2 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -108,7 +108,6 @@ in "/info" "/lib" "/man" - "/sbin" "/share/emacs" "/share/vim-plugins" "/share/org" diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index e0379a2c02a..1a84e05763f 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -39,7 +39,7 @@ in # TODO: move most of these elsewhere environment.profileRelativeEnvVars = - { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ]; + { PATH = [ "/bin" "/lib/kde4/libexec" ]; INFOPATH = [ "/info" "/share/info" ]; PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; TERMINFO_DIRS = [ "/share/terminfo" ]; From 33dfdbd0df14b8b54f1316d9d5039e1a2acc26dc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 16:21:13 +0200 Subject: [PATCH 850/947] php: Update to 5.4.39 CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331. --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 49740fddb46..8eda7eef222 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.38"; + version = "5.4.39"; name = "php-${version}"; @@ -258,7 +258,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; + sha256 = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw"; }; meta = with stdenv.lib; { From b3e1021b41b710240bfdacd7c4603acf2029237d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 1 Apr 2015 16:35:03 +0200 Subject: [PATCH 851/947] i2pd: 0.8.0 -> 0.9.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b8d2deb626b..984e91e255f 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "i2pd-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { name = "i2pd-src-${version}.tar.gz"; url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"; - sha256 = "1vw6s480lmxwhq0rx6d2lczb6d2j9f68hmv3ri9jwgp7bicy6ziz"; + sha256 = "1rcf4wc34g2alva9jzj6bz0f88g2f5v1w4418b6lp6chvqi7fhc7"; }; buildInputs = [ boost cryptopp ]; From 1c39a47ac87959b2589ef797e519af96d73c27d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Apr 2015 16:28:18 +0200 Subject: [PATCH 852/947] Reload, don't restart, dbus.service Many bus clients get hopelessly confused when dbus-daemon is restarted. So let's not do that. Of course, this is not ideal either, because we end up stuck with a possibly outdated dbus-daemon. But that issue will become irrelevant in the glorious kdbus-based future. Hopefully this also gets rid of systemd getting stuck after dbus-daemon is restarted: Apr 01 15:37:50 mandark systemd[1]: Failed to register match for Disconnected message: Connection timed out Apr 01 15:37:50 mandark systemd[1]: Looping too fast. Throttling execution a little. Apr 01 15:37:51 mandark systemd[1]: Looping too fast. Throttling execution a little. ... --- nixos/modules/services/system/dbus.nix | 3 +++ .../activation/switch-to-configuration.pl | 18 +++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 928f16c9448..d40f7d6d05d 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -130,6 +130,9 @@ in config.system.path ]; + # Don't restart dbus-daemon. Bad things tend to happen if we do. + systemd.services.dbus.reloadIfChanged = true; + environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; }; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index ce36bac2bdc..7aa4b12a654 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -384,9 +384,13 @@ system("@systemd@/bin/systemctl", "reset-failed"); # Make systemd reload its units. system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; -# Signal dbus to reload its configuration before starting other units. -# Other units may rely on newly installed policy files under /etc/dbus-1 -system("@systemd@/bin/systemctl", "reload-or-restart", "dbus.service"); +# Reload units that need it. This includes remounting changed mount +# units. +if (scalar(keys %unitsToReload) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; + unlink($reloadListFile); +} # Restart changed services (those that have to be restarted rather # than stopped and started). @@ -407,14 +411,6 @@ print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered) system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; unlink($startListFile); -# Reload units that need it. This includes remounting changed mount -# units. -if (scalar(keys %unitsToReload) > 0) { - print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; - unlink($reloadListFile); -} - # Print failed and new units. my (@failed, @new, @restarting); From 8664aea63dc5758b1ade7b04578db7e2e951a841 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Apr 2015 17:47:37 +0200 Subject: [PATCH 853/947] Revert "mdadm: 3.3 -> 3.3.2". This reverts commit 7719f7f23b8ad754d3a5916f5a218110c89eb69f, again! It prevents systems from booting, for two reasons: * The initrd size is going to explode, but I think this is not the REAL issue. We had that in 666cf99 already, which reverted this update already. * Another reason I don't yet know, which is the REAL issue. We need to investigate and fix that before attempting another update. Because of that I've also added a small comment before the src attribute to prevent further updates like this. Signed-off-by: aszlig --- pkgs/os-specific/linux/mdadm/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 767f1e9ecae..a7965a70b1c 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,11 +1,20 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3.2"; + name = "mdadm-3.3"; + # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING + # Do NOT update this if you're not ABSOLUTELY certain that it will work. + # Please check the update using the NixOS VM test, BEFORE pushing: + # nix-build nixos/release.nix -A tests.installer.swraid.x86_64-linux + # Discussion: + # https://github.com/NixOS/nixpkgs/commit/7719f7f + # https://github.com/NixOS/nixpkgs/commit/666cf99 + # https://github.com/NixOS/nixpkgs/pull/6006 + # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; + sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; }; nativeBuildInputs = [ groff ]; From 243ec61c4f83fb162bbdd62402353c56f6d554be Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Wed, 1 Apr 2015 15:12:40 +0200 Subject: [PATCH 854/947] i2p: initial --- lib/maintainers.nix | 1 + pkgs/tools/networking/i2p/default.nix | 41 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/networking/i2p/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7ec31f0aad3..fcc78723f4b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -102,6 +102,7 @@ jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; + joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix new file mode 100644 index 00000000000..088e8e8de7f --- /dev/null +++ b/pkgs/tools/networking/i2p/default.nix @@ -0,0 +1,41 @@ +{ stdenv, procps, coreutils, fetchurl, openjdk8, ant, gcj, gettext }: + +# TODO: support other systems, just copy appropriate lib/wrapper.. to $out +assert stdenv.system != "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "i2p-0.9.18"; + src = fetchurl { + url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; + sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl"; + }; + buildInputs = [ openjdk8 ant gcj gettext ]; + buildPhase = '' + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant preppkg-linux-only + ''; + installPhase = '' + set -B + mkdir -p $out/{bin,share} + cp -r pkg-temp/* $out + cp installer/lib/wrapper/linux64/* $out + sed -i $out/i2prouter -i $out/runplain.sh \ + -e "s#%INSTALL_PATH#$out#" \ + -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ + -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ + -e 's#%USER_HOME#$HOME#' \ + -e "s#%SYSTEM_java_io_tmpdir#/tmp#" + mv $out/runplain.sh $out/bin/i2prouter-plain + mv $out/man $out/share/ + chmod +x $out/bin/* $out/i2psvc + rm $out/{osid,postinstall.sh,INSTALL-headless.txt} + ''; + + meta = with stdenv.lib; { + homepage = "https://geti2p.net"; + description = "Applications and router for I2P, anonymity over the Internet"; + maintainers = [ stdenv.lib.maintainers.joelmo ]; + licenses = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4eb921b8442..57eba0ebcd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1655,6 +1655,8 @@ let httptunnel = callPackage ../tools/networking/httptunnel { }; + i2p = callPackage ../tools/networking/i2p {}; + i2pd = callPackage ../tools/networking/i2pd {}; iasl = callPackage ../development/compilers/iasl { }; From 81465e8e567b276b61abaf562499e674e6b948a8 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Wed, 1 Apr 2015 17:44:18 +0200 Subject: [PATCH 855/947] graph-tool: add joelmo to maintainers --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index e647dfc809f..aa5deb6d6db 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { homepage = http://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; + maintainer = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { From 1924e48253112e22876ac4a380d16de07b10e91b Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 17:22:23 -0400 Subject: [PATCH 856/947] jbigkit: patch makefiles to use Clang when needed --- pkgs/development/libraries/jbigkit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index af2611a0bae..2e0c75c1452 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \ + --replace "CC = gcc" "CC = clang" ''; installPhase = '' From eecb59a805b7b1a0040dfb28b249abe6283a6770 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2015 19:25:34 +0200 Subject: [PATCH 857/947] samsungUnifiedLinuxDriver 0.92 -> 4.00.39 This not the latest, but the greatest version (by number of models still supported). A big bump. Everything seems to work fine. Tested with a Samsung CLP-325. Also fixed some strange things. Did this ever even work? On x86_64? --- pkgs/misc/cups/drivers/samsung/builder.sh | 16 ++++++++-------- pkgs/misc/cups/drivers/samsung/default.nix | 16 ++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/cups/drivers/samsung/builder.sh b/pkgs/misc/cups/drivers/samsung/builder.sh index db54d8a6c93..f750df6e506 100644 --- a/pkgs/misc/cups/drivers/samsung/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/builder.sh @@ -1,15 +1,14 @@ source $stdenv/setup arch=$(uname -m) -# replace i[3456]86 with i386 -echo arch | egrep -q '^i[3456]86$' && arch=i386 -arch=i386 +echo "$arch" | egrep -q '^i[3456]86$' && arch=i386 +echo "Installing for $arch" + unpackPhase patchPhase set -v -echo $arch cd cdroot/Linux mkdir -p $out/opt cp -r $arch/at_root/* $out @@ -18,8 +17,8 @@ cp -r $arch/at_opt/* $out/opt cp -r noarch/at_opt/* $out/opt cd $out -#test -d usr/lib64 && ln -s usr/lib64 lib || -ln -s usr/lib lib +test -d usr/lib64 && ln -s usr/lib64 lib || + ln -s usr/lib lib mkdir -p share/cups cd share/cups ln -s ../../opt/share/* . @@ -27,8 +26,9 @@ ln -s ppd model cd $out/lib/cups/filter for i in $(ls); do - echo patching $i... - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)" + echo "Patching $i..." + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || + echo "Couldn't set interpreter!" patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. done diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 3d111ec5942..b78104a7ddc 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -13,12 +13,15 @@ {stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf}: -stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-0.92"; +# Do not bump lightly! Visit +# to see what will break when upgrading. Consider a new versioned attribute. +let version = "4.00.39"; in +stdenv.mkDerivation { + name = "samsung-UnifiedLinuxDriver-${version}"; src = fetchurl { - url = "http://downloadcenter.samsung.com/content/DR/200911/20091103171827750/UnifiedLinuxDriver_0.92.tar.gz"; - sha256 = "0p2am0p8xvm339mad07c4j77gz31m63z76sy6d9hgwmxy2prbqfq"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; }; buildInputs = [ cups gcc ghostscript glibc patchelf ]; @@ -28,9 +31,10 @@ stdenv.mkDerivation rec { builder = ./builder.sh; meta = with stdenv.lib; { - description = "Samsung's Linux drivers; includes binaries without source code"; - homepage = "http://www.samsung.com/"; + description = "Samsung's Linux printing drivers; includes binaries without source code"; + homepage = http://www.samsung.com/; license = licenses.unfree; platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } From 224ed7e798caf80e65250385a9cb0ab09c52d2c7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Apr 2015 19:55:49 +0200 Subject: [PATCH 858/947] nixos/hardware: Add option to enable KSM. This is essentially what's been done for the official NixOS build slaves and I'm using it as well for a few of my machines and my own Hydra slaves. Here's the same implementation from the Delft server configurations: https://github.com/NixOS/nixos-org-configurations/blob/f47c2fc7f82cc8aa4ea8047487cbb819d6829fe2/delft/common.nix#L91-L101 Signed-off-by: aszlig --- nixos/modules/hardware/ksm.nix | 18 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/hardware/ksm.nix diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix new file mode 100644 index 00000000000..d6ac69b5d65 --- /dev/null +++ b/nixos/modules/hardware/ksm.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: + +{ + options.hardware.enableKSM = lib.mkEnableOption "Kernel Same-Page Merging"; + + config = lib.mkIf config.hardware.enableKSM { + systemd.services.enable-ksm = { + description = "Enable Kernel Same-Page Merging"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + script = '' + if [ -e /sys/kernel/mm/ksm ]; then + echo 1 > /sys/kernel/mm/ksm/run + fi + ''; + }; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 738faa79e29..33830dbc810 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -29,6 +29,7 @@ ./hardware/all-firmware.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/ksm.nix ./hardware/network/b43.nix ./hardware/network/intel-2100bg.nix ./hardware/network/intel-2200bg.nix From f97f3d7a1b96a3edf8253c3630bccba3d2395ce5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2015 20:21:38 +0200 Subject: [PATCH 859/947] lz4 127 -> 128 Tests now fail when run in parallel. Don't. --- pkgs/tools/compression/lz4/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index c89909503d5..d7d9fc0c0a2 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, valgrind }: stdenv.mkDerivation rec { - # The r127 source still calls itself r126 everywhere, but I'm not going to - # patch over such silly cosmetic oversights in an official release. -- nckx - version = "127"; + version = "128"; name = "lz4-${version}"; src = fetchurl { url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz"; - sha256 = "0hvbbr07j4hfix4dn4xw4fsmkr5s02bj596fn0i15d1i49xby2aj"; + sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b"; }; # valgrind is required only by `make test` @@ -20,6 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + checkFlags = "-j1"; # required since version 128 meta = with stdenv.lib; { description = "Extremely fast compression algorithm"; From 050e6fa43125636670291dfccf21566bab85791c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 12:38:43 -0700 Subject: [PATCH 860/947] mysql51: Remove from the small release --- pkgs/top-level/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8f2c548bebc..e8956b5a0da 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -116,7 +116,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; mpg321 = linux; mutt = linux; mysql = linux; - mysql51 = linux; ncat = linux; netcat = all; nfs-utils = linux; From 53f1d8147db9af0aaac12deff28544f61dc05c64 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 12:36:19 -0700 Subject: [PATCH 861/947] mariadb: Make derivation smaller and split out libs --- pkgs/servers/sql/mariadb/default.nix | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 23a09f1d54e..a5905821d17 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -55,13 +55,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "out" "lib" ]; + prePatch = '' substituteInPlace cmake/libutils.cmake \ --replace /usr/bin/libtool libtool + sed -i "s,SET(DEFAULT_MYSQL_HOME.*$,SET(DEFAULT_MYSQL_HOME /not/a/real/dir),g" CMakeLists.txt + sed -i "s,SET(PLUGINDIR.*$,SET(PLUGINDIR $lib/lib/mysql/plugin),g" CMakeLists.txt + + sed -i "s,SET(pkgincludedir.*$,SET(pkgincludedir $lib/include),g" scripts/CMakeLists.txt + sed -i "s,SET(pkglibdir.*$,SET(pkglibdir $lib/lib),g" scripts/CMakeLists.txt + sed -i "s,SET(pkgplugindir.*$,SET(pkgplugindir $lib/lib/mysql/plugin),g" scripts/CMakeLists.txt + + sed -i "s,set(libdir.*$,SET(libdir $lib/lib),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "s,set(includedir.*$,SET(includedir $lib/include),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "/\"\$[{]CMAKE_INSTALL_PREFIX}\/\$[{]GRN_RELATIVE_PLUGINS_DIR}\"/d" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "s,set(GRN_PLUGINS_DIR.*$,SET(GRN_PLUGINS_DIR $lib/\$\{GRN_RELATIVE_PLUGINS_DIR}),g" storage/mroonga/vendor/groonga/CMakeLists.txt ''; + postInstall = '' substituteInPlace $out/bin/mysql_install_db \ --replace basedir=\"\" basedir=\"$out\" + + # Remove superfluous files + rm -r $out/mysql-test $out/sql-bench $out/data + rm $out/share/man/man1/mysql-test-run.pl.1 + rm $out/bin/rcmysql + find $out/bin -name \*test\* -exec rm {} \; + + # Separate libs and includes into their own derivation + mkdir -p $lib + mv $out/lib $lib + mv $out/include $lib + + # Make sure to propagate lib for compatability + mkdir -p $out/nix-support + echo "$lib" > $out/nix-support/propagated-native-build-inputs ''; passthru.mysqlVersion = "5.6"; From 237029ab74ff99ac81331d09bbe9fb7908a15b97 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 1 Apr 2015 22:34:33 +0200 Subject: [PATCH 862/947] Add pytest-quickcheck testing framework Add Pytest-quickcheck and necessary dependencies into pythonPackages set. --- pkgs/top-level/python-packages.nix | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97a3c76b02a..bebf0f3457a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2128,6 +2128,71 @@ let }; }; + pytestcache = buildPythonPackage rec { + name = "pytest-cache-1.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-cache/pytest-cache-1.0.tar.gz"; + sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; + }; + + propagatedBuildInputs = with self ; [ pytest execnet ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-cache/"; + description = "pytest plugin with mechanisms for caching across test runs"; + }; + }; + + pytestflakes = buildPythonPackage rec { + name = "pytset-flakes-0.2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-flakes/pytest-flakes-0.2.zip"; + sha256 = "0n4mc2kaqasxmj8jid7jlss7nwgz4qgglcwdyrqvh08dilnp354i"; + }; + + propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-flakes"; + description = "pytest plugin to check source code with pyflakes"; + }; + }; + + pytestpep8 = buildPythonPackage rec { + name = "pytest-pep8"; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz"; + sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; + }; + + propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-pep8"; + description = "pytest plugin to check PEP8 requirements"; + }; + }; + + pytestquickcheck = buildPythonPackage rec { + name = "pytest-quickcheck-0.8.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-quickcheck/pytest-quickcheck-0.8.2.tar.gz"; + sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3"; + }; + + propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; + + meta = { + license = stdenv.lib.licenses.asl20; + website = "https://pypi.python.org/pypi/pytest-quickcheck"; + description = "pytest plugin to generate random data inspired by QuickCheck"; + }; + }; + pytestcov = buildPythonPackage (rec { name = "pytest-cov-1.8.1"; From 759d55dc943b5060795fa2834d6436422a5ee133 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 16:36:00 -0400 Subject: [PATCH 863/947] gtk3: fix Darwin build --- pkgs/development/libraries/gtk+/3.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index fa350110476..35b40a507a8 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; }; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ wayland ] ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; From 1afa8d28ea4e95e1d607f9a78566cdcdeab8da07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 12:39:25 +0200 Subject: [PATCH 864/947] hackage-packages.nix: re-generate from Hackage 2015-04-01T12:39:25+0200 --- .../haskell-modules/hackage-packages.nix | 300 +++++++++++++----- 1 file changed, 218 insertions(+), 82 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c40226dc89a..20f31dc3a5f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12385,17 +12385,18 @@ self: { "Redmine" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers - , HTTP, http-client-tls, http-conduit, HUnit, MissingH, network - , old-locale, old-time, resourcet, text, time, transformers + , HTTP, http-client-tls, http-conduit, http-types, HUnit, MissingH + , network, old-locale, old-time, resourcet, text, time + , transformers }: mkDerivation { pname = "Redmine"; - version = "0.0.3"; - sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; + version = "0.0.5"; + sha256 = "0hmxxnb48arh0rbd0z1vl95l3n8yr24kjqnnf3n2by5szdhz06fb"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls - http-conduit MissingH network old-locale old-time resourcet text - time transformers + http-conduit http-types MissingH network old-locale old-time + resourcet text time transformers ]; testDepends = [ aeson base bytestring connection containers http-client-tls @@ -14993,13 +14994,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Win32-security" = callPackage + ({ mkDerivation, base, text, Win32, Win32-errors }: + mkDerivation { + pname = "Win32-security"; + version = "0.1"; + sha256 = "19v0fcxqvkqzrpgbwzkgh06asfg86bkmkbb66w64wnh8s93iqywr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base text Win32 Win32-errors ]; + homepage = "https://github.com/anton-dessiatov/Win32-security"; + description = "Haskell bindings to a security-related functions of the Windows API"; + license = stdenv.lib.licenses.mit; + }) {}; + "Win32-services" = callPackage - ({ mkDerivation, Advapi32, base, errors, Win32 }: + ({ mkDerivation, Advapi32, base, Win32 }: mkDerivation { pname = "Win32-services"; - version = "0.2.4"; - sha256 = "006aiikccdgbv6m84z3wkkd3g5yn6zy85lb25b6c7r3rwxqm34d1"; - buildDepends = [ base errors Win32 ]; + version = "0.2.5"; + sha256 = "1ipsizxhs4900pn84r9hwm718mhrqs89g51vma6ba2j81fmziky2"; + buildDepends = [ base Win32 ]; extraLibraries = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; @@ -19611,8 +19626,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9"; - sha256 = "1076fy65b0qzjind3zm170ws8dq76f34n4b0gjn98v4a0nsk60xw"; + version = "0.9.0.1"; + sha256 = "0x0aixipm32vx1jdqlpnwzk9lsv5d9fiqw5jzz92mfbs9s8jv81k"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19626,7 +19641,6 @@ self: { tasty-hunit time transformers unix utf8-string ]; extraLibraries = [ libXScrnSaver ]; - jailbreak = true; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; @@ -19810,8 +19824,8 @@ self: { }: mkDerivation { pname = "arion"; - version = "0.1.0.7"; - sha256 = "15kr9dwiy415c2yn8pmgxqd8a7mwss3hkn25xk9kg1681qkhnn4z"; + version = "0.1.0.8"; + sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30804,6 +30818,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clist" = callPackage + ({ mkDerivation, base, base-unicode-symbols, peano }: + mkDerivation { + pname = "clist"; + version = "0.1.0.0"; + sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; + buildDepends = [ base base-unicode-symbols peano ]; + jailbreak = true; + homepage = "https://github.com/strake/clist.hs"; + description = "Counted list"; + license = "unknown"; + }) {}; + "clock" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32830,8 +32857,8 @@ self: { }: mkDerivation { pname = "config-value"; - version = "0.3"; - sha256 = "1p1bq93da6d28c1aw2s3rdl8lkn1v8zjy80cb25dvqplap0cxnza"; + version = "0.4"; + sha256 = "1p648vdlhqg587l9r4dr8v44mg1wshqbkg75qdy425cqs0jwkgyl"; buildDepends = [ array base bytestring pretty text transformers ]; buildTools = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -34485,6 +34512,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { crack = null;}; + "crackNum" = callPackage + ({ mkDerivation, base, data-binary-ieee754, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "1.0"; + sha256 = "1606f0pkl3rck72h8gap3k73k48pdlgkfzv96ij0dl910q332l1q"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base data-binary-ieee754 ieee754 ]; + description = "Crack various integer/floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "craftwerk" = callPackage ({ mkDerivation, base, colour, mtl, vector-space }: mkDerivation { @@ -37575,8 +37615,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "0.10.9.2"; - sha256 = "0xz1iajg8rmv1n21b0iifp3c6gywm75m4x4bir991m9j7v88ij6l"; + version = "0.10.10"; + sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d"; buildDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -39258,7 +39298,9 @@ self: { mkDerivation { pname = "diagrams-svg"; version = "1.1.0.4"; + revision = "1"; sha256 = "11adbfvj5a8yzlbkqs433qgr7884n1vlff9vr6h9w1n0nc1amzpl"; + editedCabalFile = "2fd35c0f8bb7ba4d17e04ae258addf4a949b91c2b404c0bbac76dbc6dc819c31"; buildDepends = [ base base64-bytestring blaze-markup blaze-svg bytestring colour containers diagrams-core diagrams-lib directory filepath hashable @@ -40289,8 +40331,8 @@ self: { }: mkDerivation { pname = "distributed-process-p2p"; - version = "0.1.3.1"; - sha256 = "00dbw4p60lbfjfhi9xzyh1jjdndygw00xpirzcnl5f20370hdikh"; + version = "0.1.3.2"; + sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42848,8 +42890,8 @@ self: { ({ mkDerivation, base, extensible, transformers }: mkDerivation { pname = "elevator"; - version = "0.2.2"; - sha256 = "1rnxvhyxgjb9ma680d713i0cqbsq0y8s1d57z2zx5qyq10jshcnm"; + version = "0.2.3"; + sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2"; buildDepends = [ base extensible transformers ]; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; @@ -45348,8 +45390,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.3"; - sha256 = "0vxf76x0ply748vq25nd2h2620f1iyaswzdd3bwcqb6xh50zq1bi"; + version = "0.23.1.4"; + sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -47426,6 +47468,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forecast-io" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "forecast-io"; + version = "0.1.0.0"; + sha256 = "0z2hv8lv75zij9arvxdircc0db0r0m86fgk5496hh1gvxxd5pqw6"; + buildDepends = [ aeson base text ]; + homepage = "https://github.com/stormont/forecast-io"; + description = "A Haskell library for working with forecast.io data."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foreign-storable-asymmetric" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -51179,8 +51233,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.3"; - sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; + version = "0.7.4"; + sha256 = "08b7mayd1qfalqrr2zh8ra7mm05l2inifjamvxn84697mnvxhjg7"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -62113,8 +62167,8 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.2.0.0"; - sha256 = "050mmc307h45k3i2kwlx0rw9n42rwchscrzhpvrkkzhi335g3vag"; + version = "0.2.0.1"; + sha256 = "0r44fpljqwzwzj818p3xplhwkdbndwmbxf2mrgdqsjxj0dmnifhq"; buildDepends = [ aeson base text unordered-containers vector ]; testDepends = [ aeson base http-types HUnit test-framework test-framework-hunit @@ -62127,16 +62181,16 @@ self: { "hjsonschema" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, hashable, hjsonpointer, http-conduit, http-types, HUnit + , filepath, hashable, hjsonpointer, http-client, http-types, HUnit , regexpr, scientific, test-framework, test-framework-hunit, text , unordered-containers, vector }: mkDerivation { pname = "hjsonschema"; - version = "0.5.2.2"; - sha256 = "1bpl8z2gsfa6gv02k9qjya428xga85zwsbjk2gzcwcdj4d2yhmia"; + version = "0.5.3.1"; + sha256 = "1ggqxi2f10qdls67lk3204wc4naicchr20i00p17ynkzxl9ndi8b"; buildDepends = [ - aeson base bytestring file-embed hashable hjsonpointer http-conduit + aeson base bytestring file-embed hashable hjsonpointer http-client http-types regexpr scientific text unordered-containers vector ]; testDepends = [ @@ -63653,8 +63707,8 @@ self: { }: mkDerivation { pname = "hoogle-index"; - version = "0.4.0"; - sha256 = "0a7zkpqcjx225c3prwca8cs8sai0yaxv56vsb0in1s9p86qw1gfv"; + version = "0.4.1"; + sha256 = "09ax7y205ds8wb99qmwszclam8p9s9swv0byf0ap2qiz948gjfbg"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -66809,8 +66863,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.0.0"; - sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f"; + version = "2.1.5"; + sha256 = "02v4a5hcp4bbvnjb18vpw6fwz4qxjll8k8ama0hf6y8jppp72hid"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69450,7 +69504,9 @@ self: { mkDerivation { pname = "hybrid-vectors"; version = "0.1.2.1"; + revision = "1"; sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59"; + editedCabalFile = "9adcfe7dc98b64c7a1506a58c7a771bbc244874790b68f8bc7e1c859207632d7"; buildDepends = [ base deepseq primitive vector ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; @@ -70688,16 +70744,16 @@ self: { }) {}; "imagesize-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , resourcet + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, hspec, resourcet }: mkDerivation { pname = "imagesize-conduit"; - version = "1.0.0.4"; - revision = "1"; - sha256 = "0hhmjbdqdljfy3khzpg2xq6kgxa9x89jvpci7lf413pc1lpg4cw7"; - editedCabalFile = "9a9a6ea6572ae1cdf6f1df1bbd35c96ae2aac9f61f7eabbcc1a60ed792d14a3d"; - buildDepends = [ base bytestring conduit conduit-extra ]; + version = "1.1"; + sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + buildDepends = [ + base bytestring conduit conduit-extra exceptions + ]; testDepends = [ base bytestring conduit conduit-extra hspec resourcet ]; @@ -71010,8 +71066,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.2.1"; - sha256 = "0p6ng30nnkgnfg06bfi0j822wfj1hh04imilmpr1k2n3pjqlqmv0"; + version = "0.2.1.1"; + sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj"; buildDepends = [ base mtl parsec parsers trifecta ]; testDepends = [ base parsec tasty tasty-hunit trifecta ]; homepage = "https://bitbucket.org/mdmkolbe/indentation"; @@ -75771,13 +75827,14 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.8.0"; - sha256 = "0kzhprxw2lhk5s66nh7q2rfndjlch1ii7m3bn116dym4dc16b0cm"; + version = "0.7.9.1"; + sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33"; buildDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell ]; testDepends = [ base language-c-quote ]; + jailbreak = true; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; @@ -76844,9 +76901,9 @@ self: { mkDerivation { pname = "lens"; version = "4.7"; - revision = "3"; + revision = "5"; sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "c7b97e6b3dd9c3ad8ab0458579ac411c5b07119dfbda5f5bc989a07e026814d4"; + editedCabalFile = "bbf436c8c154dc8020aaa23d19e49bbde356447c9ca2e4112baf2ad5d23d7cb1"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -78158,12 +78215,11 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.6"; - sha256 = "1yb6c0r10d44pyahhzgyajphgyhmr9hs402633k6ynm3f1jdwyyg"; + version = "0.2.0.7"; + sha256 = "0yj98757d6z1bh3mqajn58ax2iaxnf2nl68wvbjv2pncwfn679m6"; buildDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -82819,13 +82875,13 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.5.0"; - sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g"; + version = "0.1.6.0"; + sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz"; buildDepends = [ base text ]; testDepends = [ base HUnit test-framework test-framework-hunit text ]; - homepage = "http://darcsden.com/kowey/minimorph"; + homepage = "https://github.com/Mikolaj/minimorph"; description = "English spelling functions with an emphasis on simplicity"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83625,22 +83681,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-json" = callPackage + ({ mkDerivation, aeson, base, monad-logger, template-haskell, text + }: + mkDerivation { + pname = "monad-logger-json"; + version = "0.1.0.0"; + sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh"; + buildDepends = [ aeson base monad-logger template-haskell text ]; + homepage = "http://github.com/fpco/monad-logger-json"; + description = "JSON-friendly Logging APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, shelly, text, transformers + , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.0.0"; - revision = "1"; - sha256 = "0q0m611nr20nxm4wj9ywgq3qakl3qvd820vld4nqxdp1lqsilcwz"; - editedCabalFile = "93ac892b3e81cc44a8fc5ab63f0c6c5d0127602448dcf0984d37d8dd9d92000e"; + version = "0.1.1.1"; + sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf"; buildDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; - testDepends = [ base monad-logger shelly ]; - homepage = "https://github.com/docmunch/monad-logger-rsyslog"; - description = "rsyslog output for monad-logger"; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; license = stdenv.lib.licenses.mit; }) {}; @@ -84482,12 +84548,11 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.2.0"; - sha256 = "0d94hpgkrh61cax0f4p71irgvq3psn53qiy7x9bwql8qwsdni1qg"; + version = "0.1.2.1"; + sha256 = "1n76vjh785yzirfkh63nlrpi9y1bb9z1r3v514150wfxjn3n723j"; buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; - jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -90130,8 +90195,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "overture"; - version = "0.0.4"; - sha256 = "01zq2ja2vn0pvwf7rm51a0dmn5qdy83ysj656zm7wcwnlq6cfs3d"; + version = "0.0.5"; + sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; buildDepends = [ base ]; testDepends = [ base doctest ]; description = "An alternative to some of the Prelude"; @@ -90428,9 +90493,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.13.2"; - revision = "1"; + revision = "2"; sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76"; - editedCabalFile = "31556fad86bf4c7daf43b7da7912a9f40b1e9ff79fdec46767e884d61da1d9f9"; + editedCabalFile = "1b9479a2579d76c43089283b6fb7a060e16050fd62fe0da896a722db815671d6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -90486,10 +90551,9 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.3.1"; - sha256 = "1h943cyj6ph5w32rmkzlvszjbb7s65is1h9ifws4m7nj9mbn13lf"; + version = "0.3.2"; + sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb"; buildDepends = [ base containers lens pandoc-types ]; - jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -93371,11 +93435,12 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.5.3"; - sha256 = "1ny8dd4sd55df412v9dy5z0vf3nbi4h46pjazyiaj056p2w723aa"; + version = "0.6"; + sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; + jailbreak = true; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96461,6 +96526,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pseudo-trie" = callPackage + ({ mkDerivation, base, data-default, hspec, QuickCheck + , quickcheck-instances, semigroups + }: + mkDerivation { + pname = "pseudo-trie"; + version = "0.0.2"; + sha256 = "0pblqy1bp16wr4zpvd2l54la407f3jf13b55iy21j94fsyrn93x0"; + buildDepends = [ base data-default semigroups ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A tagged rose-tree with short circuited unique leaves"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pseudomacros" = callPackage ({ mkDerivation, base, old-locale, template-haskell, time }: mkDerivation { @@ -100708,8 +100787,8 @@ self: { }: mkDerivation { pname = "reserve"; - version = "0.1.0"; - sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp"; + version = "0.1.1"; + sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -101452,6 +101531,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ring-buffer" = callPackage + ({ mkDerivation, base, mtl, primitive, vector }: + mkDerivation { + pname = "ring-buffer"; + version = "0.1.1"; + sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7"; + buildDepends = [ base mtl primitive vector ]; + jailbreak = true; + homepage = "http://github.com/bgamari/ring-buffer"; + description = "A concurrent, mutable ring-buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -101840,6 +101932,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees" = callPackage + ({ mkDerivation, base, containers, data-default, hspec, pseudo-trie + , QuickCheck, quickcheck-instances, semigroups, transformers + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.1.1"; + sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx"; + buildDepends = [ + base containers data-default pseudo-trie semigroups transformers + ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosezipper" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -106623,8 +106731,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.5"; - sha256 = "000jr1lq01yzjdn8wfzjs43gk7avqw51r6gx20sjc3d90vyx8j7s"; + version = "0.6.0"; + sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -118246,7 +118354,9 @@ self: { mkDerivation { pname = "trifecta"; version = "1.5.1.3"; + revision = "1"; sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw"; + editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a"; buildDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq @@ -122487,8 +122597,8 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.6.0.3"; - sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; + version = "0.6.0.4"; + sha256 = "09f0kds50xa0r2l837gqarzazvlhx2afvvykkqiwjqma9caj52av"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring mtl mwc-random primitive vector ]; @@ -123820,6 +123930,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-consul" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring, conduit + , conduit-extra, consul-haskell, enclosed-exceptions, http-client + , http-types, monad-control, monad-logger, network, process + , resourcet, text, transformers, void, wai, wai-app-static + , wai-conduit, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-consul"; + version = "0.1.0.2"; + sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base base-prelude bytestring conduit conduit-extra + consul-haskell enclosed-exceptions http-client http-types + monad-control monad-logger network process resourcet text + transformers void wai wai-app-static wai-conduit wai-extra warp + ]; + homepage = "https://github.com/fpco/wai-middleware-consul"; + description = "Wai Middleware for Consul"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -128168,7 +128302,9 @@ self: { mkDerivation { pname = "yarr"; version = "1.3.3.3"; + revision = "1"; sha256 = "09nr1k0yhm1sh4g741876sf4vi0mgrh7gdq9cbw33hxn6168h547"; + editedCabalFile = "290dde1a67c1de78074c60796f5326cf01668fb109345cd100ff1ac5a5663687"; buildDepends = [ base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell From 943bc26762793b21e0c84ee523c1f5fe23bb624d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 13:52:21 +0200 Subject: [PATCH 865/947] haskell-generic-builder: when replacing an edited Cabal file, show the download URL rather than the store path --- pkgs/development/haskell-modules/generic-builder.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 30109b9a249..dfc7efe811b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -55,8 +55,9 @@ let isGhcjs = ghc.isGhcjs or false; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; + url = newCabalFileUrl; sha256 = editedCabalFile; name = "${pname}-${version}-r${revision}.cabal"; }; @@ -134,7 +135,7 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. prePatch = optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." + echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' echo "Running jailbreak-cabal to lift version restrictions on build inputs." From 59a1969f88f7548f5bd0197bff828b12b75d1347 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 13:54:44 +0200 Subject: [PATCH 866/947] haskell-generic-builder: enable parallel building of libraries with GHC version >= 7.10.1 We'll blame @Fuuzetsu if this change produces broken binaries left and right. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index dfc7efe811b..8474cab667c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,7 +72,7 @@ let hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; + enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary); defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" From 7eda2f9ebb96d21060e51bc13c926b0f906f1a28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 13:57:03 +0200 Subject: [PATCH 867/947] haskell-generic-builder: allow use of 'env' attributes in nix-shell We disabled this to prevent users from accidentally running nix-build on an 'env' attribute, but in fact the ability to use those in combination with "nix-shell -p" is quite useful, so the restriction is lifted. --- pkgs/development/haskell-modules/generic-builder.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 8474cab667c..11bbe550b2d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -267,12 +267,6 @@ stdenv.mkDerivation ({ export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" ''; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Haskell 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; }; }; From 945269a48fa8b91024e18a72b485797eeca308ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 14:02:46 +0200 Subject: [PATCH 868/947] haskell-generic-builder: gratuitous cosmetic change to trigger a complete re-build hydra.nixos.org serves broken binaries because of our favorite non-deterministic package IDs in GHC bug. :-( Re-building everything from scratch seems like the easiest way to recover. --- pkgs/development/haskell-modules/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 11bbe550b2d..baefedf5a74 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -138,14 +138,14 @@ stdenv.mkDerivation ({ echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." + echo "Run jailbreak-cabal to lift version restrictions on build inputs." ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + prePatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment - echo "Building with ${ghc}." + echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} From 36a23619767d045d59c88956f7432c5af528bfb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 16:42:52 +0200 Subject: [PATCH 869/947] haskell-ng-lib: add combinators for enabling/disabling source hyper-linking --- pkgs/development/haskell-modules/lib.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 323030f1eaf..8f932c87023 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -55,4 +55,7 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); + dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + } From 75b527c1e15aac9068d6bf6936e69788dee0aafb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 16:43:29 +0200 Subject: [PATCH 870/947] haskell-modules: disable broken builds on Hydra --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../development/haskell-modules/configuration-ghc-7.8.x.nix | 2 ++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41981c5f119..bb718975f65 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -594,6 +594,12 @@ self: super: { # Test suite wants to connect to $DISPLAY. hsqml = dontCheck super.hsqml; + # https://github.com/lookunder/RedmineHs/issues/4 + Redmine = markBroken super.Redmine; + + # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) + unlambda = dontHyperlinkSource super.unlambda; + # https://github.com/megantti/rtorrent-rpc/issues/1 rtorrent-rpc = markBroken super.rtorrent-rpc; 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 e89b793b141..b0203b79bc2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -76,7 +76,9 @@ self: super: { command-qq = dontCheck super.command-qq; # Doesn't support GHC < 7.10.x. + bound-gen = dontDistribute super.bound-gen; ghc-exactprint = dontDistribute super.ghc-exactprint; + ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; # Newer versions require transformers 0.4.x. seqid = super.seqid_0_1_0; From a9f2e107d00c9955ef244455ee2aac857276192b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 13:46:40 -0700 Subject: [PATCH 871/947] Revert "Remove obsolete .../sbin directories from $PATH" This reverts commit 98cedb3d22a580d8ee1804862d65a3198d9ee3ac. --- nixos/modules/config/system-path.nix | 1 + nixos/modules/programs/environment.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index ed7b949ecc2..f3e86bfd201 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -108,6 +108,7 @@ in "/info" "/lib" "/man" + "/sbin" "/share/emacs" "/share/vim-plugins" "/share/org" diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 1a84e05763f..e0379a2c02a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -39,7 +39,7 @@ in # TODO: move most of these elsewhere environment.profileRelativeEnvVars = - { PATH = [ "/bin" "/lib/kde4/libexec" ]; + { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ]; INFOPATH = [ "/info" "/share/info" ]; PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; TERMINFO_DIRS = [ "/share/terminfo" ]; From ff2117192105c4c356a6ce31514ca93da2e837ff Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 13:57:06 -0700 Subject: [PATCH 872/947] Fix references to current-system/sw/sbin --- nixos/modules/config/users-groups.nix | 2 +- nixos/modules/services/monitoring/munin.nix | 4 ++-- nixos/modules/services/network-filesystems/drbd.nix | 2 +- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/display-managers/sddm.nix | 2 +- pkgs/os-specific/linux/autofs/autofs-v5.nix | 2 +- pkgs/os-specific/linux/systemd/fixes.patch | 2 +- pkgs/os-specific/linux/udisks/1-default.nix | 2 +- pkgs/os-specific/linux/udisks/2-default.nix | 2 +- pkgs/os-specific/linux/util-linux/default.nix | 2 +- pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch | 2 +- pkgs/servers/mail/postfix/default.nix | 2 +- pkgs/tools/networking/network-manager/nixos-purity.patch | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index db87f9fd0b1..9d48edf2f26 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -110,7 +110,7 @@ let shell = mkOption { type = types.str; - default = "/run/current-system/sw/sbin/nologin"; + default = "/run/current-system/sw/bin/nologin"; description = "The path to the user's shell."; }; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 8558c4ff8e4..31afa859e25 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \ + --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -194,7 +194,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix index b914724abfe..1bd67206444 100644 --- a/nixos/modules/services/network-filesystems/drbd.nix +++ b/nixos/modules/services/network-filesystems/drbd.nix @@ -44,7 +44,7 @@ let cfg = config.services.drbd; in boot.extraModprobeConfig = '' - options drbd usermode_helper=/run/current-system/sw/sbin/drbdadm + options drbd usermode_helper=/run/current-system/sw/bin/drbdadm ''; environment.etc = singleton diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index e7ddb7ff254..6a7b810261d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -55,7 +55,7 @@ let [UserList] minimum-uid=500 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} - hidden-shells=/run/current-system/sw/sbin/nologin + hidden-shells=/run/current-system/sw/bin/nologin ''; lightdmConf = writeText "lightdm.conf" diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index c14c13b1cba..c44383cc611 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -26,7 +26,7 @@ let [Users] MaximumUid=${toString config.ids.uids.nixbld} HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} - HideShells=/run/current-system/sw/sbin/nologin + HideShells=/run/current-system/sw/bin/nologin [XDisplay] MinimumVT=${toString xcfg.tty} diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 5c5c2f026af..787cd34180e 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags="--disable-move-mount --with-path=$PATH" export MOUNT=/var/run/current-system/sw/bin/mount export UMOUNT=/var/run/current-system/sw/bin/umount - export MODPROBE=/var/run/current-system/sw/sbin/modprobe + export MODPROBE=/var/run/current-system/sw/bin/modprobe # Grrr, rpcgen can't find cpp. (NIXPKGS-48) mkdir rpcgen echo "#! $shell" > rpcgen/rpcgen diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index 182927486c5..c1c768dbacb 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -229,7 +229,7 @@ index 70a5918..1926e52 100644 - cmdline[i++] = "/sbin/fsck"; - cmdline[i++] = arg_repair; -+ cmdline[i++] = "/run/current-system/sw/sbin/fsck"; ++ cmdline[i++] = "/run/current-system/sw/bin/fsck"; cmdline[i++] = "-T"; /* diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 780eeb68d1d..b3df300e519 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace src/main.c --replace \ "/sbin:/bin:/usr/sbin:/usr/bin" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" ''; buildInputs = diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 7888fc51be0..2dc99504c58 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { '' substituteInPlace src/main.c --replace \ "@path@" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" ''; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 62fb4976ad0..327f07442d2 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --enable-mesg --enable-ddate --disable-use-tty-group - --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin + --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin ${if ncurses == null then "--without-ncurses" else ""} ''; diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch index 49ad88fc3a4..82b5999cf9e 100644 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -16,7 +16,7 @@ diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount # Ignore the prefix for the mount helper. It must be installed in /sbin/ # because this path is hardcoded in the mount(8) for security reasons. + # -+ # ... except on nixos, where it really is /var/run/current-system/sw/sbin, ++ # ... except on nixos, where it really is /var/run/current-system/sw/bin, + # which is where this will end up if we put it in ${out}/sbin. # sbin_PROGRAMS = mount.zfs diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0bfc31580e1..e12565238c9 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,/usr/sbin,/var/run/current-system/sw/bin, \ -e s,:/sbin,, src/util/sys_defs.h ''; diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 505dd8b2b3c..831b2010fcf 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); From d68a0554b67cfb6c40d5da950747066f1e97a627 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 18:00:18 -0400 Subject: [PATCH 873/947] librsvg: Fix libintl undefined symbols on Darwin --- pkgs/development/libraries/librsvg/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 3ed89ec8a8a..9589298ecd5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco +, bzip2, libcroco, libintlOrEmpty , gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; From 0253cf06c06dfdb919a2c49e084349852faf8234 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 20:40:38 -0400 Subject: [PATCH 874/947] libfpx: fix Darwin build --- pkgs/development/libraries/libfpx/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 11ec1c0ecf3..2540d22b8d4 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; }; + # Darwin gets misdetected as Windows without this + NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + + # This dead code causes a duplicate symbol error in Clang so just remove it + postPatch = if (stdenv.cc.cc.isClang or false) then '' + substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" + '' else null; + meta = with stdenv.lib; { homepage = http://www.imagemagick.org; description = "A library for manipulating FlashPIX images"; From 2f63e26d040dca257b6d6ed0a5f3d1ef7a43773c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 21:49:45 -0400 Subject: [PATCH 875/947] fontforge: fix Darwin build --- pkgs/tools/misc/fontforge/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index e166d2e93c9..886495a27eb 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext -, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2 +, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withGTK ? false, gtk2 , withPython ? false # python-scripting was breaking inconsolata and libertine builds }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { git autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withGTK [ gtk2 ]; + ++ lib.optionals withGTK [ gtk2 ] + # I'm not sure why pango doesn't seem necessary on Linux + ++ lib.optionals stdenv.isDarwin [ pango ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] From e05b68ed051e1973379105dbecf425eec69a74ae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 14:25:56 -0700 Subject: [PATCH 876/947] More cleanups of sw/sbin --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 682c36401de..686f63720fc 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { substituteInPlace "$out"/modprobe.conf \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ - --replace /sbin/rmmod /run/booted-system/sw/sbin/rmmod \ - --replace /sbin/modprobe /run/booted-system/sw/sbin/modprobe \ + --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ + --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ --replace " grep " " ${gnugrep}/bin/grep " \ --replace " xargs " " ${findutils}/bin/xargs " ''; From be9aa93ddce290f1e4b90ad8274e11da796ae52e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 15:09:50 -0700 Subject: [PATCH 877/947] mariadb: Fix input propagation --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a5905821d17..c53466ae036 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # Make sure to propagate lib for compatability mkdir -p $out/nix-support - echo "$lib" > $out/nix-support/propagated-native-build-inputs + echo "$lib" > $out/nix-support/propagated-build-inputs ''; passthru.mysqlVersion = "5.6"; From 7a3780a675c3c1fe240efa9fd833cc501fadf779 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 2 Apr 2015 01:32:27 +0300 Subject: [PATCH 878/947] crawl: fix build --- pkgs/games/crawl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 7b153eab869..e99df5e6c74 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL, SDL_image, mesa, freetype +, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype , tileMode ? true }: @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] ++ stdenv.lib.optionals tileMode - [ libpng SDL SDL_image freetype mesa ]; + [ libpng SDL2 SDL2_image freetype mesa ]; preBuild = '' cd crawl-ref/source echo "${version}" > util/release_ver # Related to issue #1963 sed -i 's/-fuse-ld=gold//g' Makefile - for i in util/*.pl; do + for i in util/*; do patchShebangs $i done patchShebangs util/gen-mi-enum From 98a32ad124b80441f09d0d84e415181ac7dc482b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 31 Mar 2015 17:52:25 +0300 Subject: [PATCH 879/947] xmonad-with-packages: use 'inherit' --- 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 57eba0ebcd5..36c354b6483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12384,7 +12384,7 @@ let xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { - ghcWithPackages = haskellngPackages.ghcWithPackages; + inherit (haskellngPackages) ghcWithPackages; packages = self: []; }; From 4da3e360e800dc8b5f38a67e310277d9988d9697 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 2 Apr 2015 01:46:57 +0300 Subject: [PATCH 880/947] rxvt_unicode-with-plugins: rename (keep the old name for a while) --- pkgs/applications/misc/rxvt_unicode/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 146ac9704f4..2f68e4ec5f1 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -25,4 +25,4 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36c354b6483..39d1a5bdbc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11632,10 +11632,13 @@ let urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; - rxvt_unicode_with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { plugins = [ urxvt_perls urxvt_tabbedex ]; }; + # FIXME: remove somewhere in future + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; + sakura = callPackage ../applications/misc/sakura { inherit (gnome3) vte; }; From e97b63a72729d054c7eb52da4eb7f6b2cb3b3f32 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:09:18 -0700 Subject: [PATCH 881/947] mariadb: Fix mysql_config generation --- pkgs/servers/sql/mariadb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c53466ae036..d85d9fff433 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -88,6 +88,11 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib + # Add mysql_config to libs since configure scripts use it + mkdir -p $lib/bin + cp $out/bin/mysql_config $lib/bin + sed -i "/\(execdir\|bindir\)/ s,'[^\"']*',$lib/bin,g" $lib/bin/mysql_config + # Make sure to propagate lib for compatability mkdir -p $out/nix-support echo "$lib" > $out/nix-support/propagated-build-inputs From fe527e7d33f1a59a1fcc6e7de86f82efcd02c5ea Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 1 Apr 2015 13:52:45 -0400 Subject: [PATCH 882/947] babl: 0.1.10 -> 0.1.12 New version fixes build on Darwin --- pkgs/development/libraries/babl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 473df8819c0..f5de02e22bb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.10"; + name = "babl-0.1.12"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; + url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g"; }; meta = { From 8430216fb55318d95489e1d978dca5c08e01f3a2 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 1 Apr 2015 16:29:38 -0400 Subject: [PATCH 883/947] aalib: patch for Darwin --- pkgs/development/libraries/aalib/darwin.patch | 106 ++++++++++++++++++ pkgs/development/libraries/aalib/default.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/libraries/aalib/darwin.patch diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch new file mode 100644 index 00000000000..44559d06210 --- /dev/null +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -0,0 +1,106 @@ +diff --git a/src/aaedit.c b/src/aaedit.c +index 09534d2..2ea52f9 100644 +--- a/src/aaedit.c ++++ b/src/aaedit.c +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + static void aa_editdisplay(struct aa_edit *e) + +diff --git a/src/aakbdreg.c b/src/aakbdreg.c +index def65fe..f4f8efb 100644 +--- a/src/aakbdreg.c ++++ b/src/aakbdreg.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aalib.c b/src/aalib.c +index 11fecc8..e3063b4 100644 +--- a/src/aalib.c ++++ b/src/aalib.c +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + +diff --git a/src/aamoureg.c b/src/aamoureg.c +index 0380828..bb55fe3 100644 +--- a/src/aamoureg.c ++++ b/src/aamoureg.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aarec.c b/src/aarec.c +index 70f4ebc..ee43e8a 100644 +--- a/src/aarec.c ++++ b/src/aarec.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, +diff --git a/src/aaregist.c b/src/aaregist.c +index 54abec0..765155e 100644 +--- a/src/aaregist.c ++++ b/src/aaregist.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aax.c b/src/aax.c +index adcbd82..36e3294 100644 +--- a/src/aax.c ++++ b/src/aax.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/src/aaxkbd.c b/src/aaxkbd.c +index 30d5903..da2248d 100644 +--- a/src/aaxkbd.c ++++ b/src/aaxkbd.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/src/aaxmouse.c b/src/aaxmouse.c +index 9935b03..7e725ad 100644 +--- a/src/aaxmouse.c ++++ b/src/aaxmouse.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/aalib.m4 b/aalib.m4 +index c40b8db..991fbda 100644 +--- a/aalib.m4 ++++ b/aalib.m4 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index fa21a9570c7..d7dcbeba330 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { configureFlags = "--without-x --with-ncurses=${ncurses}"; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + meta = { description = "ASCII art graphics library"; }; From d27ba2824a1ca67d3f1e92b5c067f834ba273f9a Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 1 Apr 2015 16:32:57 -0400 Subject: [PATCH 884/947] gegl: fix Darwin build --- pkgs/development/libraries/gegl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a589d625273..38432f68273 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; nativeBuildInputs = [ pkgconfig ]; From 1155bb97f851a4583fe3da93e6f1192f85cc2c3c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 1 Apr 2015 16:33:55 -0400 Subject: [PATCH 885/947] poppler: 0.28.1 -> 0.32.0 and cmake -> configure Use autotools build script rather than cmake as the cmake build script is buggy (doesn't seem to work with openjpeg2) Fixes build on Darwin and openjpeg2 support on Linux --- pkgs/development/libraries/poppler/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2c310603b78..34b6b2f62f6 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null, qt5 }: let - version = "0.28.1"; # even major numbers are stable - sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; + version = "0.32.0"; # even major numbers are stable + sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9"; # This is for Okular (and similar) to support subpixel rendering. # It's kept from upstream because of political reasons. @@ -26,9 +26,13 @@ let propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; - nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + configureFlags = [ + "--enable-xpdf-headers" + "--enable-libcurl" + "--enable-zlib" + ]; patches = [ ./datadir_env.patch ./poppler-glib.patch ]; From 2b79ac63398f2eca452ad5d39482f5c16efe4515 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 1 Apr 2015 16:44:17 -0400 Subject: [PATCH 886/947] gimp: build on Darwin --- pkgs/applications/graphics/gimp/2.8.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 9f7643ad1c0..83f409457fb 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -28,12 +28,13 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 71a2a59f46e023c29d69cf0f035511037a488d6d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:31:51 -0700 Subject: [PATCH 887/947] opendbx: 1.4.4 -> 1.4.6 --- pkgs/development/libraries/opendbx/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a89965d0467..03e7718a3ae 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, readline, mysql, postgresql, sqlite}: +{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }: stdenv.mkDerivation rec { - name = "opendbx-1.4.4"; + name = "opendbx-1.4.6"; + src = fetchurl { url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; - sha256 = "1pc70l54kkdakdw8njr2pnbcghq7fn2bnk97wzhac2adwdkjp7vs"; + sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; preConfigure = '' - export CPPFLAGS="-I${mysql}/include/mysql" - export LDFLAGS="-L${mysql}/lib/mysql" + export CPPFLAGS="-I${mysql.lib}/include/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [readline mysql postgresql sqlite]; + buildInputs = [ readline mysql.lib postgresql sqlite ]; } From bc7b39784ac6779820ac2bfefc1f7a94ba3ab310 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:41:10 -0700 Subject: [PATCH 888/947] DBD-mysql: 4.023 -> 4.031 --- .../perl-modules/DBD-mysql/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index a7464893cbb..273cc0e44f2 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,15 +1,17 @@ -{fetchurl, buildPerlPackage, DBI, mysql}: +{ fetchurl, buildPerlPackage, DBI, mysql }: -buildPerlPackage { - name = "DBD-mysql-4.023"; +buildPerlPackage rec { + name = "DBD-mysql-4.031"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.023.tar.gz; - sha256 = "0j4i0i6apjwx5klk3wigh6yysssn7bs6p8c5sh31m6qxsbgyk9xa"; + url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; + sha256 = "1lngnkfi71gcpfk93xhil2x9i3w3rqjpxlvn5n92jd5ikwry8bmf"; }; - buildInputs = [mysql] ; - propagatedBuildInputs = [DBI]; + buildInputs = [ mysql.lib ] ; + propagatedBuildInputs = [ DBI ]; + + doCheck = false; # makeMakerFlags = "MYSQL_HOME=${mysql}"; } From a604b4248054b31bbdfd1c96fdf591793859abc5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:39:50 -0700 Subject: [PATCH 889/947] mysql: Use libs in place of the binary mysql --- pkgs/applications/audio/amarok/default.nix | 2 +- pkgs/applications/graphics/digikam/2.nix | 2 +- pkgs/applications/graphics/digikam/default.nix | 2 +- pkgs/applications/misc/mysql-workbench/default.nix | 2 +- pkgs/applications/misc/stardict/stardict.nix | 6 +++--- pkgs/applications/office/calligra/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 2 +- pkgs/development/compilers/urweb/default.nix | 4 ++-- pkgs/development/interpreters/php/5.4.nix | 12 ++++++------ pkgs/development/interpreters/php/5.5.nix | 12 ++++++------ pkgs/development/interpreters/php/5.6.nix | 12 ++++++------ .../ruby/bundler-env/default-gem-config.nix | 2 +- .../development/libraries/libdbi-drivers/default.nix | 6 +++--- pkgs/development/libraries/qt-3/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/qt-5/5.3/default.nix | 2 +- .../libraries/unixODBCDrivers/default.nix | 4 ++-- pkgs/development/ocaml-modules/mysql/default.nix | 6 +++--- pkgs/development/tools/misc/sysbench/default.nix | 5 ++++- pkgs/servers/computing/slurm/default.nix | 2 +- pkgs/servers/games/ghost-one/default.nix | 6 +++--- pkgs/servers/http/lighttpd/default.nix | 2 +- pkgs/servers/restund/default.nix | 6 +++--- pkgs/tools/backup/bareos/default.nix | 4 ++-- pkgs/tools/networking/mailutils/default.nix | 2 +- .../package-management/disnix/dysnomia/default.nix | 2 +- pkgs/tools/system/collectd/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 2 +- 28 files changed, 59 insertions(+), 56 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d695150bf31..6ecdc1f98d4 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi + libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix index be991772d39..c239827633f 100644 --- a/pkgs/applications/graphics/digikam/2.nix +++ b/pkgs/applications/graphics/digikam/2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ]; + opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5ace07f827b..70966196b07 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4 + libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 shared_desktop_ontologies soprano ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index efe8785654a..4f2c2fba97c 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa - mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; + mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index d4c41edde30..600642f488a 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; }; - buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; + buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql.lib pcre which libxslt]; postPatch = '' # mysql hacks: we need dynamic linking as there is no libmysqlclient.a - substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' + substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql.lib}/include/mysql/' substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' - substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' + substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql.lib}/lib/mysql/' substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index ac3072f62b5..89bc4ecb4c8 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg - libvisio kactivities mysql postgresql freetds xbase openexr pstoedit + libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit librevenge ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index f296ca3edcf..0b18705e6fb 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame + sqlite mysql.lib nasm avahi libdvdcss lame curl bzip2 zip unzip glxinfo xdpyinfo ] ++ lib.optional dbusSupport dbus_libs diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 71271ee7ed8..6d5b49da066 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { '' export CC="${stdenv.cc}/bin/gcc"; export CCARGS="-I$out/include \ - -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; + -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${mysql}/include/mysql/mysql.h"; + export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; export SQHEADER="${sqlite}/include/sqlite3.h"; ''; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 8eda7eef222..6796a195286 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -87,13 +87,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -103,8 +103,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index fac04654847..87aff4ff1a2 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 6559ecfa658..1fa98708920 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index cf7bf881a8f..cadda288764 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -57,7 +57,7 @@ in }; mysql2 = attrs: { - buildInputs = [ mysql zlib openssl ]; + buildInputs = [ mysql.lib zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 542aa3cb340..128553705e0 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite postgresql ]; + buildInputs = [ libdbi mysql.lib sqlite postgresql ]; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (mysql != null) [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" + "--with-mysql-incdir=${mysql.lib}/include/mysql" + "--with-mysql-libdir=${mysql.lib}/lib/mysql" ] ++ optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 432b4358f7a..ffad4418815 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft}/lib -I${libXft}/include -L${libXft.freetype}/lib -I${libXft.freetype}/include diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a8d8beb4145..06ff3fe66d4 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql postgresql sqlite libjpeg libmng libtiff icu ] + mysql.lib postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 98fd20c44c0..d7ae685af6d 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 03769815a3e..74a14231801 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -64,8 +64,8 @@ args : with args; md5 = "a484f590464fb823a8f821b2f1fd7fef"; }; configureFlags = "--disable-gui" - + " --with-mysql-path=${mysql} --with-unixODBC=${unixODBC}"; - buildInputs = [libtool zlib]; + + " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}"; + buildInputs = [ libtool zlib ]; inherit mysql unixODBC; }; ini = diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 0ae60ab07e4..4ffef60c4bf 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation { "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib mysql]; + buildInputs = [ocaml findlib mysql.lib ]; createFindlibDestdir = true; - propagatedbuildInputs = [mysql]; + propagatedbuildInputs = [ mysql.lib ]; preConfigure = '' - export LDFLAGS="-L${mysql}/lib/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" ''; buildPhase = '' diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 1b4cab361ce..e4c2b474d46 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; - buildInputs = [ autoreconfHook mysql libxslt zlib ]; + + buildInputs = [ autoreconfHook mysql.lib libxslt zlib ]; + src = fetchurl { url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; + preAutoreconf = '' touch NEWS AUTHORS ''; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 25f3fbb5a64..a1a1a2ea1f2 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2"; }; - buildInputs = [ python munge perl pam openssl mysql ]; + buildInputs = [ python munge perl pam openssl mysql.lib ]; configureFlags = '' --with-munge=${munge} diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index f90b5e40997..3c1430157d0 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; }; - buildInputs = [ unzip gmp zlib bzip2 boost mysql ]; + buildInputs = [ unzip gmp zlib bzip2 boost mysql.lib ]; patchPhase = '' - substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql}/lib/mysql" + substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql.lib}/lib/mysql" ''; buildPhase = '' @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index f564cb0d483..056f9202df4 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql mysql; + ++ stdenv.lib.optional enableMysql mysql.lib; configureFlags = [ "--with-openssl" ] ++ stdenv.lib.optional enableMagnet "--with-lua" diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 65e957852fb..705a4ba43e7 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}: +{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }: stdenv.mkDerivation rec { version = "0.4.2"; name = "restund-${version}"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; }; - buildInputs = [zlib openssl libre librem mysql]; + buildInputs = [ zlib openssl libre librem mysql.lib ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; + NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql ''; meta = { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5342b4f489d..c375937ba24 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig nettools gettext readline openssl python - ncurses sqlite postgresql mysql zlib lzo acl glusterfs ceph libcap + ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs ceph libcap ]; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql}" + ++ optional (mysql != null) "--with-mysql=${mysql.lib}" ++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (acl != null) "--enable-acl" diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 5326c9059de..0b57a752a37 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext gdbm libtool pam readline ncurses - gnutls mysql guile texinfo gnum4 ] + gnutls mysql.lib guile texinfo gnum4 ] ++ stdenv.lib.optional doCheck dejagnu; # Tests fail since gcc 4.8 diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 6fa95f060d7..021225c1b4d 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 + ++ stdenv.lib.optional enableMySQLDatabase mysql.lib ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 692016153a6..e0149078271 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt - lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool + lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool varnish yajl ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 2f62ce31949..a9fabd19f47 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc mysql.lib postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis ] ++ stdenv.lib.optional stdenv.isLinux systemd; From b524480695955da0d1060a7d0a21f7cef47a1dda Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:50:47 -0700 Subject: [PATCH 890/947] More mysql migrations --- pkgs/applications/misc/grass/default.nix | 6 +++--- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 6 +++--- pkgs/games/zod/default.nix | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 291ce723aab..9875b3abf01 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -87,10 +87,10 @@ a.composableDerivation.composableDerivation {} (fix: { // wwf { name = "mysql"; enable = { - buildInputs = [ a.mysql ]; + buildInputs = [ a.mysql.lib ]; configureFlags = [ - "--with-mysql-libs=${a.mysql}/lib/mysql" - "--with-mysql-includes=${a.mysql}/include/mysql" + "--with-mysql-libs=${a.mysql.lib}/lib/mysql" + "--with-mysql-includes=${a.mysql.lib}/include/mysql" ]; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7722dd83183..237b5537ba4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -24,7 +24,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql}/bin/mysql_config" + "--with-mysql=${mysql.lib}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 064ea840e26..e423344fb16 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -193,7 +193,7 @@ let lispPackages = rec { version = "git-20141112"; description = "Common Lisp SQL Interface library"; deps = [uffi]; - buildInputs = [pkgs.mysql pkgs.zlib]; + buildInputs = [pkgs.mysql.lib pkgs.zlib]; # Source type: git src = pkgs.fetchgit { url = ''http://git.b9.com/clsql.git''; @@ -202,8 +202,8 @@ let lispPackages = rec { }; overrides = x:{ preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql" ''; }; }; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 0b344873734..0d55f1cd13e 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib makeWrapper ]; - NIX_LDFLAGS="-L${mysql}/lib/mysql"; + NIX_LDFLAGS="-L${mysql.lib}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod From 758319f67f6bcdf36a50394383f7b2471767820a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 16:52:38 -0700 Subject: [PATCH 891/947] One more mysql fix --- pkgs/development/r-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 818cdcb3376..c3572bfd0a0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -278,7 +278,7 @@ let rmatio = [ pkgs.zlib ]; Rmpfr = [ pkgs.gmp pkgs.mpfr ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql ]; + RMySQL = [ pkgs.zlib pkgs.mysql.lib ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -1011,7 +1011,7 @@ let RMySQL = old.RMySQL.overrideDerivation (attrs: { patches = [ ./patches/RMySQL.patch ]; - MYSQL_DIR="${pkgs.mysql}"; + MYSQL_DIR="${pkgs.mysql.lib}"; }); devEMF = old.devEMF.overrideDerivation (attrs: { From 06f3a686e0a7965ec8336096128596326431e3ee Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 1 Apr 2015 18:11:00 -0700 Subject: [PATCH 892/947] emacs-packages: update magit and git-modes --- pkgs/top-level/emacs-packages.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4b23992d12a..16894993159 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -461,12 +461,12 @@ let self = _self // overrides; git-commit-mode = melpaBuild rec { pname = "git-commit-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "git-commit-mode.el" ]; meta = { license = gpl3Plus; }; @@ -474,12 +474,12 @@ let self = _self // overrides; git-rebase-mode = melpaBuild rec { pname = "git-rebase-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "git-rebase-mode.el" ]; meta = { license = gpl3Plus; }; @@ -487,12 +487,12 @@ let self = _self // overrides; gitattributes-mode = melpaBuild rec { pname = "gitattributes-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitattributes-mode.el" ]; meta = { license = gpl3Plus; }; @@ -500,12 +500,12 @@ let self = _self // overrides; gitconfig-mode = melpaBuild rec { pname = "gitconfig-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitconfig-mode.el" ]; meta = { license = gpl3Plus; }; @@ -513,12 +513,12 @@ let self = _self // overrides; gitignore-mode = melpaBuild rec { pname = "gitignore-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitignore-mode.el" ]; meta = { license = gpl3Plus; }; @@ -695,12 +695,12 @@ let self = _self // overrides; magit = melpaBuild rec { pname = "magit"; - version = "20141025"; + version = "1.4.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; - sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; + rev = version; + sha256 = "0x8bvfw47bfpzsv9yr98aays4idbbwvnkp0pag1q78gcn9h2k9vi"; }; packageRequires = [ git-commit-mode git-rebase-mode ]; meta = { license = gpl3Plus; }; From 475e43ee22467ef82a558aa5b628a7cbfe4dc5f3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 19:10:24 -0700 Subject: [PATCH 893/947] mariadb: Fix on i686 --- pkgs/servers/sql/mariadb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d85d9fff433..830d217122a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { sed -i "s,set(includedir.*$,SET(includedir $lib/include),g" storage/mroonga/vendor/groonga/CMakeLists.txt sed -i "/\"\$[{]CMAKE_INSTALL_PREFIX}\/\$[{]GRN_RELATIVE_PLUGINS_DIR}\"/d" storage/mroonga/vendor/groonga/CMakeLists.txt sed -i "s,set(GRN_PLUGINS_DIR.*$,SET(GRN_PLUGINS_DIR $lib/\$\{GRN_RELATIVE_PLUGINS_DIR}),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; postInstall = '' From 4a76e860bb2868857bbdd3b8d1336dc912e2f123 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 19:33:36 -0700 Subject: [PATCH 894/947] libunwind: Add meta information --- pkgs/development/libraries/libunwind/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 75139ea988b..c39deba765d 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz}: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { touch "$out/lib/libunwind-generic.so" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; + platforms = platforms.linux; + license = licenses.gpl2; }; } From c91f939b94578a579b2a029bbb26c2ea3fda69e9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 1 Apr 2015 19:37:30 -0700 Subject: [PATCH 895/947] libibverbs: Correct platforms --- pkgs/development/libraries/libibverbs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix index cef34fe6db8..38f94e7992d 100644 --- a/pkgs/development/libraries/libibverbs/default.nix +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.openfabrics.org/; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } From 8769f43aa44d972b31f8f0e805262ff385d10e04 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 2 Apr 2015 13:27:04 +0200 Subject: [PATCH 896/947] qt-5.4: Fix reference to MySQL library. The MySQL library has been split up from the main client/server binaries in 53f1d8147db9af0aaac12deff28544f61dc05c64. Signed-off-by: aszlig --- pkgs/development/libraries/qt-5/5.4/qtbase.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 45de927bc8d..bc342f605bc 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; From 01e9dfb44988ca0d205582e914c4249abb4253de Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 06:58:09 -0500 Subject: [PATCH 897/947] cups-filters: fix build with latest poppler --- pkgs/misc/cups/filters.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 524662a0ee6..099bf9f6d0c 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -10,6 +10,20 @@ stdenv.mkDerivation rec { sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; }; + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + + # Fix build with poppler-0.31.0 + (fetchurl { + url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476"; + name = "cups-filters-poppler-0.31.0.patch"; + sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4"; + }) + ]; + buildInputs = [ pkgconfig cups poppler fontconfig libjpeg libpng perl ijs qpdf dbus @@ -34,13 +48,6 @@ stdenv.mkDerivation rec { substituteInPlace filter/gstoraster.c --replace execve execvpe ''; - patches = [ - (substituteAll { - src = ./longer-shell-path.patch; - bash = "${bash}/bin/bash"; - }) - ]; - postInstall = '' for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do From 82bd608de14a8488b52e2884c86dbc79c8693be0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 2 Apr 2015 14:08:23 +0200 Subject: [PATCH 898/947] tests/chromium: Work around popup close flakiness. It's not nice to send the escape key over and over again just to ensure the popup is closed, because even *if* it fails to close the popup 4 times in a row it's just very unlikely that it will be closed. But in order to make really sure, we might need to do a screenshot and detect visual changes. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 368d0e43c46..026433fc7ee 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -109,7 +109,12 @@ import ./make-test.nix ( $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup - key Escape + key -delay 1000 Escape + # XXX: This is to make sure the popup is closed, but we better do + # screenshots to detect visual changes. + key -delay 2000 Escape + key -delay 3000 Escape + key -delay 4000 Escape windowfocus --sync windowactivate --sync ''}"); From 5275d1e11eb1a09b7f24317e0b172e3ea687bff8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Apr 2015 15:45:13 +0200 Subject: [PATCH 899/947] ounit: fix homepage URL --- pkgs/development/ocaml-modules/ounit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 92b70a8cd1b..ba0ce29bdf9 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + homepage = http://ounit.forge.ocamlcore.org/; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; From da74e8c317519059b62383a90f48d5403863038d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 08:50:38 -0500 Subject: [PATCH 900/947] poppler: remove qtcairo patch cruft --- pkgs/development/libraries/poppler/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 34b6b2f62f6..bec779e221a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -7,14 +7,6 @@ let version = "0.32.0"; # even major numbers are stable sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9"; - # This is for Okular (and similar) to support subpixel rendering. - # It's kept from upstream because of political reasons. - qtcairo_patch = fetchpatch { - url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/" - + "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd - sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm"; - }; - poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ rec { name = "poppler-${nameSuff}-${version}"; From c0d5cd0ff90cac2e04f6b436991baa4c4471150f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 09:50:37 -0500 Subject: [PATCH 901/947] poppler: fix build of Qt 4 and Qt 5 wrappers The autoconf build system for poppler does not support building the wrappers separately, so this slightly enlarges the size of closures. To compensate, the command-line utilities have been separated into their own package. --- .../editors/texstudio/default.nix | 6 +- pkgs/applications/kde-apps-14.12/default.nix | 2 +- pkgs/applications/misc/qpdfview/default.nix | 4 +- pkgs/applications/office/calligra/default.nix | 4 +- pkgs/applications/office/kbibtex/default.nix | 4 +- pkgs/desktops/kde-4.14/kdegraphics/okular.nix | 4 +- .../kde-4.14/kdelibs/kfilemetadata.nix | 4 +- .../kde-4.14/kdelibs/nepomuk-core.nix | 4 +- pkgs/desktops/plasma-5.2/default.nix | 2 +- .../development/libraries/poppler/default.nix | 87 +++++++------------ .../libraries/poppler/poppler-glib.patch | 19 ---- pkgs/top-level/all-packages.nix | 18 +++- pkgs/top-level/python-packages.nix | 4 +- 13 files changed, 63 insertions(+), 99 deletions(-) delete mode 100644 pkgs/development/libraries/poppler/poppler-glib.patch diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index cd7f0b78c23..5cb31af797d 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) " + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) " qmake PREFIX=$out texstudio.pro ''; diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 00f84896a0b..96f1aea6875 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -107,7 +107,7 @@ let OggVorbis = libvorbis; OpenAL = openal; OpenEXR = openexr; - Poppler = poppler.poppler_qt4; + Poppler = poppler_qt4; Prison = prison; PulseAudio = pulseaudio; PythonLibrary = python; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 0845a379685..1cf6d76b892 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups , file, ghostscript }: let @@ -11,7 +11,7 @@ let sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; }; buildInputs = [ - qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript + qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 89bc4ecb4c8..00f27bfc93c 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 -, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 +, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libodfgen, opencolorio, openjpeg, pstoedit, librevenge @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype - sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl + sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit librevenge diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index ba0d719a049..b3e62b8e051 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, libxslt, popplerQt4 }: +{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: stdenv.mkDerivation rec { pname = "kbibtex"; @@ -14,5 +14,5 @@ stdenv.mkDerivation rec { sed -e '25i#include ' -i src/gui/preferences/settingsabstractwidget.h ''; - buildInputs = [ kdelibs libxslt popplerQt4 ]; + buildInputs = [ kdelibs libxslt poppler_qt4 ]; } diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix index 092833388a7..de7b7799993 100644 --- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix @@ -1,11 +1,11 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: kde { # TODO: package activeapp, qmobipocket - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 + buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4 qca2 qimageblitz libtiff kactivities libkexiv2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix index 48f535549ce..6068516ba2b 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }: +{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }: kde { buildInputs = [ - kdelibs popplerQt4 taglib exiv2 ffmpeg + kdelibs poppler_qt4 taglib exiv2 ffmpeg ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix index d90e1455ce9..526ac069e61 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 , pkgconfig, doxygen, ebook_tools }: @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - popplerQt4 ebook_tools + poppler_qt4 ebook_tools ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index dfaafa06a77..8a7733299b5 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5; + PopplerQt5 = pkgs.poppler_qt.override { inherit qt5; }; } // # packages from nixpkgs (with pkgs; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bec779e221a..c79cdfd4466 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,79 +1,50 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, qt4Support ? false, qt4 ? null, qt5 +, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, utils ? false, suffix ? "glib" }: let version = "0.32.0"; # even major numbers are stable sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; - poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ - rec { - name = "poppler-${nameSuff}-${version}"; + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + inherit sha256; + }; - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - inherit sha256; - }; + patches = [ ./datadir_env.patch ]; - propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; + propagatedBuildInputs = with stdenv.lib; + [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ] + ++ optional qt4Support qt4 + ++ optional qt5Support qt5.base; - nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; - configureFlags = [ + configureFlags = + [ "--enable-xpdf-headers" "--enable-libcurl" "--enable-zlib" - ]; + ] + ++ stdenv.lib.optional (!utils) "--disable-utils"; - patches = [ ./datadir_env.patch ./poppler-glib.patch ]; + enableParallelBuilding = true; - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; + meta = { + homepage = http://poppler.freedesktop.org/; + description = "A PDF rendering library"; - enableParallelBuilding = true; - - meta = { - homepage = http://poppler.freedesktop.org/; - description = "A PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - }; - } merge ]); # poppler_drv - - /* We always use cairo in poppler, so we always depend on glib, - so we always build the glib wrapper (~350kB). - We also always build the cpp wrapper (<100kB). - ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB). - */ - - poppler_glib = poppler_drv "glib" { }; - - poppler_qt4 = poppler_drv "qt4" { - #patches = [ qtcairo_patch ]; # text rendering artifacts in recent versions - propagatedBuildInputs = [ qt4 poppler_glib ]; - NIX_LDFLAGS = "-lpoppler"; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig" - cd qt4 + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - }; - poppler_qt5 = poppler_drv "qt5" { - propagatedBuildInputs = [ qt5.base poppler_glib ]; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" - cd qt5 - ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; - -in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib +} diff --git a/pkgs/development/libraries/poppler/poppler-glib.patch b/pkgs/development/libraries/poppler/poppler-glib.patch deleted file mode 100644 index 09f5a145b84..00000000000 --- a/pkgs/development/libraries/poppler/poppler-glib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake ---- a/poppler-glib.pc.cmake 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.cmake 2014-01-01 09:30:50.000000001 +0100 -@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in ---- a/poppler-glib.pc.in 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.in 2014-01-01 09:27:17.000000001 +0100 -@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -+ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39d1a5bdbc0..bd111fac26a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7230,9 +7230,21 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5 = qt54; }; - popplerQt4 = poppler.poppler_qt4; - poppler_qt5 = poppler.poppler_qt5; + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + + poppler_qt4 = poppler.override { + inherit qt4; + qt4Support = true; + suffix = "qt4"; + }; + + poppler_qt5 = poppler.override { + qt5 = qt54; + qt5Support = true; + suffix = "qt5"; + }; + + poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c1c6b927a8..6eb259f245d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3361,10 +3361,10 @@ let md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; + " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; meta = with stdenv.lib; { description = "A Python binding to Poppler-Qt4"; From 94eb519e190c1d6f8a908da542f1e6c184aaba35 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Apr 2015 17:44:48 +0200 Subject: [PATCH 902/947] Add nfs4 test --- nixos/release.nix | 1 + nixos/tests/nfs.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 4c2a1c76f1c..99d22496c8b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -298,6 +298,7 @@ in rec { # TODO: put in networking.nix after the test becomes more complete tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; + tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 5ed805a1695..216fea7784a 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ version, ... }: +import ./make-test.nix ({ version ? 4, ... }: let From e5b9a42aea6aa901d58839c502c94c091e995f81 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 11:44:13 -0500 Subject: [PATCH 903/947] texmaker: fix poppler_qt4 name --- pkgs/applications/editors/texmaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 16335a55065..4df2dc8cac1 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib, pkgconfig, poppler}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: stdenv.mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; nativeBuildInputs = [ pkgconfig poppler ]; From 6b47ddf9991698b7cfc427e508ffa7058123e3bb Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 2 Apr 2015 12:56:06 -0400 Subject: [PATCH 904/947] s3cmd: 1.0.1 -> 1.5.2 and remove git version --- pkgs/tools/networking/s3cmd/default.nix | 19 ++++++++----------- pkgs/tools/networking/s3cmd/git.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 pkgs/tools/networking/s3cmd/git.nix diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 83a8b4cafef..2287671aef2 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { - name = "s3cmd-1.0.1"; +pythonPackages.buildPythonPackage rec { + name = "s3cmd-1.5.2"; src = fetchurl { url = "mirror://sourceforge/s3tools/${name}.tar.gz"; - sha256 = "1kmxhilwix5plv3qb49as6jknll3pq5abw948h28jisskkm2cs6p"; + sha256 = "0bdl2wvh4nri4n6hpaa8s9lk98xy4a1b0l9ym54fvmxxx1j6g2pz"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ]; - installPhase = - '' - python setup.py install --prefix=$out - wrapPythonPrograms - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://s3tools.org/; description = "A command-line tool to manipulate Amazon S3 buckets"; + license = licenses.gpl2; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix deleted file mode 100644 index 6193137c8d4..00000000000 --- a/pkgs/tools/networking/s3cmd/git.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchgit, pythonPackages }: - -pythonPackages.buildPythonPackage rec { - name = "s3cmd-1.5-pre-81e3842f7a"; - - src = fetchgit { - url = "https://github.com/s3tools/s3cmd.git"; - rev = "81e3842f7afbc8c629f408f4d7dc22058f7bd536"; - sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; - }; - - propagatedBuildInputs = with pythonPackages; [ dateutil ]; - - meta = with stdenv.lib; { - description = "Command line tool for managing Amazon S3 and CloudFront services"; - homepage = http://s3tools.org/s3cmd; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57eba0ebcd5..c43ee4705df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2611,8 +2611,6 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); - s3sync = callPackage ../tools/networking/s3sync { ruby = ruby_1_8; }; From 2c0c3af88fdaeb6693d3f513b76d675bb408658d Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 2 Apr 2015 13:35:50 -0400 Subject: [PATCH 905/947] Remove mozilla browser --- .../networking/browsers/mozilla/builder.sh | 51 ------------------- .../networking/browsers/mozilla/default.nix | 21 -------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 76 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh deleted file mode 100644 index 483585dd170..00000000000 --- a/pkgs/applications/networking/browsers/mozilla/builder.sh +++ /dev/null @@ -1,51 +0,0 @@ -source $stdenv/setup - -preConfigure() { - cat > .mozconfig < Date: Thu, 2 Apr 2015 20:52:55 +0200 Subject: [PATCH 906/947] slic3r: Remove meta.broken due to Perl update. The update happened in fac757a77efa87c4050bef653d197381547f1b59. So it was a looong time ago and the build is working right now. Signed-off-by: aszlig --- pkgs/applications/misc/slic3r/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 727bb048605..a057197a92d 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor the-kenny ]; - broken = true; # requires Perl 5.14 }; } From 847f25d03b5d740f7e5e964dc233744975fb1270 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Apr 2015 14:13:44 +0200 Subject: [PATCH 907/947] hackage-packages.nix: enable a couple of builds that now succeed --- .../haskell-modules/hackage-packages.nix | 193 +++--------------- 1 file changed, 24 insertions(+), 169 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 20f31dc3a5f..286a9470247 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -904,7 +904,6 @@ self: { homepage = "http://github.com/konn/AttoJSON"; description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Attrac" = callPackage @@ -973,7 +972,6 @@ self: { buildDepends = [ base containers llvm random timeit ]; description = "Embedded BASIC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1044,7 +1042,6 @@ self: { homepage = "https://github.com/5outh/Bang/"; description = "A Drum Machine DSL for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Barracuda" = callPackage @@ -2092,6 +2089,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CabalSearch" = callPackage @@ -5343,7 +5341,6 @@ self: { homepage = "https://github.com/favilo/GoogleDirections.git"; description = "Haskell Interface to Google Directions API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleSB" = callPackage @@ -5383,7 +5380,6 @@ self: { buildDepends = [ AttoJson base bytestring dataenc download-curl ]; description = "Interface to Google Translate API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GotoT-transformers" = callPackage @@ -10869,7 +10865,6 @@ self: { homepage = "https://github.com/svenssonjoel/Obsidian"; description = "Embedded language for GPU Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Octree" = callPackage @@ -14140,6 +14135,7 @@ self: { buildDepends = [ base containers matrix random ]; description = "Game for Lounge Marmelade"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Top" = callPackage @@ -15006,6 +15002,7 @@ self: { homepage = "https://github.com/anton-dessiatov/Win32-security"; description = "Haskell bindings to a security-related functions of the Windows API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Win32-services" = callPackage @@ -15085,7 +15082,6 @@ self: { homepage = "https://github.com/gbgar/Wordlint"; description = "Plaintext prose redundancy linter"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Workflow" = callPackage @@ -15312,7 +15308,6 @@ self: { pkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage @@ -15850,7 +15845,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cublas/"; description = "Basic Linear Algebra using native CUBLAS library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cuda" = callPackage @@ -15876,7 +15870,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cufft" = callPackage @@ -15896,7 +15889,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-examples" = callPackage @@ -15914,7 +15906,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fft" = callPackage @@ -15929,7 +15920,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fftw" = callPackage @@ -15989,7 +15979,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-io" = callPackage @@ -16250,7 +16239,6 @@ self: { homepage = "https://github.com/llelf/acme-lolcat"; description = "LOLSPEAK translator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-lookofdisapproval" = callPackage @@ -16931,7 +16919,6 @@ self: { homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-serialize" = callPackage @@ -17936,7 +17923,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage @@ -17949,7 +17935,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage @@ -17962,7 +17947,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage @@ -17975,7 +17959,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage @@ -17988,7 +17971,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -18001,7 +17983,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage @@ -18014,7 +17995,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage @@ -18039,7 +18019,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage @@ -18052,7 +18031,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage @@ -18065,7 +18043,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage @@ -18078,7 +18055,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage @@ -18091,7 +18067,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage @@ -18133,7 +18108,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage @@ -18146,7 +18120,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage @@ -18159,7 +18132,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage @@ -18172,7 +18144,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage @@ -18197,7 +18168,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -18210,7 +18180,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage @@ -18223,7 +18192,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage @@ -18236,7 +18204,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -18249,7 +18216,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage @@ -18274,7 +18240,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage @@ -18287,7 +18252,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage @@ -18300,7 +18264,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage @@ -18325,7 +18288,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage @@ -18338,7 +18300,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -18351,7 +18312,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage @@ -18364,7 +18324,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -18377,7 +18336,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage @@ -18390,7 +18348,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage @@ -18403,7 +18360,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage @@ -18416,7 +18372,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -18429,7 +18384,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -18442,7 +18396,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage @@ -18455,7 +18408,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage @@ -18480,7 +18432,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage @@ -18493,7 +18444,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage @@ -18506,7 +18456,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage @@ -18519,7 +18468,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ampersand" = callPackage @@ -18603,7 +18551,6 @@ self: { buildDepends = [ base deepseq parsec ]; description = "Interpreter for AM"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "analyze-client" = callPackage @@ -20487,7 +20434,6 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -21244,6 +21190,7 @@ self: { ]; description = "empty"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avl-static" = callPackage @@ -24444,7 +24391,6 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitarray" = callPackage @@ -24829,7 +24775,6 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blakesum" = callPackage @@ -25651,6 +25596,7 @@ self: { homepage = "https://github.com/anchor/borel-core"; description = "Metering System for OpenStack metrics provided by Vaultaire"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bot" = callPackage @@ -26294,7 +26240,6 @@ self: { ]; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv" = callPackage @@ -26624,6 +26569,7 @@ self: { jailbreak = true; description = "Backport copy of ShortByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-show" = callPackage @@ -26769,7 +26715,6 @@ self: { buildDepends = [ base c0parser ]; description = "Simple C0 Syntax Check"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c0parser" = callPackage @@ -26781,7 +26726,6 @@ self: { buildDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c10k" = callPackage @@ -27946,7 +27890,6 @@ self: { homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -29974,7 +29917,6 @@ self: { homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "citeproc-hs-pandoc-filter" = callPackage @@ -30667,6 +30609,7 @@ self: { homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -30714,7 +30657,6 @@ self: { jailbreak = true; description = "Toy game (tetris on billiard board). Hipmunk in action."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clientsession" = callPackage @@ -30829,6 +30771,7 @@ self: { homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clock" = callPackage @@ -32663,6 +32606,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the LAME MP3 library"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) { mp3lame = null;}; "conduit-audio-samplerate" = callPackage @@ -32680,6 +32624,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsamplerate resampling library"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) { samplerate = null;}; "conduit-audio-sndfile" = callPackage @@ -33200,6 +33145,7 @@ self: { homepage = "https://github.com/alphaHeavy/consul-haskell"; description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "container-classes" = callPackage @@ -33461,7 +33407,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadsfd" = callPackage @@ -33478,7 +33423,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-fd instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadstf" = callPackage @@ -33495,7 +33439,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-tf instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-mtl" = callPackage @@ -34351,7 +34294,6 @@ self: { homepage = "https://github.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs" = callPackage @@ -35617,7 +35559,6 @@ self: { homepage = "https://github.com/bmsherman/cublas"; description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { cublas = null; cusparse = null;}; "cuboid" = callPackage @@ -35646,7 +35587,6 @@ self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -35678,7 +35618,6 @@ self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curl" = callPackage @@ -40550,6 +40489,7 @@ self: { homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-static" = callPackage @@ -42299,7 +42239,6 @@ self: { homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -45405,7 +45344,6 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -45418,7 +45356,6 @@ self: { homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -45434,7 +45371,6 @@ self: { ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -45447,7 +45383,6 @@ self: { homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -45474,7 +45409,6 @@ self: { homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -45487,7 +45421,6 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -45500,7 +45433,6 @@ self: { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -45513,7 +45445,6 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -49808,7 +49739,6 @@ self: { homepage = "http://github.com/vincenthz/ghc-core-html"; description = "Core to HTML display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-datasize" = callPackage @@ -50388,7 +50318,6 @@ self: { buildDepends = [ base glib gtk3 mtl text transformers webkitgtk3 ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -50403,7 +50332,6 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghclive" = callPackage @@ -50670,7 +50598,6 @@ self: { homepage = "https://github.com/singpolyma/git-date-haskell"; description = "Bindings to the date parsing from Git"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-embed" = callPackage @@ -51451,7 +51378,6 @@ self: { jailbreak = true; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -51572,7 +51498,6 @@ self: { jailbreak = true; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-rendering" = callPackage @@ -52943,7 +52868,6 @@ self: { homepage = "http://github.com/iand675/growler"; description = "A revised version of the scotty library that attempts to be simpler and more performant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gruff" = callPackage @@ -53009,7 +52933,6 @@ self: { buildDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gsl-random" = callPackage @@ -53506,7 +53429,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -55975,7 +55897,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-foundation" = callPackage @@ -56072,7 +55993,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -56465,7 +56385,6 @@ self: { jailbreak = true; description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { groonga = null;}; "haroonga-httpd" = callPackage @@ -58898,7 +58817,6 @@ self: { homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hat" = callPackage @@ -59741,7 +59659,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hdf"; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdigest" = callPackage @@ -61314,7 +61231,6 @@ self: { testDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -62356,7 +62272,6 @@ self: { buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -62892,7 +62807,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmk" = callPackage @@ -63196,7 +63110,6 @@ self: { homepage = "http://github.com/tanakh/hoe"; description = "hoe: Haskell One-liner Evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hofix-mtl" = callPackage @@ -63986,7 +63899,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -64396,7 +64308,6 @@ self: { homepage = "https://github.com/agocorona/hplayground"; description = "monadic, reactive Formlets running in the Web browser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplaylist" = callPackage @@ -64929,7 +64840,6 @@ self: { ]; description = "Java .class files assembler/disassembler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-json-rpc" = callPackage @@ -64991,7 +64901,6 @@ self: { ]; extraLibraries = [ mesos protobuf ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage @@ -65396,7 +65305,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-auditor" = callPackage @@ -65410,7 +65318,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -65455,7 +65362,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-dot" = callPackage @@ -65468,7 +65374,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -65594,7 +65499,6 @@ self: { homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -65666,7 +65570,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -65683,7 +65586,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -65717,7 +65619,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-utils"; description = "Haskell SuperCollider Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscamwire" = callPackage @@ -65901,7 +65802,6 @@ self: { homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdip" = callPackage @@ -67224,7 +67124,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-notes" = callPackage @@ -67239,7 +67138,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-samples" = callPackage @@ -67576,7 +67474,6 @@ self: { homepage = "http://www.happstack.com/"; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -67609,7 +67506,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -70069,6 +69965,7 @@ self: { ]; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend-common" = callPackage @@ -73341,7 +73238,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-snap" = callPackage @@ -73476,7 +73372,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -75030,7 +74925,6 @@ self: { homepage = "https://github.com/lucasdicioccio/laborantin-hs"; description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "labyrinth" = callPackage @@ -75298,7 +75192,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -76121,7 +76014,6 @@ self: { homepage = "http://github.com/osa1/language-lua"; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -76459,7 +76351,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "High and low-level interface to the Novation Launchpad midi controller"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lax" = callPackage @@ -76764,7 +76655,6 @@ self: { jailbreak = true; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -76884,7 +76774,6 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens_4_7" = callPackage @@ -77060,7 +76949,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-sop" = callPackage @@ -77659,7 +77547,6 @@ self: { homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm"; description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { nvvm = null;}; "liboleg" = callPackage @@ -77830,7 +77717,6 @@ self: { homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) taglib;}; "libvirt-hs" = callPackage @@ -78960,7 +78846,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-analysis" = callPackage @@ -79002,7 +78887,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (self.llvmPackages) llvm;}; "llvm-base-types" = callPackage @@ -79034,7 +78918,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Utilities for bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-data-interop" = callPackage @@ -79075,7 +78958,6 @@ self: { homepage = "http://code.haskell.org/~thielema/llvm-extra/"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-general" = callPackage @@ -79238,7 +79120,6 @@ self: { jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-tools" = callPackage @@ -79346,7 +79227,6 @@ self: { ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loch" = callPackage @@ -80826,7 +80706,6 @@ self: { ]; description = "Virtual package to install all Manatee packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-anything" = callPackage @@ -81004,7 +80883,6 @@ self: { jailbreak = true; description = "IRC client extension for Manatee"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-mplayer" = callPackage @@ -83798,6 +83676,7 @@ self: { jailbreak = true; description = "Open recursion for when you need it"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ox" = callPackage @@ -86766,6 +86645,7 @@ self: { homepage = "https://github.com/jdnavarro/nero"; description = "Lens-based HTTP toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nested-sets" = callPackage @@ -86808,7 +86688,6 @@ self: { homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netcore" = callPackage @@ -87127,6 +87006,7 @@ self: { homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-api-support" = callPackage @@ -87205,6 +87085,7 @@ self: { testDepends = [ base cabal-test-bin hspec hspec-server process ]; description = "Linux NetworkNameSpace Builder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -89114,7 +88995,6 @@ self: { jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -89561,7 +89441,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell OpenSoundControl utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssh-github-keys" = callPackage @@ -89756,7 +89635,6 @@ self: { homepage = "https://github.com/tsuraan/optimal-blocks"; description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimization" = callPackage @@ -90083,7 +89961,6 @@ self: { homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -90414,7 +90291,6 @@ self: { homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "palette" = callPackage @@ -91337,7 +91213,6 @@ self: { homepage = "http://code.haskell.org/~thielema/patch-image/"; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -91751,7 +91626,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -92470,7 +92344,6 @@ self: { ]; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona" = callPackage @@ -92488,7 +92361,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-persona"; description = "Persona (BrowserID) library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona-idp" = callPackage @@ -98157,6 +98029,7 @@ self: { homepage = "https://github.com/srijs/random-hypergeometric"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random-shuffle" = callPackage @@ -101694,7 +101567,6 @@ self: { homepage = "https://github.com/lfairy/robot"; description = "Simulate keyboard and mouse events"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robots-txt" = callPackage @@ -102607,7 +102479,6 @@ self: { buildDepends = [ base control-monad-exception safe-failure ]; description = "control-monad-exception Instances for safe-failure"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-freeze" = callPackage @@ -103263,7 +103134,6 @@ self: { homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalable-server" = callPackage @@ -104056,7 +103926,6 @@ self: { jailbreak = true; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sde-solver" = callPackage @@ -105716,7 +105585,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare-text" = callPackage @@ -106231,6 +106099,7 @@ self: { homepage = "https://github.com/markus-git/signals"; description = "Stream Processing for Embedded Domain Specific Languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signed-multiset" = callPackage @@ -108173,7 +108042,6 @@ self: { homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-haxl" = callPackage @@ -108913,7 +108781,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -108931,7 +108798,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -108950,7 +108816,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using tls package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sock2stream" = callPackage @@ -110424,7 +110289,6 @@ self: { homepage = "https://github.com/tsuraan/stable-tree"; description = "Trees whose branches are resistant to change"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -110508,6 +110372,7 @@ self: { homepage = "https://github.com/fpco/stackage"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-types" = callPackage @@ -112410,7 +112275,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell SuperCollider utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supercollider-midi" = callPackage @@ -113232,7 +113096,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Efficient signal processing using runtime compilation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-midi" = callPackage @@ -115733,7 +115596,6 @@ self: { homepage = "https://github.com/brendanhay/text-manipulate"; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-normal" = callPackage @@ -116136,7 +115998,6 @@ self: { homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-instances" = callPackage @@ -117046,7 +116907,6 @@ self: { homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -120942,7 +120802,6 @@ self: { buildDepends = [ array base mtl unix ]; description = "Unlambda interpreter"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlit" = callPackage @@ -121258,6 +121117,7 @@ self: { homepage = "https://travis-ci.org/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -122641,7 +122501,6 @@ self: { buildDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytestring" = callPackage @@ -123952,6 +123811,7 @@ self: { homepage = "https://github.com/fpco/wai-middleware-consul"; description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-etag" = callPackage @@ -124982,6 +124842,7 @@ self: { homepage = "https://github.com/webcrank/webcrank.hs"; description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webcrank-dispatch" = callPackage @@ -125161,7 +125022,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -125177,7 +125037,6 @@ self: { pkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webpage" = callPackage @@ -125224,6 +125083,7 @@ self: { homepage = "https://github.com/jrb/websnap"; description = "Transforms URLs to PNGs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets" = callPackage @@ -126700,7 +126560,6 @@ self: { homepage = "https://github.com/aslatter/xhb"; description = "X Haskell Bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xhb-atom-cache" = callPackage @@ -127731,7 +127590,6 @@ self: { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xournal-render" = callPackage @@ -128968,7 +128826,6 @@ self: { homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -130179,7 +130036,6 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { gomp = null; inherit (pkgs) z3;}; "zampolit" = callPackage @@ -130534,7 +130390,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits. (deprecated)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib-enum" = callPackage From 82893282dd10e798be21f172f399f55a5c8a361f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Apr 2015 14:47:18 +0200 Subject: [PATCH 908/947] haskell-ng: fix Hydra evaluation errors --- .../haskell-modules/configuration-common.nix | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bb718975f65..21a4dc5d123 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -65,7 +65,20 @@ self: super: { al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. + accelerate-cublas = dontDistribute super.accelerate-cublas; + accelerate-cuda = dontDistribute super.accelerate-cuda; + accelerate-cufft = dontDistribute super.accelerate-cufft; + accelerate-examples = dontDistribute super.accelerate-examples; + accelerate-fft = dontDistribute super.accelerate-fft; + accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark; bindings-yices = dontDistribute super.bindings-yices; + cublas = dontDistribute super.cublas; + cufft = dontDistribute super.cufft; + gloss-accelerate = dontDistribute super.gloss-accelerate; + gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate; + libnvvm = dontDistribute super.libnvvm; + Obsidian = dontDistribute super.Obsidian; + patch-image = dontDistribute super.patch-image; yices = dontDistribute super.yices; yices-easy = dontDistribute super.yices-easy; yices-painless = dontDistribute super.yices-painless; @@ -444,10 +457,18 @@ self: super: { tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); # Deprecated upstream and doesn't compile. - llvm-base = markBroken super.llvm-base; + BASIC = dontDistribute super.BASIC; bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm); + llvm = dontDistribute super.llvm; + llvm-base = markBroken super.llvm-base; + llvm-base-util = dontDistribute super.llvm-base-util; + llvm-extra = dontDistribute super.llvm-extra; + llvm-tf = dontDistribute super.llvm-tf; objectid = dontDistribute super.objectid; saltine-quickcheck = dontDistribute super.saltine-quickcheck; + stable-tree = dontDistribute super.stable-tree; + synthesizer-llvm = dontDistribute super.synthesizer-llvm; + optimal-blocks = dontDistribute super.optimal-blocks; # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; @@ -587,6 +608,8 @@ self: super: { # Build fails, but there seems to be no issue tracker available. :-( hmidi = markBrokenVersion "0.2.1.0" super.hmidi; padKONTROL = markBroken super.padKONTROL; + Bang = dontDistribute super.Bang; + launchpad-control = dontDistribute super.launchpad-control; # Upstream provides no issue tracker and no contact details. vivid = markBroken super.vivid; @@ -623,8 +646,17 @@ self: super: { haroonga-httpd = markBroken super.haroonga-httpd; # Cannot find pkg-config data for "webkit-1.0". - webkit = markBroken super.webkit; - websnap = markBroken super.websnap; + lambdacat = dontDistribute super.lambdacat; + manatee-all = dontDistribute super.manatee-all; + manatee-browser = dontDistribute super.manatee-browser; + manatee-reader = dontDistribute super.manatee-reader; + markup-preview = dontDistribute super.markup-preview; + spike = dontDistribute super.spike; + tianbar = dontDistribute super.tianbar; + web-browser-in-haskell = dontDistribute super.web-browser-in-haskell; + webkit = markBroken super.webkit; # .override { webkit = pkgs.webkitgtk24x; }; + webkit-javascriptcore = dontDistribute super.webkit-javascriptcore; + websnap = markBroken super.websnap; # .override { webkit = pkgs.webkitgtk24x; }; # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; @@ -648,6 +680,7 @@ self: super: { # https://github.com/meteficha/Hipmunk/issues/8 Hipmunk = markBroken super.Hipmunk; HipmunkPlayground = dontDistribute super.HipmunkPlayground; + click-clack = dontDistribute super.click-clack; # https://github.com/prowdsponsor/esqueleto/issues/93 esqueleto = dontCheck super.esqueleto; From 27842ccd7532c51a7de0c244799d1dbc91ca240c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Apr 2015 14:49:57 +0200 Subject: [PATCH 909/947] haskell-ng: fix webkit and websnap --- .../haskell-modules/configuration-common.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 21a4dc5d123..cc10de8f8d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -214,8 +214,10 @@ self: super: { gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; # Need WebkitGTK, not just webkit. + webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; }; webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; # https://github.com/jgm/zip-archive/issues/21 zip-archive = addBuildTool super.zip-archive pkgs.zip; @@ -645,19 +647,6 @@ self: super: { haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; - # Cannot find pkg-config data for "webkit-1.0". - lambdacat = dontDistribute super.lambdacat; - manatee-all = dontDistribute super.manatee-all; - manatee-browser = dontDistribute super.manatee-browser; - manatee-reader = dontDistribute super.manatee-reader; - markup-preview = dontDistribute super.markup-preview; - spike = dontDistribute super.spike; - tianbar = dontDistribute super.tianbar; - web-browser-in-haskell = dontDistribute super.web-browser-in-haskell; - webkit = markBroken super.webkit; # .override { webkit = pkgs.webkitgtk24x; }; - webkit-javascriptcore = dontDistribute super.webkit-javascriptcore; - websnap = markBroken super.websnap; # .override { webkit = pkgs.webkitgtk24x; }; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; From b07f749f3765beccc37f0aaf48893098359599de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Apr 2015 17:13:19 +0200 Subject: [PATCH 910/947] haskell-AttoJson: mark broken --- 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 cc10de8f8d9..439bb7c0a8a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -71,12 +71,17 @@ self: super: { accelerate-examples = dontDistribute super.accelerate-examples; accelerate-fft = dontDistribute super.accelerate-fft; accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark; + AttoJson = markBroken super.AttoJson; bindings-yices = dontDistribute super.bindings-yices; cublas = dontDistribute super.cublas; cufft = dontDistribute super.cufft; gloss-accelerate = dontDistribute super.gloss-accelerate; gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate; + GoogleTranslate = dontDistribute super.GoogleTranslate; + GoogleDirections = dontDistribute super.GoogleDirections; libnvvm = dontDistribute super.libnvvm; + manatee-all = dontDistribute super.manatee-all; + manatee-ircclient = dontDistribute super.manatee-ircclient; Obsidian = dontDistribute super.Obsidian; patch-image = dontDistribute super.patch-image; yices = dontDistribute super.yices; From 7cc31b6b499193d095c3f82eecc82ab7cf0d7f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 2 Apr 2015 22:30:28 +0200 Subject: [PATCH 911/947] fix eval --- pkgs/desktops/plasma-5.2/default.nix | 2 +- pkgs/development/libraries/libdbi-drivers/default.nix | 2 +- pkgs/tools/graphics/pdf2svg/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 8a7733299b5..7a7a48a4d82 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = pkgs.poppler_qt.override { inherit qt5; }; + PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; }; } // # packages from nixpkgs (with pkgs; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 128553705e0..4e122028ec0 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql.lib sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 591a85c2447..826f1a56055 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2"; }; - buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ]; + buildInputs = [ cairo pkgconfig poppler gtk ]; meta = { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a9fabd19f47..9966141bdfd 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc mysql.lib postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0d724e21080..b2cebf63fff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2037,7 +2037,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pop3client = callPackage ../development/libraries/haskell/pop3-client {}; poppler = callPackage ../development/libraries/haskell/poppler { - popplerGlib = pkgs.poppler.poppler_glib; + popplerGlib = pkgs.poppler; libc = pkgs.stdenv.cc.libc; }; From 548dfdb832e5a999481f42936faace3de9dc59a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Apr 2015 22:59:05 +0200 Subject: [PATCH 912/947] cabal-install: add old 1.18.x version for the benefit of ghc-mod users Install "haskellngPackages.cabal-install_1_18_0_8" to run ghc-mod with GHC 7.8.x. Resolves https://github.com/NixOS/nixpkgs/issues/7133. --- .../haskell-modules/hackage-packages.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 286a9470247..d9c10f29b56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -27072,6 +27072,38 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-install_1_18_0_8" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , directory, filepath, HTTP, HUnit, mtl, network, network-uri + , pretty, process, QuickCheck, random, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time, unix + , zlib + }: + mkDerivation { + pname = "cabal-install"; + version = "1.18.0.8"; + sha256 = "1yx7vgyi2hs934z4ln7d8m2yrsakidb551ib01l9hxnmc3jbskwi"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + array base bytestring Cabal containers directory filepath HTTP mtl + network network-uri pretty process random stm time unix zlib + ]; + testDepends = [ + array base bytestring Cabal containers directory filepath HTTP + HUnit mtl network network-uri pretty process QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + unix zlib + ]; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl From 14602b8a43f695dbe8954ca76ee82d89b9f12b88 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 14:20:11 -0700 Subject: [PATCH 913/947] mariadb: properly propagate libs --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 830d217122a..4edf66d80d4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { # Make sure to propagate lib for compatability mkdir -p $out/nix-support - echo "$lib" > $out/nix-support/propagated-build-inputs + echo "$lib" > $out/nix-support/propagated-native-build-inputs ''; passthru.mysqlVersion = "5.6"; From f1c38764e84553d4659d2f2ed3d441f0f842b266 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Thu, 2 Apr 2015 14:25:00 -0700 Subject: [PATCH 914/947] add: sfsexp - A small, fast s-expression library --- pkgs/development/libraries/sfsexp/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/sfsexp/default.nix diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix new file mode 100644 index 00000000000..57124f575a1 --- /dev/null +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sfsexp-${version}"; + version = "1.3"; + + src = fetchurl { + url = "mirror://sourceforge/sexpr/sexpr-${version}.tar.gz"; + sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k"; + }; + + meta = with stdenv.lib; { + description = "Small, fast s-expression library"; + homepage = "http://sexpr.sourceforge.net/"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fafca016dc..a21470eec0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7453,6 +7453,8 @@ let serf = callPackage ../development/libraries/serf {}; + sfsexp = callPackage ../development/libraries/sfsexp {}; + silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; From c07cce40a45f3903de0710c90a98e7a6734bd9dc Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:08:07 -0500 Subject: [PATCH 915/947] nixpkgs: dd-agent 5.1.1 -> 5.2.3 Signed-off-by: Austin Seipp --- pkgs/tools/networking/dd-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index dc29697044a..911bb7197eb 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,14 +2,14 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.2.3"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "17gj2bsnidwwmwfc0m2ll90sh28izpxz2wkczpnvzfiq0askdxmp"; + sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan"; }; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests ]; From 6a41d14686e90ce7fbcdd695353c269db1674b94 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:10:21 -0500 Subject: [PATCH 916/947] nixpkgs: nginxUnstable 1.7.10 -> 1.7.11 Signed-off-by: Austin Seipp --- 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 ee5b4a1cd5d..b47b67792b8 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.7.10"; + version = "1.7.11"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0q24rwwlw3xas0ar4jygyb6czwjzsjz11sax199z7fnfd2sc2wyz"; + sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs"; }; rtmp-ext = fetchFromGitHub { From 1b338edc80bb1a6eceb4ee59b3a818950ee8fdcf Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:13:03 -0500 Subject: [PATCH 917/947] nixpkgs: musl 1.1.7 -> 1.1.8 Signed-off-by: Austin Seipp --- 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 c10cfb38cbd..1dae1d215ec 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.7"; + version = "1.1.8"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "168mz5mwmzr5j6l4jxnwaxw6l89xycql3vfk01jsmy7chziamq6q"; + sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps"; }; enableParallelBuilding = true; From d61561e3819c37b48260280351fa21335f9ab6af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:14:28 -0500 Subject: [PATCH 918/947] nixpkgs: pax-utils 1.0.2 -> 1.0.3 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 80e87d8aacc..266fee9e493 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; + sha256 = "0w2nddgany3s0znyj6zizlvn8y5vba9x49jm5nliv13p3x7ajdc5"; }; makeFlags = [ From 5ab1096f1fcf46cc7d14aee5396d767533a5bcb6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:16:25 -0500 Subject: [PATCH 919/947] nixpkgs: re2c 0.14.1 -> 0.14.2 Signed-off-by: Austin Seipp --- pkgs/development/tools/parsing/re2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 9f02b10c898..ce9941b2362 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0xfskwzr6n94sa22m24x7z051qfbb9d6k4dipcv95s8j8zq74dcv"; + sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7"; }; meta = { From 4a3b755cc8f61841d819c60004af5658cdbd55c3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:17:49 -0500 Subject: [PATCH 920/947] nixpkgs: stunnel 5.11 -> 5.14 Signed-off-by: Austin Seipp --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 2dba887adb8..74788e6ff2a 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.11"; + version = "5.14"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "137zxnavc7880fxfbmhlgw97lk4rj8if1bb70adm0d4fwlvvra3i"; + sha256 = "0nk9cjrgpa54sphykizqx4kayrq71z1zmwdsr1lvlbmq3pyb95r1"; }; buildInputs = [ openssl ]; From 36db12ca31b98f2c3771a4bbc1a4bd2a934363d4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:24:43 -0500 Subject: [PATCH 921/947] nixpkgs: ssdeep 2.11 -> 2.12 Signed-off-by: Austin Seipp --- pkgs/tools/security/ssdeep/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index fd97a6e618d..7ec4934805b 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,14 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, patchelf }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; - version = "2.11"; + version = "2.12"; src = fetchurl { url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; - sha256 = "1izzkvrng4cc2p8gxp3w32k1v60l2yaq2y2hkifgq9s1yh30xk42"; + sha256 = "1pjb3qpcn6slfqjv23jf7i8zf7950b7h27b0v0dva5pxmn3rw149"; }; + # For some reason (probably a build system bug), the binary isn't + # properly linked to $out/lib to find libfuzzy.so + postFixup = '' + rp=$(patchelf --print-rpath $out/bin/ssdeep) + patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep + ''; + meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; From 2c55798f1a6793b7e918f723d94b3f7c8131dd80 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Apr 2015 16:27:19 -0500 Subject: [PATCH 922/947] nixpkgs: spiped 1.4.1 -> 1.5.0 Signed-off-by: Austin Seipp --- pkgs/tools/networking/spiped/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 3f7c66e0406..2fec2ac1bd5 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spiped-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "http://www.tarsnap.com/spiped/${name}.tgz"; - sha256 = "1y642mn4jz2h83vhkji0l42r2l1hbzbwwlplc3xmr66zjj54psqf"; + sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; buildInputs = [ openssl ]; From 5014bcbb883a80ddb807058adfeccd66b405f8d7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 15:32:46 -0700 Subject: [PATCH 923/947] libdbi-drivers: Slight refactor --- pkgs/development/libraries/libdbi-drivers/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 4e122028ec0..8836b0bffa2 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql; + buildInputs = [ libdbi sqlite postgresql ] + ++ optional (mysql != null) mysql.lib; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; From fc361412674950b1480ad58124af6fde5f640ce7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Apr 2015 00:28:08 +0200 Subject: [PATCH 924/947] ghc-head: update to current git HEAD --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4cde21dbcc2..45bb4342088 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.20150118"; + version = "7.11.20150402"; name = "ghc-${version}"; - rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; + rev = "47f821a1a24553dc29b9581b1a259a9b1394c955"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; + sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj"; }; postUnpack = '' From 6429b1cc0927f1241ab8bc51a10401d3ee35f9f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 18:07:27 -0500 Subject: [PATCH 925/947] haskell-poppler: fix build --- 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 439bb7c0a8a..6ad5310d1e1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -707,6 +707,14 @@ self: super: { # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; + # Hardcoded include path + poppler = overrideCabal super.poppler (drv: { + patchPhase = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; + }); + } // { # Not on Hackage. From 394562655ff09ef490eca8b14fe02c393e9ac70e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Apr 2015 19:13:26 -0500 Subject: [PATCH 926/947] cups_filter: fix build --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 099bf9f6d0c..269f0df1090 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig +{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pkgconfig cups poppler fontconfig libjpeg libpng perl + pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl ijs qpdf dbus ]; From 99173f0266cb0106bd2483e95d04e346cf1201d3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 17:43:26 -0700 Subject: [PATCH 927/947] samba4: Add extra useful dependencies and attempt to fix darwin build --- pkgs/servers/samba/4.x-fix-ctdb-deps.patch | 13 +++++++++++++ pkgs/servers/samba/4.x.nix | 8 +++++++- pkgs/top-level/all-packages.nix | 10 ++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/samba/4.x-fix-ctdb-deps.patch diff --git a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch new file mode 100644 index 00000000000..33886348412 --- /dev/null +++ b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch @@ -0,0 +1,13 @@ +diff --git a/ctdb/wscript b/ctdb/wscript +index 3e2a992..3fe15cc 100755 +--- a/ctdb/wscript ++++ b/ctdb/wscript +@@ -568,7 +568,7 @@ def build(bld): + source='ib/ibwrapper_test.c', + includes='include include/internal', + deps='''replace talloc ctdb-client ctdb-common +- ctdb-system''' + ++ ctdb-system ctdb-common-util''' + + ib_deps, + install_path='${CTDB_TEST_LIBDIR}') + diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2cc3cc69d3f..162d6b1d30b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -27,6 +27,11 @@ , zlib ? null , ncurses ? null , libcap ? null +, libunwind ? null +, dbus ? null +, libibverbs ? null +, librdmacm ? null +, systemd ? null }: stdenv.mkDerivation rec { @@ -40,6 +45,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch ./4.x-heimdal-compat.patch + ./4.x-fix-ctdb-deps.patch ]; buildInputs = [ @@ -53,7 +59,7 @@ stdenv.mkDerivation rec { gnutls libgcrypt libgpgerror - zlib ncurses libcap + zlib ncurses libcap libunwind dbus libibverbs librdmacm systemd ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a21470eec0a..c8ada7f2f27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8517,6 +8517,16 @@ let libgcrypt = libgcrypt_1_6; python = python2; pythonPackages = python2Packages; + cups = if stdenv.isDarwin then null else cups; + pam = if stdenv.isDarwin then null else pam; + libaio = if stdenv.isDarwin then null else libaio; + ceph = if stdenv.isDarwin then null else ceph; + glusterfs = if stdenv.isDarwin then null else glusterfs; + libcap = if stdenv.isLinux then libcap else null; + dbus = if stdenv.isLinux then dbus else null; + libibverbs = if stdenv.isLinux then libibverbs else null; + librdmacm = if stdenv.isLinux then librdmacm else null; + systemd = if stdenv.isLinux then system else null; }; samba = samba4; From 1fe515db8c1996b04a7ff51d665c0be6f39b6168 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 17:43:47 -0700 Subject: [PATCH 928/947] samba4: Fix documentation generation --- pkgs/servers/samba/4.x.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 162d6b1d30b..a69fc23117f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns -, docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser -, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive +{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent +, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper +, uid_wrapper, libarchive # source3/wscript optionals , kerberos ? null @@ -49,9 +50,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42 - readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit - libbsd nss_wrapper socket_wrapper uid_wrapper libarchive + python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 + docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser + pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper + libarchive kerberos openldap cups pam avahi acl libaio fam ceph glusterfs @@ -65,6 +67,9 @@ stdenv.mkDerivation rec { postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions + + # Fix the XML Catalog Paths + sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py ''; enableParallelBuilding = true; From b3f76d6030d8fed066611cf44895903a42902522 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 18:07:22 -0700 Subject: [PATCH 929/947] samba4: Remove some unecessary outputs --- pkgs/servers/samba/4.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a69fc23117f..7ee1c78ceeb 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -127,6 +127,12 @@ stdenv.mkDerivation rec { stripAllList = [ "bin" "sbin" ]; + postInstall = '' + # Remove unecessary components + rm -r $out/{lib,share}/ctdb-tests + rm $out/bin/ctdb_run{_cluster,}_tests + ''; + postFixup = '' export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" read -r -d "" SCRIPT << EOF From 4632ea106b128d78beb10265dfe96f19c80814cd Mon Sep 17 00:00:00 2001 From: Calvin Beck Date: Thu, 2 Apr 2015 22:50:19 -0600 Subject: [PATCH 930/947] Fixed hashes for cabal2nix. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6ad5310d1e1..09d850f5526 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -723,8 +723,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e"; - sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a"; + rev = "33c83599330d67929bef9b3bf10131e352bd108c"; + sha256 = "18bq66n67bx8x2bqmw5yn7nq5dzzp37c19n5w89p90a07jpxxka3"; deepClone = true; }; isLibrary = false; From 2c89d0b82dfcd399750ae685d91b63cc6b906ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 3 Apr 2015 06:37:02 +0200 Subject: [PATCH 931/947] attic: update source hash I don't know what changed, but apparently something did. We're using fetchzip and the 0.14 tag doesn't seem to have moved (AFAICS). Build and run-tested. For reference, the (current) annotated tag '0.14' is dated "Wed Dec 17 23:32:11 2014 +0100" and points to commit f342621dff8065b29aeda238ccce5ac92d04f5b6 ("Preparing release"). --- pkgs/tools/backup/attic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 40882f04d16..5e95c3546e7 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { src = fetchzip { url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; - sha256 = "17y7kihykaf84sy9cm00fn4wcc7rnhv2792kcwplylz7dsm7ksiw"; + sha256 = "1ij99dmd571rvk3kz97vs7wbjj2pbbd54l310lydnwywxhqs8hrv"; }; propagatedBuildInputs = with python3Packages; From 16730fa87aea11333933202637233c530fc182fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 3 Apr 2015 06:49:39 +0200 Subject: [PATCH 932/947] attic: update source derivation name 0.14.tar.gz => attic-0.14-src. --- pkgs/tools/backup/attic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 5e95c3546e7..9512a917d85 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -5,6 +5,7 @@ python3Packages.buildPythonPackage rec { namePrefix = ""; src = fetchzip { + name = "${name}-src"; url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; sha256 = "1ij99dmd571rvk3kz97vs7wbjj2pbbd54l310lydnwywxhqs8hrv"; }; From d205b324c3967fc7f824173ade7deaee5f2a6e77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Apr 2015 11:22:25 +0200 Subject: [PATCH 933/947] cabal2nix: version bump --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 09d850f5526..0601ebdb5c4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -723,8 +723,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "33c83599330d67929bef9b3bf10131e352bd108c"; - sha256 = "18bq66n67bx8x2bqmw5yn7nq5dzzp37c19n5w89p90a07jpxxka3"; + rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d"; + sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis"; deepClone = true; }; isLibrary = false; From fe5c3eaf81187610032898bc0697a0297a334266 Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 3 Apr 2015 09:38:54 +0000 Subject: [PATCH 934/947] mkvtoolnix: 7.7.0 -> 7.8.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 74d4196e47c..01d96542c2e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.7.0"; + version = "7.8.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; + sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af"; }; buildInputs = [ From f713e7033e963306e62471c5ed5dffb38ca9bed6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2015 11:40:06 +0200 Subject: [PATCH 935/947] nixUnstable: Update to 1.9pre4087 --- 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 d39a13196a8..dd3a6ba3cf0 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.9pre4083_5114a07"; + name = "nix-1.9pre4087_afa433e"; src = fetchurl { - url = "http://hydra.nixos.org/build/20650421/download/4/${name}.tar.xz"; - sha256 = "971fdd36bcf39c7e6ce9ef12dbfe09c98d2be3275e482ca2dbacb2e668f0dff9"; + url = "http://hydra.nixos.org/build/21053128/download/4/${name}.tar.xz"; + sha256 = "05dda3644ed68364bbff87d0ec662ca18d8542f921683cb2e1f308281d6bf384"; }; nativeBuildInputs = [ perl pkgconfig ]; From 29dc55abc32aa50b0c48a6eb589f2625fdaf56e3 Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 3 Apr 2015 09:58:16 +0000 Subject: [PATCH 936/947] mercurial: 3.3.2 -> 3.3.3 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index bd35ebb5266..a9fbd89f3fa 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.3.2"; + version = "3.3.3"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; + sha256 = "04xfzwb7jabzsfv2r18c3w6vwag7cjrl79xzg5i3mbyb1mzkcid4"; }; inherit python; # pass it so that the same version can be used in hg2git From b94cec592ceaab79eaaee72147c845cd58deba38 Mon Sep 17 00:00:00 2001 From: Bruce Adams Date: Fri, 3 Apr 2015 06:53:08 -0400 Subject: [PATCH 937/947] Update znc from 1.4 to 1.6.0 ZNC 1.6.0 includes improved SSL/TLS settings to prevent POODLE and FREAK attacks. --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index fdd02aac0b5..11681cfefd0 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-1.4"; + name = "znc-1.6.0"; src = fetchurl { url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; + sha256 = "df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7"; }; buildInputs = [ openssl pkgconfig ] From d54b6c903d0e57668850237af0fd14dc27779990 Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 3 Apr 2015 10:57:36 +0000 Subject: [PATCH 938/947] git: 2.3.4 -> 2.3.5 --- .../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 65a9679576e..1ea9d967cd1 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.3.4"; + version = "2.3.5"; 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 = "15fv155skjy80j7sv7x4kxlj3m8i334bic4q2qmb6zvr04hjpslp"; + sha256 = "0nk4q7r6dj5a2my10483z9wmzv3zw465ck8ydp2b8hcdllj16wfp"; }; patches = [ From ba93a75724b9671208d7e48789bc9d71a9da648b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 3 Apr 2015 12:46:21 +0200 Subject: [PATCH 939/947] grsecurity module: use types.enum Also - set desktop as default system - make virtualisationSoftware nullOr - make virtualisationConfig nullOr --- nixos/modules/security/grsecurity.nix | 65 ++++++----------------- pkgs/build-support/grsecurity/default.nix | 6 +-- 2 files changed, 20 insertions(+), 51 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 8cd40093348..35974f6890e 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -44,53 +44,41 @@ in config = { mode = mkOption { - type = types.str; + type = types.enum [ "auto" "custom" ]; default = "auto"; - example = "custom"; description = '' grsecurity configuration mode. This specifies whether grsecurity is auto-configured or otherwise completely - manually configured. Can either be - custom or auto. - - auto is recommended. + manually configured. ''; }; priority = mkOption { - type = types.str; + type = types.enum [ "security" "performance" ]; default = "security"; - example = "performance"; description = '' grsecurity configuration priority. This specifies whether the kernel configuration should emphasize speed or - security. Can either be security or - performance. + security. ''; }; system = mkOption { - type = types.str; - default = ""; - example = "desktop"; + type = types.enum [ "desktop" "server" ]; + default = "desktop"; description = '' - grsecurity system configuration. This specifies whether - the kernel configuration should be suitable for a Desktop - or a Server. Can either be server or - desktop. + grsecurity system configuration. ''; }; virtualisationConfig = mkOption { - type = types.str; - default = "none"; - example = "host"; + type = types.nullOr (types.enum [ "host" "guest" ]); + default = null; description = '' grsecurity virtualisation configuration. This specifies the virtualisation role of the machine - that is, whether it will be a virtual machine guest, a virtual machine - host, or neither. Can be one of none, - host, or guest. + host, or neither. ''; }; @@ -106,17 +94,10 @@ in }; virtualisationSoftware = mkOption { - type = types.str; - default = ""; - example = "kvm"; + type = types.nullOr (types.enum [ "kvm" "xen" "vmware" "virtualbox" ]); + default = null; description = '' - grsecurity virtualisation software. Set this to the - specified virtual machine technology if the machine is - running as a guest, or a host. - - Can be one of kvm, - xen, vmware or - virtualbox. + Configure grsecurity for use with this virtualisation software. ''; }; @@ -262,25 +243,13 @@ in && config.boot.kernelPackages.kernel.features.grsecurity; message = "grsecurity enabled, but kernel doesn't have grsec support"; } - { assertion = elem cfg.config.mode [ "auto" "custom" ]; - message = "grsecurity mode must either be 'auto' or 'custom'."; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.system [ "desktop" "server" ]; - message = "when using auto grsec mode, system must be either 'desktop' or 'server'"; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.priority [ "performance" "security" ]; - message = "when using auto grsec mode, priority must be 'performance' or 'security'."; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.virtualisationConfig [ "host" "guest" "none" ]; - message = "when using auto grsec mode, 'virt' must be 'host', 'guest' or 'none'."; - } - { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) -> + { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) -> cfg.config.hardwareVirtualisation != null; message = "when using auto grsec mode with virtualisation, you must specify if your hardware has virtualisation extensions"; } - { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) -> - elem cfg.config.virtualisationSoftware [ "kvm" "xen" "virtualbox" "vmware" ]; - message = "virtualisation software must be 'kvm', 'xen', 'vmware' or 'virtualbox'"; + { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) -> + cfg.config.virtualisationSoftware != null; + message = "grsecurity configured for virtualisation but no virtualisation software specified"; } ]; diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 7bafd78d76a..e82792be033 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -50,14 +50,14 @@ let "GRKERNSEC_CONFIG_SERVER y"; grsecVirtCfg = - if cfg.config.virtualisationConfig == "none" then + if cfg.config.virtualisationConfig == null then "GRKERNSEC_CONFIG_VIRT_NONE y" else if cfg.config.virtualisationConfig == "host" then "GRKERNSEC_CONFIG_VIRT_HOST y" else "GRKERNSEC_CONFIG_VIRT_GUEST y"; - grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else + grsecHwvirtCfg = if cfg.config.virtualisationConfig == null then "" else if cfg.config.hardwareVirtualisation == true then "GRKERNSEC_CONFIG_VIRT_EPT y" else @@ -66,7 +66,7 @@ let grsecVirtswCfg = let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y"; in - if cfg.config.virtualisationConfig == "none" then "" + if cfg.config.virtualisationConfig == null then "" else if cfg.config.virtualisationSoftware == "xen" then virtCfg "XEN" else if cfg.config.virtualisationSoftware == "kvm" then virtCfg "KVM" else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE" From 56855d2e0bd45c81fa5a6373b01cd980c992f11d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 3 Apr 2015 10:15:30 -0400 Subject: [PATCH 940/947] gnaural: initial package at version 1.0.20110606 http://gnaural.sourceforge.net/ --- pkgs/applications/audio/gnaural/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/audio/gnaural/default.nix diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix new file mode 100644 index 00000000000..c9746590566 --- /dev/null +++ b/pkgs/applications/audio/gnaural/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, libsndfile, portaudio }: + +stdenv.mkDerivation rec { + name = "gnaural-1.0.20110606"; + buildInputs = [ pkgconfig gtk2 libsndfile portaudio ]; + src = fetchurl { + url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; + sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; + }; + meta = with stdenv.lib; + { description = "Auditory binaural-beat generator"; + homepage = http://gnaural.sourceforge.net/; + licenses = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad..d2879edb315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1370,6 +1370,8 @@ let gmvault = callPackage ../tools/networking/gmvault { }; + gnaural = callPackage ../applications/audio/gnaural { }; + gnokii = builderDefsPackage (import ../tools/misc/gnokii) { inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite libical gtk glib; From 6e59d4372570a098f6262613195cff3b7d5c63a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 3 Apr 2015 17:38:42 +0200 Subject: [PATCH 941/947] gnome3.tracker: fix poppler/glib dependency --- pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index 13ea6bb391c..f3de70e10a1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/" + sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c ''; buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 From 6d4a9fa393bfc8d5aaf4fda85ddb9a531104c4cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 3 Apr 2015 15:28:55 +0200 Subject: [PATCH 942/947] Add Hovercraft: a tool to make impress.js presentations from reStructuredText Also updated argh to 0.26.1 and added dependencies: pathtools, svg.path and watchdog. Tests are disabled because one test assumes we are using docutils 0.12 but we only have docutils 0.11 at the moment. --- pkgs/top-level/python-packages.nix | 87 ++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6eb259f245d..8e8678c501f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3146,6 +3146,30 @@ let }; }; + hovercraft = buildPythonPackage rec { + disabled = ! isPy3k; + name = "hovercraft-${version}"; + version = "2.0b1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/h/hovercraft/${name}.zip"; + sha256 = "1l88xp563miwwkahil1sxn4kz9khjcx6z85j8d6mq8gjc8rxz3j6"; + }; + + propagatedBuildInputs = with self; [ docutils lxml manuel pygments svg-path watchdog ]; + + # one test assumes we have docutils 0.12 + # TODO: enable tests after upgrading docutils to 0.12 + doCheck = false; + + meta = { + description = "A tool to make impress.js presentations from reStructuredText"; + homepage = https://github.com/regebro/hovercraft; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + }; + }; + itsdangerous = buildPythonPackage rec { name = "itsdangerous-0.24"; @@ -3269,6 +3293,22 @@ let }; }; + pathtools = buildPythonPackage rec { + name = "pathtools-${version}"; + version = "0.1.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pathtools/${name}.tar.gz"; + sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw"; + }; + + meta = { + description = "Pattern matching and various utilities for file systems paths"; + homepage = http://github.com/gorakhargosh/pathtools; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + }; + }; paver = buildPythonPackage rec { version = "1.2.2"; @@ -3858,6 +3898,24 @@ let }; + svg-path = buildPythonPackage rec { + name = "svg.path-${version}"; + version = "2.0b1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/svg.path/${name}.zip"; + sha256 = "038x4wqkbvcs71x6n6kzr4kn99csyv8v4gqzssr8pqylqpxi56bm"; + }; + + meta = { + description = "SVG path objects and parser"; + homepage = https://github.com/regebro/svg.path; + license = licenses.cc0; + maintainers = [ maintainers.goibhniu ]; + }; + }; + + repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; @@ -3917,6 +3975,28 @@ let }; }; + watchdog = buildPythonPackage rec { + name = "watchdog-${version}"; + version = "0.8.3"; + + propagatedBuildInputs = with self; [ argh pathtools pyyaml ]; + + doCheck = false; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/watchdog/${name}.tar.gz"; + sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby"; + }; + + meta = { + description = "Python API and shell utilities to monitor file system events"; + homepage = http://github.com/gorakhargosh/watchdog; + license = licenses.asl20; + maintainers = [ maintainers.goibhniu ]; + }; + }; + + zope_tales = buildPythonPackage rec { name = "zope.tales-4.0.2"; @@ -10683,15 +10763,16 @@ let }; argh = buildPythonPackage rec { - name = "argh-0.23.3"; + name = "argh-0.26.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz"; - md5 = "25bb02c6552b42875f2c36714e0ff16c"; + sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6"; }; - preCheck = '' + checkPhase = '' export LANG="en_US.UTF-8" + py.test ''; buildInputs = with self; [ pytest py mock pkgs.glibcLocales ]; From 16f5b98e4f007bdc6ee545679240d28940b58a6f Mon Sep 17 00:00:00 2001 From: codyopel Date: Fri, 3 Apr 2015 13:22:53 -0400 Subject: [PATCH 943/947] sublime-text 3: 3.0.65 -> 3.0.83 --- pkgs/applications/editors/sublime3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index dbfb98b087f..9d6a74d942a 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - build = "3065"; + build = "3083"; libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; in let # package with just the binaries @@ -13,15 +13,15 @@ in let src = if stdenv.system == "i686-linux" then fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d"; + sha256 = "0r9irk2gdwdx0dk7lgssr4krfvf3lf71pzaz5hyjc704zaxf5s49"; } else fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea"; + sha256 = "1vhlrqz7xscmjnxpz60mdpvflanl26d7673ml7psd75n0zvcfra5"; }; dontStrip = true; From 36dad3378d47f6730c2ca18f1ad7c3c946010242 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 3 Apr 2015 13:30:30 -0400 Subject: [PATCH 944/947] Use libvpx-git on Darwin libvpx 1.3.0 is extremely challenging for us to compile on Darwin. I think we would need to use clang 3.5 and patch the configure scripts heavily. But libvpx-git works great, so lets just use that instead --- 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 8fafca016dc..eed826ad341 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6826,7 +6826,7 @@ let libviper = callPackage ../development/libraries/libviper { }; - libvpx = callPackage ../development/libraries/libvpx { }; + libvpx = if stdenv.isDarwin then libvpx-git else callPackage ../development/libraries/libvpx { }; libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; From 7db196790f0d52c551e18aab6ca8ee56c16c958e Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 3 Apr 2015 10:35:45 -0700 Subject: [PATCH 945/947] emacs-packages: update weechat.el to 0.2.2 --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 16894993159..eff7318c3d2 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1067,12 +1067,12 @@ let self = _self // overrides; weechat = melpaBuild rec { pname = "weechat.el"; - version = "20141016"; + version = "0.2.2"; src = fetchFromGitHub { owner = "the-kenny"; repo = pname; - rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; - sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; + rev = version; + sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl"; }; postPatch = lib.optionalString (!stdenv.isLinux) '' rm weechat-sauron.el weechat-secrets.el From a511157233d503dc307f32985e396981bf7cc417 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 2 Apr 2015 20:46:09 -0400 Subject: [PATCH 946/947] rtmpdump: build on Darwin --- pkgs/tools/video/rtmpdump/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index b64bedd720c..7a27f2ee1f9 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" - ++ optional opensslSupport "CRYPTO=OPENSSL"; + ++ optional opensslSupport "CRYPTO=OPENSSL" + ++ optional stdenv.isDarwin "CC=clang SYS=darwin"; buildInputs = [ zlib ] ++ optional gnutlsSupport gnutls @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { description = "Toolkit for RTMP streams"; homepage = http://rtmpdump.mplayerhq.hu/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel viric ]; }; } From 1d8c7aa9edd09b4c41e7219f7e3cabffdd4250ed Mon Sep 17 00:00:00 2001 From: codyopel Date: Fri, 3 Apr 2015 13:53:54 -0400 Subject: [PATCH 947/947] rtmpdump: fix clang support --- pkgs/tools/video/rtmpdump/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 7a27f2ee1f9..55240be19a4 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" - ++ optional stdenv.isDarwin "CC=clang SYS=darwin"; + ++ optional stdenv.isDarwin "SYS=darwin" + ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; buildInputs = [ zlib ] ++ optional gnutlsSupport gnutls