From eefbb7c5661a895900df2f1ff9ab4c9f1e11b964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 02:02:14 +0000 Subject: [PATCH 01/18] poke: 2.2 -> 2.3 --- pkgs/applications/editors/poke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index c2ade207d609..77466cfdbea8 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -22,11 +22,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-xF6k5xpRohhTZzhcAc65dZbsW3EDOGm+xKYLHLciWQM="; + sha256 = "sha256-NpDPERbafLOp7GtPcAPiU+JotRAhKiiP04qv7Q68x2Y="; }; outputs = [ "out" "dev" "info" "lib" "man" ]; From daaeb8af9c4929902fac07c69a70094decade333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 19:46:07 +0000 Subject: [PATCH 02/18] smartdns: 35 -> 36 --- pkgs/tools/networking/smartdns/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 8ac1e137ca43..fd4cdbaf977d 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -1,34 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl, testVersion, smartdns }: stdenv.mkDerivation rec { pname = "smartdns"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-5822qe3mdn4wPO8fHW5AsgMA7xbJnMjZn9DbiMU3GX0="; + sha256 = "sha256-sjrRPmTJRCUnMrA08M/VdYhL7/OfQY30/t1loLPSrlQ="; }; buildInputs = [ openssl ]; - # Force the systemd service file to be regenerated from it's template. This - # file is erroneously added in version 35 and it has already been deleted from - # upstream's git repository. So this "postPatch" phase can be deleted in next - # release. - postPatch = '' - rm -f systemd/smartdns.service - ''; - makeFlags = [ "PREFIX=${placeholder "out"}" "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system" "RUNSTATEDIR=/run" + # by default it is the build time... weird... https://github.com/pymumu/smartdns/search?q=ver + "VER=${version}" ]; installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; + passthru.tests = { + version = testVersion { package = smartdns; }; + }; + meta = with lib; { description = "A local DNS server to obtain the fastest website IP for the best Internet experience"; From 58ed6db34472246bb473a9505a7994e2798d8618 Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Mon, 4 Apr 2022 14:09:05 +0200 Subject: [PATCH 03/18] arkade: 0.8.18 -> 0.8.19 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 297e12a80a20..2ee7374e81b3 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-VQI2eAxOkOkwYkTM/UyyK6lnXFoLFHWE/ekm5qLN9OE="; + sha256 = "sha256-GbuDL0JSG0r2LVcdJgQFBMNDpAl2WbhjIX0Ls9yCDYg="; }; CGO_ENABLED = 0; From a3a55b732e33b559f36c30ae71a89588984556d1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 4 Apr 2022 17:13:42 -0500 Subject: [PATCH 04/18] nlopt: fix darwin build --- pkgs/development/libraries/nlopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 279c8a0fd054..2fae17a23236 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }: +{ lib, stdenv, fetchFromGitHub, cmake, octave ? null, libiconv }: stdenv.mkDerivation rec { pname = "nlopt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ octave ]; configureFlags = [ From 1a1f78dc02aeb7be459737d2a9e7e879b42392d0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 4 Apr 2022 18:08:50 -0500 Subject: [PATCH 05/18] python3Packages.graphviz: disable tests on darwin --- pkgs/development/python-modules/graphviz/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 881dec6b932f..46a541fe5040 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -58,6 +59,9 @@ buildPythonPackage rec { runHook postCheck ''; + # Too many failures due to attempting to connect to com.apple.fonts daemon + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Simple Python interface for Graphviz"; homepage = "https://github.com/xflr6/graphviz"; From b393b879e0516b36a68a61ae011ca8ab72d081b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 02:06:42 +0000 Subject: [PATCH 06/18] pre-commit: 2.17.0 -> 2.18.1 --- pkgs/tools/misc/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 307e5e9c7461..7053c4f1d90d 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -3,7 +3,7 @@ with python3Packages; buildPythonPackage rec { pname = "pre-commit"; - version = "2.17.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"; + sha256 = "sha256-XURe4fqHONUGiBxdhPg8Yrtb5rKDjjIgdDNkfo5evhA="; }; patches = [ From 6edf36f81c55fcdeffa54dcadda10976f9ce6886 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 4 Apr 2022 22:26:08 +0300 Subject: [PATCH 07/18] python39Packages.nodeenv: hardcode which path --- pkgs/development/python-modules/nodeenv/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index d88661ae757c..1ff2d47b32d6 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools, python, which }: buildPythonPackage rec { pname = "nodeenv"; @@ -16,6 +16,13 @@ buildPythonPackage rec { # Tests not included in PyPI tarball doCheck = false; + preFixup = '' + substituteInPlace $out/${python.sitePackages}/nodeenv.py \ + --replace '["which", candidate]' '["${lib.getBin which}/bin/which", candidate]' + ''; + + pythonImportsCheck = [ "nodeenv" ]; + meta = with lib; { description = "Node.js virtual environment builder"; homepage = "https://github.com/ekalinin/nodeenv"; From d90f4d50305b24077e6c2c8f5b377d3a7abcb200 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 4 Apr 2022 22:28:00 +0300 Subject: [PATCH 08/18] pre-commit: enable tests used arch and openSUSE packages for reference --- pkgs/tools/misc/pre-commit/default.nix | 117 ++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 7053c4f1d90d..72f7f66c9e43 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -1,4 +1,13 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +, fetchFromGitHub + # tests +, cargo +, dotnet-sdk +, git +, go +, nodejs +}: with python3Packages; buildPythonPackage rec { @@ -8,10 +17,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit version; - pname = "pre_commit"; - sha256 = "sha256-XURe4fqHONUGiBxdhPg8Yrtb5rKDjjIgdDNkfo5evhA="; + src = fetchFromGitHub { + owner = "pre-commit"; + repo = "pre-commit"; + rev = "v${version}"; + sha256 = "sha256-d/ukUTjNgpqr6IeDJHDaOXQm0EdsX+vq0sVX7HG3gSE="; }; patches = [ @@ -32,18 +42,103 @@ buildPythonPackage rec { importlib-resources ]; - # slow and impure - doCheck = false; + checkInputs = [ + cargo + dotnet-sdk + git + go + nodejs + pytest-env + pytest-xdist + pytestCheckHook + re-assert + ]; - preFixup = '' - substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ + doCheck = true; + + postPatch = '' + substituteInPlace pre_commit/resources/hook-tmpl \ --subst-var-by pre-commit $out - substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \ + substituteInPlace pre_commit/languages/python.py \ --subst-var-by virtualenv ${virtualenv} - substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \ + substituteInPlace pre_commit/languages/node.py \ --subst-var-by nodeenv ${nodeenv} + + patchShebangs pre_commit/resources/hook-tmpl ''; + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + "--forked" + ]; + + preCheck = '' + export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ + GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ + VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 + + git init -b master + + export HOME=$(mktemp -d) + + python -m venv --system-site-packages venv + source "$PWD/venv/bin/activate" + #$out/bin/pre-commit install + python setup.py develop + ''; + + postCheck = '' + deactivate + ''; + + disabledTests = [ + # ERROR: The install method you used for conda--probably either `pip install conda` + # or `easy_install conda`--is not compatible with using conda as an application. + "test_conda_" + "test_local_conda_" + + # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init: + # /usr/bin/env: bad interpreter: No such file or directory + "ruby" + + # network + "test_additional_dependencies_roll_forward" + "test_additional_golang_dependencies_installed" + "test_additional_node_dependencies_installed" + "test_additional_rust_cli_dependencies_installed" + "test_additional_rust_lib_dependencies_installed" + "test_dart_hook" + "test_dotnet_hook" + "test_golang_hook" + "test_golang_hook_still_works_when_gobin_is_set" + "test_installs_without_links_outside_env" + "test_local_dart_additional_dependencies" + "test_local_golang_additional_dependencies" + "test_local_lua_additional_dependencies" + "test_local_perl_additional_dependencies" + "test_local_rust_additional_dependencies" + "test_lua_hook" + "test_perl_hook" + "test_r_hook" + "test_r_inline_hook" + "test_r_local_with_additional_dependencies_hook" + "test_r_with_additional_dependencies_hook" + "test_run_a_node_hook_default_version" + "test_run_versioned_node_hook" + + # python2, no explanation needed + "python2" + "test_switch_language_versions_doesnt_clobber" + + # docker + "test_run_a_docker_hook" + + # i don't know why these fail + "test_install_existing_hooks_no_overwrite" + "test_installed_from_venv" + "test_uninstall_restores_legacy_hooks" + ]; + pythonImportsCheck = [ "pre_commit" ]; From 824de3c96718979c4db39bb5a92c1a12b5878d21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 16:59:55 +0000 Subject: [PATCH 09/18] python310Packages.pypandoc: 1.7.4 -> 1.7.5 --- pkgs/development/python-modules/pypandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 32bada43c154..8e46be2697ce 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.4"; + version = "1.7.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4="; + sha256 = "sha256-gCwmquF7ZBNsbQBpSdjOGDp9TZ+9Ty0FHmb0+59FylA="; }; patches = [ From 97ed9effd2294dda796acfca1643a184f2af21fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Apr 2022 23:34:30 +0200 Subject: [PATCH 10/18] python3Packages.adafruit-platformdetect: 3.22.0 -> 3.22.1 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2671c25e59f7..921c844e27d8 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.22.0"; + version = "3.22.1"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M="; + sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw="; }; nativeBuildInputs = [ From 2817885f015bec9fe61c699d3755a9a6c2cf7eac Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 4 Apr 2022 17:23:56 -0700 Subject: [PATCH 11/18] mosh: fix build on x86_64-linux --- pkgs/tools/networking/mosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 7823b7eb9096..8331e3686dc9 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; - buildInputs = [ protobuf ncurses zlib openssl bash-completion perlPackages.perl ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perlPackages.perl ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion ] ++ lib.optional withUtempter libutempter; strictDeps = true; From a0a955ba455156a3f3e29bd20a36dced0e26304b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 18:05:50 +0000 Subject: [PATCH 12/18] plfit: init at 0.9.3 --- pkgs/tools/misc/plfit/default.nix | 54 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ pkgs/top-level/python-packages.nix | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/tools/misc/plfit/default.nix diff --git a/pkgs/tools/misc/plfit/default.nix b/pkgs/tools/misc/plfit/default.nix new file mode 100644 index 000000000000..d1613af76e90 --- /dev/null +++ b/pkgs/tools/misc/plfit/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, python ? null +, swig +, llvmPackages +}: + +stdenv.mkDerivation rec { + pname = "plfit"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "ntamas"; + repo = "plfit"; + rev = version; + hash = "sha256-y4n6AlGtuuUuA+33oF7lGOYuKSqea4GMSJlv9PaSpQ8="; + }; + + patches = [ + # https://github.com/ntamas/plfit/pull/41 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/ntamas/plfit/commit/d0e77c80e6e899298240e6be465cf580603f6ee2.patch"; + hash = "sha256-wi3qCp6ZQtrKuM7XDA6xCXunCiqsyhnkxmg2eSmxjYM="; + }) + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (!isNull python) [ + python + swig + ]; + + cmakeFlags = [ + "-DPLFIT_USE_OPENMP=ON" + ] ++ lib.optionals (!isNull python) [ + "-DPLFIT_COMPILE_PYTHON_MODULE=ON" + ]; + + buildInputs = lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + + meta = with lib; { + description = "Fitting power-law distributions to empirical data"; + homepage = "https://github.com/ntamas/plfit"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94ae4aae9cae..866587e4bc6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9077,6 +9077,10 @@ with pkgs; pleroma = callPackage ../servers/pleroma { }; + plfit = callPackage ../tools/misc/plfit { + python = null; + }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01fd6c39c4c7..8d5285bacec6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6384,6 +6384,10 @@ in { plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + plfit = toPythonModule (pkgs.plfit.override { + inherit (self) python; + }); + plone-testing = callPackage ../development/python-modules/plone-testing { }; plotly = callPackage ../development/python-modules/plotly { }; From 70b2abc3ff78850705aba55eded84c2165e6fc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 18:12:33 +0000 Subject: [PATCH 13/18] igraph: random improvements * remove outdated comment * use plfit from Nixpkgs * unconditionally enable OpenMP --- pkgs/development/libraries/igraph/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 441646c43955..8402aae98198 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -12,7 +12,9 @@ , lapack , libxml2 , libxslt +, llvmPackages , pkg-config +, plfit , python3 , sourceHighlight , suitesparse @@ -30,10 +32,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ="; }; - # Normally, igraph wants us to call bootstrap.sh, which will call - # tools/getversion.sh. Instead, we're going to put the version directly - # where igraph wants, and then let autoreconfHook do the rest of the - # bootstrap. ~ C. postPatch = '' echo "${version}" > IGRAPH_VERSION '' + lib.optionalString stdenv.isAarch64 '' @@ -65,7 +63,10 @@ stdenv.mkDerivation rec { gmp lapack libxml2 + plfit suitesparse + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; cmakeFlags = [ @@ -75,8 +76,10 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_GLPK=OFF" "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" "-DIGRAPH_USE_INTERNAL_GMP=OFF" + "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" "-DIGRAPH_GRAPHML_SUPPORT=ON" + "-DIGRAPH_OPENMP_SUPPORT=ON" "-DIGRAPH_ENABLE_LTO=AUTO" "-DIGRAPH_ENABLE_TLS=ON" "-DBUILD_SHARED_LIBS=ON" From 4561be306455a4ed12c5c66408816298d14eb8f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 20:33:28 +0000 Subject: [PATCH 14/18] janet: 1.21.1 -> 1.21.2 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 4601faafb06d..098a7fe7d3a1 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wJwlGliXoj0XmC9qb6SCo8mUy4aqHvJtFiigUB7PFLE="; + sha256 = "sha256-6E726+DLs1hCUbr2/rqIdSn8u94LLFdKBBHkbB4rgm0="; }; # This release fails the test suite on darwin, remove when debugged. From 19dcc9f175c0110f228fd4ab7bf33d04ba1f717e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 07:46:31 +0000 Subject: [PATCH 15/18] cargo-flash: 0.12.0 -> 0.12.1 --- pkgs/development/tools/rust/cargo-flash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 0f90f4800439..49e9bbaceb5b 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "0s49q8x0iscy9rgn9zgymyg39cqm251a99m341znjn55lap3pdl8"; + sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys="; }; - cargoSha256 = "0rb4s5bwjs7hri636r2viva96a6z9qjv9if6i220j9yglrvi7c8i"; + cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; From fb968e0869a8914eff47cf0bc6301e016a12e60a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 20:23:59 +0000 Subject: [PATCH 16/18] sentry-cli: 1.74.2 -> 1.74.3 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 2fb0f1ebbeba..0ba8e3b3d31a 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.74.2"; + version = "1.74.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-1A/c5HiXtT6xUTxVInv9DbbCsqpu8iCJ7I0A9wFeaQ0="; + sha256 = "sha256-savbS/1j6PJqmkk6c+XMOUEkrLZNU2p0YbN8rHfz2po="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-z++t+Zt40az11z/xhobvvbbSNUBpnMzqlRzoOuYgY2U="; + cargoSha256 = "sha256-7B8cmrDYufhlIMv2r6TSD+C8NLE2Juewgy4XYYr+QKs="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From ef5d2ce251e477252f15c1399ef49783151d20f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 20:57:32 +0000 Subject: [PATCH 17/18] grcov: 0.8.8 -> 0.8.9 --- pkgs/development/tools/misc/grcov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix index 04ed4a1046b7..2ca092fa659d 100644 --- a/pkgs/development/tools/misc/grcov/default.nix +++ b/pkgs/development/tools/misc/grcov/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "grcov"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OITtZdI9d5zQVI02s5gJF9lWCjZZgE7YZRfFROU040o="; + sha256 = "sha256-VSjKZoK/o05kYX5mRCnaS6r/+4dZep9Bp9Im1Zw7piM="; }; - cargoSha256 = "sha256-AZVkS/huEsA1wdVB/xUGCCjY5AWJxaU1DD/OlEURw/c="; + cargoSha256 = "sha256-7I0BizeDbikpog0YG/X8vwoO4PGE1qYzRTWTr0RUQws="; # tests do not find grcov path correctly checkFlags = let From 937c8665307f1a67eb01a60b5f587edde53b2acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Apr 2022 07:52:46 +0200 Subject: [PATCH 18/18] systemdStage1: drop passing the removed parameter Dropped in 0c852e1fa6 (syntax error). If I looked at history right, it has never been used (but indirectly through cryptsetup). I expect it's a remnant of different attempts at breaking depenency cycle which we now solve through systemdMinimal. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383fe215f6af..ebed2b787a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23377,7 +23377,7 @@ with pkgs; withCryptsetup = true; withFido2 = true; withTpm2Tss = true; - inherit lvm2 libfido2 p11-kit; + inherit libfido2 p11-kit; }; systemdStage1Network = systemdStage1.override { pname = "systemd-stage-1-network";