diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-12 06:34:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-12 06:34:30 +0000 |
commit | bfcc20a149536a2fdfb68e377160a2d8fb9a3934 (patch) | |
tree | 4e9afe278b14acfdbce2d01f178deed547a029a7 | |
parent | 32a46d68f3864617c9f7a24e45cd0fd2b45c7086 (diff) | |
parent | bab15d6bcd1a26e4657b006ea2d13ba0f1390b7a (diff) |
Merge master into staging-next
-rw-r--r-- | pkgs/applications/audio/pulseeffects/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/tbb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/nassl/default.nix | 43 | ||||
-rw-r--r-- | pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch | 14 | ||||
-rw-r--r-- | pkgs/development/python-modules/sslyze/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/python-modules/unifiled/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/8.0.x.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/libutils.patch | 5 | ||||
-rw-r--r-- | pkgs/tools/system/gdu/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
14 files changed, 101 insertions, 64 deletions
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 4fb591e75c316..f0f3ad60b4102 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -45,13 +45,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.3"; + version = "4.8.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0k5p5y3im7xnf0ikaghh56nfhirkdwf95c8fr17wasgdpw2m86i2"; + sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 8f045802d3af4..264b34125a871 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -19,10 +19,14 @@ with stdenv.lib; stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' + runHook preInstall + mkdir -p $out/lib cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html + + runHook postInstall ''; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 0df4b0218b59d..908ecff8c177d 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -5,13 +5,15 @@ , pkgsStatic , openssl , invoke -, pytest , tls-parser , cacert +, pytestCheckHook }: let - zlibStatic = pkgsStatic.zlib; + zlibStatic = pkgsStatic.zlib.override { + splitStaticOutput = false; + }; nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -34,17 +36,16 @@ let opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( oldAttrs: rec { name = "openssl-${version}"; - version = "1.1.1"; + version = "1.1.1h"; src = fetchurl { url = "https://www.openssl.org/source/${name}.tar.gz"; - sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [ "enable-weak-ssl-ciphers" "enable-tls1_3" "no-async" ]; - patches = [ ./nix-ssl-cert-file.patch ]; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; } ); @@ -66,32 +67,36 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z"; + sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; }; - postPatch = '' - mkdir -p deps/openssl-OpenSSL_1_0_2e/ + postPatch = let + legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; + zlibVersion = zlibStatic.version; + in '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ cp ${opensslLegacyStatic.out}/lib/libssl.a \ ${opensslLegacyStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_1_0_2e/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_1_1_1/ + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ cp ${opensslStatic.out}/lib/libssl.a \ ${opensslStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_1_1_1/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include - ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-1.2.11/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ ''; propagatedBuildInputs = [ tls-parser ]; @@ -103,7 +108,7 @@ buildPythonPackage rec { invoke package.wheel ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Skip online tests diff --git a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch deleted file mode 100644 index 893fb3eb6643a..0000000000000 --- a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c ---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 -+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 -@@ -97,7 +97,9 @@ - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = getenv(X509_get_default_cert_file_env()); -+ file = getenv("NIX_SSL_CERT_FILE"); -+ if (!file) -+ file = getenv(X509_get_default_cert_file_env()); - if (file) - ok = (X509_load_cert_crl_file(ctx, file, - X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 24b334ef88228..991f85c900ecc 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -1,30 +1,30 @@ { lib , fetchFromGitHub -, pytest , buildPythonPackage , nassl , cryptography , typing-extensions , faker +, pytestCheckHook }: buildPythonPackage rec { pname = "sslyze"; - version = "3.0.8"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; + sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography" + --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Most of the tests are online; hence, applicable tests are listed diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix new file mode 100644 index 0000000000000..68fa57165df2d --- /dev/null +++ b/pkgs/development/python-modules/unifiled/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "unifiled"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "florisvdk"; + repo = pname; + rev = "v${version}"; + sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq"; + }; + + propagatedBuildInputs = [ + requests + urllib3 + ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "unifiled" ]; + + meta = with lib; { + description = "Python module for Ubiquiti Unifi LED controller"; + homepage = "https://github.com/florisvdk/unifiled"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 147ab877d6b5a..5b1d8b0794d80 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; + sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; }; outputs = [ "out" "man" ]; @@ -31,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' patchShebangs . @@ -42,9 +43,9 @@ buildGoModule rec { install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ - --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} + --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index ce4b14910b6b8..00ae9868673cc 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation { "LD8=${stdenv.cc.targetPrefix}ld" "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy" "OBJDUMP8=${stdenv.cc.targetPrefix}objdump" - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}ld" - "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - "OBJDUMP=${stdenv.cc.targetPrefix}objdump" + "CC7=${stdenv.cc.targetPrefix}cc" + "LD7=${stdenv.cc.targetPrefix}ld" + "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" + "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" ] ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8b79e415b1807..3719d597a1480 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -875,7 +875,7 @@ "uk_transport" = ps: with ps; [ ]; "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; - "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled + "unifiled" = ps: with ps; [ unifiled ]; "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ connect-box ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 299302b27de00..519ef64bca80d 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,27 +1,33 @@ { lib, stdenv, fetchurl, bison, cmake, pkgconfig -, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.17"; + version = "8.0.22"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a"; }; patches = [ ./abi-check.patch - ./libutils.patch ]; nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + ''; + buildInputs = [ boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch deleted file mode 100644 index fa1a35e12f233..0000000000000 --- a/pkgs/servers/sql/mysql/libutils.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) -- COMMAND /usr/bin/libtool -static -o $<TARGET_FILE:${TARGET}> -+ COMMAND libtool -static -o $<TARGET_FILE:${TARGET}> diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index db7275da7df28..6fb65e0c3a202 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "gdu"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "0gk36z8xzj7blwzs080fqsz76hn56c89xcsyil6n5cfkbyf85c6i"; + sha256 = "0ajkc0vbzyl56d6z03s5vb17frjrg5wl145x60asnrmh7lg8adsj"; }; vendorSha256 = "1jqbsda9bch3awdq816w4jybv7wz9mfflmvs5y2wsa2qnhn9nbyp"; buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + # analyze/dev_test.go: undefined: processMounts + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Disk usage analyzer with console interface"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b611ea8631bed..50556c9f0981c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17644,7 +17644,7 @@ in mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost169; # Configure checks for specific version. + boost = boost173; # Configure checks for specific version. protobuf = protobuf3_7; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79127874cefee..fccad132d875e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7789,6 +7789,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + unifiled = callPackage ../development/python-modules/unifiled { }; + units = callPackage ../development/python-modules/units { }; unittest2 = callPackage ../development/python-modules/unittest2 { }; |