From 4dd8a61b51f8d159e33e129ba5e6c7303bfb021f Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Thu, 28 Oct 2021 13:55:47 -0700 Subject: [PATCH 01/21] boringssl: add the "dev" output to match openssl This allows building curl with a `openssl = boringssl` override. --- pkgs/development/libraries/boringssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 32a4859a1bc9..b9b2e568ce6b 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -36,7 +36,7 @@ buildGoModule { cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' - mkdir -p $bin/bin $out/include $out/lib + mkdir -p $bin/bin $dev $out/lib mv tool/bssl $bin/bin @@ -44,10 +44,10 @@ buildGoModule { mv crypto/libcrypto.a $out/lib mv decrepit/libdecrepit.a $out/lib - mv ../include/openssl $out/include + mv ../include $dev ''; - outputs = [ "out" "bin" ]; + outputs = [ "out" "bin" "dev" ]; meta = with lib; { description = "Free TLS/SSL implementation"; From df1e8f0d11420fff898ebc7cbf4a77f07aa006a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Nov 2021 16:42:10 -0800 Subject: [PATCH 02/21] setzer: 0.4.1 -> 0.4.2 --- pkgs/applications/editors/setzer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 334f8b79c4b3..6b380e32bc69 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "1rcx2c07jg1ij81pnvg3px49hfbjmkagn68d3gp79z3gcajbp2av"; + sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo="; }; format = "other"; @@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec { pyxdg pdfminer pycairo + pexpect ]; checkPhase = '' From 92c45083e54fa06c1c54de593e4df83100e80e01 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 20 Nov 2021 19:11:09 -0500 Subject: [PATCH 03/21] arrow-cpp: 6.0.0 -> 6.0.1 --- pkgs/development/libraries/arrow-cpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 36e98bde7030..7182a5f76786 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -53,8 +53,8 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "a60b715263d9bbf7e744527fb0c084b693f58043"; - hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU="; + rev = "1d8525e109a12a8c67c489eba48715a199609153"; + hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM="; }; parquet-testing = fetchFromGitHub { @@ -67,12 +67,12 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA="; + hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ="; }; sourceRoot = "apache-arrow-${version}/cpp"; From 31fdf8b75e8fb9b5593644405d650d0ad8341a6f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 25 Nov 2021 18:02:17 +0100 Subject: [PATCH 04/21] varnish60: 6.0.8 -> 6.0.9 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 3e61e318aca9..5988c3a211e6 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -47,8 +47,8 @@ let in { varnish60 = common { - version = "6.0.8"; - sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; + version = "6.0.9"; + sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; }; varnish70 = (common { version = "7.0.1"; From 22b72c17bb0c48d6eabb2d6988040341cdce70d1 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Thu, 25 Nov 2021 14:01:32 -0800 Subject: [PATCH 05/21] gnuradio3_8packages.ais: fix build --- pkgs/development/gnuradio-modules/ais/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 638210f8412f..98b8229bc1ae 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -12,6 +12,8 @@ , mpir , fftwFloat , icu +, gnuradio +, thrift }: mkDerivation rec { @@ -31,6 +33,10 @@ mkDerivation rec { python ]; + cmakeFlags = [ + "-DCMAKE_EXE_LINKER_FLAGS=-pthread" + ]; + buildInputs = [ cppunit osmosdr @@ -40,6 +46,8 @@ mkDerivation rec { mpir fftwFloat icu + thrift + gnuradio.python.pkgs.thrift ]; meta = with lib; { From c5a0962ddd85dd6ed1794c64f79ba2ba92b1bab0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:07:37 -0500 Subject: [PATCH 06/21] arrow-cpp: fix sandboxed build on darwin --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7182a5f76786..bcf4aeb2ddc0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs build-support/ substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' ''; cmakeFlags = [ From 9fff252dcf573a265bcdac81cfa482fa0b862a7b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:47:16 -0500 Subject: [PATCH 07/21] python3Packages.pyarrow: fix sandboxed build on darwin --- pkgs/development/python-modules/pyarrow/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e9510d9552ce..7360cab01f37 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: +{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -44,6 +44,9 @@ buildPythonPackage rec { # Deselect a parquet dataset test because it erroneously fails to find the # pyarrow._dataset module. "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" + ] ++ lib.optionals stdenv.isDarwin [ + # Requires loopback networking + "--deselect=pyarrow/tests/test_ipc.py::test_socket_" ]; dontUseSetuptoolsCheck = true; From e3e77ee8a4c116d781273d0b189eaf24046ea4f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 20:54:50 -0500 Subject: [PATCH 08/21] arrow-cpp: build without jemalloc on aarch64-darwin to fix build --- pkgs/development/libraries/arrow-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index bcf4aeb2ddc0..574ba3b12501 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -38,6 +38,7 @@ , zstd , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions # see https://github.com/boostorg/process/issues/55 @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { }; sourceRoot = "apache-arrow-${version}/cpp"; - ARROW_JEMALLOC_URL = jemalloc.src; + ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src; ARROW_MIMALLOC_URL = fetchFromGitHub { # From @@ -155,6 +156,7 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" + "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. From ebe33362a84dcbec201500088c1ccfccb65e89cb Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 22 Nov 2021 06:01:53 -0500 Subject: [PATCH 09/21] parquet-tools: fix tests for arrow-cpp 6.0.1 --- pkgs/tools/misc/parquet-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 0ba909e1f602..46155dcb3323 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { --replace 'thrift = "^0.13.0"' 'thrift = "*"' \ --replace 'halo = "^0.0.29"' 'halo = "*"' substituteInPlace tests/test_inspect.py \ - --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \ + --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ --replace "serialized_size: 2222" "serialized_size: 2221" ''; From 080ca0520c395e67ad8c6f34a3b02f1cd597ddc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 08:48:51 +0100 Subject: [PATCH 10/21] python3Packages.types-requests: 2.26.0 -> 2.26.1 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index f151b0086282..6e89d2edd2ac 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.26.0"; + version = "2.26.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-317Iw0tBOkLrs45Plr3raAkLh1vfzFE43IKYnJVEWIM="; + sha256 = "sha256-CJPhEuFRC7tn9TeUHJIZLedHLlG/fyNuDlg4ZvDtkz4="; }; # Module doesn't have tests From d2a0253504e9c60fbdd1a94c7c6973b158a6e8ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 08:49:44 +0100 Subject: [PATCH 11/21] python3Packages.types-setuptools: 57.4.3 -> 57.4.4 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 5a102a395775..c8ac731ce9d5 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.3"; + version = "57.4.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G8mgC66QHvk5wXIK4EDJ8RJ+eeYOBFiO0VBsYmhThe0="; + sha256 = "sha256-o8vL8/AhQrtdO1xfWRj0U7h1I2K5bViroqXPpDum0gk="; }; # Module doesn't have tests From 257e92258e0da135e560d1c36f366e9ceb932378 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 26 Nov 2021 12:53:37 +0100 Subject: [PATCH 12/21] modules/nix-daemon: Add missing mk(Rename|Removed)OptionModule Commit 3a92a1a replaced the nix.daemonNiceLevel and nix.daemonIONiceLevel options. This commit adds appropriate mk(Rename|Removed)OptionModule. --- nixos/modules/services/misc/nix-daemon.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4ea45888e5fc..139495b9190a 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -74,6 +74,8 @@ in imports = [ (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) + (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ]) + (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") ]; ###### interface From f5b1b86934eaf00d8a10646e7fd6d3a00de2c8d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 14:38:28 +0100 Subject: [PATCH 13/21] python3Packages.netdata: 0.2.1 -> 1.0.1 --- .../python-modules/netdata/default.nix | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix index 3b1ccbb73f70..c54719b696b1 100644 --- a/pkgs/development/python-modules/netdata/default.nix +++ b/pkgs/development/python-modules/netdata/default.nix @@ -1,28 +1,47 @@ { lib , buildPythonPackage -, fetchPypi -, aiohttp -, async-timeout +, pythonOlder +, fetchFromGitHub +, poetry-core +, httpx +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, yarl }: buildPythonPackage rec { pname = "netdata"; - version = "0.2.1"; + version = "1.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oGOT4RvftI/2Ri2icM/AtglNZXt10jkFh/rlr6A46YE="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-netdata"; + rev = version; + sha256 = "sha256-4+cTIqytHrCPG7lUZv1IhL7Bk5GlTEveQTtuCkFIepo="; }; - propagatedBuildInputs = [ - aiohttp - async-timeout + nativeBuildInputs = [ + poetry-core ]; - # no tests are present - doCheck = false; + propagatedBuildInputs = [ + httpx + yarl + ]; - pythonImportsCheck = [ "netdata" ]; + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + pythonImportsCheck = [ + "netdata" + ]; meta = with lib; { description = "Python API for interacting with Netdata"; From 621f57ba6fa1efbb1785430c5919235ed67d3972 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 Nov 2021 03:08:57 +1000 Subject: [PATCH 14/21] skopeo: 1.5.1 -> 1.5.2 https://github.com/containers/skopeo/releases/tag/v1.5.2 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 556b9c4a2587..7b9a727c2ef0 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-GaOfONUAN+bNSyodDbZyahMheU5fnjuAp4/94jy+9Hg="; + sha256 = "sha256-KleTvRQwQFr4rrRXFW2z4N7DXIT920O2gig6wmOFIKs="; }; outputs = [ "out" "man" ]; From d07a9427f4303fda1a5229611391fc401e99d182 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 20:22:10 +0100 Subject: [PATCH 15/21] python3Packages.wiffi: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/wiffi/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix index a3da3f2f027e..80738318433d 100644 --- a/pkgs/development/python-modules/wiffi/default.nix +++ b/pkgs/development/python-modules/wiffi/default.nix @@ -7,21 +7,28 @@ buildPythonPackage rec { pname = "wiffi"; - version = "1.0.1"; + version = "1.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mampfes"; repo = "python-wiffi"; rev = version; - sha256 = "1bsx8dcmbkajh7hdgxg6wdnyxz4bfnd45piiy3yzyvszfdyvxw0f"; + sha256 = "sha256-uB4M3etW1DCE//V2pcmsLZbORmrL00pbPADMQD5y3CY="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "wiffi" ]; + + pythonImportsCheck = [ + "wiffi" + ]; meta = with lib; { description = "Python module to interface with STALL WIFFI devices"; From 65f8d1a0590e8b2a983c3cff332f7049ef533658 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 20:34:54 +0100 Subject: [PATCH 16/21] tfsec: 0.60.1 -> 0.61.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index f28df20f1994..7cb170c6362d 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.60.1"; + version = "0.61.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JbEqoPuvfG6SwG+uGsV5vy+d+cs/VoGCntq8oU48+y8="; + sha256 = "sha256-O0p7RMZ+JjLMpOQFLNA1LPR56DKcOa/q2vClx16iQNI="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From ab211d1343bf083c21b8929098187fd865ee3409 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 20:47:40 +0100 Subject: [PATCH 17/21] python3Packages.frigidaire: 0.17 -> 0.18.3 --- pkgs/development/python-modules/frigidaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index fc268ba05a88..efa0a704d12e 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.17"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA="; + sha256 = "sha256-ksh7+F78JBHLMmQddyWMf3XC4Tfp4/AMlegE6qHPe2k="; }; propagatedBuildInputs = [ From 85585e9d13c9e729ecb453b26bc2426aaab17aed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 21:36:41 +0100 Subject: [PATCH 18/21] python3Packages.potentials: add missing dependencies --- .../python-modules/potentials/default.nix | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 24db19b3c065..ea7fc4654284 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -1,19 +1,21 @@ { lib -, buildPythonPackage -, fetchPypi -, ipywidgets -, cdcs , bibtexparser -, habanero -, pandas -, requests -, numpy -, matplotlib -, unidecode +, buildPythonPackage +, cdcs , datamodeldict -, xmltodict +, fetchPypi +, habanero +, ipywidgets +, lxml +, matplotlib +, numpy +, pandas , pytestCheckHook , pythonOlder +, requests +, scipy +, unidecode +, xmltodict }: buildPythonPackage rec { @@ -29,16 +31,18 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - ipywidgets - cdcs bibtexparser + cdcs + datamodeldict habanero + ipywidgets + lxml + matplotlib + numpy pandas requests - numpy - matplotlib + scipy unidecode - datamodeldict xmltodict ]; From 7287bf05aa441bba567cb2a98dc1987f2b8e79e0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Nov 2021 21:44:10 +0100 Subject: [PATCH 19/21] openmpi: 4.1.1 -> 4.1.2 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index d3323b1fa9e0..aac11dc83bda 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -27,11 +27,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.1"; + version = "4.1.2"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1nkwq123vvmggcay48snm9qqmrh0bdzpln0l1jnp26niidvplkz2"; + sha256 = "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"; }; postPatch = '' From 6116670dcb9b7d57a30acc29fe81774066af253b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 Nov 2021 07:25:58 +1000 Subject: [PATCH 20/21] fd: 8.2.1 -> 8.3.0 https://github.com/sharkdp/fd/releases/tag/v8.3.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 9b0c44c3bf5c..15af17524840 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.2.1"; + version = "8.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "00vlifbri021z8nf7xvbaay8mqvnq58h19va9bqr5lhsqj1f82wq"; + sha256 = "sha256-MSkQYsBZkQOFkOnjGY+VuifUZnzloSysAO/hsp+fy1A="; }; - cargoSha256 = "0n6xqd30b8aiqrvqrmy7q56nh62nx2j1a3yq2dlpc19i2mfw2qd8"; + cargoSha256 = "sha256-nwgAgyVaxs1ebu9ndUN3FlFiycyEbRgvUhZ8iGmrVhQ="; nativeBuildInputs = [ installShellFiles ]; From f6d5c5fe01bf57a9ac82946bdd9250b6cab1e136 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 26 Nov 2021 09:18:57 +1000 Subject: [PATCH 21/21] shfmt: 3.4.0 -> 3.4.1 https://github.com/mvdan/sh/releases/tag/v3.4.1 --- pkgs/tools/text/shfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index faf813fb905b..778c48e05816 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-Bxb4BlvAmJQhog3bZEGHJlrpXNqXpokkipBszPzRHSk="; + sha256 = "sha256-Afu1KjbnIcXQZB8rrpCdgP/ud+tpCf8BrCCOCoSGcms="; }; vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8=";