From d4af467dc1e2c30721a80516baf023dfd7d9c33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 May 2021 18:39:27 +0200 Subject: [PATCH 01/37] libsForQt5.qtfeedback: init at unstable-2018-09-03 Co-authored-by: OPNA2608 --- .../libraries/qtfeedback/default.nix | 48 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/qtfeedback/default.nix diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix new file mode 100644 index 000000000000..a329ece074ba --- /dev/null +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, perl +, qmake +, qtbase +, qtdeclarative +}: + +mkDerivation rec { + pname = "qtfeedback"; + version = "unstable-2018-09-03"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtfeedback"; + rev = "a14bd0bb1373cde86e09e3619fb9dc70f34c71f2"; + sha256 = "0kiiffvriagql1cark6g1qxy7l9c3q3s13cx3s2plbz19nlnikj7"; + }; + + nativeBuildInputs = [ + perl + qmake + ]; + + buildInputs = [ + qtdeclarative + ]; + + qmakeFlags = [ "CONFIG+=git_build" ]; + + doCheck = true; + + postFixup = '' + # Drop QMAKE_PRL_BUILD_DIR because it references the build dir + find "$out/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + ''; + + meta = with lib; { + description = "Qt Tactile Feedback"; + homepage = "https://github.com/qt/qtfeedback"; + license = with licenses; [ lgpl3Only /* or */ gpl2Plus ]; + maintainers = with maintainers; [ dotlambda OPNA2608 ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index bfc576e65549..2f7fa5af1f9e 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -165,6 +165,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // withQt5 = true; }; + qtfeedback = callPackage ../development/libraries/qtfeedback { }; + qtutilities = callPackage ../development/libraries/qtutilities { }; qtinstaller = callPackage ../development/libraries/qtinstaller { }; From 8c9069d0094d6dd209e80d98d5269c6e01cd1016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 May 2021 17:10:29 +0200 Subject: [PATCH 02/37] angelfish: 1.8.0 -> 21.05 https://www.plasma-mobile.org/info/plasma-mobile-gear-21-05/#angelfish --- .../networking/browsers/angelfish/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/networking/browsers/angelfish/default.nix index 831fabf2deb1..7fb2703199a7 100644 --- a/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/pkgs/applications/networking/browsers/angelfish/default.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, fetchFromGitLab +, fetchurl , cmake , corrosion , extra-cmake-modules @@ -12,6 +12,7 @@ , knotifications , kpurpose , kwindowsystem +, qtfeedback , qtquickcontrols2 , qtwebengine , rustPlatform @@ -19,20 +20,17 @@ mkDerivation rec { pname = "angelfish"; - version = "1.8.0"; + version = "21.05"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "plasma-mobile"; - repo = "angelfish"; - rev = "v${version}"; - sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f"; + src = fetchurl { + url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; + sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m"; + sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g"; }; nativeBuildInputs = [ @@ -58,6 +56,7 @@ mkDerivation rec { knotifications kpurpose kwindowsystem + qtfeedback qtquickcontrols2 qtwebengine ]; From 345be4f03445847a23468708250736bb84a712fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 13:45:21 +0000 Subject: [PATCH 03/37] freetube: 0.12.0 -> 0.13.0 --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index a5de2142d777..df6cf6192003 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "151fcm1swsasrwzm93fddx669q4xlfl3d58q1w58nyv7r6kh4fda"; + sha256 = "sha256-CutTSpwb0G7FZgeKf/lvWHlhOn+X5AWLvPk0cpFQ1lk="; }; appimageContents = appimageTools.extractType2 { From aef81404bcc8627eb493157ecc51e9708fd14ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 May 2021 06:54:07 +0200 Subject: [PATCH 04/37] maturin: 0.10.4 -> 0.10.5 Changelog: https://github.com/PyO3/maturin/blob/v0.10.5/Changelog.md#0105---2021-05-21 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 41746fa65ceb..08b9f852a2e4 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; + hash = "sha256-wI5bk9LauIfT4aEo1pCtUicXn0mJb4ijqV0NI6rKL6k="; }; - cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j"; + cargoHash = "sha256-xLT3QeLDZnPrW1rCa0E1DrCYiqhb04o3vdi8pdJdWJQ="; nativeBuildInputs = [ pkg-config ]; From 11307c1d474523c3a901fc7d9d7de52bf93d4671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 May 2021 07:03:49 +0200 Subject: [PATCH 05/37] maturinBuildHook: add rustc to deps maturin 0.10.5 uses rustc -vV to find the host: https://github.com/PyO3/maturin/commit/e886c85f5a422111f7447541fd896228f6d403f1 We now need to make rustc visible to the hook for maturin to work properly. --- pkgs/build-support/rust/hooks/default.nix | 3 ++- pkgs/development/compilers/rust/make-rust-platform.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index e8927e2b542f..d86c9ebaed80 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -6,6 +6,7 @@ , makeSetupHook , maturin , rust +, rustc , stdenv , target ? rust.toRustTargetSpec stdenv.hostPlatform }: @@ -85,7 +86,7 @@ in { maturinBuildHook = callPackage ({ }: makeSetupHook { name = "maturin-build-hook.sh"; - deps = [ cargo maturin ]; + deps = [ cargo maturin rustc ]; substitutions = { inherit ccForBuild ccForHost cxxForBuild cxxForHost rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 584b1fdbe438..367da3c738d8 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -26,6 +26,6 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit cargo; + inherit cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } From 9c7b0d0698d4830d37b58baf9bc9f193d3fdcfb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 04:13:15 +0000 Subject: [PATCH 06/37] git-quick-stats: 2.1.9 -> 2.2.0 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 3f0450468225..548fca369b92 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.9"; + version = "2.2.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-2rrwbEXwBBuussybCZFbAEjNwm/ztbXw1jUlTnxPINA="; + sha256 = "sha256-cE9eo8FUUNlhmBrHalFDTFK2LIQUaWFy7Gj/E2F15t4="; }; nativeBuildInputs = [ makeWrapper ]; From aa53807ba7719565e547e683afaeba35e51e91eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 May 2021 08:47:40 +0200 Subject: [PATCH 07/37] maturin: fix Darwin build --- pkgs/development/tools/rust/maturin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 08b9f852a2e4..239425212e83 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,6 +5,7 @@ , rustPlatform , pkg-config , dbus +, libiconv , Security }: @@ -23,8 +24,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isLinux dbus - ++ lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isLinux [ dbus ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; # Requires network access, fails in sandbox. doCheck = false; From 604ea22f42d3a38c566071cf898e0d4f2bf30e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Sat, 22 May 2021 10:02:33 +0200 Subject: [PATCH 08/37] maturin: 0.10.5 -> 0.10.6 Changelog: https://github.com/PyO3/maturin/blob/main/Changelog.md#0106---2021-05-21 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 239425212e83..5ab47c8aa8de 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-wI5bk9LauIfT4aEo1pCtUicXn0mJb4ijqV0NI6rKL6k="; + hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; }; - cargoHash = "sha256-xLT3QeLDZnPrW1rCa0E1DrCYiqhb04o3vdi8pdJdWJQ="; + cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; nativeBuildInputs = [ pkg-config ]; From f212ed0cf43f96e24deaf761306daa12fafde42d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 15:43:27 +0000 Subject: [PATCH 09/37] gitkraken: 7.6.0 -> 7.6.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 247bb9b53efe..2f19e0693c49 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.6.0"; + version = "7.6.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "11818d8ph9qqisdpkv46afhr79qq128gaz5d0n7b48dx25ih1jb9"; + sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw="; }; dontBuild = true; From 3dc662d5cb2a2c30c4148f4996be18d0e1390363 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 06:03:49 +0000 Subject: [PATCH 10/37] agi: 1.1.0-dev-20210517 -> 1.1.0-dev-20210521 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index cc0d9dce52cb..57f9d7e33144 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210517"; + version = "1.1.0-dev-20210521"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-O3U/aDGEhXQltM70DHhnDCgothF8HHZMJ102EjiaINU="; + sha256 = "sha256-otdthD5p+12JmBltFtXgVaa1fgsItluHv0S4k/GbB9Q="; }; nativeBuildInputs = [ From 43551fc19e98e210da27a397ad66efcdce9ab575 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 14:53:19 +0000 Subject: [PATCH 11/37] armadillo: 10.4.1 -> 10.5.0 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index b286c7efbd88..ee557ba6067e 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.4.1"; + version = "10.5.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-5aRR4FXeX4sEhKzVyrLsXbrW3ihze1zHJRDYkuxppYA="; + sha256 = "sha256-6pkMNNxtcNfJW0NU2fOwgZveJX27Z3ljSOkeGWCCy4c="; }; nativeBuildInputs = [ cmake ]; From 8cc310c77c9e122ef1a6f14b4d4ca31354c43a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 May 2021 21:38:00 +0200 Subject: [PATCH 12/37] safe-rm: 0.12 -> 1.1.0 --- pkgs/tools/system/safe-rm/default.nix | 33 +++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index c81eea889023..bac9bb356024 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -1,37 +1,36 @@ -{ lib, stdenv, fetchgit, perl, coreutils }: +{ lib, rustPlatform, fetchgit, coreutils, installShellFiles }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "safe-rm"; - version = "0.12"; + version = "1.1.0"; src = fetchgit { url = "https://git.launchpad.net/safe-rm"; rev = "refs/tags/${pname}-${version}"; - sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq"; + sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; - # pod2man - nativeBuildInputs = [ perl ]; + cargoSha256 = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg="; - propagatedBuildInputs = [ coreutils perl ]; - - postFixup = '' - sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm + postPatch = '' + substituteInPlace src/main.rs \ + --replace "/bin/rm" "${coreutils}/bin/rm" ''; - installPhase = '' - mkdir -p $out/bin - cp safe-rm $out/bin + nativeBuildInputs = [ installShellFiles ]; - mkdir -p $out/share/man/man1 - pod2man safe-rm > $out/share/man/man1/safe-rm.1 + # uses lots of absolute paths outside of the sandbox + doCheck = false; + + postInstall = '' + installManPage safe-rm.1 ''; meta = with lib; { description = "Tool intended to prevent the accidental deletion of important files"; homepage = "https://launchpad.net/safe-rm"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b55ce5bfdc40ce9cd883dd7b0eff31f7f796c73c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 22:30:36 +0000 Subject: [PATCH 13/37] ft2-clone: 1.46 -> 1.47 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 8391a7509995..781889f9fe3c 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.46"; + version = "1.47"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-Y6FgIbNCsxnM/B2bEB7oufBjU1BnBYaz7/oysWttIOc="; + sha256 = "sha256-KLHJROOtRPtGHBYEMByY7LG6FY4vES6WndCiz7okan8="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 1d1efe54cfc1dd8ad862052b07ac5ea49a570d82 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 22 May 2021 18:27:00 +0200 Subject: [PATCH 14/37] staticjinja: 1.0.4 -> 2.0.0 --- pkgs/development/python-modules/staticjinja/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index e7f1e442f4d8..1f9a63927bb3 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -13,17 +13,15 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "1.0.4"; + version = "2.0.0"; format = "pyproject"; - disabled = isPy27; # 0.4.0 drops python2 support - # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "1saz6f71s693gz9c2k3bq2di2mrkj65mgmfdg86jk0z0zzjk90y1"; + sha256 = "0z5y4l4sv4c7zmp6pj1ws3psq7i87xqbcmk648bmsa1d6prr1hil"; }; nativeBuildInputs = [ From 5b42338f4ec43e437e45e777716f8e24d21a60b4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 24 May 2021 14:17:51 +0200 Subject: [PATCH 15/37] docs/release-notes: mention staticjinja --- .../manual/from_md/release-notes/rl-2111.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index abcf3406aa34..dc5a30d19bc3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -12,4 +12,15 @@ +
+ Backward incompatibilities + + + + The staticjinja package has been upgraded + from 1.0.4 to 2.0.0 + + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1499249148fb..6bd552c873ac 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -3,3 +3,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: * Support is planned until the end of April 2022, handing over to 22.05. + +## Backward incompatibilities + +* The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 From f57fb1844c296cc0b171cb978326f8a0fcf0c862 Mon Sep 17 00:00:00 2001 From: David Birks Date: Mon, 24 May 2021 10:40:42 -0400 Subject: [PATCH 16/37] microplane: 0.0.31 -> 0.0.32 --- pkgs/tools/misc/microplane/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index 502188ae4d2f..89b0bc4d8b8d 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "microplane"; - version = "0.0.31"; + version = "0.0.32"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "sha256-PcojOFe3SHhnFy09kcxHhb5kd07TG7Uq+coPUNbJjx4="; + sha256 = "sha256-QYii/UmYus5hloTUsbVKsw50bSfI4bArUgGzFSK8Cas="; }; - vendorSha256 = "sha256-5HHdxSXg3ZIUyFQALaYgvf4pQwNxG58cF4vnCnMgAuY="; + vendorSha256 = "sha256-1XtpoGqQ//2ccJdl8E7jnSBQhYoA4/YVBbHeI+OfaR0="; buildFlagsArray = '' -ldflags=-s -w -X main.version=${version} From 54144caa06abc42e56479145124518d2bf6b8d42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 19:05:51 +0000 Subject: [PATCH 17/37] links2: 2.22 -> 2.23 --- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index a6cf5ad531e5..81555fa63411 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.22"; + version = "2.23"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-A2SYazp/Ho4xcb6jYrU/ceHdM2CohC1m/cZVgOvCCE0="; + sha256 = "sha256-ZmDSAvUh/Ri/UYTD8XMtH6dCahAzdCd60c245XzmrEU="; }; buildInputs = with lib; From 9d396b5600b018f84e90e56c61dfaef1b149e330 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 20:17:02 +0000 Subject: [PATCH 18/37] lief: 0.11.4 -> 0.11.5 --- pkgs/development/libraries/lief/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 872327ed4b8f..706408061907 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "DgsTrJ2+zdXJK6CdDOan7roakaaxQiwrVeiQnzJnk0A="; + sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE="; }; outputs = [ "out" "py" ]; From 4d3d0c27104cbeb6aaa4d227957ef660d3981820 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 22:54:52 +0200 Subject: [PATCH 19/37] python3Packages.adafruit-platformdetect: 3.13.2 -> 3.13.3 --- .../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 39d460911335..21579406c52d 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.13.2"; + version = "3.13.3"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-ke2BDpMOTcYq37Eb8DX+gIztqHKstsTmjZL8Uw5C0/Q="; + sha256 = "sha256-tA3UafaFvUH6Ko0OAXhh8Jz+ht+seTuhPjBsHHaI6rE="; }; nativeBuildInputs = [ setuptools-scm ]; From 1b7c85043775856d6b7ca664c81cee6cc6c04c45 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 24 May 2021 23:56:58 +0100 Subject: [PATCH 20/37] python3Packages.lightgbm: fix for darwin package appears to have its own openmp library detection now and doesn't need the hacks. also add pythonImportsCheck. --- .../python-modules/lightgbm/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index a887c3ec8af2..fbe9e04b6438 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -23,19 +23,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # we never actually explicitly call the install command so this is the only way - # to inject these options to it - however, openmp-library doesn't appear to have - # any effect, so we have to inject it into NIX_LDFLAGS manually below - postPatch = lib.optionalString stdenv.cc.isClang '' - cat >> setup.cfg < Date: Tue, 25 May 2021 11:13:21 +0200 Subject: [PATCH 21/37] pcloud: 1.9.1 -> 1.9.2 --- pkgs/applications/networking/pcloud/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 4b1eca32750e..bd9371fff134 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,19 +21,19 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss + alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let pname = "pcloud"; - version = "1.9.1"; - code = "XZXB3fXZgXyQbnTkTm5XOJH9i6NsKX9lL21V"; + version = "1.9.2"; + code = "XZCBKnXZdbHEAu1ec7bMDQCb1oCztBc169Py"; name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip"; - hash = "sha256-vUrz4thp9tcU9T8d52DJUAbt6Jnv+E3pbUytzMR8d/E="; + hash = "sha256-9I4xl9cO1MDvdXaTv6ER/NPdqKoo0y7HNWxGl0Fn1O0="; }; appimageContents = appimageTools.extractType2 { From 88305beb434f799d70d1d69dc8f9909c5d67fb06 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 25 May 2021 20:56:32 +1000 Subject: [PATCH 22/37] navidrome: 0.42.1 -> 0.43.0 --- pkgs/servers/misc/navidrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 532f7734acbb..065184b77136 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.42.1"; + version = "0.43.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv"; + sha256 = "0y7a5n8phffxga1bjkaf7x5ijripqg1nfjljkrrj26778550vqb5"; }; nativeBuildInputs = [ makeWrapper ]; From 5d0669742fbcecb73bdaaa912972a2113e341a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 25 May 2021 08:05:05 -0300 Subject: [PATCH 23/37] marwaita: 9.2.1 -> 9.2.2 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 5eeab879743a..91404af08493 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "9.2.1"; + version = "9.2.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "08392ybpxnbq3wswa7bvz8nnxryjg9aczvw3arnhfvmbigwq5q0s"; + sha256 = "0fbcncsldn2v6x6jla187mp6sjm529ij8rf85wcxpahc45vwb9pg"; }; buildInputs = [ From 44595a679b2345ddad993c73bbd26fff9d19031c Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 25 May 2021 14:00:20 +0200 Subject: [PATCH 24/37] maintainer-list: add sheepforce (me) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a032f3017869..0130499a993d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9161,6 +9161,12 @@ githubId = 1443459; name = "Sheena Artrip"; }; + sheepforce = { + email = "phillip.seeber@googlemail.com"; + github = "sheepforce"; + githubId = 16844216; + name = "Phillip Seeber"; + }; sheganinans = { email = "sheganinans@gmail.com"; github = "sheganinans"; From 61210e673eafef214ef12b4ece6f160527c7695b Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 24 May 2021 18:55:41 +0300 Subject: [PATCH 25/37] helvum: init at 0.2.0 --- pkgs/applications/audio/helvum/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/helvum/default.nix diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix new file mode 100644 index 000000000000..1c2acb36f00d --- /dev/null +++ b/pkgs/applications/audio/helvum/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitLab +, rustPlatform +, pkg-config +, clang +, libclang +, glib +, gtk4 +, pipewire +}: + +rustPlatform.buildRustPackage rec { + pname = "helvum"; + version = "0.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "ryuukyu"; + repo = pname; + rev = version; + sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w="; + }; + + cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw="; + + nativeBuildInputs = [ clang pkg-config ]; + buildInputs = [ glib gtk4 pipewire ]; + + LIBCLANG_PATH = "${libclang.lib}/lib"; + + meta = with lib; { + description = "A GTK patchbay for pipewire"; + homepage = "https://gitlab.freedesktop.org/ryuukyu/helvum"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fufexan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb4e447884..3b6a902a1a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21739,6 +21739,8 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; + helvum = callPackage ../applications/audio/helvum { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; From ab484473ae570fbedf935d191ec9284dbc6ccfe4 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 25 May 2021 15:09:39 +0200 Subject: [PATCH 26/37] qcelemental: init at 0.20.0 qcelemental: directory name qcelemental: remove cacert, 0.19.0 -> 0.20.0 --- .../python-modules/qcelemental/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/qcelemental/default.nix diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix new file mode 100644 index 000000000000..52cd264a005a --- /dev/null +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, lib, fetchPypi, numpy, pydantic, pint, + networkx, pytestrunner, pytestcov, pytest +} : + +buildPythonPackage rec { + pname = "qcelemental"; + version = "0.20.0"; + + checkInputs = [ pytestrunner pytestcov pytest ]; + propagatedBuildInputs = [ numpy pydantic pint networkx ]; + + src = fetchPypi { + inherit pname version; + sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni"; + }; + + doCheck = true; + + meta = with lib; { + description = "Periodic table, physical constants, and molecule parsing for quantum chemistry."; + homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38ab293c872d..d39ee3091842 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7007,6 +7007,8 @@ in { qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + qcelemental = callPackage ../development/python-modules/qcelemental { }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; qdldl = callPackage ../development/python-modules/qdldl { }; From a0160c0ae804fa12a98f7020e786fc2565b81974 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 May 2021 15:53:41 +0200 Subject: [PATCH 27/37] python3Packages.pywemo: disable failing test With libxml2 2.9.12 this test started failing, it was reported upstream at https://github.com/pywemo/pywemo/issues/268. --- pkgs/development/python-modules/pywemo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index ceb190fe753a..7448f1f7f2c7 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/NixOS/nixpkgs/issues/124165 + "test_bridge_getdevicestatus" + ]; + pythonImportsCheck = [ "pywemo" ]; meta = with lib; { From 140828ce3843444a8536db884147ed5c4b941259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 09:25:07 +0200 Subject: [PATCH 28/37] nixos/kresd: tell resolveconf to use local resolver --- nixos/modules/services/networking/kresd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 9b94c390e985..6882a315f616 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -115,6 +115,8 @@ in { config = mkIf cfg.enable { environment.etc."knot-resolver/kresd.conf".source = configFile; # not required + networking.resolvconf.useLocalResolver = mkDefault true; + users.users.knot-resolver = { isSystemUser = true; group = "knot-resolver"; From 8f5c32af534d299f0ac104495db0aacbdcb2861a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 17:26:16 +0200 Subject: [PATCH 29/37] python3Packages.pyupgrade: 2.16.0 -> 2.18.0 (#124387) --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 93fd8403be7e..74723b665bef 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.16.0"; + version = "2.18.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U1Ak0oGy0FxBMqRM2A3N7VuNDz2aUW4FFW+hKKhjfdk="; + sha256 = "sha256-nkMKy1NAFBG/PuPdj3LAqr0c4UqEM2R2kHKuORql2dw="; }; checkInputs = [ pytestCheckHook ]; From 4a1c0cdba8b5ad8e9b87e5ecfecc816a3ad30658 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 17:38:18 +0200 Subject: [PATCH 30/37] python3Packages.frozenlist: init at 1.1.1 --- .../python-modules/frozenlist/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/frozenlist/default.nix diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix new file mode 100644 index 000000000000..e3def747f03b --- /dev/null +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "frozenlist"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "07z33vid7s8fjwvybyn8357yvs0f6nlhizv1l3qj1bczi3jbdkbh"; + }; + + nativeBuildInputs = [ + cython + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=frozenlist" "" + ''; + + preBuild = '' + cython frozenlist/_frozenlist.pyx + ''; + + pythonImportsCheck = [ "frozenlist" ]; + + meta = with lib; { + description = "Python module for list-like structure"; + homepage = "https://github.com/aio-libs/frozenlist"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38ab293c872d..13a477b8490e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2619,6 +2619,8 @@ in { frozendict = callPackage ../development/python-modules/frozendict { }; + frozenlist = callPackage ../development/python-modules/frozenlist { }; + fs = callPackage ../development/python-modules/fs { }; fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; From 1202bf4227ae5d27774bee09fd26ae1e9ab48d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 25 May 2021 16:52:12 +0200 Subject: [PATCH 31/37] python3Packages.tokenizers: 0.10.1 -> 0.10.3 Changelog: https://github.com/huggingface/tokenizers/releases/tag/python-v0.10.2 https://github.com/huggingface/tokenizers/releases/tag/python-v0.10.3 --- pkgs/development/python-modules/tokenizers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 348302a59c55..8973d34f5af8 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -49,19 +49,19 @@ let }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - hash = "sha256-N/dKjQwHKmJnB76q8ISQ3cjuW0Z4GqGavnFFx/w9JRQ="; + hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-3ICSjtiRfLOj+PXu6mcuDoAtod5uXAcabYWTLxEgI18="; + hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo="; }; sourceRoot = "source/bindings/python"; From 2c5f7b241ceceb4e5777124ad73c2f181eb256a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 25 May 2021 17:07:38 +0200 Subject: [PATCH 32/37] python3Packages.tokenizers: canonicalize tests Make handling of tests more like other Python derivations (and they actually run again). --- pkgs/development/python-modules/tokenizers/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 8973d34f5af8..544dbf1beafc 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -76,15 +76,12 @@ in buildPythonPackage rec { numpy ]; - installCheckInputs = [ + checkInputs = [ datasets pytestCheckHook requests ]; - doCheck = false; - doInstallCheck = true; - postUnpack = '' # Add data files for tests, otherwise tests attempt network access. mkdir $sourceRoot/tests/data From 8bf543af06a5882f4a1c78721f5ae208db46fa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= Date: Tue, 25 May 2021 18:25:37 +0200 Subject: [PATCH 33/37] libfixposix: add support for darwin --- pkgs/development/libraries/libfixposix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index d8659b9e15f0..4c7680f70469 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, getconf }: stdenv.mkDerivation rec { pname = "libfixposix"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ]; meta = with lib; { homepage = "https://github.com/sionescu/libfixposix"; description = "Thin wrapper over POSIX syscalls and some replacement functionality"; license = licenses.boost; maintainers = with maintainers; [ orivej raskin ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From b0798e7d4b6838eab3f858765b337f1bb2ef3a72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 16:46:36 +0200 Subject: [PATCH 34/37] python3Packages.zwave-js-server-python: 0.24.0 -> 0.25.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 11d1231b48da..f11ff6bece47 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.24.0"; + version = "0.25.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-LHAlGWoASDiFwvy59uXl5GH5pPmMuthoo4ZrFegkCIU="; + sha256 = "sha256-frhmyla3neFVZILDy7HnKloMqNLRjm3gxS88xZdu29w="; }; propagatedBuildInputs = [ From 0ddb62fda63d08b449090555f36ae0a04f1d6546 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 18:40:16 +0200 Subject: [PATCH 35/37] python3Packages.aiosignal: init at 1.1.1 --- .../python-modules/aiosignal/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/aiosignal/default.nix diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix new file mode 100644 index 000000000000..9b9ef3b12ae1 --- /dev/null +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, frozenlist +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiosignal"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "0a9md2dy83qwg2an57nqrzp9nb7krq27y9zz0f7qxcrv0xd42djy"; + }; + + propagatedBuildInputs = [ + frozenlist + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=aiosignal" "" + ''; + + pythonImportsCheck = [ "aiosignal" ]; + + meta = with lib; { + description = "Python list of registered asynchronous callbacks"; + homepage = "https://github.com/aio-libs/aiosignal"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13a477b8490e..d1e6b0af990e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -333,6 +333,8 @@ in { aioshelly = callPackage ../development/python-modules/aioshelly { }; + aiosignal = callPackage ../development/python-modules/aiosignal { }; + aiosmb = callPackage ../development/python-modules/aiosmb { }; aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; From 919dd5497aaf200a7d8e8c67b56b4dd165eac112 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 25 May 2021 19:47:06 +0300 Subject: [PATCH 36/37] nginxStable: 1.20.0 -> 1.20.1 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 5972177204fc..bb554c500e27 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.20.0"; - sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; + version = "1.20.1"; + sha256 = "0jccnknx57yvbvx6qwwisa8rb5zm1wb54xnz0nm0phym6cay2qp4"; } From 0a7feef8094d65a4b6a9806b61ca9843f70c68a3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 25 May 2021 19:48:44 +0300 Subject: [PATCH 37/37] nginxMainline: 1.20.0 -> 1.21.0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index b7a11fc240d7..5b87b499964e 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.20.0"; - sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; + version = "1.21.0"; + sha256 = "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy"; }