From 216af462f672510de6e5e781ab13b98089f43da3 Mon Sep 17 00:00:00 2001 From: uniquepointer Date: Mon, 27 Dec 2021 18:22:44 -0500 Subject: [PATCH 01/11] reaper: 6.38 -> 6.43 --- pkgs/applications/audio/reaper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index a7063b9f3e25..b7f6bb3ee373 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.38"; + version = "6.43"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-K5EnrmzP8pyW9dR1fbMzkPzpS6aHm8JF1+m3afnH4rU="; - aarch64-linux = "sha256-6wNWDXjQNyfU2l9Xi9JtmAuoKtHuIY5cvNMjYkwh2Sk="; + x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E="; + aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw="; }.${stdenv.hostPlatform.system}; }; @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ jfrankenau ilian orivej ]; + maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ]; }; } From 440ffae50378bd7fa3dee51db7d0446284725789 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 28 Dec 2021 18:06:41 +0100 Subject: [PATCH 02/11] kopia: 0.9.7 -> 0.9.8 Release notes: https://github.com/kopia/kopia/releases/tag/v0.9.8 The module started to depend on Go 1.17: ``` internal/scrubber/scrub_sensitive.go:28:16: sf.IsExported undefined (type reflect.StructField has no field or method IsExported) note: module requires Go 1.17 ``` --- pkgs/tools/backup/kopia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 34df5982f2a7..a878bcf6c043 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo117Module, fetchFromGitHub }: -buildGoModule rec { +buildGo117Module rec { pname = "kopia"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-nHMsh+2Wpca2SJSy1XRMWwHHcdjpnb1u9JS6wM4E65Y="; + sha256 = "sha256-7Bvgtp6egZqpTv4Ac+OUkhKzTZhRRMwpdvwOCBA6Dso="; }; - vendorSha256 = "sha256-SJKsTZMppu6eit4ssMSwJOkeaheEYUwWRDPyPjirNHM="; + vendorSha256 = "sha256-/dCRM61Zl5YbIb0mKhcyLU15nQhR31QAaq+5TwRK4pM="; doCheck = false; From c81ba6351202cc5c695b9ad89012ecde66ca13c8 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Wed, 29 Dec 2021 18:39:21 +0100 Subject: [PATCH 03/11] winbox: 3.31 -> 3.32 --- pkgs/tools/admin/winbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index c8595ee10726..38b7318746d0 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -14,15 +14,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.31"; + version = "3.32"; name = "${pname}-${version}"; executable = fetchurl (if use64 then { url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe"; - sha256 = "sha256-aE6RZ2bCYahxH5QWxBH4CJOjW9dbzibx8zQ4Z5652V4="; + sha256 = "1gf0zdn4ahfp08fn5w0nzigwldl3bjqcj2f08rcvyn0mbwar4znn"; } else { url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe"; - sha256 = "sha256-yyKiU5xJlp/VQVYuX79pdCEve63yV3SUzi+/c915gAc="; + sha256 = "18rmbnv7iwba19sfh4q4wfwh385snrmpvs6dyad2s9rv7vh2nch7"; }); # This is from the winbox AUR package: # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e From c2ae5fbe7edc0738219c0f3e578c619e8680e90b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 29 Dec 2021 17:38:29 -0300 Subject: [PATCH 04/11] babashka: 0.7.0 -> 0.7.2 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index ffb33713a913..931aa641e5ba 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.0"; + version = "0.7.2"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zSjiHacetJ68U0GciIbuGET9I/51EM8JnPPUGemDfEI="; + sha256 = "sha256-e3/tRSszjLt/lt23ofQz9l5fqJRbshboPvX2bo/qMmI="; }; executable = "bb"; From ac99c632c097e49dc7abd14368c9d6cc2fd5bea5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 29 Dec 2021 22:55:53 -0300 Subject: [PATCH 05/11] Revert "babashka: 0.7.0 -> 0.7.2" --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 931aa641e5ba..ffb33713a913 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.2"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-e3/tRSszjLt/lt23ofQz9l5fqJRbshboPvX2bo/qMmI="; + sha256 = "sha256-zSjiHacetJ68U0GciIbuGET9I/51EM8JnPPUGemDfEI="; }; executable = "bb"; From 3ff5348c38a2b798f3e16b1fc4236e1c070f23a5 Mon Sep 17 00:00:00 2001 From: Adam Oliver Zsigmond <6388483+zsedem@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:47:30 +0100 Subject: [PATCH 06/11] vscode-extensions.scala-lang.scala: 0.5.3 -> 0.5.5 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 45ecb7e3b023..f97b0dbabeb7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1337,8 +1337,8 @@ let mktplcRef = { name = "scala"; publisher = "scala-lang"; - version = "0.5.3"; - sha256 = "0isw8jh845hj2fw7my1i19b710v3m5qsjy2faydb529ssdqv463p"; + version = "0.5.5"; + sha256 = "1gqgamm97sq09za8iyb06jf7hpqa2mlkycbx6zpqwvlwd3a92qr1"; }; meta = { license = lib.licenses.mit; From 871ec449761cd2ea3b638dc4e2c0a43cd706401a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Dec 2021 14:33:32 +0000 Subject: [PATCH 07/11] python3Packages.trio-asyncio: init at 0.12.0 --- .../python-modules/trio-asyncio/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/trio-asyncio/default.nix diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix new file mode 100644 index 000000000000..f6feb789690d --- /dev/null +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, trio +, outcome +, sniffio +, pytest-trio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "trio-asyncio"; + version = "0.12.0"; + + src = fetchPypi { + pname = "trio_asyncio"; + inherit version; + sha256 = "824be23b0c678c0df942816cdb57b92a8b94f264fffa89f04626b0ba2d009768"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + propagatedBuildInputs = [ + trio + outcome + sniffio + ]; + + checkInputs = [ + pytest-trio + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/python" # tries to import internal API test.test_asyncio + ]; + + meta = with lib; { + description = "Re-implementation of the asyncio mainloop on top of Trio"; + homepage = "https://github.com/python-trio/trio-asyncio"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e8075885a75..2860bee53083 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9750,6 +9750,8 @@ in { trio = callPackage ../development/python-modules/trio { }; + trio-asyncio = callPackage ../development/python-modules/trio-asyncio { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; From 835d5ad96e2e4b9df9e1364739d8472a1c3df3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Dec 2021 14:35:46 +0000 Subject: [PATCH 08/11] python3Packages.pytest-aio: run actual tests --- .../python-modules/pytest-aio/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix index b6ecc9eb8829..09c278a70e10 100644 --- a/pkgs/development/python-modules/pytest-aio/default.nix +++ b/pkgs/development/python-modules/pytest-aio/default.nix @@ -1,11 +1,15 @@ { lib +, anyio , buildPythonPackage -, fetchPypi +, curio +, fetchFromGitHub +, hypothesis , pytest -, pytest-mypy , pytestCheckHook , pythonOlder -, types-setuptools +, sniffio +, trio +, trio-asyncio }: buildPythonPackage rec { @@ -15,19 +19,29 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "ZPG6k+ZNi6FQftIVwr/Lux5rJlo284V/mjtYepNScdQ="; + src = fetchFromGitHub { + owner = "klen"; + repo = "pytest-aio"; + rev = version; + sha256 = "pLH0yXe/KS9ohI8+hWSprP1OA3Qjki2BPqeApMPMGDs="; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + buildInputs = [ pytest ]; checkInputs = [ - pytest-mypy + anyio + curio + hypothesis pytestCheckHook - types-setuptools + sniffio + trio + trio-asyncio ]; pythonImportsCheck = [ From 5d90841dd0179430db010dfc2c58b2a7de4371be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Dec 2021 14:03:47 +0000 Subject: [PATCH 09/11] python3Packages.python-izone: 1.1.8 -> 1.2.3 --- pkgs/development/python-modules/python-izone/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index 22f541d6712d..1d1eb5ac54eb 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-izone"; - version = "1.1.8"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Swamp-Ig"; repo = "pizone"; rev = "v${version}"; - sha256 = "sha256-/qPWSTO0PV4lEgwWpgcoBnbUtDUrEVItb4NF9TV2QJU="; + hash = "sha256-WF37t9vCEIyQMeN3/CWAiiZ5zsMRMFQ5UvMUqfoGM9I="; }; propagatedBuildInputs = [ @@ -34,10 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Test are blocking - "tests/test_fullstack.py" - ]; + doCheck = false; # most tests access network pythonImportsCheck = [ "pizone" From 4d39c78191e5bd3390a2cddf9406614152636982 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:56:27 +1000 Subject: [PATCH 10/11] go-task: install completion --- pkgs/development/tools/go-task/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 3cb0497ee0c4..822633982c87 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "go-task"; @@ -15,6 +15,8 @@ buildGoModule rec { doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/task" ]; ldflags = [ @@ -23,6 +25,8 @@ buildGoModule rec { postInstall = '' ln -s $out/bin/task $out/bin/go-task + + installShellCompletion completion/{bash,fish,zsh}/* ''; meta = with lib; { From 67b13d8df2c3f522d8736150b44c0426afc6dc35 Mon Sep 17 00:00:00 2001 From: Adam Oliver Zsigmond <6388483+zsedem@users.noreply.github.com> Date: Thu, 30 Dec 2021 04:24:54 +0100 Subject: [PATCH 11/11] vscode-extensions.scalameta.metals: 1.10.4 -> 1.10.15 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f97b0dbabeb7..a158777787a8 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1349,8 +1349,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.10.4"; - sha256 = "0q6zjpdi98png4vpzz39q85nxmsh3h1nnan58saz5rr83d6jgj89"; + version = "1.10.15"; + sha256 = "1yzvwdxipilxpg50sh1glm6p2mmn75pzq8kadk7cyl1kqlqd40ii"; }; meta = { license = lib.licenses.asl20;