From 87d1a826272ec3ecb1a7ad44b07375d2eb093965 Mon Sep 17 00:00:00 2001 From: Markus Date: Tue, 12 Mar 2019 15:01:14 +0000 Subject: [PATCH 01/95] nixos/kubernetes: Add preferredAddressTypes option to apiserver --- nixos/modules/services/cluster/kubernetes/apiserver.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index 455d0239604..50932cbe6cb 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -184,6 +184,12 @@ in type = bool; }; + preferredAddressTypes = mkOption { + description = "List of the preferred NodeAddressTypes to use for kubelet connections."; + type = nullOr str; + default = null; + }; + runtimeConfig = mkOption { description = '' Api runtime configuration. See @@ -316,6 +322,8 @@ in "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \ ${optionalString (cfg.kubeletClientKeyFile != null) "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \ + ${optionalString (cfg.preferredAddressTypes != null) + "--kubelet-preferred-address-types=${cfg.preferredAddressTypes}"} \ --insecure-bind-address=${cfg.insecureBindAddress} \ --insecure-port=${toString cfg.insecurePort} \ ${optionalString (cfg.runtimeConfig != "") From 6858d0fd62e5a705d6f8b2422a8c3bb07129cb2a Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 26 Mar 2019 15:45:59 +0100 Subject: [PATCH 02/95] clustal-omega: init at 1.2.4 --- .../science/biology/clustal-omega/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/biology/clustal-omega/default.nix diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix new file mode 100644 index 00000000000..3464e134ee8 --- /dev/null +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, argtable }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + name = "clustal-omega-${version}"; + + src = fetchurl { + url = "http://www.clustal.org/omega/${name}.tar.gz"; + sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6"; + }; + + buildInputs = [ argtable ]; + + preConfigure = '' + for f in configure \ + src/clustal-omega-config.h \ + src/clustal-omega-config.h \ + src/config.h.in \ + src/mymain.c + do + sed -i -re 's/argtable2/argtable3/g' $f + done + ''; + + meta = with stdenv.lib; { + description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; + homepage = http://www.clustal.org/omega/; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33464ab30a4..8c94ffc621e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21630,6 +21630,8 @@ in cmtk = callPackage ../applications/science/biology/cmtk { }; + clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; From d4d710c1ab00461c132d87c37b5754d975fb0c53 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Mar 2019 08:40:00 -0500 Subject: [PATCH 03/95] postgresqlPackages.pipelinedb: init at 1.0.0-13 --- .../servers/sql/postgresql/ext/pipelinedb.nix | 39 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pipelinedb.nix diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix new file mode 100644 index 00000000000..de3cde8120d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: + +if stdenv.lib.versionOlder postgresql.version "10" +then throw "PipelineDB not supported for PostgreSQL ${postgresql.version}" +else +stdenv.mkDerivation rec { + pname = "pipelinedb"; + version = "1.0.0-13"; + + src = fetchFromGitHub { + owner = "pipelinedb"; + repo = pname; + rev = version; + sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; + }; + + buildInputs = [ postgresql openssl zeromq ]; + + makeFlags = [ "USE_PGXS=1" ]; + + preConfigure = '' + substituteInPlace Makefile \ + --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -t $out/lib/ pipelinedb.so + install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control} + ''; + + meta = with stdenv.lib; { + description = "High-performance time-series aggregation for PostgreSQL"; + homepage = https://www.pipelinedb.com/; + license = licenses.asl20; + platforms = postgresql.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 2d0c699c12e..1d003e73964 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -31,6 +31,8 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; + pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; + timescaledb = super.callPackage ./ext/timescaledb.nix { }; tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; From a3ac12aca9c7d7be41c6af125f8b08d657e46f12 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:18:30 -0400 Subject: [PATCH 04/95] boost: remove old cygwin patches Most of these are unused and the others only used in 1.59. --- pkgs/development/libraries/boost/1.59.nix | 30 - .../boost/cygwin-1.40.0-cstdint-cygwin.patch | 20 - .../cygwin-1.40.0-iostreams-cygwin.patch | 24 - .../boost/cygwin-1.40.0-python-cygwin.patch | 35 - .../boost/cygwin-1.40.0-regex-cygwin.patch | 15 - .../boost/cygwin-1.45.0-jam-cygwin.patch | 12 - .../boost/cygwin-1.50.0-jam-pep3149.patch | 11 - .../boost/cygwin-1.55.0-asio-MSG_EOR.patch | 14 - .../cygwin-1.55.0-interlocked-cygwin.patch | 11 - .../boost/cygwin-1.57.0-asio-cygwin.patch | 1835 ----------------- .../boost/cygwin-1.57.0-config-cygwin.patch | 76 - .../boost/cygwin-1.57.0-context-cygwin.patch | 600 ------ .../cygwin-1.57.0-filesystem-cygwin.patch | 32 - .../boost/cygwin-1.57.0-locale-cygwin.patch | 81 - .../boost/cygwin-1.57.0-log-cygwin.patch | 46 - .../cygwin-1.57.0-smart_ptr-cygwin.patch | 77 - .../boost/cygwin-1.57.0-system-cygwin.patch | 22 - ...dora-boost-1.50.0-fix-non-utf8-files.patch | 22 - .../cygwin-fedora-boost-1.50.0-pool.patch | 122 -- ...a-boost-1.54.0-locale-unused_typedef.patch | 11 - ...-boost-1.54.0-pool-max_chunks_shadow.patch | 14 - ...a-boost-1.54.0-python-unused_typedef.patch | 15 - ...in-fedora-boost-1.57.0-move-is_class.patch | 20 - ...cygwin-fedora-boost-1.57.0-mpl-print.patch | 31 - ...edora-boost-1.57.0-pool-test_linking.patch | 33 - ...edora-boost-1.57.0-signals2-weak_ptr.patch | 10 - ...a-boost-1.57.0-spirit-unused_typedef.patch | 19 - ...-fedora-boost-1.57.0-uuid-comparison.patch | 11 - 28 files changed, 3249 deletions(-) delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 603d7883c64..f4931dfe547 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -7,34 +7,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - - patches = stdenv.lib.optionals stdenv.isCygwin [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ]; }) diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch deleted file mode 100644 index 61791c60d9e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch +++ /dev/null @@ -1,20 +0,0 @@ -These were fixed in ~1.7.0-46 - ---- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600 -+++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500 -@@ -40,15 +40,6 @@ - # include - # else - # include -- --// There is a bug in Cygwin two _C macros --# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) --# undef INTMAX_C --# undef UINTMAX_C --# define INTMAX_C(c) c##LL --# define UINTMAX_C(c) c##ULL --# endif -- - # endif - - #ifdef __QNX__ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch deleted file mode 100644 index 6641ba823b1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500 -@@ -44,8 +44,7 @@ - //------------------Locale support--------------------------------------------// - - #ifndef BOOST_IOSTREAMS_NO_LOCALE --# if defined(BOOST_NO_STD_LOCALE) || \ -- defined(__CYGWIN__) && \ -+# if defined(BOOST_NO_STD_LOCALE) && \ - ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \ - /**/ - # define BOOST_IOSTREAMS_NO_LOCALE ---- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500 -@@ -13,8 +13,7 @@ - - // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use. - #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX ) --# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ -- !defined(__CYGWIN__) \ -+# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) - /**/ - # define BOOST_IOSTREAMS_WINDOWS - # else diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch deleted file mode 100644 index 7932b0e124b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500 -@@ -83,7 +83,7 @@ - # endif - # define BOOST_PYTHON_DECL_FORWARD - # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) --# elif (defined(_WIN32) || defined(__CYGWIN__)) -+# elif defined(_WIN32) - # if defined(BOOST_PYTHON_SOURCE) - # define BOOST_PYTHON_DECL __declspec(dllexport) - # define BOOST_PYTHON_BUILD_DLL ---- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500 -+++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500 -@@ -82,8 +82,8 @@ - // Some things we need in order to get Python.h to work with compilers other - // than MSVC on Win32 - // --#if defined(_WIN32) || defined(__CYGWIN__) --# if defined(__GNUC__) && defined(__CYGWIN__) -+#if defined(_WIN32) -+# if defined(__GNUC__) - - # define SIZEOF_LONG 4 - ---- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500 -+++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500 -@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char - - }}} - --# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE) -+# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE) - - # define BOOST_PYTHON_MODULE_INIT(name) \ - void init_module_##name(); \ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch deleted file mode 100644 index 969bb814bd1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500 -@@ -28,11 +28,7 @@ - - #ifndef BOOST_REGEX_NO_FILEITER - --#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32) --#error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" --#define BOOST_REGEX_FI_WIN32_MAP --#define BOOST_REGEX_FI_POSIX_DIR --#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) -+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) - #define BOOST_REGEX_FI_WIN32_MAP - #define BOOST_REGEX_FI_WIN32_DIR - #else diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch deleted file mode 100644 index 1a00851fa92..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch +++ /dev/null @@ -1,12 +0,0 @@ -OS_CYGWIN is used to assume cygpath, Win32-isms - ---- boost_1_48_0/tools/build/src/engine/jam.h -+++ boost_1_48_0/tools/build/src/engine/jam.h -@@ -245,7 +245,6 @@ - #endif - #if defined(__cygwin__) || defined(__CYGWIN__) - #define OSMINOR "OS=CYGWIN" -- #define OS_CYGWIN - #endif - #if defined(__FreeBSD__) && !defined(__DragonFly__) - #define OSMINOR "OS=FREEBSD" diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch deleted file mode 100644 index 4bc6ec9d36e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500 -+++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600 -@@ -376,7 +376,7 @@ local rule path-to-native ( paths * ) - # - local rule split-version ( version ) - { -- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ; -+ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ; - if ! $(major-minor[2]) || $(major-minor[3]) - { - ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch deleted file mode 100644 index 46308a59cb0..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500 -+++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500 -@@ -332,7 +332,11 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB - # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK - # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE -+#ifdef MSG_EOR - # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR -+#else -+# define BOOST_ASIO_OS_DEF_MSG_EOR 0 -+#endif - # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD - # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR - # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch deleted file mode 100644 index df3edf51e7b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500 -+++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500 -@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc - ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange))) - # endif - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport) - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch deleted file mode 100644 index 3702d475c8e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch +++ /dev/null @@ -1,1835 +0,0 @@ ---- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500 -@@ -42,7 +42,7 @@ protected: - BOOST_ASIO_DECL static void init_native_buffer( - native_buffer_type& buf, - const boost::asio::const_buffer& buffer); --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -61,7 +61,7 @@ protected: - buf.buf = const_cast(boost::asio::buffer_cast(buffer)); - buf.len = static_cast(boost::asio::buffer_size(buffer)); - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -92,7 +92,7 @@ protected: - boost::asio::buffer_cast(buffer))); - iov.iov_len = boost::asio::buffer_size(buffer); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - }; - - // Helper class to translate buffers into the native buffer representation. ---- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500 -@@ -474,7 +474,7 @@ - #endif // !defined(BOOST_ASIO_WINDOWS) - - // Windows: target OS version. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) - # if defined(_MSC_VER) || defined(__BORLANDC__) - # pragma message( \ -@@ -512,29 +512,29 @@ - # error You must add -D__USE_W32_SOCKETS to your compiler options. - # endif // !defined(__USE_W32_SOCKETS) - # endif // defined(__CYGWIN__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: minimise header inclusion. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) - # if !defined(WIN32_LEAN_AND_MEAN) - # define WIN32_LEAN_AND_MEAN - # endif // !defined(WIN32_LEAN_AND_MEAN) - # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: suppress definition of "min" and "max" macros. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_NOMINMAX) - # if !defined(NOMINMAX) - # define NOMINMAX 1 - # endif // !defined(NOMINMAX) - # endif // !defined(BOOST_ASIO_NO_NOMINMAX) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: IO Completion Ports. - #if !defined(BOOST_ASIO_HAS_IOCP) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) - # if !defined(UNDER_CE) - # if !defined(BOOST_ASIO_DISABLE_IOCP) -@@ -542,7 +542,7 @@ - # endif // !defined(BOOST_ASIO_DISABLE_IOCP) - # endif // !defined(UNDER_CE) - # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_HAS_IOCP) - - // Linux: epoll, eventfd and timerfd. -@@ -599,8 +599,7 @@ - #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) - # if defined(BOOST_ASIO_HAS_IOCP) \ - || !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # if !defined(__SYMBIAN32__) - # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) - # define BOOST_ASIO_HAS_SERIAL_PORT 1 -@@ -609,7 +608,6 @@ - # endif // defined(BOOST_ASIO_HAS_IOCP) - // || !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT) - - // Windows: stream handles. -@@ -633,11 +631,11 @@ - // Windows: object handles. - #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if !defined(UNDER_CE) - # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 - # endif // !defined(UNDER_CE) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) - #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - -@@ -654,12 +652,10 @@ - #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - -@@ -667,12 +663,10 @@ - #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - -@@ -680,12 +674,10 @@ - #if !defined(BOOST_ASIO_HAS_SIGACTION) - # if !defined(BOOST_ASIO_DISABLE_SIGACTION) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_SIGACTION 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION) - #endif // !defined(BOOST_ASIO_HAS_SIGACTION) - -@@ -700,7 +692,7 @@ - - // Can use getaddrinfo() and getnameinfo(). - #if !defined(BOOST_ASIO_HAS_GETADDRINFO) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) - # define BOOST_ASIO_HAS_GETADDRINFO 1 - # elif defined(UNDER_CE) ---- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP ---- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500 -@@ -26,7 +26,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef win_fd_set_adapter fd_set_adapter; - #else - typedef posix_fd_set_adapter fd_set_adapter; ---- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500 -@@ -21,9 +21,9 @@ - #include - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( - + (reinterpret_cast(p) >> 3); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - inline std::size_t calculate_hash_value(SOCKET s) - { - return static_cast(s); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Note: assumes K and V are POD types. - template ---- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500 -@@ -21,8 +21,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - -@@ -448,6 +447,5 @@ int poll_write(int d, state_type state, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP ---- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #if !defined(BOOST_ASIO_WINDOWS) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset() - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - ---- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_ - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500 -@@ -19,7 +19,7 @@ - #include - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500 -@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_ - max_fd = fd_sets_[i].max_descriptor(); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty(); - fd_sets_[write_op].set(op_queue_[connect_op], ops); -@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_ - fd_sets_[except_op].set(op_queue_[connect_op], ops); - if (fd_sets_[except_op].max_descriptor() > max_fd) - max_fd = fd_sets_[except_op].max_descriptor(); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // We can return immediately if there's no work to do and the reactor is - // not supposed to block. -@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_ - // Dispatch all ready operations. - if (retval > 0) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - fd_sets_[except_op].perform(op_queue_[connect_op], ops); - fd_sets_[write_op].perform(op_queue_[connect_op], ops); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Exception operations must be processed first to ensure that any - // out-of-band data is read before normal data. ---- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500 -@@ -60,12 +60,10 @@ signal_state* get_signal_state() - void boost_asio_signal_handler(int signal_number) - { - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) -+ || defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_set_service::deliver_signal(signal_number); - #else // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - int saved_errno = errno; - signal_state* state = get_signal_state(); - signed_size_type result = ::write(state->write_descriptor_, -@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa - errno = saved_errno; - #endif // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - - #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) - ::signal(signal_number, boost_asio_signal_handler); -@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa - } - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - class signal_set_service::pipe_read_op : public reactor_op - { - public: -@@ -115,30 +111,25 @@ public: - }; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - signal_set_service::signal_set_service( - boost::asio::io_service& io_service) - : io_service_(boost::asio::use_service(io_service)), - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_(boost::asio::use_service(io_service)), - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - next_(0), - prev_(0) - { - get_signal_state()->mutex_.init(); - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_.init_task(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - for (int i = 0; i < max_signal_number; ++i) - registrations_[i] = 0; -@@ -174,8 +165,7 @@ void signal_set_service::fork_service( - boost::asio::io_service::fork_event fork_ev) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - -@@ -217,11 +207,9 @@ void signal_set_service::fork_service( - } - #else // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - (void)fork_ev; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::construct( -@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - delete new_registration; - return ec; - } -@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser - if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the first service to be created, open a new pipe. - if (state->service_list_ == 0) - open_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - // Insert service into linked list of all services. - service->next_ = state->service_list_; -@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig - state->service_list_ = service; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Register for pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig - read_descriptor, service->reactor_data_, new pipe_read_op); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::remove_service(signal_set_service* service) -@@ -534,8 +520,7 @@ void signal_set_service::remove_service( - if (service->next_ || service->prev_ || state->service_list_ == service) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Disable the pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -544,7 +529,6 @@ void signal_set_service::remove_service( - lock.lock(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // Remove service from linked list of all services. - if (state->service_list_ == service) -@@ -556,19 +540,18 @@ void signal_set_service::remove_service( - service->next_ = 0; - service->prev_ = 0; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the last service to be removed, close the pipe. - if (state->service_list_ == 0) - close_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - } - } - - void signal_set_service::open_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - int pipe_fds[2]; -@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor - } - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::close_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - if (state->read_descriptor_ != -1) -@@ -612,7 +593,6 @@ void signal_set_service::close_descripto - state->write_descriptor_ = -1; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::start_wait_op( ---- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 -@@ -33,12 +33,12 @@ - # include - #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ -+#if defined(BOOST_ASIO_WINDOWS) \ - || defined(__MACH__) && defined(__APPLE__) - # if defined(BOOST_ASIO_HAS_PTHREADS) - # include - # endif // defined(BOOST_ASIO_HAS_PTHREADS) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - // || defined(__MACH__) && defined(__APPLE__) - - #include -@@ -50,9 +50,9 @@ namespace socket_ops { - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - struct msghdr { int msg_namelen; }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) - // HP-UX doesn't declare these functions extern "C", so they are declared again -@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c - - inline void clear_last_error() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - WSASetLastError(0); - #else - errno = 0; -@@ -78,7 +78,7 @@ template - inline ReturnType error_wrapper(ReturnType return_value, - boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(WSAGetLastError(), - boost::asio::error::get_system_category()); - #else -@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - if (result != 0 - && (ec == boost::asio::error::would_block -@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta - // current OS where this behaviour is seen, Windows, says that the socket - // remains open. Therefore we'll put the descriptor back into blocking - // mode and have another attempt at closing it. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = 0; - ::ioctlsocket(s, FIONBIO, &arg); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - # if defined(__SYMBIAN32__) - int flags = ::fcntl(s, F_GETFL, 0); - if (flags >= 0) -@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta - ioctl_arg_type arg = 0; - ::ioctl(s, FIONBIO, &arg); - # endif // defined(__SYMBIAN32__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - state &= ~non_blocking; - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - } - -@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, - // Check if the connect operation has finished. This is required since we may - // get spurious readiness notifications from the reactor. - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, - zero_timeout.tv_usec = 0; - int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, - fds.revents = 0; - int ready = ::poll(&fds, 1, 0); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (ready == 0) - { -@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, - int socketpair(int af, int type, int protocol, - socket_type sv[2], boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(af); - (void)(type); - (void)(protocol); -@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy - - #if defined(SIOCATMARK) - ioctl_arg_type value = 0; --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - # if defined(ENOTTY) -@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s - } - - ioctl_arg_type value = 0; --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - #if defined(ENOTTY) -@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v - base = static_cast(addr); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - void init_buf(buf& b, void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(data); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, data); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - void init_buf(buf& b, const void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(const_cast(data)); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, const_cast(data)); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) -@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recv(socket_type s, state_type state, buf* bufs, -@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(*addrlen); -@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, -@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, - int in_flags, int& out_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - out_flags = 0; - return socket_ops::recv(s, bufs, count, in_flags, ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, - else - out_flags = 0; - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvmsg(socket_type s, state_type state, -@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = const_cast(bufs); - msg.msg_iovlen = static_cast(count); -@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_send(socket_type s, state_type state, const buf* bufs, -@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(addrlen); -@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_sendto(socket_type s, state_type state, const buf* bufs, -@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, - WSA_FLAG_OVERLAPPED), ec); - if (s == invalid_socket) -@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type - } - ec = boost::asio::error::fault; - return socket_error_retval; --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - template -@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad - return socket_error_retval; - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (cached) - { - // Check if socket is still connected. -@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad - ec = boost::system::error_code(); - return 0; - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - (void)cached; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - clear_last_error(); - int result = error_wrapper(call_getpeername( -@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); - #elif defined(__MACH__) && defined(__APPLE__) \ - || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd - fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (!readfds && !writefds && !exceptfds && timeout) - { - DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; -@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd - if (timeout && timeout->tv_sec == 0 - && timeout->tv_usec > 0 && timeout->tv_usec < 1000) - timeout->tv_usec = 1000; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) && defined(__SELECT) - timespec ts; -@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - } - -@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::address_family_not_supported; - return 0; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::invalid_argument; - - return result == socket_error_retval ? 0 : dest; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - const char* result = error_wrapper(::inet_ntop( - af, src, dest, static_cast(length)), ec); - if (result == 0 && !ec) -@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void - strcat(dest, if_name); - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int inet_pton(int af, const char* src, void* dest, -@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v - ec = boost::asio::error::address_family_not_supported; - return -1; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy and strcmp. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v - ec = boost::system::error_code(); - - return result == socket_error_retval ? -1 : 1; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::inet_pton(af, src, dest), ec); - if (result <= 0 && !ec) - ec = boost::asio::error::invalid_argument; -@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v - } - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int gethostname(char* name, int namelen, boost::system::error_code& ec) -@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char - hostent* result, char* buffer, int buflength, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); -@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char - char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - (void)(ai_flags); -@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla - case EAI_SOCKTYPE: - return boost::asio::error::socket_type_not_supported; - default: // Possibly the non-portable EAI_SYSTEM. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return boost::system::error_code( - WSAGetLastError(), boost::asio::error::get_system_category()); - #else -@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co - host = (host && *host) ? host : 0; - service = (service && *service) ? service : 0; - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - int error = ::getaddrinfo(host, service, &hints, result); -@@ -3213,7 +3201,7 @@ boost::system::error_code background_get - - void freeaddrinfo(addrinfo_type* ai) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - ::freeaddrinfo(ai); -@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co - std::size_t addrlen, char* host, std::size_t hostlen, - char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - clear_last_error(); ---- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() - #include - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP ---- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -54,6 +54,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP ---- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_HAS_THREADS) \ - || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -65,7 +64,6 @@ public: - #endif // !defined(BOOST_ASIO_HAS_THREADS) - // || defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP ---- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - // Guess whether we are building against on old Platform SDK. - #if !defined(IN6ADDR_ANY_INIT) -@@ -211,6 +211,6 @@ struct addrinfo_emulation - # define IPPROTO_ICMPV6 58 - #endif - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP ---- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS) - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -84,7 +83,6 @@ private: - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #endif // !defined(BOOST_ASIO_WINDOWS) - ---- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 -@@ -18,7 +18,6 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(__CYGWIN__) \ - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include -@@ -114,7 +113,6 @@ private: - #include - - #endif // !defined(BOOST_ASIO_WINDOWS) -- // && !defined(__CYGWIN__) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -319,6 +318,5 @@ private: - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 -@@ -19,7 +19,7 @@ - #include - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -230,7 +230,7 @@ private: - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_EVENTFD) - # include -@@ -31,7 +31,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - typedef socket_select_interrupter select_interrupter; - #elif defined(BOOST_ASIO_HAS_EVENTFD) - typedef eventfd_select_interrupter select_interrupter; ---- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 -@@ -51,13 +51,13 @@ class select_reactor - : public boost::asio::detail::service_base - { - public: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 3, max_ops = 4 }; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 1, max_ops = 3 }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Per-descriptor data. - struct per_descriptor_data ---- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_PTHREADS) - # include -@@ -33,7 +33,7 @@ namespace detail { - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - typedef null_signal_blocker signal_blocker; - #elif defined(BOOST_ASIO_HAS_PTHREADS) - typedef posix_signal_blocker signal_blocker; ---- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -44,6 +44,6 @@ public: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP ---- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 -@@ -28,9 +28,9 @@ - #include - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -183,8 +183,7 @@ private: - io_service_impl& io_service_; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // The type used for registering for pipe reactor notifications. - class pipe_read_op; - -@@ -195,7 +194,6 @@ private: - reactor::per_descriptor_data reactor_data_; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // A mapping from signal number to the registered signal sets. - registration* registrations_[max_signal_number]; ---- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 -@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ - BOOST_ASIO_DECL int listen(socket_type s, - int backlog, boost::system::error_code& ec); - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); - ---- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -85,7 +84,6 @@ private: - #endif // defined(BOOST_ASIO_HEADER_ONLY) - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 -@@ -19,7 +19,7 @@ - - #if defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Empty. --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) - # error WinSock.h has already been included - # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) -@@ -169,7 +169,7 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 - # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 - # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - typedef SOCKET socket_type; - const SOCKET invalid_socket = INVALID_SOCKET; - const int socket_error_retval = SOCKET_ERROR; ---- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -146,6 +146,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP ---- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 -@@ -20,7 +20,6 @@ - #include - #include - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) - # include - #else -@@ -45,7 +44,7 @@ - # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_NATIVE_ERROR(e) e - # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e - # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e -@@ -225,7 +224,7 @@ inline const boost::system::error_catego - return boost::system::system_category(); - } - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_netdb_category(); -@@ -233,7 +232,7 @@ const boost::system::error_category& get - extern BOOST_ASIO_DECL - const boost::system::error_category& get_addrinfo_category(); - --#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#else // !defined(BOOST_ASIO_WINDOWS) - - inline const boost::system::error_category& get_netdb_category() - { -@@ -245,7 +244,7 @@ inline const boost::system::error_catego - return get_system_category(); - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_misc_category(); ---- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 -@@ -25,7 +25,7 @@ namespace boost { - namespace asio { - namespace error { - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - -@@ -87,7 +87,7 @@ const boost::system::error_category& get - return instance; - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - ---- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 -@@ -27,7 +27,7 @@ - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios -@@ -41,7 +41,7 @@ namespace asio { - boost::system::error_code serial_port_base::baud_rate::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.BaudRate = value_; - #else - speed_t baud; -@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::baud_rate::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.BaudRate; - #else - speed_t baud = ::cfgetospeed(&storage); -@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con - boost::system::error_code serial_port_base::flow_control::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.fOutxCtsFlow = FALSE; - storage.fOutxDsrFlow = FALSE; - storage.fTXContinueOnXoff = TRUE; -@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::flow_control::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.fOutX && storage.fInX) - { - value_ = software; -@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ - boost::system::error_code serial_port_base::parity::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case none: -@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::parity::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.Parity == EVENPARITY) - { - value_ = even; -@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( - boost::system::error_code serial_port_base::stop_bits::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case one: -@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::stop_bits::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.StopBits == ONESTOPBIT) - { - value_ = one; -@@ -507,7 +507,7 @@ serial_port_base::character_size::charac - boost::system::error_code serial_port_base::character_size::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.ByteSize = value_; - #else - storage.c_cflag &= ~CSIZE; -@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::character_size::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.ByteSize; - #else - if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } ---- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 -@@ -24,7 +24,7 @@ - #include - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) -@@ -600,7 +600,7 @@ public: - friend bool has_service(io_service& ios); - - private: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - detail::winsock_init<> init_; - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) ---- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 -@@ -21,16 +21,16 @@ - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ - || defined(GENERATING_DOCUMENTATION) - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - #include - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios ---- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 -@@ -85,15 +85,15 @@ public: - private: - static unsigned long openssl_id_func() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return ::GetCurrentThreadId(); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - void* id = instance()->thread_id_; - if (id == 0) - instance()->thread_id_ = id = &id; // Ugh. - BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); - return reinterpret_cast(id); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - static void openssl_locking_func(int mode, int n, -@@ -109,10 +109,10 @@ private: - std::vector > mutexes_; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // The thread identifiers to be used by openssl. - boost::asio::detail::tss_ptr thread_id_; --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch deleted file mode 100644 index 97acc72689d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 -+++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 -@@ -39,18 +39,8 @@ - #define BOOST_HAS_STDINT_H - #endif - --/// Cygwin has no fenv.h --#define BOOST_NO_FENV_H -- - // boilerplate code: - #include -- --// --// Cygwin lies about XSI conformance, there is no nl_types.h: --// --#ifdef BOOST_HAS_NL_TYPES_H --# undef BOOST_HAS_NL_TYPES_H --#endif - - - ---- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 -@@ -68,7 +68,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 -@@ -41,7 +41,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 -@@ -17,7 +17,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 -@@ -13,7 +13,7 @@ - #define BOOST_NO_STD_MESSAGES - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 -+++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 -@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) - defined(__CYGWIN__) \ - ) - # undef BOOST_OS_CYGWIN --# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE -+# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE - #endif - - #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch deleted file mode 100644 index 3d9726179be..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch +++ /dev/null @@ -1,600 +0,0 @@ ---- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 -+++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 -@@ -29,6 +29,7 @@ local rule default_binary_format ( ) - local tmp = elf ; - if [ os.name ] = "MACOSX" { tmp = mach-o ; } - if [ os.name ] = "NT" { tmp = pe ; } -+ if [ os.name ] = "CYGWIN" { tmp = pe ; } - if [ os.name ] = "AIX" { tmp = xcoff ; } - return $(tmp) ; - } -@@ -581,6 +582,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_i386_ms_pe_gas.S -+ asm/jump_i386_ms_pe_gas.S -+ dummy.cpp -+ : 32 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_i386_ms_pe_masm.asm - asm/jump_i386_ms_pe_masm.asm - dummy.cpp -@@ -715,6 +726,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_x86_64_ms_pe_gas.S -+ asm/jump_x86_64_ms_pe_gas.S -+ dummy.cpp -+ : 64 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp ---- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 -@@ -0,0 +1,108 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "jump_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _jump_fcontext -+.def _jump_fcontext; .scl 2; .type 32; .endef -+_jump_fcontext: -+ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ -+ movl %edi, (%ecx) /* save EDI */ -+ movl %esi, 0x04(%ecx) /* save ESI */ -+ movl %ebx, 0x08(%ecx) /* save EBX */ -+ movl %ebp, 0x0c(%ecx) /* save EBP */ -+ -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl (%edx), %eax /* load current SEH exception list */ -+ movl %eax, 0x24(%ecx) /* save current exception list */ -+ movl 0x04(%edx), %eax /* load current stack base */ -+ movl %eax, 0x18(%ecx) /* save current stack base */ -+ movl 0x08(%edx), %eax /* load current stack limit */ -+ movl %eax, 0x20(%ecx) /* save current stack limit */ -+ movl 0x10(%edx), %eax /* load fiber local storage */ -+ movl %eax, 0x28(%ecx) /* save fiber local storage */ -+ -+ leal 0x04(%esp), %eax /* exclude the return address */ -+ movl %eax, 0x10(%ecx) /* save as stack pointer */ -+ movl (%esp), %eax /* load return address */ -+ movl %eax, 0x14(%ecx) /* save return address */ -+ -+ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ -+ movl (%edx), %edi /* restore EDI */ -+ movl 0x04(%edx), %esi /* restore ESI */ -+ movl 0x08(%edx), %ebx /* restore EBX */ -+ movl 0x0c(%edx), %ebp /* restore EBP */ -+ -+ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ -+ testl %eax, %eax -+ je 1f -+ -+ stmxcsr 0x2c(%ecx) /* save MMX control word */ -+ fnstcw 0x30(%ecx) /* save x87 control word */ -+ ldmxcsr 0x2c(%edx) /* restore MMX control word */ -+ fldcw 0x30(%edx) /* restore x87 control word */ -+1: -+ movl %edx, %ecx -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl 0x24(%ecx), %eax /* load SEH exception list */ -+ movl %eax, (%edx) /* restore next SEH item */ -+ movl 0x18(%ecx), %eax /* load stack base */ -+ movl %eax, 0x04(%edx) /* restore stack base */ -+ movl 0x20(%ecx), %eax /* load stack limit */ -+ movl %eax, 0x08(%edx) /* restore stack limit */ -+ movl 0x28(%ecx), %eax /* load fiber local storage */ -+ movl %eax, 0x10(%edx) /* restore fiber local storage */ -+ -+ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ -+ -+ movl 0x10(%ecx), %esp /* restore ESP */ -+ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ -+ movl 0x14(%ecx), %ecx /* fetch the address to return to */ -+ -+ jmp *%ecx /* indirect jump to context */ ---- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 -@@ -0,0 +1,189 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "jump_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl jump_fcontext -+.def jump_fcontext; .scl 2; .type 32; .endef -+.seh_proc jump_fcontext -+jump_fcontext: -+.seh_endprologue -+ movq %r12, (%rcx) /* save R12 */ -+ movq %r13, 0x08(%rcx) /* save R13 */ -+ movq %r14, 0x10(%rcx) /* save R14 */ -+ movq %r15, 0x18(%rcx) /* save R15 */ -+ movq %rdi, 0x20(%rcx) /* save RDI */ -+ movq %rsi, 0x28(%rcx) /* save RSI */ -+ movq %rbx, 0x30(%rcx) /* save RBX */ -+ movq %rbp, 0x38(%rcx) /* save RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x08(%r10), %rax /* load current stack base */ -+ movq %rax, 0x50(%rcx) /* save current stack base */ -+ movq 0x10(%r10), %rax /* load current stack limit */ -+ movq %rax, 0x60(%rcx) /* save current stack limit */ -+ movq 0x18(%r10), %rax /* load fiber local storage */ -+ movq %rax, 0x68(%rcx) /* save fiber local storage */ -+ -+ testq %r9, %r9 -+ je 1f -+ -+ stmxcsr 0x70(%rcx) /* save MMX control and status word */ -+ fnstcw 0x74(%rcx) /* save x87 control word */ -+ /* save XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rcx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps %xmm6, (%r10) -+ movaps %xmm7, 0x10(%r10) -+ movaps %xmm8, 0x20(%r10) -+ movaps %xmm9, 0x30(%r10) -+ movaps %xmm10, 0x40(%r10) -+ movaps %xmm11, 0x50(%r10) -+ movaps %xmm12, 0x60(%r10) -+ movaps %xmm13, 0x70(%r10) -+ movaps %xmm14, 0x80(%r10) -+ movaps %xmm15, 0x90(%r10) -+ -+ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ -+ fldcw 0x74(%rdx) /* restore x87 control word */ -+ /* restore XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rdx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps (%r10), %xmm6 -+ movaps 0x10(%r10), %xmm7 -+ movaps 0x20(%r10), %xmm8 -+ movaps 0x30(%r10), %xmm9 -+ movaps 0x40(%r10), %xmm10 -+ movaps 0x50(%r10), %xmm11 -+ movaps 0x60(%r10), %xmm12 -+ movaps 0x70(%r10), %xmm13 -+ movaps 0x80(%r10), %xmm14 -+ movaps 0x90(%r10), %xmm15 -+ -+1: -+ leaq 0x08(%rsp), %rax /* exclude the return address */ -+ movq %rax, 0x40(%rcx) /* save as stack pointer */ -+ movq (%rsp), %rax /* load return address */ -+ movq %rax, 0x48(%rcx) /* save return address */ -+ -+ movq (%rdx), %r12 /* restore R12 */ -+ movq 0x08(%rdx), %r13 /* restore R13 */ -+ movq 0x10(%rdx), %r14 /* restore R14 */ -+ movq 0x18(%rdx), %r15 /* restore R15 */ -+ movq 0x20(%rdx), %rdi /* restore RDI */ -+ movq 0x28(%rdx), %rsi /* restore RSI */ -+ movq 0x30(%rdx), %rbx /* restore RBX */ -+ movq 0x38(%rdx), %rbp /* restore RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x50(%rdx), %rax /* load stack base */ -+ movq %rax, 0x08(%r10) /* restore stack base */ -+ movq 0x60(%rdx), %rax /* load stack limit */ -+ movq %rax, 0x10(%r10) /* restore stack limit */ -+ movq 0x68(%rdx), %rax /* load fiber local storage */ -+ movq %rax, 0x18(%r10) /* restore fiber local storage */ -+ -+ movq 0x40(%rdx), %rsp /* restore RSP */ -+ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ -+ -+ movq %r8, %rax /* use third arg as return value after jump */ -+ movq %r8, %rcx /* use third arg as first arg in context function */ -+ -+ jmp *%r10 /* indirect jump to caller */ -+.seh_endproc ---- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 -@@ -0,0 +1,115 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "make_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _make_fcontext -+.def _make_fcontext; .scl 2; .type 32; .endef -+_make_fcontext: -+ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in EAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andl $-16, %eax -+ -+ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ -+ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ -+ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ -+ negl %edx /* negate stack size for LEA instruction (== substraction) */ -+ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ -+ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ -+ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ -+ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ -+ -+ stmxcsr 0x02c(%eax) /* save MMX control word */ -+ fnstcw 0x030(%eax) /* save x87 control word */ -+ -+ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ -+ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ -+ -+ movl $finish, %ecx /* abs address of finish */ -+ movl %ecx, (%edx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ /* traverse current seh chain to get the last exception handler installed by Windows */ -+ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ -+ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ -+ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ -+ /* program is aborted */ -+ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ -+ -+walk: -+ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ -+ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ -+ jz found -+ decl %edx -+ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ -+ jmp walk /* inspect next SEH */ -+ -+found: -+ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ -+ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ -+ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ -+ movl $0xffffffff,%ecx /* set ECX to -1 */ -+ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ -+ leal 0x14(%edx), %ecx /* load address of next SEH item */ -+ movl %ecx, 0x24(%eax) /* save next SEH */ -+ -+ ret -+ -+finish: -+ /* ESP points to same address as ESP on entry of context function + 0x4 */ -+ xorl %eax, %eax -+ movl %eax, (%esp) /* exit code is zero */ -+ call __exit /* exit application */ -+ hlt -+ -+.def __exit; .scl 2; .type 32; .endef /* standard C library function */ ---- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 -@@ -0,0 +1,132 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "make_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl make_fcontext -+.def make_fcontext; .scl 2; .type 32; .endef -+.seh_proc make_fcontext -+make_fcontext: -+.seh_endprologue -+ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in RAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andq $-16, %rax -+ -+ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ -+ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ -+ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ -+ -+ negq %rdx /* negate stack size for LEA instruction (== substraction) */ -+ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ -+ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ -+ -+ stmxcsr 0x70(%rax) /* save MMX control and status word */ -+ fnstcw 0x74(%rax) /* save x87 control word */ -+ -+ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ -+ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ -+ -+ leaq finish(%rip),%rcx /* compute abs address of label finish */ -+ movq %rcx,(%rdx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ ret -+ -+finish: -+ /* RSP points to same address as RSP on entry of context function + 0x8 */ -+ xorq %rcx, %rcx /* exit code is zero */ -+ call _exit /* exit application */ -+ hlt -+.seh_endproc -+ -+.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch deleted file mode 100644 index cbb5757746d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 -@@ -1966,8 +1966,7 @@ namespace - { - errno = 0; - --# if !defined(__CYGWIN__)\ -- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ -+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ - && defined(_SC_THREAD_SAFE_FUNCTIONS)\ - && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ - && (!defined(__hpux) || defined(_REENTRANT)) \ ---- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 -@@ -36,7 +36,7 @@ - # include "windows_file_codecvt.hpp" - # include - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OPEN_BSD__) -+ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) - # include - #endif - -@@ -831,7 +831,7 @@ namespace - std::locale global_loc = std::locale(); - return std::locale(global_loc, new windows_file_codecvt); - # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OpenBSD__) -+ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." See - // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch deleted file mode 100644 index 16208385a9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 -@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla - - } - -- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) -+ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) - { - ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; - result += no ; -@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla - if ! in $(properties:G) - { - if windows in $(properties) -- || cygwin in $(properties) - { - properties += on ; - } -@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla - } - - if ( ! off in $(properties) || ! off in $(properties) ) -- && ( windows in $(properties) || cygwin in $(properties) ) -+ && windows in $(properties) - { - result += win32/lcid.cpp ; - } ---- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 -@@ -8,7 +8,7 @@ - #define BOOST_LOCALE_SOURCE - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #define BOOST_LOCALE_WITH_WCONV - #endif - ---- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 -@@ -59,7 +59,7 @@ namespace boost { - return normalize_encoding(l).compare(normalize_encoding(r)); - } - -- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+ #if defined(BOOST_WINDOWS) - int encoding_to_windows_codepage(char const *ccharset); - #endif - ---- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 -@@ -15,7 +15,7 @@ - # pragma warning(disable : 4996) - #endif - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #ifndef NOMINMAX - #define NOMINMAX - #endif ---- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 -@@ -23,7 +23,7 @@ - # include - #endif - --#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - #ifndef NOMINMAX - # define NOMINMAX - #endif -@@ -395,7 +395,7 @@ int main() - def.push_back("posix"); - #endif - -- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - test_iso_8859_8 = IsValidCodePage(28598)!=0; - #endif - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch deleted file mode 100644 index a7748ec58d8..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 -@@ -96,11 +96,6 @@ - # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS - #endif - --#if defined(__CYGWIN__) -- // Boost.ASIO is broken on Cygwin --# define BOOST_LOG_NO_ASIO --#endif -- - #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) - # ifndef BOOST_LOG_WITHOUT_SYSLOG - # define BOOST_LOG_WITHOUT_SYSLOG ---- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 -@@ -170,10 +170,6 @@ project boost/log - windows:ws2_32 - windows:mswsock - -- cygwin:__USE_W32_SOCKETS -- cygwin:ws2_32 -- cygwin:mswsock -- - linux:rt - linux:_XOPEN_SOURCE=600 - linux:_GNU_SOURCE=1 ---- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 -@@ -18,7 +18,7 @@ - - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - - #if defined(BOOST_LOG_USE_WINNT6_API) - -@@ -50,6 +50,6 @@ - #define WIN32_LEAN_AND_MEAN - #endif - --#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_WINDOWS) - - #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch deleted file mode 100644 index 35e6905b0f3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 -@@ -79,7 +79,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) ---- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 -@@ -32,7 +32,7 @@ - # include - #elif defined(BOOST_HAS_PTHREADS) - # include --#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - #else - // Use #define BOOST_DISABLE_THREADS to avoid the error ---- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 -@@ -65,7 +65,7 @@ - #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) - # include - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - # include - - #elif defined( _AIX ) ---- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 -@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch - # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange - # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - namespace boost - { ---- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 -@@ -49,7 +49,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(BOOST_HAS_PTHREADS) ---- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 -@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); - - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #if defined( BOOST_USE_WINDOWS_H ) - # include ---- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 -@@ -8,7 +8,7 @@ - // http://www.boost.org/LICENSE_1_0.txt - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #include - #include diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch deleted file mode 100644 index e241f37f203..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 -@@ -33,7 +33,7 @@ - // Standalone MinGW and all other known Windows compilers do predefine _WIN32 - // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. - --# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin -+# if defined(_WIN32) // Windows default, including MinGW and Cygwin - # define BOOST_WINDOWS_API - # else - # define BOOST_POSIX_API ---- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 -@@ -97,7 +97,7 @@ namespace - char buf[64]; - char * bp = buf; - std::size_t sz = sizeof(buf); -- # if defined(__CYGWIN__) || defined(__USE_GNU) -+ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) - // Oddball version of strerror_r - const char * c_str = strerror_r( ev, bp, sz ); - return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch deleted file mode 100644 index b60a3ac49d3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp -index 8b2bc43..d04f2fe 100644 ---- a/libs/units/example/autoprefixes.cpp -+++ b/libs/units/example/autoprefixes.cpp -@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return("€"); } -+ static const char* symbol() { return("€"); } - }; - - int main() -@@ -140,7 +140,7 @@ int main() - - quantity ce = 2048. * euro_base_unit::unit_type(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ - - - return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch deleted file mode 100644 index 15ce4007675..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- a/boost/pool/pool.hpp (revision 78317) -+++ b/boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include - -+// std::numeric_limits -+#include - // boost::math::static_lcm - #include -@@ -358,4 +360,13 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = math::static_lcm::value + sizeof(size_type); -+ size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -+ -+ return max_chunks; -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -400,7 +413,7 @@ - } - void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -410,5 +423,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -797,4 +811,6 @@ - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- a/libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) -@@ -0,0 +1,27 @@ -+/* Copyright (C) 2012 Étienne Dupuis -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include -+#include -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch deleted file mode 100644 index b7c91284d9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp ---- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 -+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 -@@ -27,7 +27,6 @@ namespace boundary { - int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) - { - typedef LeftIterator left_iterator; -- typedef RightIterator right_iterator; - typedef typename std::iterator_traits::value_type char_type; - typedef std::char_traits traits; - while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch deleted file mode 100644 index 6c1d0a021ed..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp ---- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 -+++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 -@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ - { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. - size_type partition_size = alloc_size(); - size_type POD_size = math::static_lcm::value + sizeof(size_type); -- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -- -- return max_chunks; -+ return (std::numeric_limits::max() - POD_size) / alloc_size(); - } - - static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch deleted file mode 100644 index 8adf8ed2080..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp ---- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 -+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 -@@ -147,8 +147,8 @@ namespace detail - template - inline PyObject* registry_to_python_value::operator()(argument_type x) const - { -- typedef converter::registered r; - # if BOOST_WORKAROUND(__GNUC__, < 3) -+ typedef converter::registered r; - // suppresses an ICE, somehow - (void)r::converters; - # endif - -Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch deleted file mode 100644 index cf9756e40ea..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ./move/core.hpp~ ./move/core.hpp ---- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 -+++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 -@@ -43,6 +43,7 @@ - #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) - - #include -+ #include - - //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers - #if defined(__GNUC__) && (__GNUC__ >= 4) && \ -@@ -65,7 +66,7 @@ - template - class rv - : public ::boost::move_detail::if_c -- < ::boost::move_detail::is_class_or_union::value -+ < ::boost::is_class::value - , T - , ::boost::move_detail::nat - >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch deleted file mode 100644 index 561cef19eb2..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp ---- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 -+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 -@@ -52,16 +52,15 @@ struct print - enum { n = sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else -- enum { -- n = --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned::value > -1 --# else -- sizeof(T) > -1 --# endif -- }; --#endif -+#elif defined(__EDG_VERSION__) -+ enum { n = aux::dependent_unsigned::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n = n1 != n2 }; -+#else -+ enum { n = sizeof(T) > -1 }; -+#endif - }; - - #if defined(BOOST_MSVC) - -Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch deleted file mode 100644 index 57e6206bba1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 -@@ -28,17 +28,17 @@ explicit valgrind_config_check ; - local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp ] -- [ run test_pool_alloc.cpp ] -- [ run pool_msvc_compiler_bug_test.cpp ] -- [ run test_msvc_mem_leak_detect.cpp ] -- [ run test_bug_3349.cpp ] -- [ run test_bug_4960.cpp ] -- [ run test_bug_1252.cpp ] -- [ run test_bug_2696.cpp ] -- [ run test_bug_5526.cpp ] -+ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] - [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] -- [ run ../example/time_pool_alloc.cpp ] -+ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] - [ compile test_poisoned_macros.cpp ] - - # - -Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch deleted file mode 100644 index eb9ea14011f..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/boost/signals2/trackable.hpp -+++ b/boost/signals2/trackable.hpp -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - namespace boost { - namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch deleted file mode 100644 index 282962987c5..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 -@@ -282,12 +282,12 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base helper_base_t; - typedef grammar_helper_list helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - grammartract_helper_list::do_(self); - - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else - -Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch deleted file mode 100644 index 30ebb981b70..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/boost/uuid/detail/uuid_x86.hpp -+++ b/boost/uuid/detail/uuid_x86.hpp -@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT - cmp = (cmp - 1u) ^ cmp; - rcmp = (rcmp - 1u) ^ rcmp; - -- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); -+ return cmp < rcmp; - } - - } // namespace uuids From b71493598a47dbe7597ba33832042a4cd958fade Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:20:04 -0400 Subject: [PATCH 05/95] herqq: remove gcc6.patch not referenced in nix code --- pkgs/development/libraries/herqq/gcc6.patch | 1320 ------------------- 1 file changed, 1320 deletions(-) delete mode 100644 pkgs/development/libraries/herqq/gcc6.patch diff --git a/pkgs/development/libraries/herqq/gcc6.patch b/pkgs/development/libraries/herqq/gcc6.patch deleted file mode 100644 index b0f7d8d0c6f..00000000000 --- a/pkgs/development/libraries/herqq/gcc6.patch +++ /dev/null @@ -1,1320 +0,0 @@ -diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -index c4d2ebe..707dbdb 100644 ---- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -+++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged( - { - foreach(const HAvtLastChangeInfo& info, infos) - { -- if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0) -+ if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0) - { - HTransportState state(info.value().toString()); - if (state.isValid()) -diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -index 40f9fda..6739a58 100644 ---- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -+++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const - { - QString vrs = version(); - -- return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) && -+ return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) && - (vrs.size() == 3 && - (vrs[0] == '1') && - vrs[1] == '.' && -@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const - { - QString vrs = version(); - -- bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 && -+ bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 && - vrs.size() >= 3 && - vrs[0] == '1' && - vrs[1] == '.'; -diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp -index 8ed2492..94ab1e0 100644 ---- c/herqq/hupnp/src/dataelements/hresourcetype.cpp -+++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp -@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - { - return; - } -- if (tmp[1].compare("schemas-upnp-org") != 0) -+ if (tmp[1].compare(QString("schemas-upnp-org")) != 0) - { - flags = 0x01; - tmp[1] = tmp[1].replace('.', '-'); -@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - } - - tmp[2] = tmp[2].simplified(); -- if (tmp[2].compare("device") == 0) -+ if (tmp[2].compare(QString("device")) == 0) - { - flags |= 0x04; - } -- else if (tmp[2].compare("service") == 0) -+ else if (tmp[2].compare(QString("service")) == 0) - { - flags |= 0x08; - } -diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp -index 9b0fad6..11a8640 100644 ---- c/herqq/hupnp/src/dataelements/hserviceid.cpp -+++ i/herqq/hupnp/src/dataelements/hserviceid.cpp -@@ -64,7 +64,7 @@ public: - return; - } - -- if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0) -+ if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD( - QString("Invalid service identifier [%1]").arg(arg)); -@@ -72,7 +72,7 @@ public: - return; - } - -- if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0) -+ if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0) - { - tmp[1] = tmp[1].replace('.', '-'); - if (tmp[1].isEmpty()) -@@ -85,7 +85,7 @@ public: - } - - bool warned = false; -- if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0) -+ if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg)); - warned = true; -diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -index b3a58fa..d1853e1 100644 ---- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -+++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments( - } - - HActionArgument createdArg; -- if (dirStr.compare("out", Qt::CaseInsensitive) == 0) -+ if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0) - { - if (retValWasDefined) - { -@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments( - - outArgs->push_back(createdArg); - } -- else if (dirStr.compare("in", Qt::CaseInsensitive) == 0) -+ else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0) - { - if (firstOutArgFound) - { -@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable( - - QString strSendEvents = stateVariableElement.attribute("sendEvents", "no"); - bool bSendEvents = false; -- if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bSendEvents = true; - } -- else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable( - - QString strMulticast = stateVariableElement.attribute("multicast", "no"); - bool bMulticast = false; -- if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bMulticast = true; - } -- else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -index 2e375a0..2d6a8cc 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents( - - // this appears to be an initial subscription - -- if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0) -+ if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0) - { - return PreConditionFailed; - } -diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -index aacdfcf..b618ba7 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; -@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; - } - -- if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0) -+ if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0) - { - m_subTypeValue.first = SubType_UpnpPropChange; - m_subTypeValue.second = "upnp:propchange"; -diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -index 0faf7f4..addbaaf 100644 ---- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) : - m_value(-1) - { - QString tmp(timeout.simplified()); -- if (tmp.compare("infinite", Qt::CaseInsensitive) != 0) -+ if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0) - { - if (tmp.startsWith("Second-", Qt::CaseInsensitive)) - { -diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp -index 9f2084f..ae8e9ae 100644 ---- c/herqq/hupnp/src/general/hupnp_datatypes.cpp -+++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp -@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType( - - case HUpnpDataTypes::boolean: - { -- if (value.compare("true", Qt::CaseInsensitive) == 0 || -- value.compare("yes", Qt::CaseInsensitive) == 0 || -- value.compare("1") == 0) -+ if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("yes"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("1")) == 0) - { - retVal = true; - } -- else if (value.compare("false", Qt::CaseInsensitive) == 0 || -- value.compare("no", Qt::CaseInsensitive) == 0 || -- value.compare("0") == 0) -+ else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("no"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("0")) == 0) - { - retVal = false; - } -diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp -index eb1a56c..42e93ca 100644 ---- c/herqq/hupnp/src/http/hhttp_server_p.cpp -+++ i/herqq/hupnp/src/http/hhttp_server_p.cpp -@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op) - mi->setKeepAlive(HHttpUtils::keepAlive(*hdr)); - - QString method = hdr->method(); -- if (method.compare("GET", Qt::CaseInsensitive) == 0) -+ if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0) - { - processGet(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("HEAD"), Qt::CaseInsensitive) -+ else if (method.compare(QString("HEAD")), Qt::CaseInsensitive) - { - processHead(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("POST", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0) - { - processPost(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0) - { - processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processSubscription(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processUnsubscription(op->takeMessagingInfo(), *hdr); - } -diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h -index 7285190..b3ee62e 100644 ---- c/herqq/hupnp/src/http/hhttp_utils_p.h -+++ i/herqq/hupnp/src/http/hhttp_utils_p.h -@@ -64,10 +64,10 @@ public: - QString connection = hdr.value("CONNECTION"); - if (hdr.minorVersion() == 1) - { -- return connection.compare("close", Qt::CaseInsensitive) != 0; -+ return connection.compare(QString("close"), Qt::CaseInsensitive) != 0; - } - -- return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0; -+ return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0; - } - - // returns the URLs as a string inside brackets. This is the format used in -diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -index 6641d14..7ea567a 100644 ---- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp -+++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok) - bool retVal = false, match = true; - if (arg == "1") { retVal = true; } - else if (arg == "0") { retVal = false; } -- else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal = false; } -- else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; } - else { match = false; } - - if (ok) { *ok = match; } -diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -index 6531929..8bd05c5 100644 ---- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -+++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status) - HObject::WriteStatus HObject::writeStatusFromString(const QString& status) - { - WriteStatus retVal = UnknownWriteStatus; -- if (status.compare("writable", Qt::CaseInsensitive) == 0) -+ if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0) - { - retVal = WritableWriteStatus; - } -- else if (status.compare("protected", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0) - { - retVal = ProtectedWriteStatus; - } -- else if (status.compare("mixed", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0) - { - retVal = MixedWriteStatus; - } -diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -index 25ee560..bea6ece 100644 ---- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -+++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type) - HMatchingId::Type HMatchingId::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0) - { - retVal = SeriesId; - } -- else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0) - { - retVal = ProgramId; - } -diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -index 06ab6bf..e7cec20 100644 ---- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -+++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type) - HScheduledTime::Type HScheduledTime::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0) - { - retVal = ScheduledProgram; - } -- else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0) - { - retVal = OnDemand; - } -diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -index 078d719..31e1af0 100644 ---- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -+++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type) - HSortModifier::Type HSortModifier::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("+", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByValue; - } -- else if (type.compare("-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByValue; - } -- else if (type.compare("TIME+", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByTime; - } -- else if (type.compare("TIME-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByTime; - } -diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -index 65b67f8..f51e6b2 100644 ---- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -+++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString( - const QString& type) - { - RcsInstanceType retVal = Undefined; -- if (type.compare("pre-mix", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PreMix; - } -- else if (type.compare("post-mix", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PostMix; - } -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -index 9f5712d..cd4dacb 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml( - addNamespaces(reader); - if (reader.readNextStartElement()) - { -- if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0) - { - h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element"; - return false; -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -index 30af243..af03c5c 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn( - - if (stateVariableReader.readNextStartElement()) - { -- if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return false; - } -diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp -index d35a559..85b7e32 100644 ---- c/herqq/hupnp_av/src/common/hradioband.cpp -+++ i/herqq/hupnp_av/src/common/hradioband.cpp -@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type) - HRadioBand::Type HRadioBand::fromString(const QString& arg) - { - Type retVal = Undefined; -- if (arg.compare("am", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0) - { - retVal = AM; - } -- else if (arg.compare("fm", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0) - { - retVal = FM; - } -- else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0) - { - retVal = ShortWave; - } -- else if (arg.compare("internet", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0) - { - retVal = Internet; - } -- else if (arg.compare("satellite", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0) - { - retVal = Satellite; - } -diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp -index 37ab7e0..c7f2109 100644 ---- c/herqq/hupnp_av/src/common/hstoragemedium.cpp -+++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp -@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type) - HStorageMedium::Type HStorageMedium::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = Unknown; - } -- else if (type.compare("DV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0) - { - retVal = DigitalVideo; - } -- else if (type.compare("VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0) - { - retVal = VHS; - } -- else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = W_VHS; - } -- else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = S_VHS; - } -- else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0) - { - retVal = D_VHS; - } -- else if (type.compare("VHSC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0) - { - retVal = VHSC; - } -- else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0) - { - retVal = Video8; - } -- else if (type.compare("HI8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0) - { - retVal = HI8; - } -- else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = CD_ROM; - } -- else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0) - { - retVal = CD_DA; - } -- else if (type.compare("CD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0) - { - retVal = CD_R; - } -- else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = CD_RW; - } -- else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0) - { - retVal = Video_CD; - } -- else if (type.compare("SACD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0) - { - retVal = SACD; - } -- else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscAudio; - } -- else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscPicture; - } -- else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_ROM; - } -- else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_Video; - } -- else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRecordable; - } -- else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRecordable; - } -- else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRewritable; - } -- else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRewritable; - } -- else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_RAM; - } -- else if (type.compare("DAT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0) - { - retVal = DAT; - } -- else if (type.compare("LD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0) - { - retVal = LD; - } -- else if (type.compare("HDD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0) - { - retVal = HDD; - } -- else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0) - { - retVal = MicroMV; - } -- else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0) - { - retVal = Network; - } -- else if (type.compare("NONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0) - { - retVal = None; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = SecureDigital; - } -- else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0) - { - retVal = PC_Card; - } -- else if (type.compare("MMC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0) - { - retVal = MultimediaCard; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CompactFlash; - } -- else if (type.compare("BD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0) - { - retVal = BluRay; - } -- else if (type.compare("MS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0) - { - retVal = MemoryStick; - } -- else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0) - { - retVal = HD_DVD; - } -diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -index 89d44ae..bb364b5 100644 ---- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -+++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction - HConnectionManagerInfo::directionFromString(const QString& arg) - { - Direction retVal = DirectionUndefined; -- if (arg.compare("Input", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionInput; - } -- else if (arg.compare("Output", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionOutput; - } -@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus - HConnectionManagerInfo::statusFromString(const QString& arg) - { - ConnectionStatus retVal = StatusUnknown; -- if (arg.compare("Ok", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0) - { - retVal = StatusOk; - } -- else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnknown; - } -- else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0) - { - retVal = StatusContentFormatMismatch; - } -- else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0) - { - retVal = StatusInsufficientBandwidth; - } -- else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnreliableChannel; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -index 5c0c0d0..743ed1e 100644 ---- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag - HContentDirectoryInfo::browseFlagFromString(const QString& arg) - { - BrowseFlag retVal = Undefined; -- if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseMetadata; - } -- else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseDirectChildren; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -index 0a663dc..1771b6f 100644 ---- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo() - HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg) - { - Status retVal = Error; -- if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0) - { - retVal = InProgress; - } -- else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0) - { - retVal = Completed; - } -diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp -index c3f93a9..27d98a0 100644 ---- c/herqq/hupnp_av/src/hav_global.cpp -+++ i/herqq/hupnp_av/src/hav_global.cpp -@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg) - addNamespaces(reader); - - if (!reader.readNextStartElement() || -- reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return retVal; - } -diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -index f9e2dc4..69b7648 100644 ---- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -+++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0) - { - return; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -index 651e727..9fb4958 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived( - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -index 174f423..bf7e9f2 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection( - return HConnectionManagerInfo::IncompatibleDirections; - } - -- if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) && -+ if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) && - remoteProtocolInfo.protocol() != "*") - { - return HConnectionManagerInfo::IncompatibleProtocolInfo; -diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -index 1ad337a..0f5e209 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName) - { - bool retVal = false; - QString trimmed = svName.trimmed(); -- if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0) -+ if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -index a614e17..fbb3258 100644 ---- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables( - foreach(QString svName, stateVarNames) - { - svName = svName.trimmed(); -- if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 || -+ if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 || - svName.startsWith("A_ARG", Qt::CaseInsensitive)) - { - return HAvTransportInfo::InvalidStateVariableList; -@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -index 751a3d9..51c1ff4 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -@@ -110,59 +110,59 @@ QString HChannel::toString(Type type) - HChannel::Type HChannel::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("MASTER", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0) - { - retVal = Master; - } -- else if (type.compare("LF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0) - { - retVal = LeftFront; - } -- else if (type.compare("RF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0) - { - retVal = RightFront; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CenterFront; - } -- else if (type.compare("LFE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0) - { - retVal = LFE; - } -- else if (type.compare("LS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0) - { - retVal = LeftSurround; - } -- else if (type.compare("RS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0) - { - retVal = RightSurround; - } -- else if (type.compare("LFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0) - { - retVal = LeftOfCenter; - } -- else if (type.compare("RFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0) - { - retVal = RightOfCenter; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = Surround; - } -- else if (type.compare("SL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0) - { - retVal = SideLeft; - } -- else if (type.compare("SR", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0) - { - retVal = SideRight; - } -- else if (type.compare("T", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0) - { - retVal = Top; - } -- else if (type.compare("B", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0) - { - retVal = Bottom; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -index fd52f9a..84f5579 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp -index cb18ce0..e3fcd64 100644 ---- c/herqq/hupnp_av/src/transport/havtransport_info.cpp -+++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp -@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState - HAvTransportInfo::drmStateFromString(const QString& state) - { - DrmState retVal = DrmState_Unknown; -- if (state.compare("OK", Qt::CaseInsensitive) == 0) -+ if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Ok; - } -- else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Unknown; - } -- else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ProcessingContentKey; - } -- else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ContentKeyFailure; - } -- else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_AttemptingAuthentication; - } -- else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_FailedAuthentication; - } -- else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_NotAuthenticated; - } -- else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_DeviceRevocation; - } -diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp -index 9e642c1..5f33847 100644 ---- c/herqq/hupnp_av/src/transport/hmediainfo.cpp -+++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp -@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString( - const QString& category) - { - MediaCategory retVal = Undefined; -- if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0) -+ if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0) - { - retVal = NoMedia; - } -- else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackAware; - } -- else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackUnaware; - } -diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp -index 8d3a20e..57605f0 100644 ---- c/herqq/hupnp_av/src/transport/hplaymode.cpp -+++ i/herqq/hupnp_av/src/transport/hplaymode.cpp -@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type) - HPlayMode::Type HPlayMode::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NORMAL", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0) - { - retVal = Normal; - } -- else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0) - { - retVal = Shuffle; - } -- else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatOne; - } -- else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatAll; - } -- else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0) - { - retVal = Random; - } -- else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0) - { - retVal = Direct_1; - } -- else if (type.compare("INTRO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0) - { - retVal = Intro; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -index ab29f09..a1a5de0 100644 ---- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString( - const QString& type) - { - Type retVal = Unknown; -- if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = Writable; - } -- else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0) - { - retVal = Protected; - } -- else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = NotWritable; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty()) -+ else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty()) - { - retVal = VendorDefined; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -index bf7dd90..b659fd7 100644 ---- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode) - HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode) - { - Type retVal = Undefined; -- if (mode.compare("0:EP", Qt::CaseInsensitive) == 0) -+ if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0) - { - retVal = Ep; - } -- else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0) - { - retVal = Lp; - } -- else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0) - { - retVal = Sp; - } -- else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0) - { - retVal = Basic; - } -- else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0) - { - retVal = Medium; - } -- else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0) - { - retVal = High; - } -- else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp -index c2ac69a..d3eee2b 100644 ---- c/herqq/hupnp_av/src/transport/hseekinfo.cpp -+++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp -@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type) - HSeekMode::Type HSeekMode::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0) - { - retVal = TrackNr; - } -- else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = AbsTime; - } -- else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = RelTime; - } -- else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = AbsCount; - } -- else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = RelCount; - } -- else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0) - { - retVal = ChannelFreq; - } -- else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = TapeIndex; - } -- else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = RelTapeIndex; - } -- else if (type.compare("FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = Frame; - } -- else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = RelFrame; - } -diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp -index d64b1bc..4a34b8d 100644 ---- c/herqq/hupnp_av/src/transport/htransportaction.cpp -+++ i/herqq/hupnp_av/src/transport/htransportaction.cpp -@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type) - HTransportAction::Type HTransportAction::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("PLAY", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0) - { - retVal = Play; - } -- else if (type.compare("STOP", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0) - { - retVal = Stop; - } -- else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0) - { - retVal = Pause; - } -- else if (type.compare("SEEK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0) - { - retVal = Seek; - } -- else if (type.compare("NEXT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0) - { - retVal = Next; - } -- else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0) - { - retVal = Previous; - } -- else if (type.compare("RECORD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0) - { - retVal = Record; - } -diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp -index ecfaf0b..8ca9b1c 100644 ---- c/herqq/hupnp_av/src/transport/htransportinfo.cpp -+++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp -@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type) - HTransportStatus::Type HTransportStatus::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("OK", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = OK; - } -- else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0) - { - retVal = ErrorOccurred; - } -diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp -index b460065..f2a1ac3 100644 ---- c/herqq/hupnp_av/src/transport/htransportstate.cpp -+++ i/herqq/hupnp_av/src/transport/htransportstate.cpp -@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type) - HTransportState::Type HTransportState::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0) - { - retVal = NoMediaPresent; - } -- else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0) - { - retVal = Playing; - } -- else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0) - { - retVal = Transitioning; - } -- else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0) - { - retVal = PausedPlayback; - } -- else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = PausedRecording; - } -- else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = Recording; - } From 374e8f4e28114547f052495b83e73031d22c751a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:22:53 -0400 Subject: [PATCH 06/95] pharo: remove resource files These should be checked into upstream --- pkgs/development/pharo/vm/build-vm-legacy.nix | 1 - .../share/icons/hicolor/16x16/apps/pharo.png | Bin 902 -> 0 bytes .../share/icons/hicolor/256x256/apps/pharo.png | Bin 52181 -> 0 bytes .../share/icons/hicolor/32x32/apps/pharo.png | Bin 2368 -> 0 bytes .../share/icons/hicolor/48x48/apps/pharo.png | Bin 4602 -> 0 bytes .../share/mime/packages/pharo-image.xml | 9 --------- pkgs/development/pharo/vm/share.nix | 4 +--- 7 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index f2fd6eebd56..bd84dd06e7f 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { preConfigure = '' cd build/ ''; - resources = ./resources; installPhase = '' mkdir -p "$prefix/lib/$name" diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png deleted file mode 100644 index 7910e17ebc49ab5b0f4404ca5afd661747589b19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 902 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 diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png deleted file mode 100644 index ec8a5f95c6c4103616e68eb4186bbe36cea6e5f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2368 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_B)&${1);b+)qU^FmRmpba4!cIDB?`^_0+1 z+2i*6YtPl55q@TSz~Hbn*BRDl21|Z;Y-Zvt<_WnMw@cQ&PlVaTiS69!9{P^>u`rNBmt{iFOm6kBi zlhM`Heb4*nX7zRE4_}YR%`ZJ(e@m{qpnAF8&h_E*b6;NG%Kqz4Hv8|=;%cYuk-1Nq~~I!xj`|BN2oW`Gjiz?+1p|Jc0ImyThIRY+Ml1F zC$F9Q?pDHcmHzudUgM~%)eJ|oBK#be>~%0WNRg>)fjv-!aXW+!~Xf7QmmIB z5BAaKkO+Su5iFD%;@NX?siBsyLdlj%R<}%(FIF0Vzqh~ezW=o~kzBPN@p*68iomX#X8lt=9$ha*3z=RQyb1`tqIoUyisrG; zCzf2cSl;1KZq#gF#q_@9%i3K?lhgxvOJpX*H!wI3xzpZ}B?|gUWSL=JJ zHt|2DzeCx-zlpkQ@c2tLoAc_(<&z5gN*+X5xUJC9JkoJcxY@ADknJPSJVS-1_dhH4 zosT`g=j7kl-vsn^4q3V(IO#H1E%Yy2cCR#5>fEqnbpVmT%?q5y8Q2LHphQ7rFEUwx_Kq?@D$D7CB~6C z5*zfTua;zP{Zn-GvFXRQ%T{JO^X4Wm`1>wDFg(1xTg!T_yruQ)32R!ngr-f^x}5Fx zv1j__7@lLNdCyn;nAiTi+C@oFX`_a`bW2yc(hvQuhMO19Eivm}by)Mt#0f5DSM=j+ z4(^o}JI{82eMQ8t0G-)>^0I-}WtD0nUypKXNQUZ3#y2T-Fa|mX&M8)}n6TnO!3~#5 zviJW>1_g9%R-E}PO)Y1qfOvm$uGIPOD`nnH`giCQYiju4Ri9oko0m#92#Ti8x4Lxg z+a%L_GkQW#ws{>pbjNG{rbQOVo@_Cl=lE%x`J~_C6YpG?NV*!@a&>XRKL1T`6;wYz zOHM9y%Iuk*BtBDw75j-=FZ->>FwiUf#(J19?cQzbj$d_ma1^U@-S0N zmXz?a1sk_oFFqS9dFwaRq=lb4Z#5++9OL<4{cMJS^Zg26(dW5!Q{P2sx-VY(rFX@m z+xlt8wDlF|&FA+$XtmTPZ`n7sVD>iFfQcnGkF1qF5*9ADS1_H>=%M2Nz3_oE`^=gb zl7^M#0$o|zA7-C>*b(mZ@uzsfzsvnXntE1=^E(1koqo-^f98#=axKH-YTIT%wMIVo z=O=cs|7678AVXz5KwYllEpx0SRh5773iGZ_(${MS9vggb{!>MABTV;EG z@2-CJuzXkN_IT5_Q-M#_1uYiXRr8g-eY@xNFK0{PBV6vcN;WY+`l;M{-P(v}rpu>u zi{1xqb7u8_F!Af}%12L~E0%_yv0gmu{294cD{p~0H#AMv=X!tn@`l~ye1nbt4U1

bsN^JZG7%XFuOFFNbK z?#Qavs#vC>^fK>&OV%;rGTA@9KQ=z{IPzt}`|pchRlIq7#9+s&XFd*mH5GL)N>7RU zn#NRznF=;4dmiu2p1dZLxtW>uxyb7Y?6VI4jy0QWu~5dpa!2W2-{o;K5?}JSH6CSU zyg1|h!K1>3m22DEin~@RZ{VA(fB2lH;MO-%1%DFPCp)(2u7%^6wR1ypCz{O<%-%@nL|^7rsxs&3{jLeBi3)6KTQtPlqO4 z&U>ks_)u&BXaliE}GH9Z1uB>?Ik(h5&cuy`7wbth~-ITIG-{yL& z*lgaD7RQ&Z_e~4xG|%}RBU#4N*46GD^0R#U<72S`t3JHsIvu(-^3`I-nFkW*s&46f zpXd4i+s^f8Vt&ob{W)bS`?nHVFQ35K!UtLzr>3^P*|Uss`GYyqX3fFvXTLM|%LT=~ z6wI49W9gNMO^JRdE<{-woth+@_E~zm|19CPvz@l(zF#@}lBRaF=bf^r?%t=9^H<27 z?rOjN`{%J+a!OAQFwZu2ej&2B@7|1&tM}izD_;y|hl)pR3|lF0Jt5Xe_att*5x2ApB${eZLn=0S&)y#f|?VU}3Kg>1XvVZ;Ti%;64DqeRL`s~U7 zoyyGlGr0b^gQuRn(n7A%#ojv$k_<0vFY3`2)NyJ}uUzH4plg#M&ETf zzghRbW%<#at9HE;X?<#|ueNHZ)8!AxW$pcVcBG!1mr^I>D7sugQ&YuwMsZg1TCrY@ z1w}q5>v%8eFDc85DSI(3d)Cn(E4c0d+%3p>d&E9}zm1{58UD@d0u6;lJ{Cz{v<$rc wNb;^o|L670*UjyCQi4~BbbYA*`$s(B#_}Em^^boU7#J8lUHx3vIVCg!01gy=a{vGU diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png deleted file mode 100644 index 3f206cf8b18cf18ae1597a0472d3147f24c7d885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4602 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 C42%W< diff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml deleted file mode 100644 index 927514dd215..00000000000 --- a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Pharo image file - Fichier d'image Pharo - - - - diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 1a24ecd274e..75ce2ff771c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - src = ./resources; + unpackPhase = "true"; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $prefix/lib - cp -R "$src/"* "$prefix/" - unzip ${sources10Zip} -d $prefix/lib/ unzip ${sources20Zip} -d $prefix/lib/ unzip ${sources30Zip} -d $prefix/lib/ From 5fbf3067607ea85240987a7238fe69150c45508c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 23 Apr 2019 14:04:40 +0200 Subject: [PATCH 07/95] nixos/icingaweb2: Fix environment.etc assignment --- nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 644aad82df2..910e1d937bf 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -215,7 +215,7 @@ in { # /etc/icingaweb2 environment.etc = let - doModule = name: optionalAttrs (cfg.modules."${name}".enable) (nameValuePair "icingaweb2/enabledModules/${name}" { source = "${pkgs.icingaweb2}/modules/${name}"; }); + doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; in {} # Module packages // (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages) From 786f02f7a45621b9f628f63649ff92546aff83b7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 24 Apr 2019 05:48:22 +0200 Subject: [PATCH 08/95] treewide: Remove usage of isNull isNull "is deprecated; just write e == null instead" says the Nix manual --- lib/generators.nix | 2 +- lib/sources.nix | 4 ++-- lib/trivial.nix | 2 +- nixos/maintainers/option-usages.nix | 2 +- .../config/fonts/fontconfig-penultimate.nix | 2 +- nixos/modules/config/fonts/fontconfig.nix | 2 +- nixos/modules/config/sysctl.nix | 2 +- nixos/modules/installer/cd-dvd/iso-image.nix | 4 ++-- nixos/modules/programs/bash/bash.nix | 2 +- nixos/modules/programs/fish.nix | 2 +- nixos/modules/programs/ssmtp.nix | 2 +- nixos/modules/programs/zsh/zsh.nix | 2 +- nixos/modules/services/backup/znapzend.nix | 4 ++-- .../services/cluster/kubernetes/kubelet.nix | 6 ++--- .../services/cluster/kubernetes/pki.nix | 2 +- .../buildkite-agent.nix | 2 +- .../jenkins/default.nix | 2 +- .../modules/services/databases/cassandra.nix | 22 +++++++------------ .../services/databases/cockroachdb.nix | 4 ++-- nixos/modules/services/databases/pgmanage.nix | 4 ++-- .../services/games/minecraft-server.nix | 4 ++-- nixos/modules/services/logging/logcheck.nix | 2 +- nixos/modules/services/mail/dovecot.nix | 12 +++++----- nixos/modules/services/misc/bepasty.nix | 2 +- nixos/modules/services/misc/errbot.nix | 2 +- .../services/misc/taskserver/default.nix | 4 ++-- nixos/modules/services/misc/zoneminder.nix | 2 +- .../modules/services/monitoring/graphite.nix | 4 ++-- nixos/modules/services/networking/flannel.nix | 2 +- nixos/modules/services/networking/i2pd.nix | 8 +++---- .../strongswan-swanctl/param-constructors.nix | 2 +- .../strongswan-swanctl/param-lib.nix | 4 ++-- nixos/modules/services/search/kibana.nix | 2 +- .../services/security/oauth2_proxy.nix | 8 +++---- nixos/modules/services/web-apps/miniflux.nix | 2 +- .../services/web-apps/restya-board.nix | 12 +++++----- .../web-servers/apache-httpd/default.nix | 2 +- .../virtualisation/docker-containers.nix | 6 ++--- .../virtualisation/google-compute-image.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 4 ++-- .../networking/mailreaders/lumail/default.nix | 2 +- .../science/math/cplex/default.nix | 2 +- .../science/math/sage/sage-with-env.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/build-support/emacs/melpa.nix | 2 +- .../haskell-modules/make-package-set.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/stdenv/adapters.nix | 2 +- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 2 +- pkgs/tools/security/b2sum/default.nix | 2 +- pkgs/tools/system/osquery/default.nix | 2 +- 52 files changed, 89 insertions(+), 95 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 863ba847423..a71654bec6c 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -178,7 +178,7 @@ rec { toPlist = {}: v: let isFloat = builtins.isFloat or (x: false); expr = ind: x: with builtins; - if isNull x then "" else + if x == null then "" else if isBool x then bool ind x else if isInt x then int ind x else if isString x then str ind x else diff --git a/lib/sources.nix b/lib/sources.nix index f02ddad17c6..0ffadea8f1b 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -83,7 +83,7 @@ rec { # Sometimes git stores the commitId directly in the file but # sometimes it stores something like: «ref: refs/heads/branch-name» matchRef = match "^ref: (.*)$" fileContent; - in if isNull matchRef + in if matchRef == null then fileContent else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the @@ -92,7 +92,7 @@ rec { then let fileContent = readFile packedRefsName; matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent; - in if isNull matchRef + in if matchRef == null then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); diff --git a/lib/trivial.nix b/lib/trivial.nix index 2d682961035..f2710a6f033 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -112,7 +112,7 @@ rec { # Function to call f: # Argument to check for null before passing it to `f` - a: if isNull a then a else f a; + a: if a == null then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 242c2a4dd44..a67a0ab960e 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -145,7 +145,7 @@ let displayOptionsGraph = let checkList = - if !(isNull testOption) then [ testOption ] + if testOption != null then [ testOption ] else testOptions; checkAll = checkList == []; in diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 2c18244621a..04fa8b9559a 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -31,7 +31,7 @@ let # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index d79c43c0b5b..724158f7382 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -46,7 +46,7 @@ let cfg = config.fonts.fontconfig; # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 74bff602a47..0c6a7e2431a 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -8,7 +8,7 @@ let name = "sysctl option value"; check = val: let - checkType = x: isBool x || isString x || isInt x || isNull x; + checkType = x: isBool x || isString x || isInt x || x == null; in checkType val || (val._type or "" == "override" && checkType val.content); merge = loc: defs: mergeOneOption loc (filterOverrides defs); diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index fd780be2082..d5c92cfc1d9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -198,7 +198,7 @@ let fi ${ # When there is a theme configured, use it, otherwise use the background image. - if (!isNull config.isoImage.grubTheme) then '' + if config.isoImage.grubTheme != null then '' # Sets theme. set theme=(hd0)/EFI/boot/grub-theme/theme.txt # Load theme fonts @@ -622,7 +622,7 @@ in { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (!isNull config.isoImage.grubTheme) [ + ] ++ optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 27b5f9e4b64..a7e57b8608d 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -34,7 +34,7 @@ let bashAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 622d2f96fe4..87f6816e4ac 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -10,7 +10,7 @@ let fishAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 44756171b74..0e060e3f522 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -148,7 +148,7 @@ in UseSTARTTLS=${yesNo cfg.useSTARTTLS} #Debug=YES ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} - ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"} + ${optionalString (cfg.authPassFile != null) "AuthPassFile=${cfg.authPassFile}"} ''; environment.systemPackages = [pkgs.ssmtp]; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b7117e5f90d..bdb37eae23e 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -12,7 +12,7 @@ let zshAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index fc8a424190f..f3aa5074e42 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -255,7 +255,7 @@ let cfg = config.services.znapzend; onOff = b: if b then "on" else "off"; - nullOff = b: if isNull b then "off" else toString b; + nullOff = b: if b == null then "off" else toString b; stripSlashes = replaceStrings [ "/" ] [ "." ]; attrsToFile = config: concatStringsSep "\n" (builtins.attrValues ( @@ -263,7 +263,7 @@ let mkDestAttrs = dst: with dst; mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({ - "" = optionalString (! isNull host) "${host}:" + dataset; + "" = optionalString (host != null) "${host}:" + dataset; _plan = plan; } // optionalAttrs (presend != null) { _precmd = presend; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2a4a0624555..ccc8a16e788 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -7,9 +7,9 @@ let cfg = top.kubelet; cniConfig = - if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + if cfg.cni.config != [] && cfg.cni.configDir != null then throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.cni.configDir) then + else if cfg.cni.configDir != null then cfg.cni.configDir else (pkgs.buildEnv { @@ -373,7 +373,7 @@ in boot.kernelModules = ["br_netfilter"]; services.kubernetes.kubelet.hostname = with config.networking; - mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + mkDefault (hostName + optionalString (domain != null) ".${domain}"); services.kubernetes.pki.certs = with top.lib; { kubelet = mkCert { diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 32eacad9025..e68660e8bdd 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -285,7 +285,7 @@ in }; }; - environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null) (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig); environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 2136778aff4..12cc3d2b1cc 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -236,7 +236,7 @@ in }; assertions = [ - { assertion = cfg.hooksPath == hooksDir || all isNull (attrValues cfg.hooks); + { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agent.hooksPath' and `services.buildkite-agent.hooks.' are mutually exclusive. diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1eca45fbd57..ec6a36413fe 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -189,7 +189,7 @@ in { preStart = let replacePlugins = - if isNull cfg.plugins + if cfg.plugins == null then "" else let pluginCmds = lib.attrsets.mapAttrsToList diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index d741ee48c48..68893886802 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -22,11 +22,11 @@ let else {}) ); cassandraConfigWithAddresses = cassandraConfig // - ( if isNull cfg.listenAddress + ( if cfg.listenAddress == null then { listen_interface = cfg.listenInterface; } else { listen_address = cfg.listenAddress; } ) // ( - if isNull cfg.rpcAddress + if cfg.rpcAddress == null then { rpc_interface = cfg.rpcInterface; } else { rpc_address = cfg.rpcAddress; } ); @@ -219,19 +219,13 @@ in { config = mkIf cfg.enable { assertions = [ { assertion = - ((isNull cfg.listenAddress) - || (isNull cfg.listenInterface) - ) && !((isNull cfg.listenAddress) - && (isNull cfg.listenInterface) - ); + (cfg.listenAddress == null || cfg.listenInterface == null) + && !(cfg.listenAddress == null && cfg.listenInterface == null); message = "You have to set either listenAddress or listenInterface"; } { assertion = - ((isNull cfg.rpcAddress) - || (isNull cfg.rpcInterface) - ) && !((isNull cfg.rpcAddress) - && (isNull cfg.rpcInterface) - ); + (cfg.rpcAddress == null || cfg.rpcInterface == null) + && !(cfg.rpcAddress == null && cfg.rpcInterface == null); message = "You have to set either rpcAddress or rpcInterface"; } ]; @@ -276,7 +270,7 @@ in { }; }; systemd.timers.cassandra-full-repair = - mkIf (!isNull cfg.fullRepairInterval) { + mkIf (cfg.fullRepairInterval != null) { description = "Schedule full repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = @@ -300,7 +294,7 @@ in { }; }; systemd.timers.cassandra-incremental-repair = - mkIf (!isNull cfg.incrementalRepairInterval) { + mkIf (cfg.incrementalRepairInterval != null) { description = "Schedule incremental repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index e977751b21e..268fdcc819f 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -7,7 +7,7 @@ let crdb = cfg.package; escape = builtins.replaceStrings ["%"] ["%%"]; - ifNotNull = v: s: optionalString (!isNull v) s; + ifNotNull = v: s: optionalString (v != null) s; startupCommand = lib.concatStringsSep " " [ # Basic startup @@ -164,7 +164,7 @@ in config = mkIf config.services.cockroachdb.enable { assertions = [ - { assertion = !cfg.insecure -> !(isNull cfg.certsDir); + { assertion = !cfg.insecure -> cfg.certsDir != null; message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)"; } ]; diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 1a34c7f5ece..1050c2dd481 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -16,7 +16,7 @@ let super_only = ${builtins.toJSON cfg.superOnly} - ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"} + ${optionalString (cfg.loginGroup != null) "login_group = ${cfg.loginGroup}"} login_timeout = ${toString cfg.loginTimeout} @@ -24,7 +24,7 @@ let sql_root = ${cfg.sqlRoot} - ${optionalString (!isNull cfg.tls) '' + ${optionalString (cfg.tls != null) '' tls_cert = ${cfg.tls.cert} tls_key = ${cfg.tls.key} ''} diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 7d26d150165..39a68f4b553 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -215,8 +215,8 @@ in { networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then { allowedUDPPorts = [ serverPort ]; allowedTCPPorts = [ serverPort ] - ++ optional (! isNull queryPort) queryPort - ++ optional (! isNull rconPort) rconPort; + ++ optional (queryPort != null) queryPort + ++ optional (rconPort != null) rconPort; } else { allowedUDPPorts = [ defaultServerPort ]; allowedTCPPorts = [ defaultServerPort ]; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 9c64160e92b..f139190a170 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -227,7 +227,7 @@ in ''; services.cron.systemCronJobs = - let withTime = name: {timeArgs, ...}: ! (builtins.isNull timeArgs); + let withTime = name: {timeArgs, ...}: timeArgs != null; mkCron = name: {user, cmdline, timeArgs, ...}: '' ${timeArgs} ${user} ${cmdline} ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 30ad7d82fb8..139011dca23 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -16,13 +16,13 @@ let sendmail_path = /run/wrappers/bin/sendmail '' - (if isNull cfg.sslServerCert then '' + (if cfg.sslServerCert == null then '' ssl = no disable_plaintext_auth = no '' else '' ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} - ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} ssl_dh = <${config.security.dhparams.params.dovecot2.path} disable_plaintext_auth = yes '') @@ -298,7 +298,7 @@ in config = mkIf cfg.enable { security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - security.dhparams = mkIf (! isNull cfg.sslServerCert) { + security.dhparams = mkIf (cfg.sslServerCert != null) { enable = true; params.dovecot2 = {}; }; @@ -384,14 +384,14 @@ in { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; } - { assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey - && (!(isNull cfg.sslCACert) -> !(isNull cfg.sslServerCert || isNull cfg.sslServerKey)); + { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) + && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto"; } { assertion = cfg.showPAMFailure -> cfg.enablePAM; message = "dovecot is configured with showPAMFailure while enablePAM is disabled"; } - { assertion = (cfg.sieveScripts != {}) -> ((cfg.mailUser != null) && (cfg.mailGroup != null)); + { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null); message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set"; } ]; diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 006feca42b3..87d36068144 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -143,7 +143,7 @@ in serviceConfig = { Type = "simple"; PrivateTmp = true; - ExecStartPre = assert !isNull server.secretKeyFile; pkgs.writeScript "bepasty-server.${name}-init" '' + ExecStartPre = assert server.secretKeyFile != null; pkgs.writeScript "bepasty-server.${name}-init" '' #!/bin/sh mkdir -p "${server.workDir}" mkdir -p "${server.dataDir}" diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index ac6ba2181de..256adce2f02 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -81,7 +81,7 @@ in { systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let - dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else + dataDir = if instanceCfg.dataDir != null then instanceCfg.dataDir else "/var/lib/errbot/${name}"; in { after = [ "network-online.target" ]; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 483bc99ad94..07dbee69db0 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -48,7 +48,7 @@ let type = types.nullOr types.int; default = null; example = 365; - apply = val: if isNull val then -1 else val; + apply = val: if val == null then -1 else val; description = mkAutoDesc '' The expiration time of ${desc} in days or null for no expiration time. @@ -82,7 +82,7 @@ let then attrByPath newPath (notFound newPath) cfg.pki.manual else findPkiDefinitions newPath val; in flatten (mapAttrsToList mkSublist attrs); - in all isNull (findPkiDefinitions [] manualPkiOptions); + in all (x: x == null) (findPkiDefinitions [] manualPkiOptions); orgOptions = { ... }: { options.users = mkOption { diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 2bd2f3c7cc0..01720ba432e 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -17,7 +17,7 @@ let defaultDir = "/var/lib/${user}"; home = if useCustomDir then cfg.storageDir else defaultDir; - useCustomDir = !(builtins.isNull cfg.storageDir); + useCustomDir = cfg.storageDir != null; socket = "/run/phpfpm/${dirName}.sock"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 2365142af40..d6473220c14 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -19,13 +19,13 @@ let graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( "STATIC_ROOT = '${staticDir}'\n" + - optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n" + optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + cfg.web.extraConfig ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' search_index: ${dataDir}/index - ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} + ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index c1f778ac139..dd2f6454e95 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -92,7 +92,7 @@ in { Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; type = types.nullOr types.str; - default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}"); + default = with config.networking; (hostName + optionalString (domain != null) ".${domain}"); example = "node1.example.com"; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 40478b85b75..f2be417738e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -12,9 +12,9 @@ let boolOpt = k: v: k + " = " + boolToString v; intOpt = k: v: k + " = " + toString v; lstOpt = k: xs: k + " = " + concatStringsSep "," xs; - optionalNullString = o: s: optional (! isNull s) (strOpt o s); - optionalNullBool = o: b: optional (! isNull b) (boolOpt o b); - optionalNullInt = o: i: optional (! isNull i) (intOpt o i); + optionalNullString = o: s: optional (s != null) (strOpt o s); + optionalNullBool = o: b: optional (b != null) (boolOpt o b); + optionalNullInt = o: i: optional (i != null) (intOpt o i); optionalEmptyList = o: l: optional ([] != l) (lstOpt o l); mkEnableTrueOption = name: mkEnableOption name // { default = true; }; @@ -225,7 +225,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh exec ${pkgs.i2pd}/bin/i2pd \ - ${if isNull cfg.address then "" else "--host="+cfg.address} \ + ${if cfg.address == null then "" else "--host="+cfg.address} \ --service \ --conf=${i2pdConf} \ --tunconf=${tunnelConf} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 5e74a96664f..95a174122d0 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -56,7 +56,7 @@ rec { }; documentDefault = description : strongswanDefault : - if isNull strongswanDefault + if strongswanDefault == null then description else description + '' diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index fb87e81f321..193ad27f035 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -45,10 +45,10 @@ rec { filterEmptySets ( (mapParamsRecursive (path: name: param: let value = attrByPath path null cfg; - in optionalAttrs (!isNull value) (param.render name value) + in optionalAttrs (value != null) (param.render name value) ) ps)); - filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + filterEmptySets = set : filterAttrs (n: v: (v != null)) (mapAttrs (name: value: if isAttrs value then let value' = filterEmptySets value; in if value' == {} diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 2a6e8250850..c096af731ad 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -129,7 +129,7 @@ in { This defaults to the singleton list [ca] when the option is defined. ''; - default = if isNull cfg.elasticsearch.ca then [] else [ca]; + default = if cfg.elasticsearch.ca == null then [] else [ca]; type = types.listOf types.path; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 0c5fe8c0ef5..61f203ef9e7 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -58,11 +58,11 @@ let httponly = cookie.httpOnly; }; set-xauthrequest = setXauthrequest; - } // lib.optionalAttrs (!isNull cfg.email.addresses) { + } // lib.optionalAttrs (cfg.email.addresses != null) { authenticated-emails-file = authenticatedEmailsFile; } // lib.optionalAttrs (cfg.passBasicAuth) { basic-auth-password = cfg.basicAuthPassword; - } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + } // lib.optionalAttrs (cfg.htpasswd.file != null) { display-htpasswd-file = cfg.htpasswd.displayForm; } // lib.optionalAttrs tls.enable { tls-cert = tls.certificate; @@ -71,7 +71,7 @@ let } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; mapConfig = key: attr: - if (!isNull attr && attr != []) then ( + if attr != null && attr != [] then ( if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else @@ -538,7 +538,7 @@ in config = mkIf cfg.enable { - services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + services.oauth2_proxy = mkIf (cfg.keyFile != null) { clientID = mkDefault null; clientSecret = mkDefault null; cookie.secret = mkDefault null; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 1d60004e574..304712d0efc 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -85,7 +85,7 @@ in DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if isNull cfg.adminCredentialsFile + EnvironmentFile = if cfg.adminCredentialsFile == null then defaultCredentials else cfg.adminCredentialsFile; }; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 15fd943a082..2e5e0ea6622 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -184,7 +184,7 @@ in phpOptions = '' date.timezone = "CET" - ${optionalString (!isNull cfg.email.server) '' + ${optionalString (cfg.email.server != null) '' SMTP = ${cfg.email.server} smtp_port = ${toString cfg.email.port} auth_username = ${cfg.email.login} @@ -282,7 +282,7 @@ in sed -i "s@^php@${config.services.phpfpm.phpPackage}/bin/php@" "${runDir}/server/php/shell/"*.sh - ${if (isNull cfg.database.host) then '' + ${if (cfg.database.host == null) then '' sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', 'localhost');/g" "${runDir}/server/php/config.inc.php" sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" '' else '' @@ -311,7 +311,7 @@ in chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" - ${optionalString (isNull cfg.database.host) '' + ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \ @@ -367,14 +367,14 @@ in }; users.groups.restya-board = {}; - services.postgresql.enable = mkIf (isNull cfg.database.host) true; + services.postgresql.enable = mkIf (cfg.database.host == null) true; - services.postgresql.identMap = optionalString (isNull cfg.database.host) + services.postgresql.identMap = optionalString (cfg.database.host == null) '' restya-board-users restya-board restya_board ''; - services.postgresql.authentication = optionalString (isNull cfg.database.host) + services.postgresql.authentication = optionalString (cfg.database.host == null) '' local restya_board all ident map=restya-board-users ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 8f00f81b078..a8fb11f114e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -690,7 +690,7 @@ in ; Don't advertise PHP expose_php = off - '' + optionalString (!isNull config.time.timeZone) '' + '' + optionalString (config.time.timeZone != null) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index c4e47bfa477..9e3d06ef07e 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -177,13 +177,13 @@ let "--rm" "--name=%n" "--log-driver=${container.log-driver}" - ] ++ optional (! isNull container.entrypoint) + ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}" + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}" + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" ++ map escapeShellArg container.extraDockerOptions ++ [container.image] ++ map escapeShellArg container.cmd diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 0d2d25d3075..d172ae38fdc 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -51,7 +51,7 @@ in popd ''; format = "raw"; - configFile = if isNull cfg.configFile then defaultConfigFile else cfg.configFile; + configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; inherit (cfg) diskSize; inherit config lib pkgs; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 081c4ab41ac..ddbefd129ff 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { else releasePath else if stdenv.hostPlatform.system == "i686-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 79deab46912..bc0918737dd 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -10,7 +10,7 @@ let alternativeConfig = builtins.toFile "lumail2.lua" (builtins.readFile alternativeGlobalConfigFilePath); - globalConfig = if isNull alternativeGlobalConfigFilePath then '' + globalConfig = if alternativeGlobalConfigFilePath == null then '' mkdir -p $out/etc/lumail2 cp global.config.lua $out/etc/lumail2.lua for n in ./lib/*.lua; do diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index dae5e1b76d3..dc0e9ea1aa5 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "128"; src = - if builtins.isNull releasePath then + if releasePath == null then throw '' This nix expression requires that the cplex installer is already downloaded to your machine. Get it from IBM: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 18060f342a9..5bb7eda47d5 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -59,7 +59,7 @@ let # return the names of all dependencies in the transitive closure transitiveClosure = dep: - if isNull dep then + if dep == null then # propagatedBuildInputs might contain null # (although that might be considered a programming error in the derivation) [] diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 91fd7eab126..b9976e54019 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -59,7 +59,7 @@ let self = rec { extraRuntimeDependencies = [ ]; installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + ${if sourceDir == null then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 96e61bbf90e..e2ec84c75e6 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ ename = - if isNull(ename) + if ename == null then pname else ename; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6b5ecc1df8a..0d579b1681b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -120,7 +120,7 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let - sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; + sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 2b9d048f77e..4c3a2b2d588 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -7,7 +7,7 @@ with import ./util.nix { inherit lib; }; -stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { +stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { inherit name src configureFlags; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7823d641344..a384e5470e4 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -128,7 +128,7 @@ rec { with the following function: isFree = license: with builtins; - if isNull license then true + if license == null then true else if isList license then lib.all isFree license else license != "non-free" && license != "unfree"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7d8e3ba523..5930a8203cb 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -81,7 +81,7 @@ in rec { bintools = { name = "${name}-binutils"; outPath = bootstrapTools; }; }; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + cc = if last == null then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenvNoCC; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2bccd620436..390c7f1123e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -96,7 +96,7 @@ let inherit system; }; - cc = if isNull prevStage.gcc-unwrapped + cc = if prevStage.gcc-unwrapped == null then null else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index f9d2855e739..16811d8f889 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openmp ]; - buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ]; + buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ]; installFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1e2882e1f1f..1c1da724676 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = let gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); # use older `lvm2` source for osquery, the 2.03 sourcetree From c29b17eecbeb0798ff3148c3a23978261f3348df Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 00:55:11 -0500 Subject: [PATCH 09/95] qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently --- .../libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff | 4 ++-- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff index 14199d40503..d2ebbf3b45a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644 // The code below has the same effect as this one: // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; @@ -46,7 +46,7 @@ index b8c8f2a..e7f4dc5 100644 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6b43f6ed25c..2a474ab0ffe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -58,7 +58,8 @@ qtModule { ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' + # this file used to exist in gdk_pixbuf? + ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; From 41e9920fcbe592310b2949ff28ebf689a0c74286 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 12:07:03 -0500 Subject: [PATCH 10/95] remove unused substitution variable Thanks @worldofpeace! --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 1 - 1 file changed, 1 deletion(-) 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 8715aaaa44d..ef01e5b5386 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { ++ lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; From 44a554792d58f8bf1239ab3cd8892ac9f1e693ff Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 30 Apr 2019 18:55:17 +0200 Subject: [PATCH 11/95] timetrap: use bundlerApp --- pkgs/applications/office/timetrap/Gemfile.lock | 2 +- pkgs/applications/office/timetrap/default.nix | 18 ++++++++---------- pkgs/applications/office/timetrap/gemset.nix | 8 ++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index f71f4eaa408..9f2ea82cee0 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 20dd27fa287..ad0d5c636f3 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,17 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "timetrap-${version}"; - - version = (import gemset).timetrap.version; - inherit ruby; +bundlerApp { + pname = "timetrap"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; - license = licenses.mit; - maintainers = [ maintainers.jerith666 ]; + homepage = https://github.com/samg/timetrap; + license = licenses.mit; + maintainers = with maintainers; [ jerith666 manveru ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 5764016573f..1ea489b92c3 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -8,6 +10,8 @@ version = "0.10.2"; }; sequel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; @@ -16,6 +20,8 @@ version = "4.43.0"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; @@ -25,6 +31,8 @@ }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; From 1478feb7aa4bb3a963dba7afd73af61d24fa4234 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 30 Apr 2019 22:10:11 -0600 Subject: [PATCH 12/95] doc: Explain the nginx ETag patch https://github.com/NixOS/nixpkgs/issues/25485 --- doc/package-notes.xml | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 12d81ae29bf..54f3079d554 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -918,4 +918,52 @@ citrix_receiver.override { +

+ Nginx + + + Nginx is a + reverse proxy and lightweight webserver. + + +
+ ETags on static files served from the Nix store + + + HTTP has a couple different mechanisms for caching to prevent + clients from having to download the same content repeatedly + if a resource has not changed since the last time it was requested. + When nginx is used as a server for static files, it implements + the caching mechanism based on the + Last-Modified + response header automatically; unfortunately, it works by using + filesystem timestamps to determine the value of the + Last-Modified header. This doesn't give the + desired behavior when the file is in the Nix store, because all + file timestamps are set to 0 (for reasons related to build + reproducibility). + + + + Fortunately, HTTP supports an alternative (and more effective) + caching mechanism: the + ETag + response header. The value of the ETag header + specifies some identifier for the particular content that the + server is sending (e.g. a hash). When a client makes a second + request for the same resource, it sends that value back in an + If-None-Match header. If the ETag value is + unchanged, then the server does not need to resend the content. + + + + As of NixOS 19.09, the nginx package in Nixpkgs is patched such + that when nginx serves a file out of /nix/store, + the hash in the store path is used as the ETag + header in the HTTP response, thus providing proper caching functionality. + This happens automatically; you do not need to do modify any + configuration to get this behavior. + +
+
From eaeb587429d0fefeb39ee52fbe070dc4dd44984f Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 3 May 2019 13:38:25 +0300 Subject: [PATCH 13/95] moc: refactor options, add patches Add support for conditional compile options, add pulseaudio and ffmpeg4 support patches. --- pkgs/applications/audio/moc/default.nix | 93 +- pkgs/applications/audio/moc/moc-ffmpeg4.patch | 33 + pkgs/applications/audio/moc/pulseaudio.patch | 800 ++++++++++++++++++ 3 files changed, 917 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/audio/moc/moc-ffmpeg4.patch create mode 100644 pkgs/applications/audio/moc/pulseaudio.patch diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index ea83a1012eb..3ed330cc743 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,9 +1,35 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg -, libvorbis, libmpc, libsndfile, libjack2, db, libmodplug, timidity, libid3tag -, libtool +{ stdenv, fetchurl, pkgconfig +, ncurses, db , popt, libtool +# Sound sub-systems +, alsaSupport ? true, alsaLib +, pulseSupport ? true, libpulseaudio, autoreconfHook +, jackSupport ? true, libjack2 +, ossSupport ? true +# Audio formats +, aacSupport ? true, faad2, libid3tag +, flacSupport ? true, flac +, midiSupport ? true, timidity +, modplugSupport ? true, libmodplug +, mp3Support ? true, libmad +, musepackSupport ? true, libmpc, libmpcdec, taglib +, vorbisSupport ? true, libvorbis +, speexSupport ? true, speex +, ffmpegSupport ? true, ffmpeg +, sndfileSupport ? true, libsndfile +, wavpackSupport ? true, wavpack +# Misc +, withffmpeg4 ? false, ffmpeg_4 +, curlSupport ? true, curl +, samplerateSupport ? true, libsamplerate +, withDebug ? false }: -stdenv.mkDerivation rec { +let + opt = stdenv.lib.optional; + mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; + +in stdenv.mkDerivation rec { + name = "moc-${version}"; version = "2.5.2"; @@ -12,18 +38,67 @@ stdenv.mkDerivation rec { sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [] + ++ opt withffmpeg4 ./moc-ffmpeg4.patch + ++ opt pulseSupport ./pulseaudio.patch; - buildInputs = [ - ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2 - db libmodplug timidity libid3tag libtool + nativeBuildInputs = [ pkgconfig ] + ++ opt pulseSupport autoreconfHook; + + buildInputs = [ ncurses db popt libtool ] + # Sound sub-systems + ++ opt alsaSupport alsaLib + ++ opt pulseSupport libpulseaudio + ++ opt jackSupport libjack2 + # Audio formats + ++ opt (aacSupport || mp3Support) libid3tag + ++ opt aacSupport faad2 + ++ opt flacSupport flac + ++ opt midiSupport timidity + ++ opt modplugSupport libmodplug + ++ opt mp3Support libmad + ++ opt musepackSupport [ libmpc libmpcdec taglib ] + ++ opt vorbisSupport libvorbis + ++ opt speexSupport speex + ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg + ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 + ++ opt sndfileSupport libsndfile + ++ opt wavpackSupport wavpack + # Misc + ++ opt curlSupport curl + ++ opt samplerateSupport libsamplerate; + + configureFlags = [ + # Sound sub-systems + (mkFlag alsaSupport "alsa") + (mkFlag pulseSupport "pulse") + (mkFlag jackSupport "jack") + (mkFlag ossSupport "oss") + # Audio formats + (mkFlag aacSupport "aac") + (mkFlag flacSupport "flac") + (mkFlag midiSupport "timidity") + (mkFlag modplugSupport "modplug") + (mkFlag mp3Support "mp3") + (mkFlag musepackSupport "musepack") + (mkFlag vorbisSupport "vorbis") + (mkFlag speexSupport "speex") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag sndfileSupport "sndfile") + (mkFlag wavpackSupport "wavpack") + # Misc + (mkFlag curlSupport "curl") + (mkFlag samplerateSupport "samplerate") + ("--enable-debug=" + (if withDebug then "yes" else "no")) + "--disable-cache" + "--without-rcc" ]; meta = with stdenv.lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = licenses.gpl2; - maintainers = with maintainers; [ pSub jagajaga ]; + maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/moc/moc-ffmpeg4.patch b/pkgs/applications/audio/moc/moc-ffmpeg4.patch new file mode 100644 index 00000000000..7499f9c539b --- /dev/null +++ b/pkgs/applications/audio/moc/moc-ffmpeg4.patch @@ -0,0 +1,33 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963) ++++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo) +@@ -697,7 +697,7 @@ + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -705,8 +705,8 @@ + } + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) + { +@@ -725,7 +725,7 @@ + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); diff --git a/pkgs/applications/audio/moc/pulseaudio.patch b/pkgs/applications/audio/moc/pulseaudio.patch new file mode 100644 index 00000000000..37d81dddf2b --- /dev/null +++ b/pkgs/applications/audio/moc/pulseaudio.patch @@ -0,0 +1,800 @@ +diff --git a/audio.c b/audio.c +--- a/audio.c ++++ b/audio.c +@@ -32,6 +32,9 @@ + #include "log.h" + #include "lists.h" + ++#ifdef HAVE_PULSE ++# include "pulse.h" ++#endif + #ifdef HAVE_OSS + # include "oss.h" + #endif +@@ -893,6 +896,15 @@ + } + #endif + ++#ifdef HAVE_PULSE ++ if (!strcasecmp(name, "pulseaudio")) { ++ pulse_funcs (funcs); ++ printf ("Trying PulseAudio...\n"); ++ if (funcs->init(&hw_caps)) ++ return; ++ } ++#endif ++ + #ifdef HAVE_OSS + if (!strcasecmp(name, "oss")) { + oss_funcs (funcs); +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -162,6 +162,21 @@ + AC_MSG_ERROR([BerkeleyDB (libdb) not found.])) + fi + ++AC_ARG_WITH(pulse, AS_HELP_STRING(--without-pulse, ++ Compile without PulseAudio support.)) ++ ++if test "x$with_pulse" != "xno" ++then ++ PKG_CHECK_MODULES(PULSE, [libpulse], ++ [SOUND_DRIVERS="$SOUND_DRIVERS PULSE" ++ EXTRA_OBJS="$EXTRA_OBJS pulse.o" ++ AC_DEFINE([HAVE_PULSE], 1, [Define if you have PulseAudio.]) ++ EXTRA_LIBS="$EXTRA_LIBS $PULSE_LIBS" ++ CFLAGS="$CFLAGS $PULSE_CFLAGS"], ++ [true]) ++fi ++ ++ + AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss], + [Compile without OSS support])) + +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -572,10 +572,11 @@ + + #ifdef OPENBSD + add_list ("SoundDriver", "SNDIO:JACK:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); ++ + #else + add_list ("SoundDriver", "Jack:ALSA:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); + #endif + + add_str ("JackClientName", "moc", CHECK_NONE); +diff --git a/pulse.c b/pulse.c +new file mode 100644 +--- /dev/null ++++ b/pulse.c +@@ -0,0 +1,705 @@ ++/* ++ * MOC - music on console ++ * Copyright (C) 2011 Marien Zwart ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ */ ++ ++/* PulseAudio backend. ++ * ++ * FEATURES: ++ * ++ * Does not autostart a PulseAudio server, but uses an already-started ++ * one, which should be better than alsa-through-pulse. ++ * ++ * Supports control of either our stream's or our entire sink's volume ++ * while we are actually playing. Volume control while paused is ++ * intentionally unsupported: the PulseAudio documentation strongly ++ * suggests not passing in an initial volume when creating a stream ++ * (allowing the server to track this instead), and we do not know ++ * which sink to control if we do not have a stream open. ++ * ++ * IMPLEMENTATION: ++ * ++ * Most client-side (resource allocation) errors are fatal. Failure to ++ * create a server context or stream is not fatal (and MOC should cope ++ * with these failures too), but server communication failures later ++ * on are currently not handled (MOC has no great way for us to tell ++ * it we no longer work, and I am not sure if attempting to reconnect ++ * is worth it or even a good idea). ++ * ++ * The pulse "simple" API is too simple: it combines connecting to the ++ * server and opening a stream into one operation, while I want to ++ * connect to the server when MOC starts (and fall back to a different ++ * backend if there is no server), and I cannot open a stream at that ++ * time since I do not know the audio format yet. ++ * ++ * PulseAudio strongly recommends we use a high-latency connection, ++ * which the MOC frontend code might not expect from its audio ++ * backend. We'll see. ++ * ++ * We map MOC's percentage volumes linearly to pulse's PA_VOLUME_MUTED ++ * (0) .. PA_VOLUME_NORM range. This is what the PulseAudio docs recommend ++ * ( http://pulseaudio.org/wiki/WritingVolumeControlUIs ). It does mean ++ * PulseAudio volumes above PA_VOLUME_NORM do not work well with MOC. ++ * ++ * Comments in audio.h claim "All functions are executed only by one ++ * thread" (referring to the function in the hw_funcs struct). This is ++ * a blatant lie. Most of them are invoked off the "output buffer" ++ * thread (out_buf.c) but at least the "playing" thread (audio.c) ++ * calls audio_close which calls our close function. We can mostly ++ * ignore this problem because we serialize on the pulseaudio threaded ++ * mainloop lock. But it does mean that functions that are normally ++ * only called between open and close (like reset) are sometimes ++ * called without us having a stream. Bulletproof, therefore: ++ * serialize setting/unsetting our global stream using the threaded ++ * mainloop lock, and check for that stream being non-null before ++ * using it. ++ * ++ * I am not convinced there are no further dragons lurking here: can ++ * the "playing" thread(s) close and reopen our output stream while ++ * the "output buffer" thread is sending output there? We can bail if ++ * our stream is simply closed, but we do not currently detect it ++ * being reopened and no longer using the same sample format, which ++ * might have interesting results... ++ * ++ * Also, read_mixer is called from the main server thread (handling ++ * commands). This crashed me once when it got at a stream that was in ++ * the "creating" state and therefore did not have a valid stream ++ * index yet. Fixed by only assigning to the stream global when the ++ * stream is valid. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#define DEBUG ++ ++#include ++#include "common.h" ++#include "log.h" ++#include "audio.h" ++ ++ ++/* The pulse mainloop and context are initialized in pulse_init and ++ * destroyed in pulse_shutdown. ++ */ ++static pa_threaded_mainloop *mainloop = NULL; ++static pa_context *context = NULL; ++ ++/* The stream is initialized in pulse_open and destroyed in pulse_close. */ ++static pa_stream *stream = NULL; ++ ++static int showing_sink_volume = 0; ++ ++/* Callbacks that do nothing but wake up the mainloop. */ ++ ++static void context_state_callback (pa_context *context ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_state_callback (pa_stream *stream ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_write_callback (pa_stream *stream ATTR_UNUSED, ++ size_t nbytes ATTR_UNUSED, void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++/* Initialize pulse mainloop and context. Failure to connect to the ++ * pulse daemon is nonfatal, everything else is fatal (as it ++ * presumably means we ran out of resources). ++ */ ++static int pulse_init (struct output_driver_caps *caps) ++{ ++ pa_context *c; ++ pa_proplist *proplist; ++ ++ assert (!mainloop); ++ assert (!context); ++ ++ mainloop = pa_threaded_mainloop_new (); ++ if (!mainloop) ++ fatal ("Cannot create PulseAudio mainloop"); ++ ++ if (pa_threaded_mainloop_start (mainloop) < 0) ++ fatal ("Cannot start PulseAudio mainloop"); ++ ++ /* TODO: possibly add more props. ++ * ++ * There are a few we could set in proplist.h but nothing I ++ * expect to be very useful. ++ * ++ * http://pulseaudio.org/wiki/ApplicationProperties recommends ++ * setting at least application.name, icon.name and media.role. ++ * ++ * No need to set application.name here, the name passed to ++ * pa_context_new_with_proplist overrides it. ++ */ ++ proplist = pa_proplist_new (); ++ if (!proplist) ++ fatal ("Cannot allocate PulseAudio proplist"); ++ ++ pa_proplist_sets (proplist, ++ PA_PROP_APPLICATION_VERSION, PACKAGE_VERSION); ++ pa_proplist_sets (proplist, PA_PROP_MEDIA_ROLE, "music"); ++ pa_proplist_sets (proplist, PA_PROP_APPLICATION_ID, "net.daper.moc"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ c = pa_context_new_with_proplist ( ++ pa_threaded_mainloop_get_api (mainloop), ++ PACKAGE_NAME, proplist); ++ pa_proplist_free (proplist); ++ ++ if (!c) ++ fatal ("Cannot allocate PulseAudio context"); ++ ++ pa_context_set_state_callback (c, context_state_callback, mainloop); ++ ++ /* Ignore return value, rely on state being set properly */ ++ pa_context_connect (c, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL); ++ ++ while (1) { ++ pa_context_state_t state = pa_context_get_state (c); ++ ++ if (state == PA_CONTEXT_READY) ++ break; ++ ++ if (!PA_CONTEXT_IS_GOOD (state)) { ++ error ("PulseAudio connection failed: %s", ++ pa_strerror (pa_context_errno (c))); ++ ++ goto unlock_and_fail; ++ } ++ ++ debug ("waiting for context to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global now that the context is actually ready */ ++ context = c; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ /* We just make up the hardware capabilities, since pulse is ++ * supposed to be abstracting these out. Assume pulse will ++ * deal with anything we want to throw at it, and that we will ++ * only want mono or stereo audio. ++ */ ++ caps->min_channels = 1; ++ caps->max_channels = 2; ++ caps->formats = (SFMT_S8 | SFMT_S16 | SFMT_S32 | ++ SFMT_FLOAT | SFMT_BE | SFMT_LE); ++ ++ return 1; ++ ++unlock_and_fail: ++ ++ pa_context_unref (c); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++ ++ return 0; ++} ++ ++static void pulse_shutdown (void) ++{ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_context_disconnect (context); ++ pa_context_unref (context); ++ context = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++} ++ ++static int pulse_open (struct sound_params *sound_params) ++{ ++ pa_sample_spec ss; ++ pa_buffer_attr ba; ++ pa_stream *s; ++ ++ assert (!stream); ++ /* Initialize everything to -1, which in practice gets us ++ * about 2 seconds of latency (which is fine). This is not the ++ * same as passing NULL for this struct, which gets us an ++ * unnecessarily short alsa-like latency. ++ */ ++ ba.fragsize = (uint32_t) -1; ++ ba.tlength = (uint32_t) -1; ++ ba.prebuf = (uint32_t) -1; ++ ba.minreq = (uint32_t) -1; ++ ba.maxlength = (uint32_t) -1; ++ ++ ss.channels = sound_params->channels; ++ ss.rate = sound_params->rate; ++ switch (sound_params->fmt) { ++ case SFMT_U8: ++ ss.format = PA_SAMPLE_U8; ++ break; ++ case SFMT_S16 | SFMT_LE: ++ ss.format = PA_SAMPLE_S16LE; ++ break; ++ case SFMT_S16 | SFMT_BE: ++ ss.format = PA_SAMPLE_S16BE; ++ break; ++ case SFMT_FLOAT | SFMT_LE: ++ ss.format = PA_SAMPLE_FLOAT32LE; ++ break; ++ case SFMT_FLOAT | SFMT_BE: ++ ss.format = PA_SAMPLE_FLOAT32BE; ++ break; ++ case SFMT_S32 | SFMT_LE: ++ ss.format = PA_SAMPLE_S32LE; ++ break; ++ case SFMT_S32 | SFMT_BE: ++ ss.format = PA_SAMPLE_S32BE; ++ break; ++ ++ default: ++ fatal ("pulse: got unrequested format"); ++ } ++ ++ debug ("opening stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* TODO: figure out if there are useful stream properties to set. ++ * ++ * I do not really see any in proplist.h that we can set from ++ * here (there are media title/artist/etc props but we do not ++ * have that data available here). ++ */ ++ s = pa_stream_new (context, "music", &ss, NULL); ++ if (!s) ++ fatal ("pulse: stream allocation failed"); ++ ++ pa_stream_set_state_callback (s, stream_state_callback, mainloop); ++ pa_stream_set_write_callback (s, stream_write_callback, mainloop); ++ ++ /* Ignore return value, rely on failed stream state instead. */ ++ pa_stream_connect_playback ( ++ s, NULL, &ba, ++ PA_STREAM_INTERPOLATE_TIMING | ++ PA_STREAM_AUTO_TIMING_UPDATE | ++ PA_STREAM_ADJUST_LATENCY, ++ NULL, NULL); ++ ++ while (1) { ++ pa_stream_state_t state = pa_stream_get_state (s); ++ ++ if (state == PA_STREAM_READY) ++ break; ++ ++ if (!PA_STREAM_IS_GOOD (state)) { ++ error ("PulseAudio stream connection failed"); ++ ++ goto fail; ++ } ++ ++ debug ("waiting for stream to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global stream now that it is actually ready */ ++ stream = s; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return 1; ++ ++fail: ++ pa_stream_unref (s); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ return 0; ++} ++ ++static void pulse_close (void) ++{ ++ debug ("closing stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_stream_disconnect (stream); ++ pa_stream_unref (stream); ++ stream = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_play (const char *buff, const size_t size) ++{ ++ size_t offset = 0; ++ ++ debug ("Got %d bytes to play", (int)size); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* The buffer is usually writable when we get here, and there ++ * are usually few (if any) writes after the first one. So ++ * there is no point in doing further writes directly from the ++ * callback: we can just do all writes from this thread. ++ */ ++ ++ /* Break out of the loop if some other thread manages to close ++ * our stream underneath us. ++ */ ++ while (stream) { ++ size_t towrite = MIN(pa_stream_writable_size (stream), ++ size - offset); ++ debug ("writing %d bytes", (int)towrite); ++ ++ /* We have no working way of dealing with errors ++ * (see below). */ ++ if (pa_stream_write(stream, buff + offset, towrite, ++ NULL, 0, PA_SEEK_RELATIVE)) ++ error ("pa_stream_write failed"); ++ ++ offset += towrite; ++ ++ if (offset >= size) ++ break; ++ ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("Done playing!"); ++ ++ /* We should always return size, calling code does not deal ++ * well with anything else. Only read the rest if you want to ++ * know why. ++ * ++ * The output buffer reader thread (out_buf.c:read_thread) ++ * repeatedly loads some 64k/0.1s of audio into a buffer on ++ * the stack, then calls audio_send_pcm repeatedly until this ++ * entire buffer has been processed (similar to the loop in ++ * this function). audio_send_pcm applies the softmixer and ++ * equalizer, then feeds the result to this function, passing ++ * through our return value. ++ * ++ * So if we return less than size the equalizer/softmixer is ++ * re-applied to the remaining data, which is silly. Also, ++ * audio_send_pcm checks for our return value being zero and ++ * calls fatal() if it is, so try to always process *some* ++ * data. Also, out_buf.c uses the return value of this ++ * function from the last run through its inner loop to update ++ * its time attribute, which means it will be interestingly ++ * off if that loop ran more than once. ++ * ++ * Oh, and alsa.c seems to think it can return -1 to indicate ++ * failure, which will cause out_buf.c to rewind its buffer ++ * (to before its start, usually). ++ */ ++ return size; ++} ++ ++static void volume_cb (const pa_cvolume *v, void *userdata) ++{ ++ int *result = userdata; ++ ++ if (v) ++ *result = 100 * pa_cvolume_avg (v) / PA_VOLUME_NORM; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static void sink_input_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata ATTR_UNUSED) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static int pulse_read_mixer (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("read mixer"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_volume_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_volume_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_set_mixer (int vol) ++{ ++ pa_cvolume v; ++ pa_operation *op; ++ ++ /* Setting volume for one channel does the right thing. */ ++ pa_cvolume_set(&v, 1, vol * PA_VOLUME_NORM / 100); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_set_sink_volume_by_index ( ++ context, pa_stream_get_device_index (stream), ++ &v, NULL, NULL); ++ else ++ op = pa_context_set_sink_input_volume ( ++ context, pa_stream_get_index (stream), ++ &v, NULL, NULL); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_get_buff_fill (void) ++{ ++ /* This function is problematic. MOC uses it to for the "time ++ * remaining" in the UI, but calls it more than once per ++ * second (after each chunk of audio played, not for each ++ * playback time update). We have to be fairly accurate here ++ * for that time remaining to not jump weirdly. But PulseAudio ++ * cannot give us a 100% accurate value here, as it involves a ++ * server roundtrip. And if we call this a lot it suggests ++ * switching to a mode where the value is interpolated, making ++ * it presumably more inaccurate (see the flags we pass to ++ * pa_stream_connect_playback). ++ * ++ * MOC also contains what I believe to be a race: it calls ++ * audio_get_buff_fill "soon" (after playing the first chunk) ++ * after starting playback of the next song, at which point we ++ * still have part of the previous song buffered. This means ++ * our position into the new song is negative, which fails an ++ * assert (in out_buf.c:out_buf_time_get). There is no sane ++ * way for us to detect this condition. I believe no other ++ * backend triggers this because the assert sits after an ++ * implicit float -> int seconds conversion, which means we ++ * have to be off by at least an entire second to get a ++ * negative value, and none of the other backends have buffers ++ * that large (alsa buffers are supposedly a few 100 ms). ++ */ ++ pa_usec_t buffered_usecs = 0; ++ int buffered_bytes = 0; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* Using pa_stream_get_timing_info and returning the distance ++ * between write_index and read_index would be more obvious, ++ * but because of how the result is actually used I believe ++ * using the latency value is slightly more correct, and it ++ * makes the following crash-avoidance hack more obvious. ++ */ ++ ++ /* This function will frequently fail the first time we call ++ * it (pulse does not have the requested data yet). We ignore ++ * that and just return 0. ++ * ++ * Deal with stream being NULL too, just in case this is ++ * called in a racy fashion similar to how reset() is. ++ */ ++ if (stream && ++ pa_stream_get_latency (stream, &buffered_usecs, NULL) >= 0) { ++ /* Crash-avoidance HACK: floor our latency to at most ++ * 1 second. It is usually more, but reporting that at ++ * the start of playback crashes MOC, and we cannot ++ * sanely detect when reporting it is safe. ++ */ ++ if (buffered_usecs > 1000000) ++ buffered_usecs = 1000000; ++ ++ buffered_bytes = pa_usec_to_bytes ( ++ buffered_usecs, ++ pa_stream_get_sample_spec (stream)); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("buffer fill: %d usec / %d bytes", ++ (int) buffered_usecs, (int) buffered_bytes); ++ ++ return buffered_bytes; ++} ++ ++static void flush_callback (pa_stream *s ATTR_UNUSED, int success, ++ void *userdata) ++{ ++ int *result = userdata; ++ ++ *result = success; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static int pulse_reset (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("reset requested"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* We *should* have a stream here, but MOC is racy, so bulletproof */ ++ if (stream) { ++ op = pa_stream_flush (stream, flush_callback, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } else ++ logit ("pulse_reset() called without a stream"); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static int pulse_get_rate (void) ++{ ++ /* This is called once right after open. Do not bother making ++ * this fast. */ ++ ++ int result; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) ++ result = pa_stream_get_sample_spec (stream)->rate; ++ else { ++ error ("get_rate called without a stream"); ++ result = 0; ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_toggle_mixer_channel (void) ++{ ++ showing_sink_volume = !showing_sink_volume; ++} ++ ++static void sink_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_input_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static char *pulse_get_mixer_channel_name (void) ++{ ++ char *result = NULL; ++ pa_operation *op; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_name_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_name_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ if (!result) ++ result = xstrdup ("disconnected"); ++ ++ return result; ++} ++ ++void pulse_funcs (struct hw_funcs *funcs) ++{ ++ funcs->init = pulse_init; ++ funcs->shutdown = pulse_shutdown; ++ funcs->open = pulse_open; ++ funcs->close = pulse_close; ++ funcs->play = pulse_play; ++ funcs->read_mixer = pulse_read_mixer; ++ funcs->set_mixer = pulse_set_mixer; ++ funcs->get_buff_fill = pulse_get_buff_fill; ++ funcs->reset = pulse_reset; ++ funcs->get_rate = pulse_get_rate; ++ funcs->toggle_mixer_channel = pulse_toggle_mixer_channel; ++ funcs->get_mixer_channel_name = pulse_get_mixer_channel_name; ++} +diff --git a/pulse.h b/pulse.h +new file mode 100644 +--- /dev/null ++++ b/pulse.h +@@ -0,0 +1,14 @@ ++#ifndef PULSE_H ++#define PULSE_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void pulse_funcs (struct hw_funcs *funcs); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif From e0a2bc49fdbdaedd7e0e30c0720374fa4195fa64 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 4 May 2019 23:41:26 +0200 Subject: [PATCH 14/95] patchelfUnstable: 0.10-pre-20180509 -> 0.10-pre-20190328 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 0c5ec640426..29d713a9af4 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "0.10-pre-20180509"; + version = "0.10-pre-20190328"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69"; - sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr"; + rev = "e1e39f3639e39360ceebb2f7ed533cede4623070"; + sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k"; }; # Drop test that fails on musl (?) From f965fb26a9eae8069e3ffe2ad6779000bf06b5b5 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Mon, 6 May 2019 02:23:15 +0200 Subject: [PATCH 15/95] nixos/kubernetes: upgrade CoreDNS 1.3.1 -> 1.5.0 --- nixos/modules/services/cluster/kubernetes/addons/dns.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 4368159ea6e..ee0ac632ecf 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.3.1"; + version = "1.5.0"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -55,9 +55,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4"; + imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c"; finalImageTag = version; - sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5"; + sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q"; }; }; }; @@ -160,7 +160,7 @@ in { fallthrough in-addr.arpa ip6.arpa } prometheus :${toString ports.metrics} - proxy . /etc/resolv.conf + forward . /etc/resolv.conf cache 30 loop reload From 5a07dafc4ad33875ecabc9f28b311ad3146a9689 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 9 May 2019 20:13:25 -0500 Subject: [PATCH 16/95] maintainer-list: add my gpg key info (@dtzWill), fix email Apparently I have zero commits under nix@wdtz.org, so change my address to match my commits and key. --- maintainers/maintainer-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bc92ff08d8..835c1ef76b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1354,9 +1354,13 @@ name = "David Sferruzza"; }; dtzWill = { - email = "nix@wdtz.org"; + email = "w@wdtz.org"; github = "dtzWill"; name = "Will Dietz"; + keys = [{ + longkeyid = "rsa4096/0xFD42C7D0D41494C8"; + fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; + }]; }; dxf = { email = "dingxiangfei2009@gmail.com"; From 9b685c7997a9a091c153915d53bd92d02a4c5518 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 May 2019 21:01:17 -0700 Subject: [PATCH 17/95] alsaPlugins: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-plugins/versions --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 90319efd7c7..8e3b61ea13a 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; + sha256 = "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"; }; # ToDo: a52, etc.? From 74aee999dd4105d79874cb6e0b5d5393c9713d1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 May 2019 21:10:23 -0700 Subject: [PATCH 18/95] alsaUtils: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-utils/versions --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 2ced9c6094e..09c430bcd53 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"; + sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; patchPhase = '' From 58c998d633154a7ffe9cc4d8a4c49fe4f4647421 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 12 May 2019 14:31:45 -0400 Subject: [PATCH 19/95] pythonPackages.celery: unpin moto --- pkgs/development/python-modules/celery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 404ead243a9..41c9493922a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements/test.txt \ + --replace "moto==1.3.7" moto \ --replace "pytest>=4.3.1,<4.4.0" pytest ''; From 18765a70baf7f508304412b4339f9c708afa01d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:28:01 +0200 Subject: [PATCH 20/95] pythonPackages.wasabi: init at 0.2.2 --- .../python-modules/wasabi/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/wasabi/default.nix diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix new file mode 100644 index 00000000000..01a9a4034d5 --- /dev/null +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "wasabi"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest wasabi/tests + ''; + + meta = with stdenv.lib; { + description = "A lightweight console printing and formatting toolkit"; + homepage = https://github.com/ines/wasabi; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c8026ced43..251c0e91c60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5431,6 +5431,8 @@ in { thinc = callPackage ../development/python-modules/thinc { }; + wasabi = callPackage ../development/python-modules/wasabi { }; + yahooweather = callPackage ../development/python-modules/yahooweather { }; spacy = callPackage ../development/python-modules/spacy { }; From b631c266ee2fba9fefdf1a634a729b0639772102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:29:14 +0200 Subject: [PATCH 21/95] pythonPackages.srsly: init at 0.0.5 --- .../python-modules/srsly/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/srsly/default.nix diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix new file mode 100644 index 00000000000..ca5909f02f6 --- /dev/null +++ b/pkgs/development/python-modules/srsly/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, mock +, numpy +, pathlib +, pytest +, pytz +}: + +buildPythonPackage rec { + pname = "srsly"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0apgm8znc3k79ifja16fvxsxwgpy3n2fvbp7iwf9szizzpjscylp"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; + + checkInputs = [ + mock + numpy + pytest + pytz + ]; + + # TypeError: cannot serialize '_io.BufferedRandom' object + # Possibly because of sandbox restrictions. + doCheck = false; + + meta = with stdenv.lib; { + description = "Modern high-performance serialization utilities for Python"; + homepage = https://github.com/explosion/srsly; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 251c0e91c60..63a1f7f0d69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + srsly = callPackage ../development/python-modules/srsly { }; + thinc = callPackage ../development/python-modules/thinc { }; wasabi = callPackage ../development/python-modules/wasabi { }; From 54f9e90e4f9da32e0b00590de710e7f344a32ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:30:13 +0200 Subject: [PATCH 22/95] pythonPackages.blis: init at 0.2.4 --- .../python-modules/blis/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/blis/default.nix diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix new file mode 100644 index 00000000000..5fee40a941f --- /dev/null +++ b/pkgs/development/python-modules/blis/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, cython +, hypothesis +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "blis"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d"; + }; + + nativeBuildInputs = [ + cython + ]; + + + checkInputs = [ + cython + hypothesis + numpy + pytest + ]; + + meta = with stdenv.lib; { + description = "BLAS-like linear algebra library"; + homepage = https://github.com/explosion/cython-blis; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63a1f7f0d69..0414d81a775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + blis = callPackage ../development/python-modules/blis { }; + srsly = callPackage ../development/python-modules/srsly { }; thinc = callPackage ../development/python-modules/thinc { }; From 613e802f01a939e7d3b4ac6ac62ac53364658170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:08 +0200 Subject: [PATCH 23/95] pythonPackages.thinc: 6.12.1 -> 7.0.4 --- .../python-modules/thinc/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79ae18d33ea..9cb25af7a92 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,15 +21,18 @@ , mock , wrapt , dill +, blis +, srsly +, wasabi }: buildPythonPackage rec { pname = "thinc"; - version = "6.12.1"; + version = "7.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich"; + sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ]); propagatedBuildInputs = [ + blis cython cymem msgpack-numpy @@ -48,8 +52,10 @@ buildPythonPackage rec { cytoolz plac six + srsly wrapt dill + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -61,12 +67,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ - --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel" \ - --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ - --replace "msgpack>=0.5.6,<0.6.0" "msgpack" + --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" ''; # Cannot find cython modules. From 52731eb4f64f10c02ca2536e8ccbd32a751e7a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:31 +0200 Subject: [PATCH 24/95] python3Packages.spacy: 2.0.18 -> 2.1.3 Changes: https://github.com/explosion/spaCy/releases The largest change since 2.0.x is support for ELMo/BERT-like pretraining. --- .../development/python-modules/spacy/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a39593bb9e7..a59cd78d6a2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -17,22 +17,24 @@ , pathlib , msgpack-python , msgpack-numpy +, jsonschema +, blis +, wasabi +, srsly }: buildPythonPackage rec { pname = "spacy"; - version = "2.0.18"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj"; + sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; }; prePatch = '' substituteInPlace setup.py \ - --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ @@ -49,6 +51,10 @@ buildPythonPackage rec { ftfy msgpack-python msgpack-numpy + jsonschema + blis + wasabi + srsly ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ From 21ec7004f69c7d67fc16c7c33de238bc777373e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 17:54:40 +0200 Subject: [PATCH 25/95] python3Packages.spacy_models: 2.0.0 -> 2.1.0 - Update models for spaCy 2.1. - Add medium/small-sized models for Greek. - Add medium-sized model for German. --- .../python-modules/spacy/models.json | 70 ++++++++++++------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 34b8082872b..d8078c116c2 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,78 +1,96 @@ [{ + "pname": "de_core_news_md", + "version": "2.1.0", + "sha256": "0q1flyrp2n8ja11kdlw6x1k0gll0r096pxy8ba4xv15hjng2zay1", + "license": "cc-by-sa-40" +}, +{ "pname": "de_core_news_sm", - "version": "2.0.0", - "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", + "version": "2.1.0", + "sha256": "0fj4dqa915i6niyskxmw2318fxzjhgdjhjx79h9cpp4mxw719w95", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_md", + "version": "2.1.0", + "sha256": "1rgy9hlb92amhlbwkd91yh87xssqj2a1ign0wm59aai69rb79q3s", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_sm", + "version": "2.1.0", + "sha256": "07n7qg0nnzg5gjq7vs72j9qc6z4zjx65qsrrj0hjhiihk3ps378z", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.0.0", - "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "version": "2.1.0", + "sha256": "0ywcczd9nsxmpfwknxa7z54h566bwi7chq0jzx3sqk2a6lva4q52", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.0.0", - "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", + "version": "2.1.0", + "sha256": "10vgq1xd6dpdl7xdssgf0kywbq7xpxp79yqc2vcnl3c4axfpwk5q", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.0.0", - "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", + "version": "2.1.0", + "sha256": "1wg5a7nxq82sfmnc3j5xfr8il65rprmcx2h36va5dvydm1h6icad", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.0.0", - "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", + "version": "2.1.0", + "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.0.0", - "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "version": "2.1.0", + "sha256": "02v7hm711r9ma8p5yk057z7hm2pcvpfjgnjszc697d0ymfn4avby", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.0.0", - "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "version": "2.1.0", + "sha256": "1smyyb1gqp090sailqdqp5v5ww4kf99a3hcd9d9rdhn1wgsv28dh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.0.0", - "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "version": "2.1.0", + "sha256": "0n94ja7y4jbvz0k0x5bij2dypy11ikvgpd9dav0m0hw1wpqgls1i", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.0.0", - "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "version": "2.1.0", + "sha256": "1czr40y5sqs0n2dd4s37kc2xawkh2nsj41wvmsx48bw0aksb1n75", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.0.0", - "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "version": "2.1.0", + "sha256": "1i8dm703mf1l39jwis3mn5mb9azpx6bsimh66iriax94612x64mb", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "2.0.0", - "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "version": "2.1.0", + "sha256": "0ywyn7jprsfr10bvwnm3qk270raxm9s9rvzyp1cp7ca037ab633y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.0.0", - "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "version": "2.1.0", + "sha256": "0vigc9x7158sdqxjgcxgvp6458k5936jlmlp2qdmlmzxr5wmfrbc", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.0.0", - "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", + "version": "2.1.0", + "sha256": "19sfsxwjqdzlfm43gb4hbyj0hgqcfhcfxwdib4g5i1pcfx1v3pf4", "license": "cc-by-sa-40" }] From 635385388fdd7600a58a66adf3a4dc39d7769b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 13 May 2019 20:03:21 +0200 Subject: [PATCH 26/95] python3Packages.spacy: 2.1.3 -> 2.1.4 This release has some improvements for training models: https://github.com/explosion/spaCy/releases/tag/v2.1.4 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a59cd78d6a2..80524154f67 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; + sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; }; prePatch = '' From de1110d5356059fbbff326e269b0c61bf65ae6a2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 14:22:39 -0500 Subject: [PATCH 27/95] pkgs: remove llvm_37 These expressions are now unused, and can be removed to lighten the load on build machines. Signed-off-by: Austin Seipp --- .../compilers/llvm/3.7/clang/default.nix | 60 ---------- .../compilers/llvm/3.7/clang/purity.patch | 17 --- .../compilers/llvm/3.7/default.nix | 59 ---------- .../compilers/llvm/3.7/libc++/darwin.patch | 30 ----- .../compilers/llvm/3.7/libc++/default.nix | 48 -------- .../compilers/llvm/3.7/libc++/r242056.patch | 16 --- .../compilers/llvm/3.7/libc++/setup-hook.sh | 6 - .../llvm/3.7/libc++/xlocale-glibc-2.26.patch | 17 --- .../compilers/llvm/3.7/libc++abi.nix | 61 ---------- pkgs/development/compilers/llvm/3.7/lldb.nix | 49 -------- pkgs/development/compilers/llvm/3.7/llvm.nix | 105 ------------------ pkgs/top-level/all-packages.nix | 11 -- 12 files changed, 479 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.7/clang/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/darwin.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/r242056.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++abi.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/llvm.nix diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix deleted file mode 100644 index 4ccd00af684..00000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - name = "clang-${version}"; - - unpackPhase = '' - unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"} - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - buildInputs = [ cmake libxml2 llvm ]; - - cmakeFlags = [ - "-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 = [ ./purity.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 = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - ''; - - enableParallelBuilding = true; - - passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both - isClang = true; - inherit llvm; - } // 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/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch deleted file mode 100644 index ee73b26eb5c..00000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/purity.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2015-07-31 00:47:41.000000000 +0200 -+++ b/lib/Driver/Tools.cpp 2015-09-11 21:30:50.057895565 +0200 -@@ -8150,15 +8150,6 @@ - CmdArgs.push_back("-shared"); - } - -- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb || -- Arch == llvm::Triple::thumb || Arch == 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.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix deleted file mode 100644 index 3c557711449..00000000000 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl -, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - version = "3.7.1"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; - clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv isl version fetch; }); - in { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch deleted file mode 100644 index bf83f169cfc..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix deleted file mode 100644 index 7b7ac7297ba..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation rec { - name = "libc++-${version}"; - - src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") - ''; - - patches = [ - ./darwin.patch - ./r242056.patch - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ]; - - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch deleted file mode 100644 index 96245e76653..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/include/string 2015/07/13 20:04:56 242056 -+++ b/include/string 2015/07/18 20:40:46 242623 -@@ -1936,7 +1936,12 @@ - template - inline _LIBCPP_INLINE_VISIBILITY - basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a) -- : __r_(__a) -+#if _LIBCPP_STD_VER <= 14 -+ _NOEXCEPT_(is_nothrow_copy_constructible::value) -+#else -+ _NOEXCEPT -+#endif -+: __r_(__a) - { - #if _LIBCPP_DEBUG_LEVEL >= 2 - __get_db()->__insert_c(this); diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh deleted file mode 100644 index 6611259165a..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index 5ee8f6b8230..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index 1989558..1e42905 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -34,10 +34,10 @@ - # include - #elif defined(_NEWLIB_VERSION) - # include --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix deleted file mode 100644 index 2c79d7b3b1b..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }: - -let - # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version - llvm38-and-above = fetchpatch { - url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch"; - sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr"; - }; -in stdenv.mkDerivation { - name = "libc++abi-${version}"; - - src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) 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 - ''; - - # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract - # into the libc++abi build environment above. - prePatch = ''( - cd ../libcxx-* - patch -p1 < ${llvm38-and-above} - )''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; 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/*.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 = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix deleted file mode 100644 index 294410f9986..00000000000 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python2 -, version -}: - -stdenv.mkDerivation { - name = "lldb-${version}"; - - src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; - - preConfigure = '' - export CXXFLAGS="-pthread" - export LDFLAGS="-ldl" - ''; - - cmakeFlags = [ - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" - "-DPYTHON_VERSION_MAJOR=2" - "-DPYTHON_VERSION_MINOR=7" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix deleted file mode 100644 index a6fd18f94d6..00000000000 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python2 -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, libcxxabi -, debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin -}: - -let - src = fetch "llvm" "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"; -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 python2 libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; - - propagatedBuildInputs = [ ncurses zlib ]; - - # The goal here is to disable LLVM bindings (currently go and ocaml) regardless - # of whether the impure CMake search sheananigans find the compilers in global - # paths. This mostly exists because sandbox builds don't work very well on Darwin - # and sometimes you get weird behavior if CMake finds go in your system path. - # This would be far prettier if there were a CMake option to just disable bindings - # but from what I can tell, there isn't such a thing. The file in question only - # contains `if(WIN32)` conditions to check whether to disable bindings, so making - # those always succeed has the net effect of disabling all bindings. - prePatch = '' - substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)" - '' - + stdenv.lib.optionalString (stdenv ? glibc) '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - patches = stdenv.lib.optionals (!stdenv.isDarwin) [ - # llvm-config --libfiles returns (non-existing) static libs - ../fix-llvm-config.patch - ]; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optional enableSharedLibraries - "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ]; - - NIX_LDFLAGS = "-lpthread"; # no idea what's the problem - - postBuild = '' - rm -fR $out - ''; - - enableParallelBuilding = true; - - passthru.src = src; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ac118e7755..fa5e7eeaac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,7 +3550,6 @@ in highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { - # doesn't build with clang_37 inherit (llvmPackages_38) stdenv; }); @@ -7035,7 +7034,6 @@ in clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; - clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { @@ -7694,7 +7692,6 @@ in llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; - llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; @@ -7705,14 +7702,6 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; }); - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_37.tools; - targetLlvmLibraries = targetPackages.llvmPackages_37.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; - }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_38.tools; From a5f60140201ede024783d9bc71f21b8fd01dac4b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 14:57:38 -0500 Subject: [PATCH 28/95] pkgs: remove souper-2017-03-23 Souper is a very experimental package that's only useful for for compiler hackers or people who are doing PhDs. The support/cost ratio of keeping such a package probably isn't very good. More importantly, this puts us one step closer to deleting llvmPackages_4, as this is one of the only two remaining packages using it. Deleting these older LLVM packages would be far more useful than the value Souper currently provides. Current versions of Souper support more recent LLVM versions anyway, so this expression could be resurrected. But it might be better to place it in the Nix User Archive (NUR), perhaps. Signed-off-by: Austin Seipp --- .../compilers/souper/cmake-fix.patch | 14 ----- pkgs/development/compilers/souper/default.nix | 59 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 75 deletions(-) delete mode 100644 pkgs/development/compilers/souper/cmake-fix.patch delete mode 100644 pkgs/development/compilers/souper/default.nix diff --git a/pkgs/development/compilers/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch deleted file mode 100644 index 5ef289f53e9..00000000000 --- a/pkgs/development/compilers/souper/cmake-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600 -+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600 -@@ -33,7 +33,10 @@ - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+ -+if (LLVM_SYSTEM_LIBS) -+ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+endif() - - execute_process( - COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix deleted file mode 100644 index 2203dc980b1..00000000000 --- a/pkgs/development/compilers/souper/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper -, llvmPackages_4, hiredis, z3, gtest -}: - -let - klee = fetchFromGitHub { - owner = "rsas"; - repo = "klee"; - rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f"; - sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz"; - }; -in stdenv.mkDerivation rec { - name = "souper-unstable-${version}"; - version = "2017-03-23"; - - src = fetchFromGitHub { - owner = "google"; - repo = "souper"; - rev = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc"; - sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl"; - }; - - nativeBuildInputs = [ - cmake - makeWrapper - ]; - - buildInputs = [ - llvmPackages_4.llvm - llvmPackages_4.clang-unwrapped - hiredis - gtest - ]; - - patches = [ ./cmake-fix.patch ]; - - enableParallelBuilding = true; - - preConfigure = '' - mkdir -pv third_party - cp -R "${klee}" third_party/klee - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v ./souper $out/bin/ - cp -v ./clang-souper $out/bin/ - wrapProgram "$out/bin/souper" \ - --add-flags "-z3-path=\"${z3}/bin/z3\"" - ''; - - meta = with stdenv.lib; { - description = "A superoptimizer for LLVM IR"; - homepage = "https://github.com/google/souper"; - license = licenses.asl20; - maintainers = with maintainers; [ taktoa ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..55da6542195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5867,8 +5867,6 @@ in soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {}; - souper = callPackage ../development/compilers/souper { }; - sparsehash = callPackage ../development/libraries/sparsehash { }; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; From 4277333c5aef2ad8e7cda942333cb3a4fdc4acf3 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 15 May 2019 10:05:38 +0300 Subject: [PATCH 29/95] parity: 2.4.5 -> 2.4.6 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index d01ef9ad059..18e3dd4129e 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.5"; - sha256 = "02ajwjw6cz86x6zybvw5l0pgv7r370hickjv9ja141w7bhl70q3v"; - cargoSha256 = "1n218c43gf200xlb3q03bd6w4kas0jsqx6ciw9s6h7h18wwibvf1"; + version = "2.4.6"; + sha256 = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z"; + cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 0040e207d85bd2b2fcfb3c52a189e72af2632b50 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 15 May 2019 10:05:57 +0300 Subject: [PATCH 30/95] parity-beta: 2.5.0 -> 2.5.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b844c441bbc..ed3f691122c 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.0"; - sha256 = "1dsckybjg2cvrvcs1bya03xymcm0whfxcb1v0vljn5pghyazgvhx"; - cargoSha256 = "0z7dmzpqg0qnkga7r4ykwrvz8ds1k9ik7cx58h2vnmhrhrddvizr"; + version = "2.5.1"; + sha256 = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d"; + cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 9388ca29fc0e8b59df08a2efdec8469ed986adf0 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Wed, 15 May 2019 14:47:43 +0000 Subject: [PATCH 31/95] packer: 1.3.3 -> 1.4.0 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5e54a8b3705..162ac045a9d 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.3"; + version = "1.4.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; + sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; }; meta = with stdenv.lib; { From 0c9f0c8823000067eb80ad3139378291b8572f24 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:06:55 -0400 Subject: [PATCH 32/95] gnome3.evolution: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/evolution/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a423dd85887..83202a75c26 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq"; + sha256 = "1sb60zhdawza33zlp0n3hbd7mq43a4y09jmkphpnxdifypfkar55"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; From 5a12e68b0d0e32a9a0964034446622e5daad548c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:07:35 -0400 Subject: [PATCH 33/95] gnome3.gedit: 3.32.0 -> 3.32.2 https://gitlab.gnome.org/GNOME/gedit/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index f767e309a65..532e8dcb0f0 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; + sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; nativeBuildInputs = [ From 6377960911c67744695e6354a6abc345b618c432 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:08:33 -0400 Subject: [PATCH 34/95] gnome3.gnome-boxes: 3.32.0.2 -> 3.32.1 https://gitlab.gnome.org/GNOME/gnome-boxes/blob/v3.32.1/NEWS --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index a983c59d192..3b68bec7585 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.32.0.2"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk"; + sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; doCheck = true; From 977c921e0e1311271226d701af17451160f13077 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:09:04 -0400 Subject: [PATCH 35/95] gnome3.gnome-calendar: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-calendar/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 3244fa639c2..03619f38c9b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wip968nvp1yj34hbpc3wjbrmrgjm1f82ag5ngv90z38953vi9vl"; + sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k"; }; passthru = { From 5cd950982ec43a6d888088f655a467efdd7de3fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:09:43 -0400 Subject: [PATCH 36/95] gnome3.gnome-maps: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b3b9fb0dddd..a059ec3ac3c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0"; + sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; }; doCheck = true; From f82dd09e928def459a401d203bfb53a9a451956d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:10:13 -0400 Subject: [PATCH 37/95] gnome3.gnome-music: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-music/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 4e601849a35..1f1bfafb595 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.32.1"; + version = "3.32.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4"; + sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From 9ac96f7a53a7cc6b5557937107c769db25084767 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:11:06 -0400 Subject: [PATCH 38/95] gnome3.gnome-software: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-software/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index f71df437d11..ab4b360221e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0xxhvyqfwlcyvlqc36rpcili00dpwy8b5c5klaqccn5qrc87rl38"; + sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; }; patches = [ From dfdc2553a3e257b04effa50f38a70559e35bf573 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:12:05 -0400 Subject: [PATCH 39/95] gnome3.gnome-terminal: 3.32.1 -> 3.32.2 --- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 9b25ae9218d..77a630261fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x"; + sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; buildInputs = [ From a83155c9df7eb77eac8c4d49b480c391624f26c8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:12:57 -0400 Subject: [PATCH 40/95] gnome3.gnome-user-docs: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-user-docs/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 02bcb52b387..d9f93862143 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw"; + sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c"; }; passthru = { From 9dfeb1e5769266a8e85432f41b40c2e858237e0e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:14:28 -0400 Subject: [PATCH 41/95] gnome3.nautilus: 3.32.0 -> 3.32.1 Fixes CVE-2019-11461 https://gitlab.gnome.org/GNOME/nautilus/blob/3.32.1/NEWS --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 688e8cc9365..2eeb77db0c6 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -7,13 +7,13 @@ let pname = "nautilus"; - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2"; + sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s"; }; nativeBuildInputs = [ From 51636785c1c710e123a15d66f3a2d2f31ed6db6f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:15:25 -0400 Subject: [PATCH 42/95] gnome3.simple-scan: 3.32.2 -> 3.32.2.1 Just translations. https://gitlab.gnome.org/GNOME/simple-scan/blob/3.32.2.1/NEWS --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ad2ac5d6e69..047e79e14e5 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.32.2"; + version = "3.32.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k"; + sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; buildInputs = [ From acd125c0f18dd1856e4a01934b901220a2997aea Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:16:31 -0400 Subject: [PATCH 43/95] gnome3.yelp: 3.32.1 -> 3.32.2 Just translations. https://gitlab.gnome.org/GNOME/yelp/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index ecbb7b277ff..24a49413960 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r"; + sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; From 386fb53a26dad61b43d80747e753249f439dde5d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:16:58 -0400 Subject: [PATCH 44/95] gnome3.yelp-tools: 3.32.0 -> 3.32.1 https://gitlab.gnome.org/GNOME/yelp-tools/blob/3.32.1/NEWS --- pkgs/desktops/gnome-3/core/yelp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 41120a74b08..d6ed0c22e4b 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz"; + sha256 = "1qrn8ss3wc601w8j0ziicgmgic0yh01az6611n3jgd7wll9c79wr"; }; passthru = { From dcaf2ef73f56559ff0786cd06bc388a14481c704 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:17:32 -0400 Subject: [PATCH 45/95] gnome3.gnome-mines: 3.32.0 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-mines/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 9ceb65f8308..b2c8e99e823 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj"; + sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; # gobject-introspection for finding vapi files From 743df678c2c711f2685b4e13433c0ddd861fb944 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:22:07 -0400 Subject: [PATCH 46/95] gnome3.gjs: 1.56.1 -> 1.56.2 https://gitlab.gnome.org/GNOME/gjs/blob/1.56.2/NEWS --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 25c3cef3f6a..ef4de369915 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.56.1"; + version = "1.56.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937"; + sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; passthru = { From 166bb809f393194277d7c0e175242d041ceb0c5f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:26:40 -0400 Subject: [PATCH 47/95] gnome3.metacity: 3.30.1 -> 3.32.0 https://gitlab.gnome.org/GNOME/metacity/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index c42356aa16a..8b1d2b05df1 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -16,13 +16,13 @@ let pname = "metacity"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kr472gblx7jxh9rvnamy09bkg29ms2pgc0c3373piqmavi24qg"; + sha256 = "177dmb1smizfgkddk49n2kr90graj9r6xw5hg3aq0y2qqg6v4rcg"; }; patches = [ From 6ec263488ae18f42b658d85ac22f31322404635c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:28:15 -0400 Subject: [PATCH 48/95] gnome3.gnome-applets: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-applets/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index de0d70ae42f..7bb162b7b8b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -26,13 +26,13 @@ let pname = "gnome-applets"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cvl32486kqw301wy40l1a1sdhanra7bx4smq0a3lmnl3x01zg43"; + sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { doCheck = true; configureFlags = [ - "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets" + "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets" ]; passthru = { From 4b917336f4858963e718e120bb555859e9d7c70b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 15 May 2019 20:51:35 -0700 Subject: [PATCH 49/95] analog: 6.0.13 -> 6.0.15 * Updates src so it can be auto updated. * Changes output paths to be only the pname, which seems more consistent with other packages in nixpkgs * minor cleanups --- pkgs/tools/admin/analog/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index c6135e8d143..d0731c1f599 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -1,38 +1,38 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { + pname = "analog"; + version = "6.0.15"; - name = "analog-6.0.13"; - - buildInputs = [ unzip ]; - - src = fetchurl { - url = "http://www.c-amie.co.uk/static/analog/6013/analog-src-6013ce.zip"; - sha256 = "1njfsclmxk8sn1i07k3qfk8fmsnz7qw9kmydk3bil7qjf4ngmzc6"; + src = fetchFromGitHub { + owner = "c-amie"; + repo = "analog-ce"; + rev = version; + sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; }; configurePhase = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${name}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" ''; installPhase = '' - mkdir -p $out/bin $out/etc $out/share/doc/${name} $out/share/man/man1 $out/share/${name} + mkdir -p $out/bin $out/etc $out/share/doc/$pname $out/share/man/man1 $out/share/$pname mv analog $out/bin/ cp examples/big.cfg $out/etc/analog.cfg mv analog.man $out/share/man/man1/analog.1 - mv docs $out/share/doc/${name}/manual - mv how-to $out/share/doc/${name}/ - mv lang images examples $out/share/${name}/ + mv docs $out/share/doc/$pname/manual + mv how-to $out/share/doc/$pname/ + mv lang images examples $out/share/$pname/ ''; meta = { - homepage = https://www.c-amie.co.uk/software/analog/; - license = stdenv.lib.licenses.gpl2; + homepage = "https://www.c-amie.co.uk/software/analog/"; + license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; }; } From 9ade471e67eab09d34bcafed81dae28003982335 Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 16 May 2019 10:02:28 +0200 Subject: [PATCH 50/95] racket: 7.2 -> 7.3 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 9d65997ffe5..c2147fb5f6a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.2"; # always change at once with ./minimal.nix + version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4"; + sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 0710c4e2d2a..a3d4a7a3c4f 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx"; + sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj"; }; meta = oldAttrs.meta // { From fb4ec8f688d9064924100cf695b32474cfb1a968 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 22:45:38 -0400 Subject: [PATCH 51/95] geoclue: 2.5.2 -> 2.5.3 Updated patch as needed. https://gitlab.freedesktop.org/geoclue/geoclue/tags/2.5.3 --- ...d-option-for-installation-sysconfdir.patch | 23 +++++++++++++------ .../development/libraries/geoclue/default.nix | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch index feb46021f8c..9eb53acebb0 100644 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index f826864..8b8a25e 100644 +index c189753..12c10cb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ if get_option('enable-backend') @@ -11,7 +11,16 @@ index f826864..8b8a25e 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -26,7 +26,7 @@ if get_option('enable-backend') +@@ -16,7 +16,7 @@ if get_option('enable-backend') + conf = configuration_data() + conf.set('libexecdir', libexecdir) + conf.set('dbus_srv_user', get_option('dbus-srv-user')) +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + service_dir = join_paths(datadir, 'dbus-1', 'system-services') + configure_file(output: 'org.freedesktop.GeoClue2.service', +@@ -33,7 +33,7 @@ if get_option('enable-backend') # DBus Service policy file dbus_service_dir = get_option('dbus-sys-dir') if dbus_service_dir == '' @@ -21,10 +30,10 @@ index f826864..8b8a25e 100644 configure_file(output: 'org.freedesktop.GeoClue2.conf', input: 'org.freedesktop.GeoClue2.conf.in', diff --git a/demo/meson.build b/demo/meson.build -index 99c094f..a29ca96 100644 +index 1427fbe..2623f16 100644 --- a/demo/meson.build +++ b/demo/meson.build -@@ -56,7 +56,7 @@ if get_option('demo-agent') +@@ -54,7 +54,7 @@ if get_option('demo-agent') install_dir: desktop_dir) # Also install in the autostart directory. @@ -34,7 +43,7 @@ index 99c094f..a29ca96 100644 desktop_file.full_path(), autostart_dir) diff --git a/meson.build b/meson.build -index d738ef6..c794a1d 100644 +index fde6fa3..39b7b0a 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,11 @@ gclue_api_version='2.0' @@ -50,8 +59,8 @@ index d738ef6..c794a1d 100644 localedir = join_paths(datadir, 'locale') header_dir = 'libgeoclue-' + gclue_api_version -@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'http://www.freedesktop.org/wiki/Software/GeoClue - conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugs.freedesktop.org/enter_bug.cgi?product=GeoClue') +@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w + conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/') conf.set_quoted('LOCALEDIR', localedir) -conf.set_quoted('SYSCONFDIR', sysconfdir) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 5b8951cb3e0..70319c9151f 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = version; - sha256 = "1zk6n28q030a9v03whad928b9zwq16d30ch369qv2c0994axdr5p"; + sha256 = "1wbpi74dw3p7izxwd57irz2i1g55r7wzl5h2yf0ns0hgq2njdfsg"; }; patches = [ From d54ea3e42b7553f9a880615c02dc5b8acec7db1a Mon Sep 17 00:00:00 2001 From: xbreak Date: Thu, 16 May 2019 14:15:40 +0000 Subject: [PATCH 52/95] sloccount: Wrap shell scripts This fixes the issue that when `sloccount` is invoked it would fail due to missing PATH to companion scripts. --- pkgs/development/tools/misc/sloccount/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 28500ee08ee..965f0ed096c 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; # Make sure the Flex-generated files are newer than the `.l' files, so that @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc" ''; + postInstall = '' + for w in "$out/bin"/*; do + isScript "$w" || continue + wrapProgram "$w" --prefix PATH : "$out/bin" + done + ''; + meta = { description = "Set of tools for counting physical Source Lines of Code (SLOC)"; From ff884c83715f8eda9b1d5e3a0593baa9ae7aa936 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 19:57:04 -0500 Subject: [PATCH 53/95] audacity: 2.3.1 -> 2.3.2 https://www.audacityteam.org/audacity-2-3-2-released/ --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 3b12ffe3463..b685fda7683 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "089kz6hgqg0caz33sps19wpkfnza5gf7brdq2p9y6bnwkipw1w9f"; + sha256 = "0cf7fr1qhyyylj8g9ax1rq5sb887bcv5b8d7hwlcfwamzxqpliyc"; }; preConfigure = /* we prefer system-wide libs */ '' From dce18eefd182864543ffbb0f83550a2610a4940a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 May 2019 13:07:53 +0200 Subject: [PATCH 54/95] molden: 5.9.5 -> 6.1 --- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 35d21848e2b..274afd5fc3d 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.9.5"; + version = "6.1"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9"; + sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539"; }; nativeBuildInputs = [ which ]; From bbba52522635f0ac0dab06571d1b93bd8a651ffd Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Sat, 18 May 2019 03:46:52 +0200 Subject: [PATCH 55/95] tokei: fix missing Security framework on macOS --- pkgs/development/tools/misc/tokei/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index f9b4343a63a..de60d91bf83 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -13,7 +13,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4"; - buildInputs = [ libiconv ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security + ]; meta = with stdenv.lib; { description = "Program that displays statistics about your code"; From 9b3b2af6e750c7e7412dd30da1b0a60af00bf043 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 09:08:33 -0500 Subject: [PATCH 56/95] kdiff3: 1.8, finally a release! Drop git-diff patch, really hope it's not still outstanding (and it doesn't apply). cc @vcunat (who filed linked upstream issue) --- pkgs/tools/text/kdiff3/default.nix | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 514085bee64..ea50e69fa53 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,35 +1,18 @@ { - mkDerivation, lib, fetchgit, fetchpatch, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, wrapGAppsHook, kcrash, kconfig, kinit, kparts }: mkDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-2017-02-19"; + pname = "kdiff3"; + version = "1.8"; - src = fetchgit { - # gitlab is outdated - url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; - sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; - rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54"; }; - setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; - - patches = [ - (fetchpatch { - name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2 - url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch"; - sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y"; - }) - ]; - patchFlags = "-p 2"; - - postPatch = '' - sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp - ''; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; From 10832b0c4d48ee5ed53101ea2716fe2f030035ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 10:35:43 -0700 Subject: [PATCH 57/95] python37Packages.plyvel: 1.0.5 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-plyvel/versions --- pkgs/development/python-modules/plyvel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 9ce01c098fd..b66d3231146 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "14cbdyq1s8xmvha3lj942gw478cd6jyhkw8n0mhxpgbz8px9jkfn"; + sha256 = "1icsycqqjj8048a0drj3j75a71yiv2cmijh4w3jf9zxahh3k2c9p"; }; buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; From d7cfe3cad03330fa0e8b3666823d15e5c5620c3c Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Sat, 18 May 2019 09:11:21 +0200 Subject: [PATCH 58/95] maintainers: add ptrhlm --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0df70cdbaf7..98ec8551f5a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4001,6 +4001,11 @@ github = "Ptival"; name = "Valentin Robert"; }; + ptrhlm = { + email = "ptrhlm0@gmail.com"; + github = "ptrhlm"; + name = "Piotr Halama"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; From 0127f447c2bd97ac3e424aadb7c55c811d7931c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 18:29:11 -0500 Subject: [PATCH 59/95] libu2f-host: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/libu2f-host/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index c163720f56e..ad0557049e3 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.9"; + pname = "libu2f-host"; + version = "1.1.10"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "1hnh3f4scx07v9jfkr1nnxasmydk1cmivn0nijcp2p75bc1fznip"; + url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.xz"; + sha256 = "0vrivl1dwql6nfi48z6dy56fwy2z13d7abgahgrs2mcmqng7hra2"; }; nativeBuildInputs = [ pkgconfig ]; From c0a0dc19ce8259aacd0f4559f38ff829f689aeaa Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 17 May 2019 09:58:58 +0300 Subject: [PATCH 60/95] tiled: 1.2.3 -> 1.2.4 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 1cfb04b7b2e..4fa93d78235 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tiled"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "1zsfhw539zwyf5qfnirzkkgy5bmrrs2cry4gimrhpky9fjlaa9h8"; + sha256 = "18a0pkq8j20v1njrl0sswm0ch10c6c4fas7q9kk2d2fd610ga6gh"; }; nativeBuildInputs = [ pkgconfig qmake ]; From bc38106acbd757c9fffe64599e44132b0d6d78ce Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 May 2019 10:56:55 +0200 Subject: [PATCH 61/95] jellyfin: 10.3.2 -> 10.3.3 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index d41c94eee56..9be9a1ec06c 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.2"; + version = "10.3.3"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz"; + sha256 = "197bmr9y13rxms1bwm4infrv0dzbv9qqw67lb1alskmpp0vjg3s7"; }; buildInputs = [ From 381964e9a3390ceccf60dcd9d443fa137547a7a3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 18 May 2019 10:56:19 +0200 Subject: [PATCH 62/95] alsaPlugins: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-plugins/versions The alsalconfdir has been fixed upstream in: https://git.alsa-project.org/?p=alsa-plugins.git;a=blobdiff;f=configure.ac;h=1be4a70c803c367528aaf07839430801bc7f0c78;hp=5b80585fa54257266de4c59adcfd7858156f9abd;hb=2d9f140caa63fbf79d6a0823e293110b97229895;hpb=613ac0c3483fb9bc0d010e8ed4ad50191500d641 Co-authored-by: Robin Gloster --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 90319efd7c7..6768dac3326 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; - configureFlags = [ - "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d" - ]; - meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; From e8a24831634f7209dbba06fe6384c1bac6595197 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 18 May 2019 11:38:55 +0200 Subject: [PATCH 63/95] cnstrokeorder: init at 0.0.4.7 --- pkgs/data/fonts/cnstrokeorder/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/cnstrokeorder/default.nix diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix new file mode 100644 index 00000000000..965bf119f6e --- /dev/null +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl }: + +let + version = "0.0.4.7"; +in fetchurl { + name = "cnstrokeorder-${version}"; + + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + + recursiveHash = true; + downloadToTemp = true; + + postFetch = '' + install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + ''; + + sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; + + meta = with lib; { + description = "Chinese font that shows stroke order for HSK 1-4"; + homepage = "http://rtega.be/chmn/index.php?subpage=68"; + license = [ licenses.arphicpl ]; + maintainers = with maintainers; [ johnazoidberg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c28665f1b61..39c08f1143b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16022,6 +16022,8 @@ in cherry = callPackage ../data/fonts/cherry { }; + cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; From 52dca1c459b208bd2e965bc2e5b6f204a968ab49 Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Sat, 18 May 2019 09:13:21 +0200 Subject: [PATCH 64/95] kanji-stroke-order-font: init at 4.002 --- .../fonts/kanji-stroke-order-font/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/kanji-stroke-order-font/default.nix diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix new file mode 100644 index 00000000000..1c1609b03f1 --- /dev/null +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip }: + +let + version = "4.002"; +in fetchzip { + name = "kanji-stroke-order-font-${version}"; + + url = "https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${version}.zip?attredirects=0"; + + postFetch = '' + mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/kanji-stroke-order + unzip -j $downloadedFile \*.txt -d $out/share/doc/kanji-stroke-order + ''; + + sha256 = "194ylkx5p7r1461wnnd3hisv5dz1xl07fyxmg8gv47zcwvdmwkc0"; + + meta = with stdenv.lib; { + description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; + homepage = "https://sites.google.com/site/nihilistorguk/"; + + license = [ licenses.bsd3 ]; + maintainers = with maintainers; [ ptrhlm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50cd07c2f1b..56b837fe18b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16223,6 +16223,8 @@ in junicode = callPackage ../data/fonts/junicode { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; + kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; From b7f032ebed61cfecd53ec6f17f081513837adb9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 May 2019 20:51:02 +0200 Subject: [PATCH 65/95] LTS Haskell 13.21 --- .../configuration-hackage2nix.yaml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe76c581eda..7c1ab7f85b6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.20 + # LTS Haskell 13.21 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -196,7 +196,7 @@ default-package-overrides: - apecs-gloss ==0.2.0 - apecs-physics ==0.3.2 - api-field-json-th ==0.1.0.2 - - appar ==0.1.7 + - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 @@ -282,7 +282,7 @@ default-package-overrides: - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.5.1 + - binary-tagged ==0.1.5.2 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 @@ -458,7 +458,7 @@ default-package-overrides: - conduit-throttle ==0.3.1.0 - conduit-zstd ==0.0.1.1 - confcrypt ==0.1.0.4 - - configuration-tools ==0.4.0 + - configuration-tools ==0.4.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 @@ -795,7 +795,7 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - - generics-sop-lens ==0.1.2.1 + - generics-sop-lens ==0.1.3 - genvalidity ==0.7.0.2 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 @@ -804,7 +804,7 @@ default-package-overrides: - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 - - genvalidity-hspec-hashable ==0.2.0.3 + - genvalidity-hspec-hashable ==0.2.0.4 - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - genvalidity-property ==0.3.0.0 @@ -895,7 +895,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.2 - - happy ==1.19.9 + - happy ==1.19.10 - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 @@ -1000,7 +1000,7 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.3 + - hslua ==1.0.3.1 - hslua-aeson ==1.0.0 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 @@ -1046,7 +1046,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7.1 - http-date ==0.0.8 - - http-directory ==0.1.1 + - http-directory ==0.1.2 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1063,7 +1063,7 @@ default-package-overrides: - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - - hw-diagnostics ==0.0.0.5 + - hw-diagnostics ==0.0.0.7 - hweblib ==0.6.3 - hw-eliasfano ==0.1.0.1 - hw-excess ==0.2.0.2 @@ -1174,7 +1174,7 @@ default-package-overrides: - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - kan-extensions ==5.2 - - kanji ==3.4.0 + - kanji ==3.4.0.2 - katip ==0.7.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 @@ -1310,7 +1310,7 @@ default-package-overrides: - microbench ==0.1 - microformats2-parser ==1.0.1.9 - microlens ==0.4.10 - - microlens-aeson ==2.3.0.1 + - microlens-aeson ==2.3.0.4 - microlens-contra ==0.1.0.2 - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 @@ -1430,7 +1430,7 @@ default-package-overrides: - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - - newtype ==0.2 + - newtype ==0.2.1.0 - newtype-generics ==0.5.3 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 @@ -1472,7 +1472,7 @@ default-package-overrides: - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - - OpenGL ==3.0.2.2 + - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 @@ -1505,7 +1505,7 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.2 + - parser-combinators ==1.0.3 - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 @@ -1602,7 +1602,7 @@ default-package-overrides: - prettyprinter-compat-wl-pprint ==1.0.0.1 - pretty-show ==1.9.5 - pretty-simple ==2.2.0.1 - - pretty-sop ==0.2.0.2 + - pretty-sop ==0.2.0.3 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.4.0 @@ -1687,7 +1687,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - rebase ==1.3.1 - record-dot-preprocessor ==0.1.5 - - records-sop ==0.1.0.2 + - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 - refact ==0.3.0.2 @@ -1704,10 +1704,10 @@ default-package-overrides: - regex-pcre-builtin ==0.94.4.8.8.35 - regex-pcre-text ==0.94.0.1 - regex-posix ==0.95.2 - - regex-tdfa ==1.2.3.1 + - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.6 + - registry ==0.1.4.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1927,7 +1927,7 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.29.1 - streaming ==0.2.2.0 - - streaming-attoparsec ==1.0.0 + - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 - streaming-wai ==0.1.1 @@ -2057,7 +2057,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.1.0 + - th-utilities ==0.2.3.0 - thyme ==0.3.5.5 - tidal ==1.0.13 - tile ==0.3.0.0 @@ -2092,7 +2092,7 @@ default-package-overrides: - transformers-compat ==0.6.4 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.2 + - tree-diff ==0.0.2.1 - tree-fun ==0.8.1.0 - trifecta ==2 - triplesec ==0.2.2.0 @@ -2201,7 +2201,7 @@ default-package-overrides: - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 - - void ==0.7.2 + - void ==0.7.3 - vty ==5.25.1 - wai ==3.2.2 - wai-app-static ==3.1.6.3 @@ -2239,7 +2239,7 @@ default-package-overrides: - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - - websockets-snap ==0.10.3.0 + - websockets-snap ==0.10.3.1 - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.11 From dc1cd81cfbf8c8bc2d1a4b2d9b2ea9e35a787a8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 May 2019 17:23:02 +0000 Subject: [PATCH 66/95] hackage2nix: disable broken builds on Hydra --- .../configuration-hackage2nix.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7c1ab7f85b6..0f942bb25b4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2899,6 +2899,7 @@ broken-packages: - atomic-primops-vector - atomo - ats-format + - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2968,6 +2969,7 @@ broken-packages: - azure-service-api - azure-servicebus - azurify + - b9 - babylon - backdropper - backtracking-exceptions @@ -3054,6 +3056,7 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree + - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3321,6 +3324,7 @@ broken-packages: - cabin - cabocha - cached + - cacophony - caffegraph - cairo-core - cake @@ -3696,6 +3700,7 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous-checked - contiguous-fft - continue - continuum @@ -4006,6 +4011,7 @@ broken-packages: - derp-lib - descript-lang - deterministic-game-engine + - detour-via-sci - detour-via-uom - deunicode - devil @@ -4197,6 +4203,7 @@ broken-packages: - Dust-crypto - Dust-tools - Dust-tools-pcap + - dvault - dvda - dvdread - dvi-processing @@ -4542,6 +4549,7 @@ broken-packages: - flexiwrap - flexiwrap-smallcheck - flickr + - flight-kml - Flippi - flite - float-binstring @@ -4821,6 +4829,7 @@ broken-packages: - gi-wnck - giak - Gifcurry + - ginger - ginsu - gipeda - gist @@ -5429,6 +5438,7 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens + - hedgehog-fn - hedgehog-gen-json - Hedi - hedis-config @@ -5520,6 +5530,7 @@ broken-packages: - hgrib - hharp - HHDL + - hhp - hi3status - hiccup - hichi @@ -6519,6 +6530,7 @@ broken-packages: - ldif - leaf - leaky + - lean - leanpub-wreq - leapseconds - learn @@ -6720,6 +6732,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -7276,6 +7289,7 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty + - nonempty-containers - NonEmptyList - normalization-insensitive - NoSlow @@ -7785,6 +7799,7 @@ broken-packages: - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort - primula-board - primula-bot - pringletons @@ -8097,6 +8112,7 @@ broken-packages: - regions-mtl - register-machine-typelevel - registry + - registry-hedgehog - regress - regular - regular-extras @@ -8109,6 +8125,7 @@ broken-packages: - relacion - relation - relational-postgresql8 + - relational-record-examples - relative-date - reload - remark @@ -9074,6 +9091,7 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-lua - tasty-quickcheck-laws - tasty-stats - tasty-tap From 71fee27abb33ab6ada3165372c600f8728ea81bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 May 2019 20:52:12 +0200 Subject: [PATCH 67/95] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5a5fa437a241e1ce625d99ac674842a2b917e2a2. --- .../haskell-modules/hackage-packages.nix | 2293 ++++++++++------- 1 file changed, 1415 insertions(+), 878 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ddcfa0ff447..4cc3c34b9d1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -768,8 +768,8 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.6.0"; - sha256 = "1f3gq1vd9ra3421ff5an6q33mlfzc2qvaxmfg9qhvr4z99ivqwdz"; + version = "2.6.0.1"; + sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -4846,8 +4846,8 @@ self: { }: mkDerivation { pname = "ENIG"; - version = "0.0.0.2"; - sha256 = "0rnqp6bdib4w683gvj6i0p3p7ms0zw6vwvmsgy9gwfwxqkh6m3ps"; + version = "0.0.1.0"; + sha256 = "1zv6dybsnj3kssiyyg69lxyj5wvi5qjx0xp7skg362xzqmi97ch3"; libraryHaskellDepends = [ base text unicode-transforms vector ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -6221,8 +6221,8 @@ self: { }: mkDerivation { pname = "Frames-map-reduce"; - version = "0.1.0.0"; - sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3"; + version = "0.1.0.1"; + sha256 = "1m3ifx867hn4zhrj9xlars44w3sv1sp6ja38kb6f3lnhr86nf8g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10545,6 +10545,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: + mkDerivation { + pname = "HsYAML"; + version = "0.1.2.0"; + sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers mtl parsec text + ]; + description = "Pure Haskell YAML 1.2 parser"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector }: @@ -11299,6 +11315,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_4_1" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.4.1"; + sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -12926,32 +12960,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_4_0_1" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; - revision = "2"; - editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -12962,6 +12970,8 @@ self: { pname = "MissingH"; version = "1.4.1.0"; sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; + revision = "2"; + editedCabalFile = "1k7d8cgvpmln4imcrfpj4c02n3c5l1gkd5hs4hnar9ln0qh61cfx"; libraryHaskellDepends = [ array base containers directory filepath hslogger HUnit mtl network old-locale old-time parsec process random regex-compat time unix @@ -12975,6 +12985,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MissingH_1_4_2_0" = callPackage + ({ mkDerivation, array, base, containers, directory + , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network + , network-bsd, old-locale, old-time, parsec, process, random + , regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.4.2.0"; + sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process random regex-compat + time unix + ]; + testHaskellDepends = [ + base containers directory errorcall-eq-instance filepath HUnit + old-time parsec regex-compat time unix + ]; + description = "Large utility library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -14505,22 +14539,6 @@ self: { }) {}; "OpenGL" = callPackage - ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName - , OpenGLRaw, StateVar, text, transformers - }: - mkDerivation { - pname = "OpenGL"; - version = "3.0.2.2"; - sha256 = "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc"; - libraryHaskellDepends = [ - base bytestring containers GLURaw ObjectName OpenGLRaw StateVar - text transformers - ]; - description = "A binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "OpenGL_3_0_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName , OpenGLRaw, StateVar, text, transformers }: @@ -14534,7 +14552,6 @@ self: { ]; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenGLCheck" = callPackage @@ -15852,8 +15869,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "1"; - editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; + revision = "2"; + editedCabalFile = "0d7dzba96vglz4k7ryf0zzqm18vl0wrr9v3xwwjf4cv91cc8cql2"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -15871,6 +15888,8 @@ self: { pname = "QuickCheck"; version = "2.13.1"; sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; + revision = "1"; + editedCabalFile = "1i8h75cxxpkriqprkr0ry5ig29pqhhhs5syjjxsyf1df6rngxipx"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -20073,8 +20092,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.3"; - sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; + version = "0.2.2.4"; + sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -20141,8 +20160,8 @@ self: { ({ mkDerivation, Advapi32, base, Win32, Win32-errors }: mkDerivation { pname = "Win32-services"; - version = "0.4"; - sha256 = "1zxi8m98n5pgpx7z20f4g40w4njqllw7gfnlfxwgw3iismxiyyp8"; + version = "0.4.0.1"; + sha256 = "1skf8w3d1n61847bjpvll3bql65mrc6vg03q84bg21mlh77mx1s3"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; @@ -23218,22 +23237,21 @@ self: { "aeson-gadt-th" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map - , dependent-sum, hspec, HUnit, markdown-unlit, template-haskell - , transformers + , dependent-sum, dependent-sum-template, hspec, HUnit + , template-haskell, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.1.0"; - sha256 = "09529lpjmm7hpqwrs3w8z1d6zzy4dw5wyqyx88ra68wf2a5nlwsh"; + version = "0.2.1.1"; + sha256 = "18lkf75pw8lp03bj4b8vknj7ysvbhpix6zkzd86qaq0z3yh6s6jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers dependent-sum template-haskell transformers ]; executableHaskellDepends = [ - aeson base dependent-map dependent-sum + aeson base dependent-map dependent-sum dependent-sum-template ]; - executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ aeson aeson-qq base dependent-sum hspec HUnit ]; @@ -27174,20 +27192,19 @@ self: { }) {}; "amazonka-s3-streaming" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, deepseq, dlist, exceptions, http-client - , lens, lifted-async, mmap, mmorph, mtl, resourcet + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async, base + , bytestring, conduit, dlist, exceptions, http-client, lens, mmorph + , mtl }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.5"; - sha256 = "1j9jp409gjq7gnwx163i7qpk4ih3rff7z2icsfmzakiarwmg2ff2"; + version = "1.0.0.2"; + sha256 = "1k7l49h3zdqw3va70mr4rrmsyjpbzgbnr3bhj7yl24np77r6cs99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq - dlist exceptions http-client lens lifted-async mmap mmorph mtl - resourcet + amazonka amazonka-core amazonka-s3 async base bytestring conduit + dlist exceptions http-client lens mmorph mtl ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; @@ -28337,12 +28354,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_9" = callPackage + "ansi-terminal_0_9_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.9"; - sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp"; + version = "0.9.1"; + sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28353,19 +28370,22 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, hspec, linebreak, split, terminal-size, timers-tick + , clock, hspec, linebreak, mtl, split, terminal-size, timers-tick }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.2.1.0"; - sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836"; + version = "0.3.1.0"; + sha256 = "0q62lq4i638hn23qvmlv7qa6gdnxl3bnrhpp2j2liw885x4qxlhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock linebreak split - terminal-size timers-tick + ansi-terminal array base bytestring cereal clock linebreak mtl + split terminal-size timers-tick + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock hspec linebreak + mtl split terminal-size timers-tick ]; - testHaskellDepends = [ array base hspec linebreak ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -28387,6 +28407,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-wl-pprint_0_6_9" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.9"; + sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { @@ -28533,14 +28567,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_2" = callPackage + "antiope-athena_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.2"; - sha256 = "0jnw1r2qxdsgb2a96ibayy504ndmgwnr083y3hxvsf081bi72n03"; + version = "7.0.3"; + sha256 = "15z64bwqnz7ypv35alj1wfvw0ab1zp0h7sdhw300mq3715snw0x1"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28558,8 +28592,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.2"; - sha256 = "0pf9dqx4px93fvq9rsl13ckngylj9dywzapn8largccvw0j5g8zk"; + version = "7.0.3"; + sha256 = "1c2q532dy6zash5ap3mq9qx9316gqhd3ilafvqs3xvfx6gddb7k6"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28591,7 +28625,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_2" = callPackage + "antiope-core_7_0_3" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28599,8 +28633,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.2"; - sha256 = "1rybjb99sqgs2qa0b2mjrfwi5h8112ipwjphapcbgzg2y7nicw60"; + version = "7.0.3"; + sha256 = "0qn89pij3gg129y4waiwq6y6i7d7lny9ibjz9zdv5n6fzsgmrz8l"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28637,15 +28671,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_2" = callPackage + "antiope-dynamodb_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.2"; - sha256 = "0apbpikpcj400qn4jq0s29rmsbk3ngi7drd8jmkpnnlqvz7g4cyv"; + version = "7.0.3"; + sha256 = "1shfi2l9pys211pxq03z71d53578d2amwlyvsj4cb9qspccqmxb0"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28683,7 +28717,7 @@ self: { broken = true; }) {}; - "antiope-messages_7_0_2" = callPackage + "antiope-messages_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28691,8 +28725,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.2"; - sha256 = "1v0wfhniy5gaqnn8b39vc8whzmj9a58zh6l0zz234n5yghggz7fq"; + version = "7.0.3"; + sha256 = "05xrjlm5w2pbx9dlgi800j28zxyhbilhd902f8mshdw5jq7l3ws3"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28714,8 +28748,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.0.1"; - sha256 = "018jnswibppmr3qzk6bn64r3xg55msp4bzmcg99vkr6nzgjl1zad"; + version = "7.0.3"; + sha256 = "1pw8jhbhn11jjp5zlsx2sdf3swjqcda0ka6xm09wzk14njyj2m0a"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28754,7 +28788,7 @@ self: { broken = true; }) {}; - "antiope-s3_7_0_2" = callPackage + "antiope-s3_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28763,8 +28797,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.2"; - sha256 = "1g46qy0xxwszx7mnsyd04yi83wf0kv57h4sb1jfq6ds6sh9l0xnc"; + version = "7.0.3"; + sha256 = "0n5jzp1ab3nk99z0n2d4kp400cg2ygxnk9s9siks2qncpgx3bb42"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28802,15 +28836,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_2" = callPackage + "antiope-sns_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.2"; - sha256 = "19l0sl33ywr2j5kxkqk0bbpqiahlzn1k883vhyki585hhgh2dad1"; + version = "7.0.3"; + sha256 = "0kq669k1h11cjrx4d0rdyzfv94br5w0pxl0zm0xa0pq4inagz06q"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28849,19 +28883,20 @@ self: { broken = true; }) {}; - "antiope-sqs_7_0_2" = callPackage + "antiope-sqs_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl - , network-uri, text, time, unliftio-core, unordered-containers + , network-uri, split, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.2"; - sha256 = "0wpfcr3z3vpsy1m0zwrzszpsa4w4p9261ys8bnmvwg1qa8fpg278"; + version = "7.0.3"; + sha256 = "152w0zg2psdgii74k8h1wpq2qcnpmiybh0fa3y8i7fj75v8y0wj9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit - generic-lens lens lens-aeson monad-loops mtl network-uri text + generic-lens lens lens-aeson monad-loops mtl network-uri split text unliftio-core unordered-containers ]; testHaskellDepends = [ @@ -29186,21 +29221,19 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, hspec, HTTP, http-client, http-client-tls, http-types - , text, tls, transformers + , QuickCheck, text, tls, transformers }: mkDerivation { pname = "api-builder"; - version = "0.15.0.0"; - sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad"; - revision = "1"; - editedCabalFile = "0sw6vdnzlqyv9n7gdhy1ibh7vrzfflc1cy2q558a4i23gn74k74s"; + version = "0.16.0.0"; + sha256 = "1va2h0sbmx15a29ffmnqqidwzj1kk6dbcgdlcx2lpfk3cwwnpj8m"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers ]; testHaskellDepends = [ - aeson base bytestring Cabal containers hspec http-client text - transformers + aeson base bytestring Cabal containers hspec http-client QuickCheck + text transformers ]; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -29685,17 +29718,6 @@ self: { }) {}; "appar" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "appar"; - version = "0.1.7"; - sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn"; - libraryHaskellDepends = [ base bytestring ]; - description = "A simple applicative parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "appar_0_1_8" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "appar"; @@ -29704,7 +29726,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appc" = callPackage @@ -32413,10 +32434,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.13"; - sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz"; - revision = "1"; - editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh"; + version = "3.2.5.16"; + sha256 = "044i1a6faw7r7ds910wk99mmg09ks1gdzc1md114nml614n3fqih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32435,6 +32454,8 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-setup" = callPackage @@ -34607,6 +34628,8 @@ self: { ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "babl" = callPackage @@ -36729,8 +36752,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.3"; - sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6"; + version = "0.2.0.4"; + sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv"; libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; @@ -37125,6 +37148,8 @@ self: { pname = "binary"; version = "0.8.6.0"; sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y"; + revision = "1"; + editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -37296,6 +37321,33 @@ self: { broken = true; }) {}; + "binary-instances" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1"; + sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "binary-list" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , phantom-state, transformers @@ -37351,6 +37403,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_1_0_1" = callPackage + ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "binary-orphans"; + version = "1.0.1"; + sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; + libraryHaskellDepends = [ base binary transformers ]; + testHaskellDepends = [ + base binary QuickCheck quickcheck-instances tagged tasty + tasty-quickcheck + ]; + description = "Compatibility package for binary; provides instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl , quickcheck-instances, rerebase, tasty, tasty-hunit @@ -37547,10 +37617,8 @@ self: { }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.1"; - sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh"; - revision = "1"; - editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx"; + version = "0.1.5.2"; + sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable scientific SHA tagged text time @@ -37571,32 +37639,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary-tagged_0_1_5_2" = callPackage + "binary-tagged_0_2" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, generics-sop, hashable, nats, quickcheck-instances - , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck - , text, time, unordered-containers, vector + , binary, binary-instances, bytestring, containers, criterion + , cryptohash-sha1, deepseq, generics-sop, hashable, nats + , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.2"; - sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; + version = "0.2"; + sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - generics-sop hashable scientific SHA tagged text time + cryptohash-sha1 generics-sop hashable scientific tagged text time unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable quickcheck-instances - scientific SHA tagged tasty tasty-quickcheck text time - unordered-containers vector + aeson array base base16-bytestring bifunctors binary + binary-instances bytestring containers generics-sop hashable + quickcheck-instances scientific tagged tasty tasty-hunit + tasty-quickcheck text time unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector + aeson array base base16-bytestring binary binary-instances + bytestring containers criterion deepseq generics-sop hashable nats + scientific semigroups SHA tagged text time unordered-containers + vector ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; @@ -38831,8 +38901,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.2.0"; - sha256 = "0xqx7y0nv80wywp6ybcb23z77plizfvv6rk04gkykcpfjna6ijai"; + version = "0.1.2.1"; + sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41386,6 +41456,8 @@ self: { pname = "both"; version = "0.1.1.0"; sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg"; + revision = "1"; + editedCabalFile = "0fi2lvxcdnj9bi683kl840xpyj12wxwxvqbi86a6qp4r8bq8442n"; libraryHaskellDepends = [ base semigroups zero ]; description = "Like Maybe, but with a different Monoid instance"; license = stdenv.lib.licenses.mit; @@ -41711,8 +41783,8 @@ self: { }: mkDerivation { pname = "breve"; - version = "0.4.4.0"; - sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p"; + version = "0.4.5.1"; + sha256 = "1db93l3lb09rsb6yh3pkbfpyh736a9ki0q1x8s8rcp4dsy79b3va"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -41723,7 +41795,7 @@ self: { xdg-basedir ]; description = "a url shortener"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -44210,8 +44282,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.9"; - sha256 = "1h7wp30gmggsrjgspsahn6b045njy6c23mhgkmhz6nn5s4wa1hak"; + version = "1.0.0.10"; + sha256 = "1iy7a7zmf3z539snj6rgg3qkcx8f8xwqvjry6wwagalr6z5smhmx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45458,6 +45530,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -48707,17 +48781,18 @@ self: { "check-pvp" = callPackage ({ mkDerivation, base, Cabal, containers, explicit-exception - , filepath, haskell-src-exts, non-empty, transformers, utility-ht + , filepath, haskell-packages, haskell-src-exts, hse-cpp, non-empty + , tagged, transformers, utility-ht }: mkDerivation { pname = "check-pvp"; - version = "0.0.1"; - sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f"; + version = "0.0.2.1"; + sha256 = "0n3rq7zf0q92jm6y1gicp98b5yww8s8d430kc6a48rsxqs96i1w6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers explicit-exception filepath haskell-src-exts - non-empty transformers utility-ht + base Cabal containers explicit-exception filepath haskell-packages + haskell-src-exts hse-cpp non-empty tagged transformers utility-ht ]; description = "Check whether module and package imports conform to the PVP"; license = stdenv.lib.licenses.bsd3; @@ -48849,7 +48924,7 @@ self: { }) {}; "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers + ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, extra, file-embed, haskeline, megaparsec, MonadRandom , mtl, o-clock, optparse-applicative, parallel, parser-combinators , prettyprinter, process, random, stm, text, time @@ -48857,23 +48932,23 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.0.0"; - sha256 = "18ni11hlcd4mkd6s0a22afiads83vhspxabchspnjyn9vm75spfg"; + version = "0.3.1.0"; + sha256 = "1aj0lnvscc07q879s9mxv0kgr8spnzvdskazi2maf7hsgirpijsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers file-embed megaparsec + attoparsec base binary bytestring containers file-embed megaparsec MonadRandom o-clock parser-combinators prettyprinter process random stm text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base bytestring containers extra file-embed haskeline - megaparsec MonadRandom mtl o-clock optparse-applicative + attoparsec base binary bytestring containers extra file-embed + haskeline megaparsec MonadRandom mtl o-clock optparse-applicative parser-combinators prettyprinter process random stm text time unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring containers directory file-embed + attoparsec base binary bytestring containers directory file-embed megaparsec MonadRandom o-clock parallel parser-combinators prettyprinter process random stm text time unordered-containers vector @@ -52135,8 +52210,8 @@ self: { pname = "co-log"; version = "0.3.0.0"; sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; - revision = "1"; - editedCabalFile = "0qf4icy6mrvkwc8kd4w3x47ckhqsx5d5zqpc6cd9qcv1r6pw2vhj"; + revision = "2"; + editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54864,6 +54939,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_10" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.10"; + sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55285,8 +55377,8 @@ self: { pname = "conduit-extra"; version = "1.2.3.2"; sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; - revision = "2"; - editedCabalFile = "0x77alx5h3v07ra0l0l5b36rx5qb3vg2f5k711yvin1q40vwvhqg"; + revision = "3"; + editedCabalFile = "0m68hvcmg4wwn12wcczqx1i60i8g2nv95c05abnl8ymq0377c7wi"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -55851,41 +55943,6 @@ self: { }) {}; "configuration-tools" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, semigroups, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; - version = "0.4.0"; - sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx"; - setupHaskellDepends = [ - base bytestring Cabal directory filepath process - ]; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors semigroups - text tls transformers unordered-containers x509 x509-system - x509-validation yaml - ]; - testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml - ]; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_4_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory @@ -55918,7 +55975,6 @@ self: { ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -56422,8 +56478,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.2.0"; - sha256 = "0czsxil1mzswm9l88df4lnrgsgp634n06k14vs6f4zh2s9xxb59g"; + version = "1.0.3.0"; + sha256 = "0mx3r79sc86afpa0fnb8jhxk2g8cfr4hax7q5j8a8lfyxp1bcf3z"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56456,18 +56512,15 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, aeson, base, constraints, markdown-unlit - , template-haskell - }: + ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.5"; - sha256 = "1p45847w48waqvwmsvk44bvg39p2ifzdrwhk5h3n7l1avsmks37w"; + version = "0.3.0.1"; + sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; executableHaskellDepends = [ aeson base constraints ]; - executableToolDepends = [ markdown-unlit ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56757,12 +56810,19 @@ self: { }) {}; "contiguous" = callPackage - ({ mkDerivation, base, deepseq, primitive }: + ({ mkDerivation, base, deepseq, primitive, primitive-unlifted + , QuickCheck, quickcheck-instances, vector + }: mkDerivation { pname = "contiguous"; - version = "0.3.3.0"; - sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; - libraryHaskellDepends = [ base deepseq primitive ]; + version = "0.4.0.1"; + sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn"; + libraryHaskellDepends = [ + base deepseq primitive primitive-unlifted + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-instances vector + ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56776,6 +56836,8 @@ self: { libraryHaskellDepends = [ base contiguous primitive ]; description = "contiguous with bounds checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-fft" = callPackage @@ -56960,9 +57022,10 @@ self: { ({ mkDerivation, base, containers, stm, time }: mkDerivation { pname = "control-event"; - version = "1.2.1.1"; - sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565"; + version = "1.3"; + sha256 = "1a48h7nna7padcffdfyaavhfl43lqfhvib5ddsxbqm7y99nylni6"; libraryHaskellDepends = [ base containers stm time ]; + testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57437,8 +57500,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0.1"; - sha256 = "11vrin2d0zfqzn3c9ikn1ra76m2083nlrk3l8j4hk0pnssy9kjvp"; + version = "3.0.2"; + sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -64144,6 +64207,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_7" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.7"; + sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -66309,6 +66400,8 @@ self: { ]; description = "JSON and CSV encoding for rationals as decimal point numbers"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "detour-via-uom" = callPackage @@ -66786,19 +66879,19 @@ self: { "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant - , dhall, Diff, directory, filepath, hashable, microlens - , optparse-applicative, prettyprinter, tasty, tasty-golden - , tasty-hunit, text, transformers, vector + , dhall, Diff, directory, filepath, microlens, optparse-applicative + , prettyprinter, tasty, tasty-golden, tasty-hunit, text + , transformers, vector }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.3.2.0"; - sha256 = "1cy7pqqfrmli3a8p24j0dgksfwhj08kjpbp31bdibnr8ix204jjc"; + version = "1.3.3.0"; + sha256 = "0nh7sn8hzm38prx4c2h9azw351gns4mscjnn7dsgxpn34l5yyql7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers contravariant dhall filepath - hashable text transformers vector + base bytestring Cabal containers contravariant dhall filepath text + transformers vector ]; executableHaskellDepends = [ base bytestring Cabal dhall directory filepath microlens @@ -68664,6 +68757,17 @@ self: { broken = true; }) {}; + "discokitty" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "discokitty"; + version = "0.1.0"; + sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj"; + libraryHaskellDepends = [ base containers ]; + description = "DisCoCat implementation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "discord-gateway" = callPackage ({ mkDerivation, aeson, base, discord-types, hslogger, transformers , url, websockets, wuss @@ -69637,8 +69741,8 @@ self: { }: mkDerivation { pname = "distributed-static"; - version = "0.3.8"; - sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm"; + version = "0.3.9"; + sha256 = "1nch2k8dnlf6is2p4skh8vd0qbkgai4r6msfn6r5cr0cqaarb6pf"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -72078,6 +72182,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dvault" = callPackage + ({ mkDerivation, base, bytestring, containers, crypto-rng + , data-default, directory, process, vector + }: + mkDerivation { + pname = "dvault"; + version = "0.1.0.0"; + sha256 = "1djk7c7zbkhr95nvrn4wf864yl425w0ifwgsb5f4al0gyv1cx0c9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers crypto-rng data-default directory + process vector + ]; + description = "Dead simple password manager"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dvda" = callPackage ({ mkDerivation, ad, base, containers, directory, fgl , file-location, graphviz, hashable, hashtables, mtl, process @@ -72468,19 +72592,18 @@ self: { "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion - , exceptions, generics-sop, hashable, hspec, lens, monad-loops - , monad-supply, safe-exceptions, scientific, semigroups, tagged - , template-haskell, text, transformers, unordered-containers - , uuid-types, vector + , exceptions, generics-sop, hashable, hspec, lens, monad-loops, mtl + , safe-exceptions, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, uuid-types, vector }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.1"; - sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; + version = "0.6.0.2"; + sha256 = "1mx2ylbvcyskv0pc053mcwlz3mycqrq3g4rgrbk4qhnywx8p7gav"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop - hashable lens monad-loops monad-supply scientific semigroups tagged + hashable lens monad-loops mtl scientific semigroups tagged template-haskell text transformers unordered-containers uuid-types vector ]; @@ -73437,8 +73560,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.14"; - sha256 = "0iilizs6nj901fmzfam9s0s2phz91m2292wggqvzj8p6260589iq"; + version = "3.8.1"; + sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -77095,6 +77218,8 @@ self: { pname = "eventful-sql-common"; version = "0.2.0"; sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + revision = "1"; + editedCabalFile = "1w2qq0p4304zsjkwmqx79azpq5v0ajz5grg740vwkca8qvdvdq91"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent persistent-template text uuid @@ -78474,29 +78599,29 @@ self: { ({ mkDerivation, async, base, bytestring, containers, data-default , deepseq, directory, exceptions, extensible-effects, filepath , hostname, HUnit, lens, monad-control, mtl, network, parallel - , process, QuickCheck, safe-exceptions, stm, tasty, tasty-discover - , tasty-hunit, text, time, transformers-base + , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty + , tasty-discover, tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.22.1"; - sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z"; + version = "0.23.0"; + sha256 = "0lyhkpds8j8b6vb9sk4ibad8a36zanfdq59mg1kiasxx6wmy20v5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-default deepseq directory exceptions extensible-effects filepath hostname lens monad-control - mtl network parallel process QuickCheck safe-exceptions stm text - time transformers-base + mtl network parallel pretty-types process QuickCheck + safe-exceptions stm text time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath - lens text + lens pretty-types text ]; testHaskellDepends = [ async base containers data-default deepseq extensible-effects - filepath hostname HUnit lens QuickCheck stm tasty tasty-discover - tasty-hunit text time + filepath hostname HUnit lens pretty-types QuickCheck stm tasty + tasty-discover tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; @@ -78966,8 +79091,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.2.0"; - sha256 = "0297bppk69gn4sv5m5w1wh4wbshiz9w3b81sr9ps309k7bb6va9j"; + version = "0.2.1"; + sha256 = "11dsj2b1dyg6hdjhj3l7q04w896mrc32zkn1zkj2l032zlbwi44n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath random @@ -79459,15 +79584,17 @@ self: { }) {inherit (pkgs) openssl;}; "fastsum" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, template-haskell }: + ({ mkDerivation, base, deepseq, ghc-prim, hashable + , template-haskell + }: mkDerivation { pname = "fastsum"; - version = "0.1.0.0"; - sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57"; + version = "0.1.1.0"; + sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim hashable template-haskell + base deepseq ghc-prim hashable template-haskell ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = stdenv.lib.licenses.bsd3; @@ -82560,6 +82687,8 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flip-cmd" = callPackage @@ -86530,15 +86659,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_3_1_0" = callPackage + "fused-effects_0_4_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.3.1.0"; - sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv"; + version = "0.4.0.0"; + sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8"; libraryHaskellDepends = [ base deepseq MonadRandom random transformers unliftio-core ]; @@ -86552,12 +86681,16 @@ self: { }) {}; "fused-effects-exceptions" = callPackage - ({ mkDerivation, base, fused-effects, safe-exceptions }: + ({ mkDerivation, base, fused-effects, safe-exceptions + , unliftio-core + }: mkDerivation { pname = "fused-effects-exceptions"; - version = "0.1.0.0"; - sha256 = "0ga4cjlmrc577gps0mhy37n1np2ds0wcfnq3nbhvz3fy3m5fzylz"; - libraryHaskellDepends = [ base fused-effects safe-exceptions ]; + version = "0.1.1.0"; + sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd"; + libraryHaskellDepends = [ + base fused-effects safe-exceptions unliftio-core + ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88238,21 +88371,19 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.2.1"; - sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "6"; - editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw"; + version = "0.1.3"; + sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop-lens_0_1_3" = callPackage + "generics-sop-lens_0_2" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.3"; - sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; + version = "0.2"; + sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -88774,27 +88905,6 @@ self: { }) {}; "genvalidity-hspec-hashable" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec - , genvalidity-property, hashable, hspec, hspec-core, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-hashable"; - version = "0.2.0.3"; - sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; - libraryHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec QuickCheck validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec genvalidity-property - hashable hspec hspec-core QuickCheck validity - ]; - description = "Standard spec's for Hashable instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-hashable_0_2_0_4" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity @@ -88813,7 +88923,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -89707,8 +89816,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0.2"; - sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy"; + version = "0.9.0"; + sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89955,8 +90064,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190423"; - sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx"; + version = "0.20190516"; + sha256 = "0jk0k870iznichiw7f99snv2syyqhaqh3faglc32fkhghmawv9y5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89980,8 +90089,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190423"; - sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k"; + version = "0.20190516"; + sha256 = "0blwr9gii81rh689skmzxqfhiya412hic9rvkqafwwrilppn8043"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -91973,15 +92082,15 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , data-default, filepath, http-types, mtl, parsec, process - , regex-tdfa, safe, scientific, tasty, tasty-hunit + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers , utf8-string, vector, yaml }: mkDerivation { pname = "ginger"; - version = "0.8.4.0"; - sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7"; + version = "0.8.4.1"; + sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91991,8 +92100,8 @@ self: { unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson base bytestring data-default process text transformers - unordered-containers yaml + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml ]; testHaskellDepends = [ aeson base bytestring data-default mtl tasty tasty-hunit @@ -92001,6 +92110,8 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gingersnap" = callPackage @@ -92233,13 +92344,12 @@ self: { bup curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - installPhase = "make PREFIX=$out BUILDER=: install"; - checkPhase = '' + postBuild = '' ln -sf dist/build/git-annex/git-annex git-annex ln -sf git-annex git-annex-shell - export PATH+=":$PWD" - git-annex test ''; + installPhase = "make PREFIX=$out BUILDER=: install install-completions"; + checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; @@ -93632,13 +93742,14 @@ self: { , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , regex-tdfa, semigroupoids, split, stm, template-haskell, text - , time, transformers, unix, unordered-containers, vector, vty + , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.30"; - sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; + version = "2.31"; + sha256 = "1div9xkls0jgsi3h0pm7y9rdlyr5rnc07ld3ka285g0hkg5yyban"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -93646,8 +93757,9 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues regex-tdfa semigroupoids split stm template-haskell text - time transformers unix unordered-containers vector vty + psqueues regex-tdfa regex-tdfa-text semigroupoids split stm + template-haskell text time transformers unix unordered-containers + vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -101206,8 +101318,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "5"; - editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi"; + revision = "6"; + editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -102430,8 +102542,8 @@ self: { }: mkDerivation { pname = "hakyll-dhall"; - version = "0.2.2.2"; - sha256 = "0w2vhma28904mg7bymk0qd3gzwirbjkjkw862jxg2zzcnsg8m04i"; + version = "0.2.3.0"; + sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102625,6 +102737,8 @@ self: { pname = "hakyll-shortcut-links"; version = "0.0.0.0"; sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; + revision = "1"; + editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p"; libraryHaskellDepends = [ base hakyll megaparsec mtl pandoc-types shortcut-links text ]; @@ -104080,25 +104194,6 @@ self: { }) {}; "happy" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; - version = "1.19.9"; - sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; - revision = "3"; - editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_10" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, mtl, process }: @@ -104113,7 +104208,6 @@ self: { testHaskellDepends = [ base process ]; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -104982,6 +105076,8 @@ self: { pname = "hashtables"; version = "1.2.3.1"; sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg"; + revision = "1"; + editedCabalFile = "1yyqnqn85mlw03f2bpvwa1w9gigswk9n30i918myqyxwr595l7rr"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -105651,18 +105747,19 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, monad-loops, process, text, unordered-containers + , haddock-api, haddock-library, monad-loops, process, text + , unordered-containers }: mkDerivation { pname = "haskell-docs"; - version = "4.2.8"; - sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz"; + version = "4.2.9"; + sha256 = "10pgziq2f9wx92afmwh1m4bwxcyygpf4xg99vghm6r4ilh1fbkg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api monad-loops process - text unordered-containers + directory filepath ghc ghc-paths haddock-api haddock-library + monad-loops process text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; @@ -107870,6 +107967,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskey-btree_0_3_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-ordlist + , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "haskey-btree"; + version = "0.3.0.1"; + sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m"; + libraryHaskellDepends = [ + base binary bytestring containers hashable mtl semigroups text + transformers vector + ]; + testHaskellDepends = [ + base binary bytestring containers data-ordlist HUnit mtl QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers vector + ]; + description = "B+-tree implementation in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskey-mtl" = callPackage ({ mkDerivation, base, binary, exceptions, haskey, haskey-btree , lens, monad-control, mtl, text, transformers, transformers-base @@ -108191,8 +108312,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.7"; - sha256 = "0dn0d71jdpa4dmrwmpqipkdbl2cb8w8i2p18fly3b1xhpqra20il"; + version = "0.15.2"; + sha256 = "078w4a3xymp79dk17rprspm4c2m3p7qbcdqzmcgxjzz7kzsr5mmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111229,8 +111350,8 @@ self: { pname = "hedgehog"; version = "0.6.1"; sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "4"; - editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx"; + revision = "5"; + editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -111245,6 +111366,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions, fail + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0"; + sha256 = "1np9xg58x20kalfci9dxbd4wsg0sl3ka56ragzy3i9p0nx29pmns"; + revision = "1"; + editedCabalFile = "1b2hvd3z5mnwfdp5xwdwrh2f1l0wshnnz6ggak2dqqm57wyifdql"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions fail lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -111307,10 +111456,8 @@ self: { ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { pname = "hedgehog-fn"; - version = "0.6"; - sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv"; - revision = "1"; - editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1"; + version = "1.0"; + sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111318,6 +111465,8 @@ self: { ]; description = "Function generation for `hedgehog`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -111363,8 +111512,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1"; sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "3"; - editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3"; + revision = "5"; + editedCabalFile = "0x3vsw9pvdgbi0a2fc0kbk9x3dbfq963bb8lkpj8cy2in29qv77f"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; @@ -111396,7 +111545,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_4" = callPackage + "hedis_0_12_5" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -111404,8 +111553,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.4"; - sha256 = "1d1r0ghf1fpiiarpywx7j48bhc86q86lass3b837dcyfni8z2sxw"; + version = "0.12.5"; + sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -111533,6 +111682,8 @@ self: { pname = "hedn"; version = "0.2.0.1"; sha256 = "16yi4x6g27zabgqwd4xckp5zibxq882919mmyyr95g56r7pm8v1j"; + revision = "1"; + editedCabalFile = "1wr3zv0bj1714y1ip40va34zysmypicd6qp0l50bg9wj2db0misz"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -113535,6 +113686,8 @@ self: { ]; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hi" = callPackage @@ -113864,8 +114017,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.1.0"; - sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542"; + version = "0.1.1.1"; + sha256 = "03jza44q99qfc46kb1r66qjirgklp7h8l2c28k4cmkzd2r23bd7a"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; testHaskellDepends = [ base doctest hspec lens QuickCheck ]; description = "Partial types as a type constructor"; @@ -114899,6 +115052,8 @@ self: { pname = "hit-on"; version = "0.0.0"; sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r"; + revision = "1"; + editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115080,21 +115235,25 @@ self: { }) {}; "hjugement-protocol" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite, hashable - , memory, mmorph, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unordered-containers + ({ mkDerivation, base, bytestring, containers, criterion + , cryptonite, deepseq, memory, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190501"; - sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894"; + version = "0.0.0.20190513"; + sha256 = "0m51216rxy0lm8q6v0hc1fa1qkxmxlnrd47plm3jjcxl5pg2li25"; libraryHaskellDepends = [ - base bytestring containers cryptonite memory mmorph random text + base bytestring containers cryptonite deepseq memory random text transformers unordered-containers ]; testHaskellDepends = [ - base containers hashable QuickCheck random tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers + base containers QuickCheck random tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion QuickCheck random text transformers ]; description = "A cryptographic protocol for the Majority Judgment"; license = stdenv.lib.licenses.gpl3; @@ -115329,8 +115488,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.12.0.0"; - sha256 = "0d57q99p1ph70mmwanlyps7vfj6iph9wmx0nza2jlg6falr7wrbj"; + version = "0.12.2.1"; + sha256 = "1vx74i1cqjmrrjq0mrdxmar6v221lir1zzkl8bn7iza4czkdarg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115624,22 +115783,22 @@ self: { "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml + , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour + , process, refact, text, transformers, uniplate + , unordered-containers, vector, yaml }: mkDerivation { pname = "hlint"; - version = "2.1.17"; - sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3"; + version = "2.1.20"; + sha256 = "01dgz9lqkx6j06r9vclicjaiylk05pzcglnqmrvyy3yk9h93lhs1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml + data-default directory extra filepath ghc-lib-parser + haskell-src-exts haskell-src-exts-util hscolour process refact text + transformers uniplate unordered-containers vector yaml ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; @@ -116722,6 +116881,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.6"; + sha256 = "1m1www5i2wp49vb03zm0d0gaq0dlgdjafwjgp2zcc16gajpabami"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -117556,28 +117735,30 @@ self: { }) {}; "hoogle" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit - , conduit-extra, connection, containers, deepseq, directory, extra - , filepath, foundation, hashable, haskell-src-exts, http-conduit - , http-types, js-flot, js-jquery, mmap, network-uri, old-locale - , process-extras, QuickCheck, resourcet, storable-tuple, tar - , template-haskell, text, time, transformers, uniplate, utf8-string - , vector, wai, wai-logger, warp, warp-tls, zlib + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, cmdargs, conduit, conduit-extra, connection + , containers, deepseq, directory, extra, filepath, foundation + , hashable, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network-uri, old-locale, process-extras + , QuickCheck, resourcet, storable-tuple, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.17.7"; - sha256 = "1nk255n7lwar9l70pz3z48c4fsp3a07gqhpci37iya1mw6kdnbbp"; + version = "5.0.17.8"; + sha256 = "0cdxxrq3c5jpkb469y7s571q8lbw7a2adq535cx0nsjldwxvjvlb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cmdargs conduit conduit-extra - connection containers deepseq directory extra filepath foundation - hashable haskell-src-exts http-conduit http-types js-flot js-jquery - mmap network-uri old-locale process-extras QuickCheck resourcet - storable-tuple tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib + aeson base binary blaze-html blaze-markup bytestring cmdargs + conduit conduit-extra connection containers deepseq directory extra + filepath foundation hashable haskell-src-exts http-conduit + http-types js-flot js-jquery mmap network-uri old-locale + process-extras QuickCheck resourcet storable-tuple tar + template-haskell text time transformers uniplate utf8-string vector + wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; @@ -117625,10 +117806,10 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.2.2"; - sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "4"; - editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; + version = "0.2.3"; + sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj"; + revision = "1"; + editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -121472,8 +121653,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.8"; - sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j"; + version = "0.10.0"; + sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121484,7 +121665,8 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; - description = "A command line program for extending the import list of a Haskell source file"; + doHaddock = false; + description = "Extend the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -121696,29 +121878,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; - version = "1.0.3"; - sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions fail mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances , tasty, tasty-hunit, tasty-quickcheck, text @@ -121739,7 +121898,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -121751,6 +121909,8 @@ self: { pname = "hslua-aeson"; version = "1.0.0"; sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; + revision = "1"; + editedCabalFile = "1ysgh5s99zv0khkwqw1kcli2r2vi77r7wz3yc0y0i7qr35shzklh"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -124864,22 +125024,6 @@ self: { }) {}; "http-directory" = callPackage - ({ mkDerivation, base, bytestring, html-conduit, http-client - , http-date, http-types, text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; - version = "0.1.1"; - sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-date http-types text - time xml-conduit - ]; - description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-directory_0_1_2" = callPackage ({ mkDerivation, base, bytestring, html-conduit, http-client , http-client-tls, http-date, http-types, text, time, xml-conduit }: @@ -124893,7 +125037,6 @@ self: { ]; description = "http directory listing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-dispatch" = callPackage @@ -126474,17 +126617,6 @@ self: { }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.5"; - sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw"; - libraryHaskellDepends = [ base ]; - description = "Diagnostics library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-diagnostics_0_0_0_7" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; @@ -126493,7 +126625,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-dsv" = callPackage @@ -126507,6 +126638,8 @@ self: { pname = "hw-dsv"; version = "0.3.5"; sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2"; + revision = "1"; + editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126607,19 +126740,18 @@ self: { }) {}; "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit - , hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog }: mkDerivation { pname = "hw-fingertree"; - version = "0.1.0.1"; - sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + version = "0.1.0.3"; + sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 + base deepseq hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -126648,6 +126780,8 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.3"; sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2"; + revision = "1"; + editedCabalFile = "1wvjv13pznqxzhix7ikjx2gpqc3ppn7z20yl7l6z80yslalh7pm2"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; @@ -126676,6 +126810,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.7"; sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv"; + revision = "1"; + editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -127021,6 +127157,8 @@ self: { pname = "hw-prim"; version = "0.6.2.23"; sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy"; + revision = "1"; + editedCabalFile = "0pwgw9fqrfmfk3fjcdc9xss1vc6fl53pdnp8xcawia4mskd38sv7"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -127916,6 +128054,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.2"; sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; + revision = "1"; + editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -131912,8 +132052,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.39"; - sha256 = "0qfns2rwgkmd1i28p5pgvcp0yza8lrpi9xlq3zpl7jqrawbxbp3v"; + version = "0.1.40"; + sha256 = "09p5bjjqagbz1xkcfd5psmgxbg3z057kyv39j0i63g4q484zznz3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -133151,6 +133291,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_1_1_0_6" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-chans + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.1.0.6"; + sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-chans text time tls transformers x509 + x509-store x509-validation + ]; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -133180,14 +133341,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_3_0_2" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.3.0.2"; + sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + description = "Streaming IRC message library using conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "2.6.0"; - sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; + version = "2.7.0"; + sha256 = "1bsj4b8xwavc2z0amd2lmh4qn4gmxfmsicwdr1h3a2sqyx8qdv9m"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -133743,8 +133923,8 @@ self: { }: mkDerivation { pname = "itanium-abi"; - version = "0.1.1.0"; - sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8"; + version = "0.1.1.1"; + sha256 = "1dmr6sz4mf24781md81jjrwjsp431zyh7alkz71jlb224phc81nz"; libraryHaskellDepends = [ base boomerang text transformers unordered-containers ]; @@ -137178,36 +137358,6 @@ self: { }) {}; "kanji" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion - , deepseq, hashable, HUnit-approx, microlens, microlens-aeson - , optparse-applicative, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "kanji"; - version = "3.4.0"; - sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr"; - revision = "2"; - editedCabalFile = "1bcc3kh6kndmkqi3vaxp27mg1qb7xbg1h8pgjc1kk1iawnhl930j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers deepseq hashable text - ]; - executableHaskellDepends = [ - aeson aeson-pretty base containers microlens microlens-aeson - optparse-applicative text transformers - ]; - testHaskellDepends = [ - aeson base containers HUnit-approx tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ aeson base containers criterion text ]; - description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "kanji_3_4_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion , deepseq, hashable, HUnit-approx, microlens, microlens-aeson , optparse-applicative, tasty, tasty-hunit, text, transformers @@ -138859,26 +139009,27 @@ self: { "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive - , colonnade, containers, directory, Glob, here, http-client - , http-client-tls, http-types, hvega, logging-effect, lucid, mtl - , network, network-uri, pandoc, polysemy, prettyprinter, random - , random-fu, random-source, text, time + , colonnade, containers, diagrams-lib, diagrams-svg, directory + , Glob, here, http-client, http-client-tls, http-types, hvega + , logging-effect, lucid, mtl, network, network-uri, pandoc, plots + , polysemy, prettyprinter, random, random-fu, random-source + , svg-builder, text, time }: mkDerivation { pname = "knit-haskell"; - version = "0.2.0.0"; - sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv"; + version = "0.3.0.0"; + sha256 = "1mhxixiz07zlyhrdw68d2ajax40s01ikh27g56hlp1ilwnp8zqcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html - bytestring case-insensitive colonnade containers directory Glob - http-client http-client-tls http-types hvega logging-effect lucid - mtl network network-uri pandoc polysemy prettyprinter random - random-fu random-source text time + bytestring case-insensitive colonnade containers diagrams-lib + diagrams-svg directory Glob http-client http-client-tls http-types + hvega logging-effect lucid mtl network network-uri pandoc polysemy + prettyprinter random random-fu random-source svg-builder text time ]; executableHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl polysemy + base blaze-html colonnade containers here hvega mtl plots polysemy random-fu text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; @@ -140521,8 +140672,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.1.1"; - sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic"; + version = "0.1.2"; + sha256 = "0v0y50n2ks8jp91y37az6q46ax6dqx1igmlkb4b7c76qngak88xi"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -142182,6 +142333,25 @@ self: { broken = true; }) {}; + "lazyboy" = callPackage + ({ mkDerivation, aeson, base, hspec, microstache, text + , transformers + }: + mkDerivation { + pname = "lazyboy"; + version = "0.2.0.1"; + sha256 = "1f5r0dpwf4x3zp9ii03pqw1j9iy0cyrrl6a9pfnmximzw753dhkp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + testHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + description = "An EDSL for programming the Game Boy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazyio" = callPackage ({ mkDerivation, base, transformers, unsafe }: mkDerivation { @@ -142407,6 +142577,23 @@ self: { broken = true; }) {}; + "lean" = callPackage + ({ mkDerivation, base, base-unicode-symbols, text-utf8 + , transformers, util + }: + mkDerivation { + pname = "lean"; + version = "0.0.0.1"; + sha256 = "1i1xkaipjaczp32hn5g5g4x9a3ml98hamb4qaycy7rlcfbildiga"; + libraryHaskellDepends = [ + base base-unicode-symbols text-utf8 transformers util + ]; + description = "Bonds to Lean theorem prover"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "leancheck" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -143221,8 +143408,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.2.2.0"; - sha256 = "0xm3nvh5irw3nw4cn94xh8i6z63mgkiymgf99yh582rbf047dfms"; + version = "1.2.3.0"; + sha256 = "07q7s710mcsbf51cwx68ps616nlsddll5k4cq6sn81bdd2n72fbx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143576,8 +143763,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "1.0.5.0"; - sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r"; + version = "1.0.5.1"; + sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -144204,6 +144391,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "librdkafka" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "librdkafka"; + version = "0.0.0.0"; + sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "libretls" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls , monad-ste, primitive, transformers, vector @@ -144316,8 +144514,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.3"; - sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq"; + version = "1.4.4"; + sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -147395,8 +147593,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.1"; - sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; + version = "0.10.1.0"; + sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -147416,10 +147614,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.0.2"; - sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; - revision = "1"; - editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; + version = "0.7.1.0"; + sha256 = "01xkkmdxlxn66a884ymzpxqqf0x8h2inagzvigg3d3iyn9sgrrh1"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -147617,6 +147813,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.4"; + sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -148201,6 +148421,23 @@ self: { broken = true; }) {}; + "looper" = callPackage + ({ mkDerivation, aeson, base, hspec, optparse-applicative, text + , time, unliftio + }: + mkDerivation { + pname = "looper"; + version = "0.0.0.2"; + sha256 = "0w4aancb0lbfgmk2drnbc1w6bxlbdkhg0zy1qj7xp3kvgc76vqli"; + libraryHaskellDepends = [ + aeson base optparse-applicative text time unliftio + ]; + testHaskellDepends = [ + aeson base hspec optparse-applicative text time unliftio + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "loops" = callPackage ({ mkDerivation, base, criterion, primitive, tasty , tasty-quickcheck, transformers, vector @@ -148620,6 +148857,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -150780,8 +151019,8 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.0"; - sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc"; + version = "0.1.0.1"; + sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151057,6 +151296,23 @@ self: { license = "GPL"; }) {}; + "markov-chain-usage-model" = callPackage + ({ mkDerivation, base, doctest, matrix, tasty, tasty-discover + , tasty-hunit, vector + }: + mkDerivation { + pname = "markov-chain-usage-model"; + version = "0.0.0"; + sha256 = "14r73bvh6w7qz7rqb97ky2iyf2z2j7y14iy4fcr8mjyxag3mk3jc"; + libraryHaskellDepends = [ base matrix vector ]; + testHaskellDepends = [ + base doctest matrix tasty tasty-discover tasty-hunit vector + ]; + testToolDepends = [ tasty-discover ]; + description = "Computations for Markov chain usage models"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "markov-processes" = callPackage ({ mkDerivation, assertions, base, bifunctors, memoize, MonadRandom , random @@ -153869,29 +154125,6 @@ self: { }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , hashable, microlens, scientific, tasty, tasty-hunit, text - , unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.3.0.1"; - sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs"; - revision = "1"; - editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable microlens - scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hashable microlens tasty tasty-hunit - text unordered-containers vector - ]; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - }) {}; - - "microlens-aeson_2_3_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , hashable, microlens, scientific, tasty, tasty-hunit, text , unordered-containers, vector @@ -153910,7 +154143,6 @@ self: { ]; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -154781,36 +155013,36 @@ self: { broken = true; }) {}; - "minio-hs_1_3_0" = callPackage + "minio-hs_1_3_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, digest, directory, exceptions, filepath - , http-client, http-conduit, http-types, ini, memory, protolude - , QuickCheck, raw-strings-qq, resourcet, retry, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , xml-conduit + , case-insensitive, conduit, conduit-extra, connection, containers + , cryptonite, cryptonite-conduit, digest, directory, exceptions + , filepath, http-client, http-client-tls, http-conduit, http-types + , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet + , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , unordered-containers, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "1.3.0"; - sha256 = "1caia9dyxirxl7qy7ijhk1s4hp56m0f901ik34nbf5aizhl0qx94"; + version = "1.3.1"; + sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude raw-strings-qq resourcet retry text - time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + raw-strings-qq resourcet retry text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; testHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude QuickCheck raw-strings-qq resourcet - retry tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary - text time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit + tasty-quickcheck tasty-smallcheck temporary text time transformers + unliftio unliftio-core unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = stdenv.lib.licenses.asl20; @@ -158805,6 +159037,26 @@ self: { broken = true; }) {}; + "ms-tds" = callPackage + ({ mkDerivation, array, base, binary, bytestring + , data-default-class, mtl, network, text, time, tls, uuid-types + , x509-store, x509-system + }: + mkDerivation { + pname = "ms-tds"; + version = "0.1.0.0"; + sha256 = "05g5y0c105p1dqcd8mybqnrky495nb0320yrjgk7dr7lhfwsyb6s"; + libraryHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + testHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty @@ -158925,6 +159177,23 @@ self: { broken = true; }) {}; + "mssql-simple" = callPackage + ({ mkDerivation, base, binary, bytestring, ms-tds, network + , network-bsd, text, time, tls + }: + mkDerivation { + pname = "mssql-simple"; + version = "0.1.0.1"; + sha256 = "0vprjbr7w4273p15d74xjl0axxn0xsbxa3j2vbjx30jmizz8imqq"; + libraryHaskellDepends = [ + base binary bytestring ms-tds network network-bsd text time tls + ]; + testHaskellDepends = [ + base binary bytestring ms-tds network network-bsd text time tls + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mstate" = callPackage ({ mkDerivation, base, fail, monad-peel, mtl, stm }: mkDerivation { @@ -163378,6 +163647,8 @@ self: { pname = "network-info"; version = "0.2.0.10"; sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; + revision = "1"; + editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d"; libraryHaskellDepends = [ base ]; description = "Access the local computer's basic network configuration"; license = stdenv.lib.licenses.bsd3; @@ -163797,6 +164068,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport_0_5_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , transformers + }: + mkDerivation { + pname = "network-transport"; + version = "0.5.4"; + sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable transformers + ]; + description = "Network abstraction layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-amqp" = callPackage ({ mkDerivation, amqp, async, base, bytestring, cereal, containers , exceptions, lens-family, lens-family-th, network-transport @@ -164283,19 +164570,6 @@ self: { }) {}; "newtype" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "newtype"; - version = "0.2"; - sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; - revision = "1"; - editedCabalFile = "0rbhpa1krcmvv4hsy3h5h8l4vqjk9wckddcz34rfcq0m7zlmsrfz"; - libraryHaskellDepends = [ base ]; - description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype_0_2_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "newtype"; @@ -164304,7 +164578,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-deriving" = callPackage @@ -165422,6 +165695,29 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "nonempty-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, comonad, containers, data-or, deepseq + , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.2.0.0"; + sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw"; + libraryHaskellDepends = [ + base comonad containers data-or deepseq semigroupoids + ]; + testHaskellDepends = [ + base comonad containers data-or hedgehog hedgehog-fn semigroupoids + tasty tasty-hedgehog text + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nonemptymap" = callPackage @@ -165817,6 +166113,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nsis_0_3_3" = callPackage + ({ mkDerivation, base, directory, process, transformers, uniplate + }: + mkDerivation { + pname = "nsis"; + version = "0.3.3"; + sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx"; + libraryHaskellDepends = [ base transformers uniplate ]; + testHaskellDepends = [ + base directory process transformers uniplate + ]; + description = "DSL for producing Windows Installer using NSIS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nth-prime" = callPackage ({ mkDerivation, base, opentheory-prime, opentheory-primitive }: mkDerivation { @@ -169008,6 +169320,8 @@ self: { pname = "optional-args"; version = "1.0.2"; sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f"; + revision = "1"; + editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; @@ -170829,7 +171143,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_1_0" = callPackage + "pandoc-pyplot_2_1_1_1" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations , open-browser, pandoc, pandoc-types, tasty, tasty-hspec @@ -170838,8 +171152,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.1.0"; - sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx"; + version = "2.1.1.1"; + sha256 = "0m066z26z0w3jq96f4i8r45r1iwzy2wp8hzjq179z6jip4pjfh2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172170,17 +172484,6 @@ self: { }) {}; "parser-combinators" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "parser-combinators"; - version = "1.0.2"; - sha256 = "1wb6xbx3p9fyisza9d7svnby4makv2bkp0yh7lfi2bg3kybg41ry"; - libraryHaskellDepends = [ base ]; - description = "Lightweight package providing commonly useful parser combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parser-combinators_1_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; @@ -172189,7 +172492,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parser-combinators-tests" = callPackage @@ -172465,12 +172767,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "partial-semigroup_0_5_1_1" = callPackage + ({ mkDerivation, base, doctest, hedgehog }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.5.1.1"; + sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hedgehog ]; + description = "A partial binary associative operator"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "partial-semigroup-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.0"; - sha256 = "1qd9bg9qv0n80asfkrycvqwv92cdyy590871ypgkl82kx8x7qgbf"; + version = "0.6.0.1"; + sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = stdenv.lib.licenses.asl20; @@ -175148,38 +175463,23 @@ self: { }) {}; "persistent-test" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base - , base64-bytestring, blaze-builder, blaze-html, blaze-markup - , bytestring, cereal, conduit, containers, exceptions, fast-logger - , hashable, hspec, hspec-expectations, http-api-data, HUnit - , lifted-base, monad-logger, mtl, network, old-locale, path-pieces - , persistent, persistent-sqlite, persistent-template, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , scientific, semigroups, silently, system-fileio, system-filepath - , tagged, template-haskell, text, time, transformers - , transformers-base, unliftio, unliftio-core, unordered-containers - , vector + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.0.0.3"; - sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3"; - isLibrary = true; - isExecutable = true; + version = "2.0.3.0"; + sha256 = "1bspcv64qhcqiam964kxfxlc9afbns41dffh00k36dl2akr7p99a"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base64-bytestring blaze-builder - blaze-html blaze-markup bytestring cereal conduit containers - exceptions fast-logger hashable hspec hspec-expectations - http-api-data HUnit lifted-base monad-logger mtl network old-locale - path-pieces persistent persistent-sqlite persistent-template - QuickCheck quickcheck-instances random resource-pool resourcet - scientific semigroups silently tagged template-haskell text time - transformers transformers-base unliftio unliftio-core - unordered-containers vector - ]; - executableHaskellDepends = [ - base hspec persistent resourcet scientific system-fileio - system-filepath + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; @@ -175569,6 +175869,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pgp-wordlist_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "pgp-wordlist"; + version = "0.1.0.3"; + sha256 = "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg"; + libraryHaskellDepends = [ base bytestring containers text vector ]; + testHaskellDepends = [ + base bytestring deepseq doctest HUnit tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Translate between binary data and a human-readable collection of words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pgsql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, binary , blaze-builder, blaze-textual, bytestring, containers @@ -178351,10 +178669,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.0.2"; - sha256 = "0kdn2s686rfanqq4qfkbjfys53zzf2hgc2jx3m9zpfzjb3wabhg5"; - revision = "1"; - editedCabalFile = "1n3qzplpis1h90kw4x8fi4d8qhqy1xxxflv1d38516ikffwvai9x"; + version = "0.1.1.0"; + sha256 = "0hhmxwz18d2wdj2xnf9mn51ibym5dxc1gmji87cdccdf6a4wcxpa"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -178722,8 +179038,8 @@ self: { pname = "pointful"; version = "1.0.11.0"; sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; - revision = "1"; - editedCabalFile = "1a7fc03c586w011amjq770ifvf7ajbp9x3xp2w2yz1da9rkga2qv"; + revision = "2"; + editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181757,19 +182073,6 @@ self: { }) {}; "pretty-sop" = callPackage - ({ mkDerivation, base, generics-sop, pretty-show }: - mkDerivation { - pname = "pretty-sop"; - version = "0.2.0.2"; - sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; - revision = "2"; - editedCabalFile = "04hzf2ajlnh3ynk72xr5s396v8y0d8fkr4pf11nqss7yf60dkxwi"; - libraryHaskellDepends = [ base generics-sop pretty-show ]; - description = "A generic pretty-printer using generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-sop_0_2_0_3" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { pname = "pretty-sop"; @@ -181780,7 +182083,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-terminal" = callPackage @@ -182127,6 +182429,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_7_0_0" = callPackage + ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.0.0"; + sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck semigroups tagged tasty + tasty-quickcheck transformers transformers-compat + ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "primitive-addr" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-addr"; + version = "0.1.0.0"; + sha256 = "0nm6l9gy57l1hli7zjlh2mfdzhwi602dnicxis1d8ylqqyv633gw"; + libraryHaskellDepends = [ base primitive ]; + description = "Addresses to unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-atomic" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -182231,6 +182563,17 @@ self: { broken = true; }) {}; + "primitive-offset" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-offset"; + version = "0.1.0.0"; + sha256 = "0la56iw09x83ci5v82z8hpb0zdzdwi6awy5czszd78kj3n8ni3ax"; + libraryHaskellDepends = [ base primitive ]; + description = "Types for offsets into unboxed arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -182266,6 +182609,31 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "primitive-stablename" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-stablename"; + version = "0.1"; + sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j"; + libraryHaskellDepends = [ base primitive ]; + description = "primitive operations on StableNames"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-unlifted" = callPackage + ({ mkDerivation, base, primitive, stm }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.0.0"; + sha256 = "014vkxfc2jas5qcsnlkxyczwsibm70vpb7zfzc5mhmfy60pib0vy"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = stdenv.lib.licenses.bsd3; }) {}; "primula-board" = callPackage @@ -186814,21 +187182,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_20" = callPackage + "quickcheck-instances_0_3_21" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, splitmix, tagged, text, time, transformers - , transformers-compat, unordered-containers, uuid-types, vector + , scientific, splitmix, tagged, text, time, time-compat + , transformers, transformers-compat, unordered-containers + , uuid-types, vector }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.20"; - sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + version = "0.3.21"; + sha256 = "0kk9i5lck40jbx1sxcvaq66hywgnfslcx2cgy7lacq4cnjmyzrh1"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time - transformers transformers-compat unordered-containers uuid-types - vector + time-compat transformers transformers-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ base containers QuickCheck tagged uuid-types @@ -190450,24 +190819,6 @@ self: { }) {}; "records-sop" = callPackage - ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec - , should-not-typecheck - }: - mkDerivation { - pname = "records-sop"; - version = "0.1.0.2"; - sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; - revision = "1"; - editedCabalFile = "082f4dmdvbnv6jq28mrva8clxif366vcbn9m8d1bb8lcf9h3qxjb"; - libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; - testHaskellDepends = [ - base deepseq generics-sop hspec should-not-typecheck - ]; - description = "Record subtyping and record utilities with generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "records-sop_0_1_0_3" = callPackage ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec , should-not-typecheck }: @@ -190481,7 +190832,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -191909,21 +192259,6 @@ self: { }) {}; "regex-tdfa" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl - , parsec, regex-base - }: - mkDerivation { - pname = "regex-tdfa"; - version = "1.2.3.1"; - sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim mtl parsec regex-base - ]; - description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "regex-tdfa_1_2_3_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl , parsec, regex-base }: @@ -191936,7 +192271,6 @@ self: { ]; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-tdfa-pipes" = callPackage @@ -192283,35 +192617,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.3.6"; - sha256 = "19wch1vd41r3hvgr9a1yjvbiz7fmib1qlhviqivsdd5apncgn2jk"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize MonadRandom mtl multimap protolude - random resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_4_2" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph , MonadRandom, mtl, multimap, protolude, random, resourcet @@ -192320,8 +192625,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.4.2"; - sha256 = "0jfwxpf4w4laj0allbalkb0haircf0w33j0h2c2b5dzrhmmsg2gp"; + version = "0.1.4.0"; + sha256 = "0iqx0pa5dzf4nbjjdjignn7baf9vckppsz81c4a1m1zrlv1ipyig"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -192340,6 +192645,62 @@ self: { broken = true; }) {}; + "registry_0_1_5_1" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.5.1"; + sha256 = "1yvfrxhldbw6y8rawx5dddqrbgn8z8fsg5n745bx8wrag63s0vna"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "registry-hedgehog" = callPackage + ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph + , multimap, protolude, registry, tasty, tasty-discover + , tasty-hedgehog, tasty-th, template-haskell, text, transformers + , universum, unordered-containers + }: + mkDerivation { + pname = "registry-hedgehog"; + version = "0.2.0.0"; + sha256 = "19wjy4dmv3cycql0aharg6qxd7bkb87qkr206apfi0km58mb01d8"; + libraryHaskellDepends = [ + base containers hedgehog mmorph multimap protolude registry tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers universum unordered-containers + ]; + testHaskellDepends = [ + base containers generic-lens hedgehog mmorph multimap protolude + registry tasty tasty-discover tasty-hedgehog tasty-th + template-haskell text transformers universum unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "utilities to work with Hedgehog generators and `registry`"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -192545,10 +192906,12 @@ self: { }: mkDerivation { pname = "relation"; - version = "0.4"; - sha256 = "1jy5m0jih6ik05zagngrskk1ibiiblxsydxgdq6kjx1aa2pqnmqi"; + version = "0.5"; + sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testHaskellDepends = [ + base containers hedgehog hspec hw-hspec-hedgehog + ]; testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; @@ -192597,6 +192960,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_2_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.2.1"; + sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -192621,6 +193007,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query-HDBC_0_7_2_0" = callPackage + ({ mkDerivation, base, containers, convertible, dlist, HDBC + , HDBC-session, names-th, persistable-record, product-isomorphic + , QuickCheck, quickcheck-simple, relational-query + , relational-schemas, sql-words, template-haskell, th-data-compat + , transformers + }: + mkDerivation { + pname = "relational-query-HDBC"; + version = "0.7.2.0"; + sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3"; + libraryHaskellDepends = [ + base containers convertible dlist HDBC HDBC-session names-th + persistable-record product-isomorphic relational-query + relational-schemas sql-words template-haskell th-data-compat + transformers + ]; + testHaskellDepends = [ + base convertible HDBC QuickCheck quickcheck-simple + ]; + description = "HDBC instance of relational-query and typed query interface for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query @@ -192640,13 +193051,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.1"; - sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; + version = "0.6.0.0"; + sha256 = "1f37pzz60zrg5z09vf6sdp9in5f78kyvxag6gbyanapi7iki14k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192654,8 +193065,13 @@ self: { relational-query relational-query-HDBC relational-schemas template-haskell ]; + executableHaskellDepends = [ + base product-isomorphic relational-query template-haskell time + ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-schemas" = callPackage @@ -192673,6 +193089,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.7.0"; + sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -193807,6 +194239,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rerebase_1_3_1_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.3.1.1"; + sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -200888,19 +201332,17 @@ self: { }) {}; "selective" = callPackage - ({ mkDerivation, base, checkers, containers, mtl, QuickCheck, tasty + ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: mkDerivation { pname = "selective"; - version = "0.1.0"; - sha256 = "1f30y2q5xph8jp2pfwkqdy59byad3q70kfp9jgcy2039i268fjfv"; - revision = "1"; - editedCabalFile = "1p6r23ahxpsq6rkb925ryd0cn09876z435q61wfz4r2rnb3s2wb2"; - libraryHaskellDepends = [ base containers mtl transformers ]; + version = "0.2"; + sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms"; + libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ - base checkers containers mtl QuickCheck tasty - tasty-expected-failure tasty-quickcheck + base containers mtl QuickCheck tasty tasty-expected-failure + tasty-quickcheck ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; @@ -201284,6 +201726,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semver_0_3_4" = callPackage + ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "semver"; + version = "0.3.4"; + sha256 = "0swffqyqraz2nxn64mwxp29zfdq7135q2j815yzwh2pk135xmns2"; + libraryHaskellDepends = [ attoparsec base deepseq hashable text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Representation, manipulation, and de/serialisation of Semantic Versions"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver-range" = callPackage ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck , text, unordered-containers @@ -205486,8 +205944,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.9"; - sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk"; + version = "0.18"; + sha256 = "1manjf4834dh556j8x7zxndw94vz1xlmilqdqlhd2q8hcfdxlc3q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206248,6 +206706,8 @@ self: { pname = "shellmet"; version = "0.0.1"; sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk"; + revision = "1"; + editedCabalFile = "0v6j5fgmbbqizqx800adnkij1b1b8f7zkjmyfqvcpgljgg6xada5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -207369,6 +207829,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-enumeration" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "simple-enumeration"; + version = "0.1"; + sha256 = "08zqs36v8vm3iqz9pnj6df0f8c15j9gl0883xxbr27nma9mwqygx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Finite or countably infinite sequences of values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-eval" = callPackage ({ mkDerivation, base, parsec, text, transformers }: mkDerivation { @@ -208162,6 +208634,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simplistic-generics" = callPackage + ({ mkDerivation, base, comonad, kind-apply }: + mkDerivation { + pname = "simplistic-generics"; + version = "0.1.0.0"; + sha256 = "11z02m4dr9p2y29xwhy6a3l2cz2np164c8cwp0a0b9vkhphw4y1j"; + libraryHaskellDepends = [ base comonad kind-apply ]; + description = "Generic programming without too many type classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -210136,8 +210619,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.4"; - sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4"; + version = "0.1.0.5"; + sha256 = "04zn5d8qz17gm1c77xmas059hvl4ach8sayh81q676fkadiwk3x7"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -211602,6 +212085,8 @@ self: { pname = "soap-tls"; version = "0.1.1.4"; sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; + revision = "1"; + editedCabalFile = "11djy824gaw3cbsvphq263hxjrn1b3v5p1kdivsvlyn7q9bgvms9"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -213691,6 +214176,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_3" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.3"; + sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -215864,17 +216362,16 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp , libuv, primitive, QuickCheck, quickcheck-instances, scientific - , stm, template-haskell, time, word8 + , stm, tagged, template-haskell, time, unordered-containers, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.1.0"; - sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; - revision = "1"; - editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; + version = "0.2.0.0"; + sha256 = "0j2ywcrzwx2q9fwa8slx7clzgrmfsnfz22ma08b77ii0yg0za271"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time word8 + integer-gmp primitive QuickCheck scientific stm tagged + template-haskell time unordered-containers ]; libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; @@ -216782,15 +217279,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_36_0" = callPackage + "stratosphere_0_37_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.36.0"; - sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k"; + version = "0.37.0"; + sha256 = "02m5cf4cxf32y3haqgx0nvwy64fmhbpmgk4g3i024mh1ab00k5fn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217020,27 +217517,6 @@ self: { }) {}; "streaming-attoparsec" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, streaming - , streaming-bytestring, tasty, tasty-hunit - }: - mkDerivation { - pname = "streaming-attoparsec"; - version = "1.0.0"; - sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z"; - revision = "2"; - editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx"; - libraryHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring - ]; - testHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring tasty - tasty-hunit - ]; - description = "Attoparsec integration for the streaming ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-attoparsec_1_0_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, streaming , streaming-bytestring, tasty, tasty-hunit }: @@ -217057,7 +217533,6 @@ self: { ]; description = "Attoparsec integration for the streaming ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-base64" = callPackage @@ -217238,8 +217713,8 @@ self: { }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.1.2"; - sha256 = "0ra4svn595qx08rfg3qz2n30y6dsv2xj2kdl4s61xbhi4cmff819"; + version = "0.3.1.3"; + sha256 = "07fk9kdfh2983qawl78sy0ibqa8ngwna2slz3ckbm1fgc8sybzip"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -219152,8 +219627,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "1"; - editedCabalFile = "0cw9vzvmmg13iyqh9g12c6yblv4ibxzcn61n4y7s59zmy4rqxg65"; + revision = "2"; + editedCabalFile = "0y3c59flsiz9w5a88ciy3jxzs1hvnlzyb3z5bz0199g0wrpwjxr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219617,8 +220092,8 @@ self: { pname = "sv"; version = "1.3.1"; sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; - revision = "1"; - editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn"; + revision = "2"; + editedCabalFile = "1c0q010bpzdmjlncjn58fvz50l5z2wqp4hjpj0isvdr5iq96pgza"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -219695,8 +220170,8 @@ self: { pname = "sv-core"; version = "0.4.1"; sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; - revision = "1"; - editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i"; + revision = "2"; + editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -221482,6 +221957,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "systemd_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "1.2.0"; + sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -222793,15 +223283,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_2_1" = callPackage + "tasty_1_2_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.2.1"; - sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia"; + version = "1.2.2"; + sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -222976,10 +223466,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "0.2.0.0"; - sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; - revision = "6"; - editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43"; + version = "1.0.0.0"; + sha256 = "1sdgadqw0y6cdaa46i4z2jah03654iikjr04i92h06cpw1aw2mqm"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -223057,6 +223545,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-hunit_0_10_0_2" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.0.2"; + sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -223187,19 +223687,25 @@ self: { }) {}; "tasty-lua" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, hslua - , tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text }: mkDerivation { pname = "tasty-lua"; - version = "0.1.0"; - sha256 = "199zhrd48ixyi32spnm85v0dj6i09sl3rwi42kaxdlxkkmc54i1z"; + version = "0.1.1"; + sha256 = "0a6b02aq9wzbdkz8mkq8ii5pp65ijbj0ayr4ay5ipqn3jzimmr71"; + revision = "1"; + editedCabalFile = "1di6lpqjkrq3mcmaix7ar136kfmc54m4jma7byz6vc41gha388yr"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; - testHaskellDepends = [ base directory hslua tasty tasty-hunit ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -223234,6 +223740,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_10_1" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.10.1"; + sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-quickcheck-laws" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { @@ -227260,26 +227783,6 @@ self: { }) {}; "th-utilities" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; - version = "0.2.1.0"; - sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-utilities_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hspec, primitive, syb, template-haskell, text, th-orphans, vector }: @@ -227297,7 +227800,6 @@ self: { ]; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thank-you-stars" = callPackage @@ -228378,6 +228880,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_2_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.2.2"; + sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -230093,7 +230613,7 @@ self: { broken = true; }) {}; - "tomland_1_0_0" = callPackage + "tomland_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -230103,10 +230623,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.0.0"; - sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; - revision = "1"; - editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; + version = "1.0.1.0"; + sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230298,8 +230816,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.6.0"; - sha256 = "1nwjf5qmvshgcg2zf0mqav5kz19rj0a4vd7w6x1zbalysj9v5nb7"; + version = "0.1.6.1"; + sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231156,6 +231674,8 @@ self: { pname = "transformers-bifunctors"; version = "0.1"; sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w"; + revision = "1"; + editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs"; libraryHaskellDepends = [ base mmorph transformers ]; description = "Bifunctors over monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -231668,33 +232188,6 @@ self: { }) {}; "tree-diff" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; - version = "0.0.2"; - sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; - revision = "2"; - editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_0_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, containers, generics-sop, hashable , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged @@ -231717,7 +232210,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -234330,6 +234822,8 @@ self: { pname = "typed-process"; version = "0.2.4.0"; sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; + revision = "1"; + editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -234601,6 +235095,8 @@ self: { pname = "typerep-map"; version = "0.3.2"; sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; + revision = "1"; + editedCabalFile = "1ka2ah7cg7hzd7yvnj6iasa57bszzif1b5r94sd8fk00l1qspjag"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; @@ -236538,6 +237034,8 @@ self: { pname = "unix-compat"; version = "0.5.1"; sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; + revision = "1"; + editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; @@ -238839,6 +239337,8 @@ self: { pname = "validation"; version = "1.1"; sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; + revision = "1"; + editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp"; libraryHaskellDepends = [ base bifunctors deepseq lens semigroupoids semigroups ]; @@ -239552,8 +240052,8 @@ self: { pname = "vector"; version = "0.12.0.3"; sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq"; - revision = "1"; - editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr"; + revision = "2"; + editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans HUnit primitive QuickCheck random @@ -239572,8 +240072,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.1"; sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; - revision = "1"; - editedCabalFile = "18jm5zjzbphyzgc1hjqay04c6j4h7bq2bs8rzngnxk2q8gv658vz"; + revision = "2"; + editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -240948,17 +241448,6 @@ self: { }) {}; "void" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "void"; - version = "0.7.2"; - sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk"; - libraryHaskellDepends = [ base ]; - description = "A Haskell 98 logically uninhabited data type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "void_0_7_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "void"; @@ -240967,7 +241456,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A Haskell 98 logically uninhabited data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vorbiscomment" = callPackage @@ -244008,6 +244496,41 @@ self: { broken = true; }) {}; + "web3_0_8_3_2" = callPackage + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, microlens, microlens-aeson + , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random + , relapse, split, stm, tagged, template-haskell, text, time + , transformers, uuid-types, vinyl + }: + mkDerivation { + pname = "web3"; + version = "0.8.3.2"; + sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; + libraryHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec relapse tagged template-haskell text transformers uuid-types + vinyl + ]; + testHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop hspec hspec-contrib hspec-discover + hspec-expectations http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec random relapse split stm tagged template-haskell text time + transformers uuid-types vinyl + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum API for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -244669,22 +245192,6 @@ self: { }) {}; "websockets-snap" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.10.3.0"; - sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_3_1" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets }: @@ -244698,7 +245205,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -251966,6 +252472,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yesod-markdown_0_12_6_2" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.2"; + sha256 = "0w9fmqk49b4c9g26dhrrmbwshrfcrnwcnsba97jyhb2m8bc4s1xj"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod @@ -254037,6 +254562,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zero_0_1_5" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "zero"; + version = "0.1.5"; + sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw"; + libraryHaskellDepends = [ base semigroups ]; + description = "Semigroups with absorption"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zerobin" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptonite, docopt, http-conduit, memory, raw-strings-qq From 2903cbf66b36aad41636dff287847454a07f8d22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 May 2019 17:20:34 +0000 Subject: [PATCH 68/95] haskell-tasty-hedgehog: current versions need hedgehog 1.x or later --- 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 ba1e461feab..548f9750d7e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1236,8 +1236,9 @@ self: super: { pandoc = doDistribute super.pandoc_2_7_2; pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - # https://github.com/qfpl/tasty-hedgehog/issues/24 - tasty-hedgehog = dontCheck super.tasty-hedgehog; + # Current versions of tasty-hedgehog need hedgehog 1.x, which + # we don't have in LTS-13.x. + tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; }; # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" From f9f3d6b210f0ca946ed202d3b7f89ec78988c130 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 May 2019 12:30:30 +0100 Subject: [PATCH 69/95] libsass: add patch for CVE-2018-19827 (PR #61673) vcunat switched to upstream commit that's reachable from master. --- pkgs/development/libraries/libsass/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 54108e1a007..ce43ed73432 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-19827.patch"; + url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; + sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; + }) + ]; + preConfigure = '' export LIBSASS_VERSION=${version} ''; From 7b09727d37fc96cf2fbacea1b9954cc119d4ec97 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 11 May 2019 17:03:59 +0200 Subject: [PATCH 70/95] cpcfs: init at 0.85.4 --- pkgs/tools/filesystems/cpcfs/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/filesystems/cpcfs/default.nix diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix new file mode 100644 index 00000000000..46635aa6741 --- /dev/null +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: + +stdenv.mkDerivation rec { + + pname = "cpcfs"; + version = "0.85.4"; + + src = fetchFromGitHub { + owner = "derikz"; + repo = "cpcfs"; + rev = "v${version}"; + sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-ltermcap' '-lncurses' \ + --replace '-L /usr/lib/termcap' ' ' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/man/man1 + cp cpcfs $out/bin + ronn --roff ../template.doc --pipe > $out/man/man1/cpcfs.1 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/derikz/cpcfs/" ; + license = licenses.bsd2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292f3596213..f0d8b3585fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2261,6 +2261,8 @@ in convoy = callPackage ../tools/filesystems/convoy { }; + cpcfs = callPackage ../tools/filesystems/cpcfs { }; + cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { }; From a8672602224e674248b828ab9b870c883587c14b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 14:26:48 -0500 Subject: [PATCH 71/95] whatstyle: init at 0.1.7 --- .../tools/misc/whatstyle/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/misc/whatstyle/default.nix diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix new file mode 100644 index 00000000000..0c6e4f568ff --- /dev/null +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python3, fetchFromGitHub, clang-unwrapped }: + +python3.pkgs.buildPythonApplication rec { + pname = "whatstyle"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "mikr"; + repo = pname; + rev = "v${version}"; + sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm"; + }; + + # Fix references to previous version, to avoid confusion: + postPatch = '' + substituteInPlace setup.py --replace 0.1.6 ${version} + substituteInPlace ${pname}.py --replace 0.1.6 ${version} + ''; + + checkInputs = [ clang-unwrapped /* clang-format */ ]; + + doCheck = false; # 3 or 4 failures depending on version, haven't investigated. + + meta = with stdenv.lib; { + description = "Find a code format style that fits given source files"; + homepage = https://github.com/mikr/whatstyle; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d9f4b8ae60..8d2e49510b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9694,6 +9694,10 @@ in vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + whatstyle = callPackage ../development/tools/misc/whatstyle { + inherit (llvmPackages) clang-unwrapped; + }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; From 13b97cffaef8174bf4183d806ff97c57f855c6fe Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 23 Feb 2019 16:56:49 +0100 Subject: [PATCH 72/95] gitAndTools.transcrypt: add hidden dependencies --- .../version-management/git-and-tools/transcrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 35e9c17438f..8218ad6ffa8 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { name = "transcrypt-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ git makeWrapper openssl ]; + buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" ''; meta = with stdenv.lib; { From de5a9dea8812f0d57c31aaaf2b938a85876bd321 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 23 Feb 2019 19:31:53 +0100 Subject: [PATCH 73/95] gitAndTools.transcrypt: query dependencies in helper scripts adds a tool to get the paths of the dependencies needed by the helper scripts (which are written only once and are never updated) to the output and patches them to use it expand their path --- .../git-and-tools/transcrypt/default.nix | 8 ++++ .../helper-scripts_depspathprefix.patch | 37 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 8218ad6ffa8..cea588f76ca 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; + patches = [ ./helper-scripts_depspathprefix.patch ]; + installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1 @@ -21,6 +23,12 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/transcrypt \ --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" + + cat > $out/bin/transcrypt-depspathprefix << EOF + #!${stdenv.shell} + echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + EOF + chmod +x $out/bin/transcrypt-depspathprefix ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch new file mode 100644 index 00000000000..925aadab3dd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch @@ -0,0 +1,37 @@ +diff --git a/transcrypt b/transcrypt +index a0b562d..7888f5d 100755 +--- a/transcrypt ++++ b/transcrypt +@@ -278,6 +278,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/clean" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -300,6 +301,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/smudge" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + tempfile=$(mktemp 2> /dev/null || mktemp -t tmp) + trap 'rm -f "$tempfile"' EXIT + cipher=$(git config --get --local transcrypt.cipher) +@@ -309,6 +311,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/textconv" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -351,7 +354,7 @@ save_configuration() { + git config merge.renormalize 'true' + + # add a git alias for listing encrypted files +- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" ++ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" + } + + # display the current configuration settings From 96e513df82579114bb95f899d7dae7b8eefb9219 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 18 May 2019 10:07:56 -0700 Subject: [PATCH 74/95] guile-lib: 0.2.2 -> 0.2.6.1 (#60978) * guile-lib: 0.2.2 -> 0.2.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guile-lib/versions * guile-cairo: disable tests --- pkgs/development/guile-modules/guile-cairo/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 4bd49b06796..592e6ad8999 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index c3aa8400791..cea464ad5d2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -4,23 +4,18 @@ assert stdenv ? cc && stdenv.cc.isGNU; let name = "guile-lib-${version}"; - version = "0.2.2"; + version = "0.2.6.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"; + sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile texinfo ]; - # One test doesn't seem to be compatible with guile_2_2. - patchPhase = '' - sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile* - ''; - doCheck = true; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d2e49510b3..9f0669b26ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8623,9 +8623,7 @@ in inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; - guile-lib = callPackage ../development/guile-modules/guile-lib { - guile = guile_2_0; - }; + guile-lib = callPackage ../development/guile-modules/guile-lib { }; guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; From 8857abb3b687be2bbf5381d7cb65b2d01426be16 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 18 May 2019 18:04:12 +0300 Subject: [PATCH 75/95] android-file-transfer: 3.7 -> 3.8 --- .../android-file-transfer/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 6441ae5dbd1..bd3c2428132 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "android-file-transfer-${version}"; - version = "3.7"; + pname = "android-file-transfer"; + version = "3.8"; + src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; }; - buildInputs = [ cmake fuse readline pkgconfig qtbase ]; - buildPhase = '' - cmake . - make - ''; - installPhase = '' - make install - ''; + + nativeBuildInputs = [ cmake readline pkgconfig ]; + buildInputs = [ fuse qtbase ]; + meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; homepage = https://whoozle.github.io/android-file-transfer-linux/; From b0651d564c38e45ea227dd08ee28737d80e792e4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:28:55 -0400 Subject: [PATCH 76/95] gnome3.gnome-panel: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-panel/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index db00758fb55..b1f0de9ba32 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -24,7 +24,7 @@ let pname = "gnome-panel"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -32,18 +32,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12q0l7wy6hzl46i7xpvv82ka3bn14z0jg6fhv5xhnk7j9mkbmgqw"; + sha256 = "0a9zi1jb0b42zd6wx3251cnns9v1w0cbwasmrx9hsj1dsb9pjq3a"; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/GNOME/gnome-panel/issues/8 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/77be9c3507bd1b5d70d97649b85ec9f47f6c359c.patch; - sha256 = "00b1ihnc6hp2g6x1v1njbc6mhsk44izl2wigviibmka2znfk03nv"; - }) - ]; - # make .desktop Exec absolute postPatch = '' patch -p0 < Date: Wed, 15 May 2019 21:29:47 -0400 Subject: [PATCH 77/95] gnome3.gnome-flashback: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-flashback/blob/3.32.0/NEWS --- .../gnome-3/misc/gnome-flashback/default.nix | 14 ++------------ pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 1 - 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index f9387c11b81..6d8f48f0d8e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -1,7 +1,6 @@ { stdenv , autoreconfHook , fetchurl -, fetchpatch , gettext , glib , gnome-bluetooth @@ -29,25 +28,16 @@ let pname = "gnome-flashback"; - version = "3.30.0"; + version = "3.32.0"; requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57"; + sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62"; }; - patches =[ - # overrides do not respect gsettingsschemasdir - # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch; - sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh"; - }) - ]; - # make .desktop Execs absolute postPatch = '' patch -p0 < Date: Sat, 18 May 2019 15:52:57 -0400 Subject: [PATCH 78/95] gnome3.mutter: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/mutter/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 2c305f002fd..a8bc4e77011 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q74lrb08vy0ynxbssqyxvbzf9252xgf9l6jxr9g4q0gmvpq402j"; + sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; }; mesonFlags = [ From 839b0767ebb23dcbe9eaf7e003e2cc47f5d58a11 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 15:54:13 -0400 Subject: [PATCH 79/95] gnome3.gnome-shell: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-shell/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 33095a0f1b9..d9001d9b1b9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pb00af3w4wivdhcvdy59z2xlxasg90bcm5a9ck0p5lf97adwx08"; + sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; LANG = "en_US.UTF-8"; From b055d80f11f17620a18cd281a83faf2bf37fd311 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:11:42 -0400 Subject: [PATCH 80/95] gnome3.accerciser: 3.32.1 -> 3.32.2 Just translations. https://gitlab.gnome.org/GNOME/accerciser/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index efff8f846b9..94ecc5f4a32 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "accerciser-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4"; + sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; }; nativeBuildInputs = [ From cd612b734c94499c1658896eeea99f81fb06d724 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:12:28 -0400 Subject: [PATCH 81/95] gnome3.polari: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/polari/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index cf056ca7841..73b8016d97b 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0z2dxj1hd798jn79y9a7lkb77lm8l7y5fsqh9g6lbr7pnmg559yk"; + sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; From 2be5edbbbba4969a06f07309cadc536b2043319a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:15:05 -0400 Subject: [PATCH 82/95] gnome3.seahorse: 3.32.1 -> 3.32.2 https://download.gnome.org/sources/seahorse/3.32/seahorse-3.32.2.news --- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index b3feb230d0f..a1bcb406eb3 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nh2gahiixj661a3l008yhidx952q50fqgdckg8l0d237wnwp7f6"; + sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x"; }; doCheck = true; From ec49cf3a4169798963b8542cd1512fe9ace2bd52 Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Sat, 18 May 2019 23:01:49 +0200 Subject: [PATCH 83/95] Update haskell.section.md (#61685) --- doc/languages-frameworks/haskell.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d832716c030..48d22831cd9 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -953,7 +953,7 @@ is essentially a "free software" license (BSD3), according to paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! To work around these problems GHC can be build with a slower but LGPL-free -alternative implemention for Integer called +alternative implementation for Integer called [integer-simple](http://hackage.haskell.org/package/integer-simple). To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use From ea222ae04ea37424f38ebe4e14fc5a0a4dfe00ef Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 17:19:31 -0400 Subject: [PATCH 84/95] gnome3.accerciser: use buildPythonPackage, add xlib This application will now actually work. --- .../gnome-3/apps/accerciser/default.nix | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 94ecc5f4a32..f7d22220e64 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection -, itstool, libxml2, python3Packages, at-spi2-core -, dbus, gettext, libwnck3 }: +{ stdenv +, fetchurl +, pkgconfig +, gnome3 +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, itstool +, libxml2 +, python3 +, at-spi2-core +, dbus +, gettext +, libwnck3 +, adwaita-icon-theme +}: -stdenv.mkDerivation rec { + python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; version = "3.32.2"; + format = "other"; + src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook itstool gettext + gettext gobject-introspection # For setup hook - ]; - buildInputs = [ - gtk3 libxml2 python3Packages.python python3Packages.pyatspi - python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme + itstool + libxml2 + pkgconfig + dbus + wrapGAppsHook ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + buildInputs = [ + adwaita-icon-theme + at-spi2-core + gtk3 + libwnck3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ipython + pyatspi + pycairo + pygobject3 + xlib + ]; + + # Strict deps breaks accerciser + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; passthru = { updateScript = gnome3.updateScript { From cb3c214602e25826ed53edb1bc00876903a483fd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 05:23:31 -0500 Subject: [PATCH 85/95] lightdm: 1.28.0 -> 1.30.0 --- pkgs/applications/display-managers/lightdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 85687090721..61d65cb64b6 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lightdm"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "CanonicalLtd"; repo = pname; rev = version; - sha256 = "1mmqy1jdvgc0h0h9gli7n4vdv5p8m5019qjr5ni4h73iz6mjdj2b"; + sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx"; }; nativeBuildInputs = [ From 9c46f16eac1bdbeabe39f52cbf563151d8360ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 19 May 2019 00:19:36 +0200 Subject: [PATCH 86/95] android-file-transfer: fix hash of version 3.8 --- pkgs/tools/filesystems/android-file-transfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index bd3c2428132..015408351fd 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; + sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; From f14cf438b4187ac2c13f2ff268bb573b93c08177 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sat, 18 May 2019 16:48:34 -0600 Subject: [PATCH 87/95] nixos/modules: Ensure the colord user is a system user Ideally, it should have an assigned uid and gid --- nixos/modules/services/x11/colord.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix index 17568df091d..cf113ad2af8 100644 --- a/nixos/modules/services/x11/colord.nix +++ b/nixos/modules/services/x11/colord.nix @@ -29,6 +29,7 @@ in { environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf"; users.users.colord = { + isSystemUser = true; home = "/var/lib/colord"; group = "colord"; }; From 9bb25d5c766098cd96da374384046dd05e04e2a5 Mon Sep 17 00:00:00 2001 From: kjuvi Date: Sat, 18 May 2019 11:18:24 +0200 Subject: [PATCH 88/95] ephemeral: init at 5.1.0 --- .../networking/browsers/ephemeral/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/networking/browsers/ephemeral/default.nix diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix new file mode 100644 index 00000000000..05bfab883fe --- /dev/null +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, desktop-file-utils +, gettext +, glib +, gtk3 +, hicolor-icon-theme +, libgee +, libdazzle +, meson +, ninja +, pantheon +, pkgconfig +, python3 +, webkitgtk +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "ephemeral"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = "ephemeral"; + rev = version; + sha256 = "1wfrbbdw429q2mkycn87fhci0jidcsflk5f2lbzfzccbcs8msffz"; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + hicolor-icon-theme + libdazzle + libgee + pantheon.granite + webkitgtk + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "The always-incognito web browser"; + homepage = https://github.com/cassidyjames/ephemeral; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f0669b26ff..9ac9475e278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17546,6 +17546,8 @@ in inherit (gnome3) epiphany; + ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; + epic5 = callPackage ../applications/networking/irc/epic5 { }; eq10q = callPackage ../applications/audio/eq10q { }; From a303d9da3d68b1ce4b2954464dd7e28e48e1ff5d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 19:36:53 -0400 Subject: [PATCH 89/95] ephemeral: add glib-networking This is needed for the wrapper. --- pkgs/applications/networking/browsers/ephemeral/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 05bfab883fe..26b3c3ace8b 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -13,7 +13,9 @@ , pkgconfig , python3 , webkitgtk -, wrapGAppsHook }: +, wrapGAppsHook +, glib-networking +}: stdenv.mkDerivation rec { pname = "ephemeral"; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib + glib-networking gtk3 hicolor-icon-theme libdazzle From af1176230794cfb1e0f4422ee9e3ccf05adff17b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 May 2019 20:00:00 -0500 Subject: [PATCH 90/95] brakeman: 4.5.0 -> 4.5.1 --- pkgs/development/tools/analysis/brakeman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 90eeffd58da..78a4396698b 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.5.0"; - source.sha256 = "0c11i01yw87fssmwbybaqf5rdxsjp44hvxdw54c3iqb8fvj76b68"; + version = "4.5.1"; + source.sha256 = "0vqnhlswvrg5fpxszfkjmla85gdlvgspz0whlli730ydx648mi68"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; From ac4bce925e7ff10b3ec06e060a4c47dd771f1bc2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 17 May 2019 14:25:19 -0700 Subject: [PATCH 91/95] pythonPackages.astroid: 2.1.0 -> 2.2.5 --- pkgs/development/python-modules/astroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 4cef66a5c2e..591726ea1ac 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,19 +5,19 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.1.0"; + version = "2.2.5"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m"; + sha256 = "1x5c8fiqa18frwwfdsw41lpqsyff3w4lxvjx9d5ccs4zfkhy2q35"; }; # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy six wrapt ] ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast; + ++ lib.optional (!isPyPy) typed-ast; checkInputs = [ pytestrunner pytest ]; From 519196e7556a70a2f23ef676c522541657d389bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 17 May 2019 14:26:49 -0700 Subject: [PATCH 92/95] pythonPackages.pylint: 2.2.3 -> 2.3.1 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6cfb6367307..8f1f4378a39 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.2.3"; + version = "2.3.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "13109caab4972cb6d7395e94ad7189e93e9454f09ededaa6b6784cc5456d41f1"; + sha256 = "1wgzq0da87m7708hrc9h4bc5m4z2p7379i4xyydszasmjns3sgkj"; }; nativeBuildInputs = [ pytestrunner ]; From 8102e2ce3bc60e9addd8ad5a2ea33211e30f60c5 Mon Sep 17 00:00:00 2001 From: Mark Gardner Date: Tue, 14 May 2019 10:13:14 -0400 Subject: [PATCH 93/95] pytricia: init at version 2019-01-16 --- .../python-modules/pytricia/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pytricia/default.nix diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix new file mode 100644 index 00000000000..2f95d7fcecb --- /dev/null +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pytricia"; + version = "unstable-2019-01-16"; + + src = fetchFromGitHub { + owner = "jsommers"; + repo = pname; + rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87"; + sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; + }; + + meta = with stdenv.lib; { + description = "A library for fast IP address lookup in Python"; + homepage = https://github.com/jsommers/pytricia; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ mkg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ebd75b5c1..a9771119340 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -838,6 +838,8 @@ in { pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + pytricia = callPackage ../development/python-modules/pytricia { }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); From 0bedafd57c2a3a6eed875f2120e7d463b782aff6 Mon Sep 17 00:00:00 2001 From: ryan4729 <40183301+ryan4729@users.noreply.github.com> Date: Sun, 19 May 2019 00:41:15 -0700 Subject: [PATCH 94/95] libsForQt5.quazip: fix darwin build (#61355) * libsForQt5.quazip: fix darwin build * libsForQt5.quazip: update license --- pkgs/development/libraries/quazip/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index b53335f45c3..addf9a1dbd6 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake }: +{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + qmakeFlags = [ "quazip" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; - meta = { + meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.lgpl21Plus; homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ - platforms = stdenv.lib.platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From c978bb04ddd78e140a7a39dc81e3ea0f44331d3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 03:23:03 -0500 Subject: [PATCH 95/95] kdiff3: 1.8 -> 1.8.1 (hotfix) https://cgit.kde.org/kdiff3.git/log/?h=1.8.1 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index ea50e69fa53..aa53aeb4206 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8"; + version = "1.8.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54"; + sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];