From fa093cff8161af642783faa747a13ea0bb29e347 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 28 May 2022 03:06:51 -0700 Subject: [PATCH 01/35] koreader: 2022.03.01 -> 2022.05.01 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 0a082cce3274..e2480dd18bde 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.03.1"; + version = "2022.05.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-ZoqITWPR60G4xY9InrtIY9rCWUk0PidGFZokHLWl5ps="; + sha256 = "sha256-Uz8fzF/SdKNRywoIb8B/iHRuXDwRyw7wH7bL9vRzPfY="; }; sourceRoot = "."; From bbfed3477dee0855983bc05c19e2cb7015328f42 Mon Sep 17 00:00:00 2001 From: fsdlkj <91154413+fsdlkj@users.noreply.github.com> Date: Sat, 28 May 2022 22:36:37 -0400 Subject: [PATCH 02/35] taisei: 1.3.1 -> 1.3.2 --- pkgs/games/taisei/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index 4bc04a336f83..8c2e268f7430 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -3,16 +3,16 @@ , docutils, meson, ninja, pkg-config, python3 # Runtime depends , glfw, SDL2, SDL2_mixer -, freetype, libpng, libwebp, libzip, zlib +, cglm, freetype, libpng, libwebp, libzip, zlib }: stdenv.mkDerivation rec { pname = "taisei"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "11f9mlqmzy1lszwcc1nsbar9q1hs4ml6pbm52hqfd4q0f4x3ln46"; + sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glfw SDL2 SDL2_mixer - freetype libpng libwebp libzip zlib + cglm freetype libpng libwebp libzip zlib ]; patches = [ ./0001-lto-fix.patch ]; @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - From d2ef633388ebdef6da2cc294dddcd73f7bb270a4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 07:36:35 +0100 Subject: [PATCH 03/35] sil: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here --- pkgs/games/sil/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 5f589ede2bc4..2e6c50daa823 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses") ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of + # `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' # the makefile doesn't have a sensible install target, so we hav to do it ourselves mkdir -p $out/bin From 8fb4658bc243275ade4cb7d73ff76142d1b9b516 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 29 May 2022 12:17:32 +0530 Subject: [PATCH 04/35] cinny: 2.0.3 -> 2.0.4 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index d27512bf5bcd..3f3d71a33718 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd"; + sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; }; installPhase = '' From 48210371c10926e3b23eba7dd639f899e2f668a6 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Sun, 29 May 2022 11:40:34 +0200 Subject: [PATCH 05/35] drawio: 18.0.6 -> 18.1.3 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3e4ea214c47e..4eecd35e1755 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "18.0.6"; + version = "18.1.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9"; + sha256 = "0abb33e790071368d1f549e5f41e8692cd565bdae8fabee23e660ace2020a743"; }; nativeBuildInputs = [ From eb68aa7177fdda688398061a4efeebb84310fafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 29 May 2022 20:33:21 +0300 Subject: [PATCH 06/35] pico-sdk: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/pico-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 1b58253edc01..ca46d203b348 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-cc1UTc1aswtJzuaUdYNcCzLtQ9+Wggiy/eRE+UoxSgE="; + sha256 = "sha256-Yf3cVFdI8vR/qcxghcx8fsbYs1qD8r6O5aqZ0AkSLDc="; }; nativeBuildInputs = [ cmake ]; From bb8a794957c5646a61cad5d401e7903b69b4c773 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 30 May 2022 11:59:15 +0300 Subject: [PATCH 07/35] =?UTF-8?q?tile38:=201.27.1=20=E2=86=92=201.28.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/tile38/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tile38/default.nix b/pkgs/servers/tile38/default.nix index 8d86a03ed7c8..50342fef59c8 100644 --- a/pkgs/servers/tile38/default.nix +++ b/pkgs/servers/tile38/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-CT611ZQmUYb6AclDEWXQsKDNxpwdJ+jqxIdDKGRo4/Q="; + sha256 = "sha256-Kac0iNqJFLLRR+Xu5GlxrsQqvim60uDlToe883++/7g="; }; - vendorSha256 = "sha256-FeQbfnvdERg5jtiTaT7Uz1YvmYLDXCDEf4sAyr3+Avk="; + vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc="; subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ]; From 9253fc4a56a6c3c0eef4de0664fc3abb4223557e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 30 May 2022 17:20:04 +0200 Subject: [PATCH 08/35] btcpayserver: 1.5.3 -> 1.5.4 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- pkgs/applications/blockchains/nbxplorer/util/update-common.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 4acb4c448f52..f93a8f329ef6 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs="; + sha256 = "sha256-8GMk7xBMhml0X/8YRuN3FsEF2TWDxtb0eoP/cduKXNg="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 033a7bbf4b6f..ee5238944867 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -54,6 +54,8 @@ git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https:/ export GNUPGHOME=$tmpdir # Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE) gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null +# Fetch Andrew Camilleri's key (64-bit key ID: 8E5530D9D1C93097) +gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 2> /dev/null echo echo "Verifying commit" git -C $repo verify-commit HEAD From 1980cec089c745cd3c67b7f0772b2c3feb2c9e42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 19:37:25 +0200 Subject: [PATCH 09/35] python310Packages.pyramid_chameleon: fix compatibility with pyramid 2 --- .../pyramid_chameleon/default.nix | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 377317049dc8..7a72a47982bc 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -1,29 +1,49 @@ { lib , buildPythonPackage -, fetchPypi , chameleon +, fetchpatch +, fetchPypi , pyramid -, zope_interface +, pytestCheckHook , setuptools +, zope_interface }: buildPythonPackage rec { - pname = "pyramid_chameleon"; + pname = "pyramid-chameleon"; version = "0.3"; src = fetchPypi { - inherit pname version; - sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017"; + pname = "pyramid_chameleon"; + inherit version; + sha256 = "sha256-0XZ5KlDrAV14ZbRL2bJKe9BIn6mlzrvRe54FBIzvkBc="; }; patches = [ # https://github.com/Pylons/pyramid_chameleon/pull/25 ./test-renderers-pyramid-import.patch + # Compatibility with pyramid 2, https://github.com/Pylons/pyramid_chameleon/pull/34 + (fetchpatch { + name = "support-later-limiter.patch"; + url = "https://github.com/Pylons/pyramid_chameleon/commit/36348bf4c01f52c3461e7ba4d20b1edfc54dba50.patch"; + sha256 = "sha256-cPS7JhcS8nkBS1T0OdZke25jvWHT0qkPFjyPUDKHBGU="; + }) ]; - propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ]; + propagatedBuildInputs = [ + chameleon + pyramid + setuptools + zope_interface + ]; - pythonImportsCheck = [ "pyramid_chameleon" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyramid_chameleon" + ]; meta = with lib; { description = "Chameleon template compiler for pyramid"; From 51b506f8de4bdd2122bd2b6e7166245a2e72f0da Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 30 May 2022 23:06:15 +0200 Subject: [PATCH 10/35] python3.pkgs.pyfuse3: fix broken mark --- pkgs/development/python-modules/pyfuse3/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 1518a7380494..cb10f07f22aa 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which, pythonAtLeast }: buildPythonPackage rec { pname = "pyfuse3"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33"; }; + disabled = pythonAtLeast "3.10"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 ]; @@ -26,7 +28,6 @@ buildPythonPackage rec { disabledTests = [ "test_listdir" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Python 3 bindings for libfuse 3 with async I/O support"; homepage = "https://github.com/libfuse/pyfuse3"; license = licenses.lgpl2Plus; From 62089e3ecaa332367dbb0e077533df83ffee719e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 23:18:37 +0200 Subject: [PATCH 11/35] checkov: 2.0.1174 -> 2.0.1175 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 108faa5221a5..0235d35aab73 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1174"; + version = "2.0.1175"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-gQuMdI4KCLQp52T9z+zxnjmKFPh97NrKSY9dgNm+6/c="; + hash = "sha256-nLh00DaSpKT6rngiXKa6z0+Ouu1/hMWzIYa54PHPD1k="; }; nativeBuildInputs = with py.pkgs; [ From c9098ff0bb3f08ada15b0b2a47095a34488e0ef0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 23:35:38 +0200 Subject: [PATCH 12/35] python310Packages.pyramid_jinja2: disable failing tests - switch to pytestCheckHook - disable on older Python releases --- .../python-modules/pyramid_jinja2/default.nix | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 455f4fb73b6c..02e43b20e0ad 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -2,23 +2,54 @@ , buildPythonPackage , fetchPypi , webtest +, markupsafe , jinja2 +, pytestCheckHook +, zope_deprecation , pyramid +, pythonOlder }: buildPythonPackage rec { - pname = "pyramid_jinja2"; + pname = "pyramid-jinja2"; version = "2.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; + pname = "pyramid_jinja2"; + inherit version; + hash = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; }; - buildInputs = [ webtest ]; - propagatedBuildInputs = [ jinja2 pyramid ]; + propagatedBuildInputs = [ + markupsafe + jinja2 + pyramid + zope_deprecation + ]; - pythonImportsCheck = [ "pyramid_jinja2" ]; + checkInputs = [ + webtest + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov" "" + ''; + + pythonImportsCheck = [ + "pyramid_jinja2" + ]; + + disabledTests = [ + # AssertionError: Lists differ: ['pyramid_jinja2-2.10',... + "test_it_relative_to_package" + # AssertionError: False is not true + "test_options" + ]; meta = with lib; { description = "Jinja2 template bindings for the Pyramid web framework"; From 66ff8747b81d2f024c7a36d55859c004c4095616 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 23:52:45 +0200 Subject: [PATCH 13/35] python310Packages.pysnmplib: 5.0.15 -> 5.0.16 --- pkgs/development/python-modules/pysnmplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix index 97a6cf4ff5d6..af0fabee7f0b 100644 --- a/pkgs/development/python-modules/pysnmplib/default.nix +++ b/pkgs/development/python-modules/pysnmplib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysnmplib"; - version = "5.0.15"; + version = "5.0.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysnmp"; rev = "v${version}"; - hash = "sha256-9HkS8oY9aHr8jXmryUMNz3z36BMWeYMuXLKdpEzCgZc="; + hash = "sha256-TmH4lvlgShEbhpBFEpgGJWLR2k1TmT2MhV2bgYWt9vo="; }; nativeBuildInputs = [ From 4c8853358de627904f31d98db6f2dfb5db4e789c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 23:55:17 +0200 Subject: [PATCH 14/35] python310Packages.nettigo-air-monitor: 1.2.4 -> 1.3.0 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index b9bfb95e2e8c..ade33b4f29fe 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.4"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-zmmJ3F2Fl4u7vOx1h5Z0LtWL0/5xmZiFRY2NU8Tc0MY="; + sha256 = "sha256-O/HJTqmNmnx85AVuhRRxNqS1W0dZyKFSPVFqaBXAuhU="; }; propagatedBuildInputs = [ From d821958373bddedc25d8100abcbf4118580fa5a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 23:58:40 +0200 Subject: [PATCH 15/35] python310Packages.nettigo-air-monitor: remove postPatch --- .../python-modules/nettigo-air-monitor/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ade33b4f29fe..81d80dcd7b2e 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -36,13 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - substituteInPlace setup.cfg \ - --replace "--cov --cov-report term-missing " "" - ''; - pythonImportsCheck = [ "nettigo_air_monitor" ]; From 113003f1a279840ca055ecb84bd5a6a642f9483c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 May 2022 00:27:19 +0200 Subject: [PATCH 16/35] python310Packages.huum: init at 0.5.0 --- .../python-modules/huum/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/huum/default.nix diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix new file mode 100644 index 000000000000..815765b8a40a --- /dev/null +++ b/pkgs/development/python-modules/huum/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, poetry-core +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "huum"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ldhAg9zGCEYvya01s6AHzALI4dS+d0R73c62YZyk19M="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + # Tests are not shipped and source not tagged + # https://github.com/frwickst/pyhuum/issues/2 + doCheck = false; + + pythonImportsCheck = [ + "huum" + ]; + + meta = with lib; { + description = "Library for for Huum saunas"; + homepage = "https://github.com/frwickst/pyhuum"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd2f70d4a020..ee5c2e20d165 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4043,6 +4043,8 @@ in { hupper = callPackage ../development/python-modules/hupper { }; + huum = callPackage ../development/python-modules/huum { }; + hvac = callPackage ../development/python-modules/hvac { }; hvplot = callPackage ../development/python-modules/hvplot { }; From 07517967de14d16de525f0fa11a2962fb2557466 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 22:33:40 +0200 Subject: [PATCH 17/35] python310Packages.verboselogs: switch to pytestCheckHook --- .../python-modules/verboselogs/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix index 99eb80530ef5..009dcd60edb0 100644 --- a/pkgs/development/python-modules/verboselogs/default.nix +++ b/pkgs/development/python-modules/verboselogs/default.nix @@ -1,21 +1,38 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "verboselogs"; version = "1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "xolox"; repo = "python-verboselogs"; rev = version; - sha256 = "10jzm8pkl49as4y2zyiidmfqqj5zmqg3p73jvx4lfxi0gmp1vhl5"; + hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I="; }; - # do not run pylint plugin test, as astroid is a old unsupported version - checkPhase = '' - PATH=$PATH:$out/bin pytest . -k "not test_pylint_plugin" - ''; - checkInputs = [ pytest mock ]; + checkInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ + "verboselogs" + ]; + + disabledTests = [ + # Do not run pylint plugin test + "test_pylint_plugin" + ]; meta = with lib; { description = "Verbose logging for Python's logging module"; From b787f238f4d091a083cb3600db81f763fa27c8c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 29 May 2022 00:19:30 +0200 Subject: [PATCH 18/35] python310Packages.webtest-aiohttp: remove superflouses inputs --- .../webtest-aiohttp/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 7c6e3589600d..c1ae249c87eb 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -1,25 +1,41 @@ -{ buildPythonPackage, fetchFromGitHub, lib, isPy27, webtest, invoke, flake8 -, aiohttp, pytest-aiohttp, pytestCheckHook }: +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, webtest +}: buildPythonPackage rec { pname = "webtest-aiohttp"; version = "2.0.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sloria"; repo = pname; rev = version; - sha256 = "1apr1x0wmnc6l8wv67z4dp00fiiygda6rwpxlspfk7nk9zz37q2j"; + sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; + propagatedBuildInputs = [ + webtest + ]; + + checkInputs = [ + aiohttp + pytest-aiohttp + pytestCheckHook + ]; + pythonImportsCheck = [ "webtest_aiohttp" ]; - propagatedBuildInputs = [ webtest ]; - checkInputs = [ invoke flake8 aiohttp pytest-aiohttp pytestCheckHook ]; - meta = with lib; { description = "Provides integration of WebTest with aiohttp.web applications"; homepage = "https://github.com/sloria/webtest-aiohttp"; From cea2a516382e9ca7f9b0b31618fd14db9d773302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 31 May 2022 00:58:07 +0000 Subject: [PATCH 19/35] python310Packages.pyhiveapi: 0.5.3 -> 0.5.4 https://github.com/Pyhass/Pyhiveapi/releases/tag/v0.5.4 --- pkgs/development/python-modules/pyhiveapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index 32975651e1fa..b5c3db62284c 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "v${version}"; - hash = "sha256-QBn+yKZN461npdhGngTnFeewE40dPZ+5TkUf5Xacajk="; + hash = "sha256-H/FxFv+1dOeJqnLZ0urDJfysYZHybeTJdQkjAFghTeI="; }; postPatch = '' From d10af5290b676a957e2c34098e77636cf14b90a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 01:17:43 +0000 Subject: [PATCH 20/35] cfripper: 1.10.0 -> 1.11.0 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 499f2d477b47..ad8757c67eec 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xDLzxe8lelHMU58SaThQ2NSfWDZ0DCYSHkiLPifxQGw="; + hash = "sha256-f/oZ7ZN2WT0a290Cq1w8O4Yggo1YV5k1tiTAm5ulVdI="; }; propagatedBuildInputs = with python3.pkgs; [ From aaf94758f3634888312b0ec5e3dd7bbd59543a88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 04:03:43 +0000 Subject: [PATCH 21/35] python310Packages.hatasmota: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 5f09cb3b7355..d41fca17e471 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-pIMao1zZXJJVEG9J9ypWlo/JF0nmci49ANcqHJSY2AY="; + sha256 = "sha256-1tCTkmhO9HyfdQuymTtFdCvxG9+Xs5/dEN5tB3/2fpQ="; }; propagatedBuildInputs = [ From 7064d75b711a866e159b46bcd17d97d2f557b118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 04:21:34 +0000 Subject: [PATCH 22/35] python310Packages.hahomematic: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 3d4af789a85c..e38f98bcad1a 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.6.1"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-/v0om2SbikNpMCvJhwIGlWSiZilhnJi7qj8SCV+zHCU="; + sha256 = "sha256-x7TaSpmNd0YUgh81Favpo6qZgRsVeIyvvFfH3UCCqsQ="; }; propagatedBuildInputs = [ From 6abc75c9400201c7b9eb14680d1eaf634f961434 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 04:28:22 +0000 Subject: [PATCH 23/35] python310Packages.pex: 2.1.90 -> 2.1.91 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 3ccaef81fa4d..ac45f9eb07ed 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.90"; + version = "2.1.91"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F9kpkp1Z70TWZjg97X0ZHMommswj07sJxQXiKVPMnRU="; + hash = "sha256-nlEdCdFxF/maOZtpUwNVExnmqUhdAfzlbrEMxAHvUxE="; }; nativeBuildInputs = [ From cfaec958cc81014eae1b8f35827c7c46b4c74207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 31 May 2022 08:36:12 +0200 Subject: [PATCH 24/35] README: 21.11 -> 22.05 I kind of forgot that when I did the release... --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff66ef0d85e8..c7e14f693495 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11) +* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents) +* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are From 32e26d2627154a54f42334dc31bf5338dc7a97ff Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 31 May 2022 08:53:58 +0200 Subject: [PATCH 25/35] release-notes: fix typo --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2205.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c7dad17149b6..8c090e6cc1a0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -615,7 +615,7 @@ version of the xmonad module, which will break your configuration if you use launch as entrypoint. The example code the corresponding nixos module - was adjusted, you way want to have a look at it. + was adjusted, you may want to have a look at it. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index ffa24bdf3e11..e4dc540eaafe 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -195,7 +195,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The update of the haskell package set brings with it a new version of the `xmonad` module, which will break your configuration if you use `launch` as entrypoint. The - example code the corresponding nixos module was adjusted, you way want to have a look at it. + example code the corresponding nixos module was adjusted, you may want to have a look at it. - The `home-assistant` module now requires users that don't want their configuration to be managed declaratively to set From 376897ced34becbfce58950225360c28e0a3ecf0 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Mon, 30 May 2022 14:53:28 +0200 Subject: [PATCH 26/35] astral: init at 5.7.1 --- .../science/biology/astral/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/biology/astral/default.nix diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/applications/science/biology/astral/default.nix new file mode 100644 index 000000000000..b092edc0e602 --- /dev/null +++ b/pkgs/applications/science/biology/astral/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, jdk8 +, makeWrapper +, jre8 +, zip +}: +let + jdk = jdk8; + jre = jre8; +in +stdenvNoCC.mkDerivation rec { + pname = "astral"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "smirarab"; + repo = "ASTRAL"; + rev = "v${version}"; + sha256 = "043w2z6gbrisqirdid022f4b8jps1pp5syi344krv2bis1gjq5sn"; + }; + + nativeBuildInputs = [ jdk makeWrapper jre zip ]; + + buildPhase = '' + patchShebangs ./make.sh + ./make.sh + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + java -jar astral.${version}.jar -i main/test_data/song_primates.424.gene.tre + runHook postCheck + ''; + + installPhase = '' + mkdir -p $out/share/lib + mkdir -p $out/bin + mv astral.${version}.jar $out/share/ + mv lib/*.jar $out/share/lib + mv Astral.${version}.zip $out/share/ + cp -a main/test_data $out/share/ + makeWrapper ${jre}/bin/java $out/bin/astral \ + --add-flags "-jar $out/share/astral.${version}.jar" + ''; + + meta = with lib; { + homepage = "https://github.com/smirarab/ASTRAL"; + description = "Tool for estimating an unrooted species tree given a set of unrooted gene trees"; + license = licenses.asl20; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e824dbd049..56277e326a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32715,6 +32715,8 @@ with pkgs; aragorn = callPackage ../applications/science/biology/aragorn { }; + astral = callPackage ../applications/science/biology/astral { }; + archimedes = callPackage ../applications/science/electronics/archimedes { stdenv = gcc6Stdenv; }; From 835056702eb6e1fdf36f34e3cb4acf9e53ea17cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 07:06:19 +0000 Subject: [PATCH 27/35] python310Packages.regenmaschine: 2022.05.0 -> 2022.05.1 --- pkgs/development/python-modules/regenmaschine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 33ecd8f7bfe4..a18e8cb2e8b5 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.05.0"; + version = "2022.05.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-8tc/7XaHqgnuQgQc1ZlkoiBnl/d+OKKXjKNWwY+vCaU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-E66qs8EC5o2WNMlv8ITK98De639wwhscbSFjljDzrks="; }; nativeBuildInputs = [ From 97bdb3c6450c58d16eeb93f4cf24500ddbe2f75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 31 May 2022 08:00:39 +0200 Subject: [PATCH 28/35] nearcore: 1.26.0 -> 1.26.1 --- pkgs/applications/blockchains/nearcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 264d53fc56a5..515108ab90bd 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.26.0"; + version = "1.26.1"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg="; + sha256 = "sha256-WoQtDdbFcvl6Wp5uv2tr/W/YYH8dyezF+LzSJ5oJcYY="; }; - cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8="; + cargoSha256 = "sha256-7h14XzhhPmkPoTx0kkJl7I7CPqbRAtxa1zpplYxg4p4="; postPatch = '' substituteInPlace neard/build.rs \ From b654502b2bb0026cdfd4d9cecdd5656745866c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 31 May 2022 10:04:09 +0200 Subject: [PATCH 29/35] terraform-providers: also include name in error messages --- .../networking/cluster/terraform-providers/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9af916e855c8..e557e07885bd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -66,13 +66,13 @@ let # Put all the providers we not longer support in this list. removed-providers = let - archived = date: throw "the provider has been archived by upstream on ${date}"; - removed = date: throw "removed from nixpkgs on ${date}"; + archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; + removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { - opc = archived "2022/05"; - oraclepaas = archived "2022/05"; - template = archived "2022/05"; + opc = archived "opc" "2022/05"; + oraclepaas = archived "oraclepaas" "2022/05"; + template = archived "template" "2022/05"; }; # excluding aliases, used by terraform-full From 5db40e768d1447624235b27d7176726550eb353f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:11:55 +0000 Subject: [PATCH 30/35] dpdk-kmods.src: use HTTPS URL --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 14c4855cf364..cdd643a40b66 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2021-04-21"; src = fetchzip { - url = "http://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz"; + url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz"; sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc="; }; From 2c746066649266eec0ce529f2091e09e905ece94 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Tue, 31 May 2022 13:14:32 +0200 Subject: [PATCH 31/35] .github/PULL_REQUEST_TEMPLATE.md: 21.11 -> 22.05 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3357fd1d3c12..47857a8ca4c3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes) +- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module From c356e7246f8b1a65b8edbe1c57e9f895caabeab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 07:12:13 +0000 Subject: [PATCH 32/35] gtk4: 4.6.4 -> 4.6.5 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index e67599e05558..bb9c431de3c8 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.4"; + version = "4.6.5"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "p5orvMeTG3A/xPofy+G5BuIpoVIthU1SKAF2anm8rJ8="; + sha256 = "+kLDcfSckJFnEeFVkdh9S+5EOMJ78GknFVgYB2KL6cI="; }; nativeBuildInputs = [ From d27cc392f04381074e5c71a2d5356442b1610cac Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 31 May 2022 09:14:43 +0200 Subject: [PATCH 33/35] ocamlPackages.resto: 0.6.1 -> 0.7 --- pkgs/development/ocaml-modules/resto/acl.nix | 4 ++-- .../ocaml-modules/resto/cohttp-client.nix | 2 +- .../resto/cohttp-self-serving-client.nix | 2 +- .../ocaml-modules/resto/cohttp-server.nix | 2 +- pkgs/development/ocaml-modules/resto/cohttp.nix | 2 +- pkgs/development/ocaml-modules/resto/default.nix | 6 ++---- pkgs/development/ocaml-modules/resto/directory.nix | 2 +- .../ocaml-modules/resto/ezresto-directory.nix | 13 ------------- pkgs/development/ocaml-modules/resto/ezresto.nix | 12 ------------ pkgs/development/ocaml-modules/resto/json.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 3 --- 11 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/resto/ezresto-directory.nix delete mode 100644 pkgs/development/ocaml-modules/resto/ezresto.nix diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 7ac05cd62da8..0eed996289da 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -2,9 +2,9 @@ buildDunePackage { pname = "resto-acl"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.10"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix index 2dc651045ba5..dd0db02cdd57 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "resto-cohttp-client"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index 88f2ef25e6a8..c01fb1db9053 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -12,7 +12,7 @@ buildDunePackage { pname = "resto-cohttp-self-serving-client"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 61a5d93e9fc3..29e18aa88b16 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "resto-cohttp-server"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix index c29e589057c2..4de70b1dfef6 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-cohttp"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 13d55b1af210..14a295e27696 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -2,16 +2,14 @@ buildDunePackage rec { pname = "resto"; - version = "0.6.1"; + version = "0.7"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87"; + sha256 = "sha256-aX7w/rsoOmbni8BOXa0WnoQ47Y5zl91vWvMobuNFT3Y="; }; - useDune2 = true; - propagatedBuildInputs = [ uri ]; diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index 7539bf98ffd6..555ec590ffd7 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-directory"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix deleted file mode 100644 index fa208cc3fbb4..000000000000 --- a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ buildDunePackage, resto, resto-directory, ezresto, lwt }: - -buildDunePackage { - pname = "ezresto-directory"; - inherit (resto) src version meta useDune2 doCheck; - - propagatedBuildInputs = [ - ezresto - resto-directory - resto - lwt - ]; -} diff --git a/pkgs/development/ocaml-modules/resto/ezresto.nix b/pkgs/development/ocaml-modules/resto/ezresto.nix deleted file mode 100644 index 8b3b2c6cd71f..000000000000 --- a/pkgs/development/ocaml-modules/resto/ezresto.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, buildDunePackage, resto, resto-json, uri }: - -buildDunePackage { - pname = "ezresto"; - inherit (resto) src version meta useDune2 doCheck; - - propagatedBuildInputs = [ - uri - resto - resto-json - ]; -} diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index e861cac6d319..dbb81fd35a62 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-json"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 546c37149f70..53ede51c4ccf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1293,9 +1293,6 @@ let rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; - ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; - ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { }; - resto = callPackage ../development/ocaml-modules/resto { }; resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { }; resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { }; From a9ce8f1ef222c4b03773e5931176189cb59daa8b Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 24 Mar 2022 15:11:16 +0100 Subject: [PATCH 34/35] ocamlPackages.json-data-encoding: 0.10 -> 0.11 --- pkgs/development/ocaml-modules/json-data-encoding/bson.nix | 2 +- .../development/ocaml-modules/json-data-encoding/default.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index d131acf4b487..46810ab1566b 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "json-data-encoding-bson"; - inherit (json-data-encoding) version src useDune2 doCheck; + inherit (json-data-encoding) version src doCheck; propagatedBuildInputs = [ json-data-encoding diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index 69fbdb6ed1c8..13b81d9c5271 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -2,15 +2,14 @@ buildDunePackage rec { pname = "json-data-encoding"; - version = "0.10"; + version = "0.11"; minimalOCamlVersion = "4.10"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "json-data-encoding"; rev = "${version}"; - sha256 = "0m0xx382wr44wz7gxf7mpfjx2w287pvqhg2lfvzmclfq3y5iy6mx"; + sha256 = "sha256-4FNUU82sq3ylgw0lxHlwi1OV58NRRh9zJqE47YyQZSc="; }; - useDune2 = true; propagatedBuildInputs = [ uri From 36049542b81b97c1d93131cd986856967719f365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 06:19:33 +0000 Subject: [PATCH 35/35] gnome.gnome-boxes: 42.0.1 -> 42.1 --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index e88a831821e0..9b770c0680e7 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.0.1"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM="; + sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA="; }; patches = [