From 926c920c12703883a7e946e9bbebf8d0d00af31a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 2 Jul 2023 18:44:28 -0700 Subject: [PATCH 01/48] gcc: tighten condition for inhibit_libc=true The situation described in the comment preceding `export inhibit_libc=true` does not match the conditional which follows it. Specifically, the comment says that this line is meant for "clang builds gcc" situations, yet it is enabled even when `!stdenv.cc.isClang`. This commit tightens the conditional to make it match the situation described in the comment. --- pkgs/development/compilers/gcc/common/pre-configure.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index e386693b22c7..5a74c5647293 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -108,7 +108,10 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # gcc->clang "cross"-compilation manages to evade it: there # hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. # We explicitly inhibit libc headers use in this case as well. -+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) '' ++ lib.optionalString (targetPlatform != hostPlatform && + withoutTargetLibc && + targetPlatform.config == hostPlatform.config && + (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM)) '' export inhibit_libc=true '' From af0311a0f12cec94783c23b117b0f546bb3c2e83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Oct 2023 10:49:39 +0000 Subject: [PATCH 02/48] checkstyle: 10.12.3 -> 10.12.4 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index f8bc11d63a6a..d6c6740e2a26 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.12.3"; + version = "10.12.4"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-drJO3sZlh2G9f80cvPD41YjhHZt74lmV9bSIhUDrTKo="; + sha256 = "sha256-ecWTB/4Lc7zgkQI6nN5VvKfRizeMEdyGUyL0fxiAHhk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 35994c0016988698e8cadc0bd46b9c19dcf1a661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Oct 2023 12:25:55 +0000 Subject: [PATCH 03/48] python311Packages.pygithub: 1.59.1 -> 2.1.1 --- pkgs/development/python-modules/pygithub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index a42c41a392dd..cbfacc2c4f36 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygithub"; - version = "1.59.1"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-tzM2+nLBHTbKlQ7HLmNRq4Kn62vmz1MaGyZsnaJSrgQ="; + hash = "sha256-ysa1RAWuFFQCF6bYwAUVFou7nxCKHLZbUtrUtXiSpPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3ee65bbd4c250322c486253a9b97bcaa104cf3a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Oct 2023 05:18:36 +0000 Subject: [PATCH 04/48] cirrus-cli: 0.104.0 -> 0.105.1 --- .../tools/continuous-integration/cirrus-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 9defb319111c..5e30c977c41e 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.104.0"; + version = "0.105.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3X/VZirKSYD+y//e8Ft8f0D27vJWekdyUTmVvOgc5bQ="; + sha256 = "sha256-F0T/4KUz0iU/THE8iRSdKe0Wo3HWQMYOd5vmbO61SzA="; }; - vendorHash = "sha256-0otC2+f0PMBZ+0Xiyq4kBd2YCJjAvDhThB3W9gIjHOY="; + vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" From f7c81d7cd3b2f2f4fbd089a11bcb919b02f442db Mon Sep 17 00:00:00 2001 From: Jonathan Wilkins Date: Mon, 2 Oct 2023 13:25:40 +0100 Subject: [PATCH 05/48] altair: Respect NIXOS_OZONE_WL to enable Wayland mode --- pkgs/development/tools/altair-graphql-client/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index dad7c397c5b1..bf8904f36dcc 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, makeWrapper, fetchurl }: let pname = "altair"; @@ -17,6 +17,10 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' From 4c3dbd50cfa0fe5cb3f2a3786f4a15e409602dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 4 Oct 2023 12:33:10 +0200 Subject: [PATCH 06/48] ast-grep: 0.12.2 -> 0.12.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index d275939e87cc..3ac77c214afc 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-N9hfHgzqwV/G3/xNY2Vx1i2dW6BcABJ/4lkhnLuvIns="; + hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8="; }; - cargoHash = "sha256-3ntsPC6OWtSN3MH+3wN2BgOqH69jiW93/xfLY+niARI="; + cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 87e84b2c7fc07815ee95972a92ce0c984f6d8903 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 18 Sep 2023 14:41:57 +0200 Subject: [PATCH 07/48] python310Packages.pytensor: 2.11.3 -> 2.17.1 --- .../python-modules/pytensor/default.nix | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index a3257131ac1a..ad48c11a5def 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -1,40 +1,51 @@ -{ stdenv -, lib +{ lib , buildPythonPackage -, cons -, cython -, etuples , fetchFromGitHub +, cython +, versioneer +, cons +, etuples , filelock -, jax -, jaxlib , logical-unification , minikanren -, numba -, numba-scipy , numpy -, pytestCheckHook -, pythonOlder , scipy , typing-extensions +, jax +, jaxlib +, numba +, numba-scipy +, pytest-mock +, pytestCheckHook +, pythonOlder +# Tensorflow is currently (2023/10/04) broken. +# Thus, we don't provide this optional test dependency. +# , tensorflow-probability +, stdenv }: buildPythonPackage rec { pname = "pytensor"; - version = "2.11.3"; - format = "setuptools"; + version = "2.17.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = pname; + repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-4GDur8S19i8pZkywKHZUelmd2e0jZmC5HzF7o2esDl4="; + hash = "sha256-OG7ZvXJOTQzSpMoj94K9JwG6ZQRQSSp+k2slkK6BJ9I="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "versioneer[toml]==0.28" "versioneer[toml]" + ''; + nativeBuildInputs = [ cython + versioneer ]; propagatedBuildInputs = [ @@ -48,19 +59,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ jax jaxlib numba numba-scipy + pytest-mock pytestCheckHook + # Tensorflow is currently (2023/10/04) broken. + # Thus, we don't provide this optional test dependency. + # tensorflow-probability ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--durations=50" "" - ''; - preBuild = '' export HOME=$(mktemp -d) ''; @@ -76,13 +86,14 @@ buildPythonPackage rec { "test_logsumexp_benchmark" "test_scan_multiple_output" "test_vector_taps_benchmark" + # Temporarily disabled because of broken tensorflow-probability + "test_tfp_ops" ]; disabledTestPaths = [ # Don't run the most compute-intense tests "tests/scan/" "tests/tensor/" - "tests/sandbox/" "tests/sparse/sandbox/" ]; From c5bbe1e74a508df18faaa38733de1ebfa9120ced Mon Sep 17 00:00:00 2001 From: Maksym Balatsko Date: Wed, 4 Oct 2023 08:04:54 -0700 Subject: [PATCH 08/48] python3Packages.aio-pika: 9.1.3 -> 9.3.0 Diff: https://github.com/mosquito/aio-pika/compare/refs/tags/9.1.3...9.3.0 Changelog: https://github.com/mosquito/aio-pika/blob/9.3.0/CHANGELOG.md --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 9082fd4b37a7..fdcb67102928 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.1.3"; + version = "9.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QCM/9Vt9/uXylaU8xymXJEjVd6sFRcVhpr2CGjB0AoY="; + hash = "sha256-Fy3vTXfj+gu/+PYWPfcOZ/D7boRiZYcFPX29p28HoGs="; }; nativeBuildInputs = [ From 050755319a883766811e0ea6c0bca8f679a1f772 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Oct 2023 18:22:18 +0200 Subject: [PATCH 09/48] python311Packages.types-awscrt: 0.19.1 -> 0.19.2 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.19.2 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index ea56034cf9c2..ce82a75f52d4 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.1"; + version = "0.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-YYM6oUDnJKkJgCVhD0uM3j3PZbhCYx10RzePn1204f0="; + hash = "sha256-2MN5QgunWx5DaH0SsLdypbsX81KFmivvaqjwq94SP1U="; }; nativeBuildInputs = [ From d4c3278f44bff2655623d8817a829b41ed4a83da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Oct 2023 18:25:19 +0200 Subject: [PATCH 10/48] restish: 0.18.0 -> 0.19.0 Diff: https://github.com/danielgtaylor/restish/compare/refs/tags/v0.18.0...v0.19.0 Changelog: https://github.com/danielgtaylor/restish/releases/tag/v0.19.0 --- pkgs/tools/networking/restish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/tools/networking/restish/default.nix index c13c5708b52b..303d88b235f2 100644 --- a/pkgs/tools/networking/restish/default.nix +++ b/pkgs/tools/networking/restish/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "restish"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "restish"; rev = "refs/tags/v${version}"; - hash = "sha256-DvI1pe4ONuIhSecJOhv6GKRzOYHo+jePqT8oYVvcKnM="; + hash = "sha256-zAWlbfZywL8jepgmXBM5lacRv1N/+dBd+9vIavWAyNs="; }; vendorHash = "sha256-sUBqeLhpWUu1NfAmFQCKFHm8DQaB8LYRrFexvuF8vC8="; From 92e8069618b70fe1393af04ee0ea9ef09373b9a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Oct 2023 06:14:25 +0200 Subject: [PATCH 11/48] checkov: 2.4.59 -> 2.4.61 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.4.59...2.4.61 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.4.61 --- 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 cb91c8c3058e..bff004557503 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.59"; + version = "2.4.61"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/Qqh0f40JxHjIbt7rm4ZY7dTXGVMHrzkgNSjPJq8SLo="; + hash = "sha256-j/mBQe9Z+8tnYdD/cEQdn7lsPlPfZTHF+Dux4Pm1768="; }; patches = [ From 388b09ff207ad3f0f221f91e421c5515da5038a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Oct 2023 18:27:39 +0200 Subject: [PATCH 12/48] checkov: 2.4.61 -> 2.5.3 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.4.61...2.5.3 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.5.3 --- 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 bff004557503..302acfb7e0f5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.61"; + version = "2.5.3"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j/mBQe9Z+8tnYdD/cEQdn7lsPlPfZTHF+Dux4Pm1768="; + hash = "sha256-QSxeVu1nGK9j8hQqcUZ2RhjPmCHjbTuG/1hvMjUhrOo="; }; patches = [ From b8f827e85b73b65a4beb44520b3794932ebaa2c1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 4 Oct 2023 21:59:26 +0200 Subject: [PATCH 13/48] =?UTF-8?q?ocamlPackages.zmq:=205.1.5=20=E2=86=92=20?= =?UTF-8?q?5.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/zmq/default.nix | 10 +++------- pkgs/development/ocaml-modules/zmq/lwt.nix | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index 267566d7ba0a..b92d8e6cb867 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -2,19 +2,15 @@ buildDunePackage rec { pname = "zmq"; - version = "5.1.5"; - - duneVersion = "3"; + version = "5.2.1"; src = fetchurl { - url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-lwt-${version}.tbz"; - sha256 = "sha256-mUfRPatLPFeSzWDwCIoFaVl85VkvDch4i6pOn3Kme1Y="; + url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-${version}.tbz"; + hash = "sha256-hVKfaTrUFqEBsv5hFB7JwsR630M0DKnqhB0QHpxcHKc="; }; buildInputs = [ czmq dune-configurator ]; - propagatedBuildInputs = [ stdint ]; - meta = { description = "ZeroMQ bindings for OCaml"; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index f6408933452c..1bbc1b7ad63e 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,9 +1,8 @@ -{ buildDunePackage, zmq, ocaml_lwt }: +{ buildDunePackage, zmq, lwt }: buildDunePackage { pname = "zmq-lwt"; inherit (zmq) version src meta; - duneVersion = "3"; - propagatedBuildInputs = [ zmq ocaml_lwt ]; + propagatedBuildInputs = [ zmq lwt ]; } From 2d97d78d9d55206063c5706545ead788f9a52b0a Mon Sep 17 00:00:00 2001 From: Christopher Rzipa Date: Sat, 30 Sep 2023 19:31:26 +0200 Subject: [PATCH 14/48] roam-research: add aarch64-darwin and x86_64-darwin support --- .../office/roam-research/common.nix | 22 +++++ .../office/roam-research/darwin.nix | 34 ++++++++ .../office/roam-research/default.nix | 87 ++----------------- .../office/roam-research/linux.nix | 71 +++++++++++++++ 4 files changed, 134 insertions(+), 80 deletions(-) create mode 100644 pkgs/applications/office/roam-research/common.nix create mode 100644 pkgs/applications/office/roam-research/darwin.nix create mode 100644 pkgs/applications/office/roam-research/linux.nix diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix new file mode 100644 index 000000000000..8e63b111ad2a --- /dev/null +++ b/pkgs/applications/office/roam-research/common.nix @@ -0,0 +1,22 @@ +{ fetchurl }: +let + pname = "roam-research"; + version = "0.0.18"; +in +{ + inherit pname version; + sources = { + x86_64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; + hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + }; + aarch64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; + hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + }; + x86_64-linux = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; + hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + }; + }; +} diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix new file mode 100644 index 000000000000..2c736c0c1a7f --- /dev/null +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, undmg, fetchurl }: +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; +in +stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + appName = "Roam Research"; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + mkdir -p $out/bin + ln -s "$out/Applications/${appName}.app/Contents/MacOS/${appName}" "$out/bin/${appName}" + runHook postInstall + ''; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/applications/office/roam-research/default.nix index e1ca9bb47e80..408f026bc57a 100644 --- a/pkgs/applications/office/roam-research/default.nix +++ b/pkgs/applications/office/roam-research/default.nix @@ -1,81 +1,8 @@ -{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat -, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm -, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango -, udev, }: - +{ stdenv, callPackage, ... }@args: let - libPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXi - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc - libXScrnSaver - libXcursor - libXrender - libXtst - libpulseaudio - udev - ]; -in stdenv.mkDerivation rec { - pname = "roam-research"; - version = "0.0.18"; - - src = fetchurl { - url = - "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; - }; - - nativeBuildInputs = [ dpkg ]; - - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - - ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" - - mv usr/* "$out/" - - substituteInPlace $out/share/applications/roam-research.desktop \ - --replace "/opt/Roam Research/roam-research" "roam-research" - ''; - - dontPatchELF = true; - meta = with lib; { - description = "A note-taking tool for networked thought."; - homepage = "https://roamresearch.com/"; - maintainers = with lib.maintainers; [ dbalan ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -} + extraArgs = removeAttrs args [ "callPackage" ]; +in +if stdenv.isDarwin then + callPackage ./darwin.nix (extraArgs // { }) +else + callPackage ./linux.nix (extraArgs // { }) diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix new file mode 100644 index 000000000000..646ec762b2d5 --- /dev/null +++ b/pkgs/applications/office/roam-research/linux.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat +, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm +, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango +, udev, }: + +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; + libPath = lib.makeLibraryPath [ + alsa-lib + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXi + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc + libXScrnSaver + libXcursor + libXrender + libXtst + libpulseaudio + udev + ]; +in stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + nativeBuildInputs = [ dpkg ]; + + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + + ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" + + mv usr/* "$out/" + + substituteInPlace $out/share/applications/roam-research.desktop \ + --replace "/opt/Roam Research/roam-research" "roam-research" + ''; + + dontPatchELF = true; + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} From e1004162a9a51711afa65ce9a8a728a015b04600 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 5 Oct 2023 03:03:21 +0300 Subject: [PATCH 15/48] roam-research: add reason why patchelf is not used --- pkgs/applications/office/roam-research/linux.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix index 646ec762b2d5..5873bcfdd190 100644 --- a/pkgs/applications/office/roam-research/linux.nix +++ b/pkgs/applications/office/roam-research/linux.nix @@ -59,7 +59,9 @@ in stdenv.mkDerivation rec { --replace "/opt/Roam Research/roam-research" "roam-research" ''; + # autoPatchelfHook/patchelf are not used because they cause the binary to coredump. dontPatchELF = true; + meta = with lib; { description = "A note-taking tool for networked thought"; homepage = "https://roamresearch.com/"; From 492414af5f848c51ed5073e2f5b6556f3d2782cc Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 15:19:55 -0300 Subject: [PATCH 16/48] treewide: remove cstrahan from meta.maintainers - part 1 All the packages here are now orphaned. --- pkgs/applications/editors/bviplus/default.nix | 2 +- pkgs/applications/editors/hexcurse/default.nix | 2 +- pkgs/applications/editors/ht/default.nix | 2 +- pkgs/applications/misc/rescuetime/default.nix | 2 +- pkgs/applications/misc/resp-app/default.nix | 2 +- pkgs/applications/misc/terminal-notifier/default.nix | 2 +- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 2 +- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 2 +- pkgs/applications/misc/zathura/ps/default.nix | 2 +- pkgs/applications/networking/cluster/cni/plugins.nix | 2 +- .../rxvt-unicode-plugins/urxvt-font-size/default.nix | 2 +- .../rxvt-unicode-plugins/urxvt-perl/default.nix | 2 +- pkgs/applications/version-management/vcprompt/default.nix | 2 +- pkgs/data/icons/vanilla-dmz/default.nix | 2 +- pkgs/development/libraries/backward-cpp/default.nix | 2 +- pkgs/development/libraries/capnproto/default.nix | 2 +- pkgs/development/libraries/keybinder3/default.nix | 2 +- pkgs/development/libraries/libmx/default.nix | 2 +- pkgs/development/libraries/libtsm/default.nix | 2 +- pkgs/development/libraries/libuchardet/default.nix | 2 +- pkgs/development/libraries/libuv/default.nix | 2 +- pkgs/development/libraries/lightstep-tracer-cpp/default.nix | 2 +- pkgs/development/libraries/linenoise-ng/default.nix | 2 +- pkgs/development/libraries/mailcore2/default.nix | 2 +- pkgs/development/tools/go-bindata/default.nix | 2 +- pkgs/development/tools/misc/chruby/default.nix | 2 +- pkgs/misc/cups/drivers/cnijfilter2/default.nix | 2 +- pkgs/misc/mnemonicode/default.nix | 2 +- pkgs/os-specific/linux/eventstat/default.nix | 2 +- pkgs/os-specific/linux/iomelt/default.nix | 2 +- pkgs/os-specific/linux/mbpfan/default.nix | 2 +- pkgs/os-specific/linux/pipework/default.nix | 2 +- pkgs/os-specific/linux/xsensors/default.nix | 2 +- pkgs/servers/http/spawn-fcgi/default.nix | 2 +- pkgs/servers/meteor/default.nix | 2 +- pkgs/servers/x11/xquartz/default.nix | 2 +- pkgs/tools/X11/go-sct/default.nix | 2 +- pkgs/tools/admin/rset/default.nix | 2 +- pkgs/tools/misc/dbus-map/default.nix | 2 +- pkgs/tools/misc/logstash/contrib.nix | 2 +- pkgs/tools/misc/xsel/default.nix | 2 +- pkgs/tools/networking/biosdevname/default.nix | 2 +- pkgs/tools/package-management/apt/default.nix | 2 +- pkgs/tools/security/lastpass-cli/default.nix | 2 +- pkgs/tools/system/nq/default.nix | 2 +- pkgs/tools/system/psensor/default.nix | 2 +- pkgs/tools/system/xe/default.nix | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index f56fe637f83f..1cffe049c73d 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 715693770c55..1c2e09695e5e 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 42b3f1495a31..c8a13738c910 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index ea97f8305fee..22a1964e466d 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -52,7 +52,7 @@ in mkDerivation rec { meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index e9781d40db7b..b95bc98fdd3a 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -98,6 +98,6 @@ mkDerivation rec { homepage = "https://resp.app/"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index cde53ef41654..19370fae0133 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 25856f0e58df..002c753caff0 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 57f33559c667..e482241bbd6c 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 151a63af33e8..180001b52aeb 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index ce6aece37803..8421c3157e5e 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -48,6 +48,6 @@ buildGoModule rec { homepage = "https://www.cni.dev/plugins/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 7824fa2a814b..ac2a5f09fb0f 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index 9ecaffb185cc..f30507483fac 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index d98f94477256..d4a4889f4a3f 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { about the current working directory for various version control systems ''; homepage = "http://hg.gerg.ca/vcprompt"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; }; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index 22b66b1c65dc..6e391aa19ef0 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec { description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 125e3799f572..15556a4108c6 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 809980c0b510..05e80893ebb0 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cee48d5e9eff..e7bbd2b131d5 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 23cb00618055..52d92840a346 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { feature is the possibility setting style properties from a CSS format file.''; license = licenses.lgpl21; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 7c0868509f09..75773296fab2 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 389aa7c283f2..14bf7f7c09c7 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 113f83c1fc92..7be9bee23a25 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 8ef4513a18dd..888e10d6a81d 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://lightstep.com/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index d19d6748147c..276756822746 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with lib.maintainers; [ cstrahan ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 65e35217f80a..77e7669c0e12 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; homepage = "http://libmailcore.com"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index e08cab6a0f95..5d3e5d714f25 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/kevinburke/go-bindata"; changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.cc0; }; } diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index cbe223513272..31e7134e7e87 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; mainProgram = "chruby-exec"; platforms = platforms.unix; }; diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 8390d5e0ba84..8520ba7aff2e 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -145,6 +145,6 @@ stdenv.mkDerivation { homepage = "https://hk.canon/en/support/0101048401/1"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index 352dd038fb5a..4ecacaf418a1 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { ''; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 88ac5add34a7..2c139cd3c865 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/eventstat"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 860a7b446328..0084a397d075 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; homepage = "http://www.iomelt.com"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.artistic2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 9a56249de39a..50fc74d7fa0a 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dgraziotin/mbpfan"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index ea274377ced9..3591303a8d0c 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jpetazzo/pipework"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 02ce560d8a94..e3639fefffa4 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index 77272694a89d..c57cc816524d 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi"; description = "Provides an interface to external programs that support the FastCGI interface"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 04f0ac3ac807..868c420d49ae 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cdb2122a612d..93b2869f8d2b 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation { meta = with lib; { platforms = platforms.darwin; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index d52cd046da9f..585e28971b49 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; homepage = "https://github.com/d4l3k/go-sct"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; mainProgram = "sct"; }; } diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/tools/admin/rset/default.nix index f7c00fffb1cc..e164e133f985 100644 --- a/pkgs/tools/admin/rset/default.nix +++ b/pkgs/tools/admin/rset/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/eradman/rset/raw/${version}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 5960ba5c5731..56f89b2f0531 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://github.com/taviso/dbusmap"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d4c88dc32ed4..2d2f6272fddf 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elasticsearch/logstash-contrib"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 69061eb15b8b..e886ff331a2a 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Command-line program for getting and setting the contents of the X selection"; homepage = "http://www.kfish.org/software/xsel"; license = licenses.mit; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index f44574fb0364..0f7702acdcc8 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Udev helper for naming devices per BIOS names"; license = licenses.gpl2; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 74676827fb95..60bd420f1548 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${version}/debian/changelog"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 45333391de04..c20157cb4194 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 133ce941faa5..46db1c612ff3 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 6e3ccc45a034..33749f30be0c 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://wpitchoune.net/psensor/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index f31cdaab4c5a..133c7d873619 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } From a9d73dea164c074ac14f2b2d7bdba0d78c36da49 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 19:29:36 -0300 Subject: [PATCH 17/48] treewide: remove cstrahan from meta.maintainers - part 2 19 files modified with this removal --- pkgs/applications/editors/vim/macvim.nix | 2 +- pkgs/applications/misc/perkeep/default.nix | 2 +- pkgs/applications/networking/browsers/w3m/default.nix | 2 +- pkgs/applications/networking/mailreaders/neomutt/default.nix | 2 +- pkgs/data/fonts/iosevka/bin.nix | 1 - pkgs/data/fonts/iosevka/default.nix | 1 - pkgs/development/compilers/rust/rustc.nix | 2 +- pkgs/development/libraries/rapidjson/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/python-modules/jupyterhub/default.nix | 2 +- pkgs/development/python-modules/pycapnp/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/development/tools/packer/default.nix | 2 +- pkgs/development/tools/watchman/default.nix | 2 +- pkgs/servers/nosql/mongodb/mongodb.nix | 2 +- pkgs/servers/zookeeper/default.nix | 2 +- pkgs/tools/filesystems/zkfuse/default.nix | 2 +- pkgs/tools/security/doas/default.nix | 2 +- pkgs/tools/security/mkpasswd/default.nix | 2 +- 19 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 8440d1fd6d9c..ce83128e98b1 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { description = "Vim - the text editor - for macOS"; homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; - maintainers = with maintainers; [ cstrahan lilyball ]; + maintainers = with maintainers; [ lilyball ]; platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 7ce8b03c08b5..da67c39ab585 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -55,6 +55,6 @@ buildGoModule rec { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan danderson kalbasit ]; + maintainers = with maintainers; [ danderson kalbasit ]; }; } diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e4a064e79059..5d2ea47b34c6 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { homepage = "https://w3m.sourceforge.net/"; changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog"; description = "A text-mode web browser"; - maintainers = with maintainers; [ cstrahan anthonyroussel ]; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.unix; license = licenses.mit; mainProgram = "w3m"; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d57f0a0b1fac..9ac8c83dc5e7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ]; + maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index dc7d132884c4..b8dc77e94098 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -33,7 +33,6 @@ in stdenv.mkDerivation rec { meta = { inherit (iosevka.meta) homepage downloadPage description license platforms; maintainers = with lib.maintainers; [ - cstrahan montchr ]; }; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 8e33e721f971..0fa8bdb8f818 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -136,7 +136,6 @@ buildNpmPackage rec { license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ - cstrahan jfrankenau ttuegel babariviere diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 869dd15df0be..0cf5020962cf 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -263,7 +263,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; + maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = [ # Platforms with host tools from diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index f73e01b64764..d3233384d3eb 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 73ff84034006..a9891a9d328c 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 3f16022e2163..d6bdedc992ae 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -201,7 +201,7 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie cstrahan ]; + maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index fc41822cebe3..64385cfd59cd 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://capnproto.github.io/pycapnp/"; - maintainers = with maintainers; [ cstrahan lukeadams ]; + maintainers = with maintainers; [ lukeadams ]; license = licenses.bsd2; # No support for capnproto 1.0 yet # https://github.com/capnproto/pycapnp/issues/323 diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index e09ecac29b3a..f281a70f8029 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { description = "A code-completion and comprehension server"; homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi cstrahan lnl7 siriobalmelli ]; + maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 18dd6370bc78..5d948190ee19 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick qjoly ]; + maintainers = with maintainers; [ zimbatm ma27 techknowlogick qjoly ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 6bd12510c13d..973a48a84bc8 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Watches files and takes action when they change"; homepage = "https://facebook.github.io/watchman"; - maintainers = with maintainers; [ cstrahan kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index ff82755d8cd7..5be49f18891f 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -190,7 +190,7 @@ in stdenv.mkDerivation rec { homepage = "http://www.mongodb.org"; inherit license; - maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; + maintainers = with maintainers; [ bluescreen303 offline ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; broken = (versionOlder version "6.0" && stdenv.system == "aarch64-darwin"); }; diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index d333494ea35d..1df644b9fbe7 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; - maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ztzg ]; + maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index c58dbff9ac73..320ccde4cc53 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ztzg ]; + maintainers = with maintainers; [ ztzg ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index ad08cd8056be..03268bc98479 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Duncaen/OpenDoas"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ cole-h cstrahan ]; + maintainers = with maintainers; [ cole-h ]; }; } diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 439fd1543cf8..38c26a93b4e3 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; }; } From 2f38016681fdde5c7e8e2e81138f8a9e2d184ce5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 19:30:50 -0300 Subject: [PATCH 18/48] maintainers: remove cstrahan The last updated on the personal fork was on [2019-06-03](https://github.com/cstrahan/nixpkgs/commit/739f74d05634ec3de8e0e87734924c90babd0e87) --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0cddee228346..7b479b1d14ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3683,12 +3683,6 @@ githubId = 398996; name = "Christopher Singley"; }; - cstrahan = { - email = "charles@cstrahan.com"; - github = "cstrahan"; - githubId = 143982; - name = "Charles Strahan"; - }; cswank = { email = "craigswank@gmail.com"; github = "cswank"; From a78b6f3272b4950bb8ff932a9190e8c2683741b6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 16:08:40 -0300 Subject: [PATCH 19/48] scrcpy: remove lukeadams from meta.maintainers --- pkgs/misc/scrcpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 9602b6364974..b43e6400c8dc 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo lukeadams msfjarvis ]; + maintainers = with maintainers; [ deltaevo msfjarvis ]; }; } From 552cb9b5a4f75445ed93ab2a79d785199a2ac927 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 16:09:04 -0300 Subject: [PATCH 20/48] pycapnp: remove lukeadams from meta.maintainers --- pkgs/development/python-modules/pycapnp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 64385cfd59cd..b18fa3b3fc7f 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://capnproto.github.io/pycapnp/"; - maintainers = with maintainers; [ lukeadams ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; # No support for capnproto 1.0 yet # https://github.com/capnproto/pycapnp/issues/323 From d4b04cef5197bbed1e2286d9cd0d6891738e3b65 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Sep 2023 16:09:44 -0300 Subject: [PATCH 21/48] maintainers: remove lukeadams The last updated on the personal fork was on [2021-05-26](https://github.com/lukeadams/nixpkgs/commit/2a6db4c056b66006804ec39d4185363d1d5f9658) --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7b479b1d14ed..56e8b1b51022 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10344,12 +10344,6 @@ githubId = 84395723; name = "Lukas Wurzinger"; }; - lukeadams = { - email = "luke.adams@belljar.io"; - github = "lukeadams"; - githubId = 3508077; - name = "Luke Adams"; - }; lukebfox = { email = "lbentley-fox1@sheffield.ac.uk"; github = "lukebfox"; From e064688a8ffc08c63e5496fb5fccf912aabe8076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Oct 2023 01:28:42 +0000 Subject: [PATCH 22/48] meli: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/mailreaders/meli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 82bc21bc6f7c..1ce4c39da7a3 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -22,15 +22,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.1"; + version = "0.8.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = "v${version}"; - hash = "sha256-sHpW2yjqYz4ePR6aQFUBD6BZwgDt3DT22/kWuKr9fAc="; + hash = "sha256-iEHTFofga/HV/1jSAqTsqV55zC22tqI7UW7m4PZgz0M="; }; - cargoSha256 = "sha256-Pg3V6Bd+drFPiJtUwsoKxu6snN88KvM+lsvnWBK/rvk="; + cargoHash = "sha256-ijlivyBezLECBSaWBYVy9tVcSO8U+yGDQyU4dIATR6k="; nativeBuildInputs = [ pkg-config From 96c84466151e2c294e47c556911bd1991a13f706 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Oct 2023 03:00:53 +0000 Subject: [PATCH 23/48] python310Packages.fake-useragent: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/fake-useragent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index c9b58a92c229..50c4f5e96837 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-kOvVqdfK9swtjW8D7COrZksLCu1N8sQO8rzx5RZqCT0="; + hash = "sha256-erGX52ipM0scn3snICf6ipjgVbV8/H5xT4GP3AtvOwo="; }; postPatch = '' From 71e9121562cff1f1ee0ff8d21c2626e5779ba67e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Sep 2023 23:55:50 +0200 Subject: [PATCH 24/48] python311Packages.aioairzone-cloud: 0.2.2 -> 0.2.4 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.2.2...0.2.4 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.2.4 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index f69f45d7efd0..bdc21d70892f 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.2"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-SGHbM7D21ykFWwg4aTUUMIFpwZ0K8CQohZYtzXOPJQg="; + hash = "sha256-7sjiY20jDUHtEnqAMwEHsBboK9XCH5XjE0sHR82YvEA="; }; nativeBuildInputs = [ From 948573bb0bf81916f2a61c76212cd810c5306256 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Sep 2023 18:54:41 +0200 Subject: [PATCH 25/48] python311Packages.aiohue: 4.6.2 -> 4.7.0 Diff: https://github.com/home-assistant-libs/aiohue/compare/refs/tags/4.6.2...4.7.0 Changelog: https://github.com/home-assistant-libs/aiohue/releases/tag/4.7.0 Co-Authored-By: Maksym Balatsko --- .../python-modules/aiohue/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index efd590e7e827..56b911ee4f89 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -5,23 +5,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pytest-aiohttp +, pytest-asyncio , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiohue"; - version = "4.6.2"; - format = "setuptools"; + version = "4.7.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU="; + hash = "sha256-t48rUPAM0XpbDreCwHU/smoyhPtxhwrpDkb1170GkQM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ awesomeversion aiohttp @@ -30,6 +42,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio + pytest-aiohttp ]; pythonImportsCheck = [ From ade9da151c7aa7e83f8adbde6e618eeb0384ab8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Sep 2023 20:35:48 +0200 Subject: [PATCH 26/48] python311Packages.aiounifi: 62 -> 63 Diff: https://github.com/Kane610/aiounifi/compare/refs/tags/v62...v63 Changelog: https://github.com/Kane610/aiounifi/releases/tag/v63 --- pkgs/development/python-modules/aiounifi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index a906f8311f81..02e84b8f7e04 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -10,12 +10,13 @@ , pythonOlder , segno , setuptools +, trustme , wheel }: buildPythonPackage rec { pname = "aiounifi"; - version = "62"; + version = "63"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5XCF67YuelS4RDUxfImSAELfdb3rJWGprIYQeQPp+yk="; + hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs="; }; postPatch = '' @@ -51,6 +52,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-asyncio pytestCheckHook + trustme ]; pytestFlagsArray = [ From a7642023cfff46f469517129665a5ee8b9239b4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH 27/48] python3Packages.faadelays: 0.0.7 -> 2023.8.0 (cherry picked from commit 299f3a889661dd26078ee9b007af2dd597785efb) --- .../python-modules/faadelays/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/faadelays/default.nix b/pkgs/development/python-modules/faadelays/default.nix index 22f764ad4ace..a4c391bf3a32 100644 --- a/pkgs/development/python-modules/faadelays/default.nix +++ b/pkgs/development/python-modules/faadelays/default.nix @@ -3,25 +3,38 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "faadelays"; - version = "0.0.7"; + version = "2023.8.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; + hash = "sha256-VAQQI9cMRKGe7RAUxoI1bBojzRq6cRz2jpeDA+GMuUI="; }; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "faadelays" ]; + + pythonImportsCheck = [ + "faadelays" + ]; meta = with lib; { + changelog = "https://github.com/ntilley905/faadelays/releases/tag/v${version}"; description = "Python package to retrieve FAA airport status"; homepage = "https://github.com/ntilley905/faadelays"; license = licenses.mit; From db398d2a38429607ce4fdeded4365892d507a65f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 20:31:46 +0200 Subject: [PATCH 28/48] python311Packages.faadelays: 2023.8.0 -> 2023.9.1 https://github.com/ntilley905/faadelays/releases/tag/v2023.9.1 --- pkgs/development/python-modules/faadelays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faadelays/default.nix b/pkgs/development/python-modules/faadelays/default.nix index a4c391bf3a32..e19b3192e350 100644 --- a/pkgs/development/python-modules/faadelays/default.nix +++ b/pkgs/development/python-modules/faadelays/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "faadelays"; - version = "2023.8.0"; + version = "2023.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VAQQI9cMRKGe7RAUxoI1bBojzRq6cRz2jpeDA+GMuUI="; + hash = "sha256-ngMFd+BE3hKeaeGEX4xHpzDIrtGFDsSwxBbrc4ZMFas="; }; nativeBuildInputs = [ From 2036d5395ab120340fbb3687d9e905717d0a012c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 20:34:08 +0200 Subject: [PATCH 29/48] home-assistant.intents: 2023.9.22 -> 2023.10.2 https://github.com/home-assistant/intents-package/compare/refs/tags/2023.9.22...2023.10.2 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 6d894aa0c9be..5f815628a50f 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.9.22"; + version = "2023.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-n0IIWS5edh4XD/W9Eo88pal2+zJQtrHg74FSGvPIlPg="; + hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk="; fetchSubmodules = true; }; From abc67d9b38e3b11862f401f839525326c7c43936 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 22:46:43 +0200 Subject: [PATCH 30/48] python311Packages.matrix-nio: 0.20.1 -> 0.21.2 https://github.com/poljar/matrix-nio/blob/0.21.2/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 03bc6015843d..77f47543c52a 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.20.1"; + version = "0.21.2"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-6oMOfyl8yR8FMprPYD831eiXh9g/bqslvxDmVcrNK80="; + hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0="; }; postPatch = '' From fccf689445202cfa336431fc0119efc08a2cef8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 22:47:15 +0200 Subject: [PATCH 31/48] python311Packages.plexapi: 4.15.3 -> 4.15.4 https://github.com/pkkid/python-plexapi/releases/tag/4.15.4 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index d2ecca94cb4d..57b4cb430b77 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.3"; + version = "4.15.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-3Rnwo6KpOsfrIWmJjxh1DSDFoVqBckB0uZh5PdsjRO8="; + hash = "sha256-NBV4jrLfU5vqQljQh28tJxgaNSo/ilph8xsjdVKCOJg="; }; propagatedBuildInputs = [ From 3340f02c680b6267623ebca46411b1aa59ef331e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 22:55:20 +0200 Subject: [PATCH 32/48] python311Packages.pyinsteon: 1.5.0 -> 1.5.1 https://github.com/pyinsteon/pyinsteon/releases/tag/1.5.1 --- .../python-modules/pyinsteon/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index dbf6ab12b44e..8980da8e24bd 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -4,7 +4,6 @@ , async-generator , buildPythonPackage , fetchFromGitHub -, fetchpatch , pypubsub , pyserial , pyserial-asyncio @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,18 +25,9 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; + hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; }; - patches = [ - # https://github.com/pyinsteon/pyinsteon/pull/361 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel From 8a132db7a57cbbcc7edd791e9a19cdbe947a78ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 01:51:34 +0200 Subject: [PATCH 33/48] python311Packages.pysensibo: 1.0.33 -> 1.0.35 https://github.com/andrey-git/pysensibo/releases/tag/1.0.35 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 0d79ed311625..603800f9a169 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.33"; + version = "1.0.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA="; + hash = "sha256-E3XUQ7Ltu9zhjWVvl1LN+UUz8B2dAjLa0CZI9ca35nc="; }; propagatedBuildInputs = [ From f261c2a3eebe75bc2cfd4e14f553f1dae171abd9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 01:52:06 +0200 Subject: [PATCH 34/48] python311Packages.python-roborock: 0.34.5 -> 0.34.6 https://github.com/humbertogontijo/python-roborock/blob/v0.34.6/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index f5a5eefd5c9f..7fa360703757 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.34.5"; + version = "0.34.6"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-BJZ24TfdIybSzLLWn7+vRMaxnBKVZSzCNLzKFaFvhok="; + hash = "sha256-c55E5J0PKk9FG3KDIO0R3vGQjYjj8u7zXz8o9oA1Grc="; }; postPatch = '' From e465a0933ab795d79960c16ee09f55981e14f00e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Sep 2023 07:40:51 +0000 Subject: [PATCH 35/48] python310Packages.screenlogicpy: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/screenlogicpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 7ed829df1679..fef2b05f9e8c 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; + hash = "sha256-bBdOaAr9VH7UeY/UdeKS9oOevJwW2HChJiTGCNbbikM="; }; propagatedBuildInputs = [ From e891c2423fb7bb16f061331ec116b390ebeefc66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Sep 2023 13:06:40 -0700 Subject: [PATCH 36/48] python310Packages.twitchapi: 3.11.0 -> 4.0.1 Changelog: https://github.com/Teekeks/pyTwitchAPI/blob/v4.0.1/docs/changelog.rst --- .../python-modules/twitchapi/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 7df76ab5dfc9..f9db5fa4ecc8 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, setuptools +, wheel , aiohttp , python-dateutil , typing-extensions @@ -9,18 +11,24 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.11.0"; + version = "4.0.1"; disabled = pythonOlder "3.7"; - format = "setuptools"; + format = "pyproject"; - src = fetchPypi { - pname = "twitchAPI"; - inherit version; - hash = "sha256-TkQzF32nt89uBvC6aj/b5f2DQkOVDz7UyeUXRyVYumM="; + src = fetchFromGitHub { + owner = "Teekeks"; + repo = "pyTwitchAPI"; + rev = "refs/tags/v${version}"; + hash = "sha256-WrZb734K51NYqlcMCRr8HO8E7XByioltd4vanTN8HUg="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp python-dateutil @@ -35,11 +43,11 @@ buildPythonPackage rec { "twitchAPI.oauth" "twitchAPI.pubsub" "twitchAPI.twitch" - "twitchAPI.types" + "twitchAPI.type" ]; meta = with lib; { - changelog = "https://github.com/Teekeks/pyTwitchAPI/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/Teekeks/pyTwitchAPI/blob/${src.rev}/docs/changelog.rst"; description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; homepage = "https://github.com/Teekeks/pyTwitchAPI"; license = licenses.mit; From 41cfffed1681def2732eda1aab66dd1889ec0564 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Oct 2023 03:21:55 +0200 Subject: [PATCH 37/48] python311Packages.webrtc-noise-gain: 1.2.2 -> 1.2.3 https://github.com/rhasspy/webrtc-noise-gain/blob/v1.2.3/CHANGELOG.md --- pkgs/development/python-modules/webrtc-noise-gain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index 52b1d1fde48a..63b02a1bfd0d 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "webrtc-noise-gain"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "webrtc-noise-gain"; rev = "v${version}"; - hash = "sha256-yHuCa2To9/9kD+tLG239I1aepuhcPUV4a4O1TQtBPlE="; + hash = "sha256-DFEtuO49zXNixLwBjQ/WOiARDhMAXVH+5hfc3eSdPIo="; }; nativeBuildInputs = [ From 81b126d8218bc655eed131a6ad5dc08a0102f3d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 01:59:20 +0200 Subject: [PATCH 38/48] python311Packages.zigpy-xbee: 0.18.2 -> 0.18.3 https://github.com/zigpy/zigpy-xbee/releases/tag/0.18.3 --- pkgs/development/python-modules/zigpy-xbee/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index a94eb4e4c545..fe0eb8607582 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.18.2"; + version = "0.18.3"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-aglKQWIMh0IyrcGt+PZVtzcgs88YbtZB7Tfg7hlB+18="; + hash = "sha256-+qtbOC3rsse57kqd4RLl9EKXzru0vdgIIPSl1OQ652U="; }; buildInputs = [ @@ -36,8 +36,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # https://github.com/zigpy/zigpy-xbee/issues/126 - "test_form_network" + # fixed in https://github.com/zigpy/zigpy-xbee/commit/f85233fc28ae01c08267965e99a29e43b00e1561 + "test_shutdown" ]; meta = with lib; { From 88bbc7fb16a8ce24c8386eb90b190ec3ec8775be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 01:59:46 +0200 Subject: [PATCH 39/48] python311Packages.zwave-js-server-python: 0.51.3 -> 0.52.1 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.52.1 --- .../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 754da83efc3a..105dbbbe0424 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.51.3"; + version = "0.52.1"; format = "setuptools"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-79INvk5WLuSki/kBU25hMHRxGk7FAznU89U+y3Eh+wI="; + hash = "sha256-+zGLWti99mYTyPkSxiYgE5RqVvEr2PGt8vFwesjcquo="; }; propagatedBuildInputs = [ From 3180c9c4c485c571a0d53f4a09cd8fb2bf60c9ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 02:06:07 +0200 Subject: [PATCH 40/48] python311Packages.pyserial-asyncio-fast: init at 0.11 Fast asyncio extension package for pyserial that implements eager writes. --- .../pyserial-asyncio-fast/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/pyserial-asyncio-fast/default.nix diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix new file mode 100644 index 000000000000..d935b2c17155 --- /dev/null +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, wheel + +# dependencies +, pyserial + +# tests +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pyserial-asyncio-fast"; + version = "0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "pyserial-asyncio-fast"; + rev = version; + hash = "sha256-B1CLk7ggI7l+DaMDlnMjl2tfh+evvaf1nxzBpmqMBZk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyserial + ]; + + pythonImportsCheck = [ + "serial_asyncio_fast" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = with lib; { + description = "Fast asyncio extension package for pyserial that implements eager writes"; + homepage = "https://github.com/bdraco/pyserial-asyncio-fast"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3e8bb1255b9..67ad8fc444a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10780,6 +10780,8 @@ self: super: with self; { pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyserial-asyncio-fast = callPackage ../development/python-modules/pyserial-asyncio-fast { }; + pyserial = callPackage ../development/python-modules/pyserial { }; pysftp = callPackage ../development/python-modules/pysftp { }; From eee2819fc48ea88bc77bb3530a536a19ebdab395 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 02:09:20 +0200 Subject: [PATCH 41/48] home-assistant: 2023.9.3 -> 2023.10.0 https://www.home-assistant.io/blog/2023/10/04/release-202310/ --- .../home-assistant/component-packages.nix | 230 +++++++++++++----- pkgs/servers/home-assistant/default.nix | 26 +- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 2 + 4 files changed, 176 insertions(+), 86 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index da8c4d4c36f1..2082b9642463 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.9.3"; + version = "2023.10.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -79,7 +79,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "airtouch4" = ps: with ps; [ @@ -200,7 +200,7 @@ aqualogic ]; "aquostv" = ps: with ps; [ - ]; # missing inputs: sharp-aquos-rc + ]; # missing inputs: sharp_aquos_rc "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors @@ -224,7 +224,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "arcam_fmj" = ps: with ps; [ @@ -251,7 +251,7 @@ hassil home-assistant-intents mutagen - webrtcvad + webrtc-noise-gain ]; "asterisk_cdr" = ps: with ps; [ asterisk-mbox @@ -395,7 +395,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "blueprint" = ps: with ps; [ @@ -439,7 +439,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bluetooth_le_tracker" = ps: with ps; [ @@ -464,7 +464,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bluetooth_tracker" = ps: with ps; [ @@ -540,7 +540,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bticino" = ps: with ps; [ @@ -581,7 +581,7 @@ pychromecast pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "cert_expiry" = ps: with ps; [ @@ -620,7 +620,7 @@ home-assistant-intents mutagen pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ pycfdns @@ -754,7 +754,7 @@ scapy securetar sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "delijn" = ps: with ps; [ @@ -895,7 +895,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "dovado" = ps: with ps; [ @@ -956,6 +956,8 @@ "ecobee" = ps: with ps; [ python-ecobee-api ]; + "ecoforest" = ps: with ps; [ + ]; # missing inputs: pyecoforest "econet" = ps: with ps; [ pyeconet ]; @@ -1052,6 +1054,8 @@ "enigma2" = ps: with ps; [ openwebifpy ]; + "enmax" = ps: with ps; [ + ]; "enocean" = ps: with ps; [ enocean ]; @@ -1098,7 +1102,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ @@ -1126,7 +1130,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "etherscan" = ps: with ps; [ @@ -1157,7 +1161,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "event" = ps: with ps; [ @@ -1269,7 +1273,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "fleetgo" = ps: with ps; [ @@ -1410,9 +1414,9 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf - ]; # missing inputs: gardena_bluetooth + ]; # missing inputs: gardena-bluetooth "gaviota" = ps: with ps; [ ]; "gc100" = ps: with ps; [ @@ -1563,7 +1567,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "gpsd" = ps: with ps; [ @@ -1694,6 +1698,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1713,6 +1718,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1732,6 +1738,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1751,6 +1758,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1799,7 +1807,7 @@ python-otbr-api pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "homematic" = ps: with ps; [ @@ -1889,12 +1897,37 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "icloud" = ps: with ps; [ pyicloud ]; + "idasen_desk" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: idasen-ha "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ @@ -1958,7 +1991,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "input_boolean" = ps: with ps; [ @@ -2098,7 +2131,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "keyboard" = ps: with ps; [ @@ -2130,7 +2163,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "kira" = ps: with ps; [ @@ -2240,7 +2273,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "led_ble" = ps: with ps; [ @@ -2266,7 +2299,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "legrand" = ps: with ps; [ @@ -2372,7 +2405,7 @@ home-assistant-intents mutagen pyturbojpeg - webrtcvad + webrtc-noise-gain ]; # missing inputs: loqedAPI "lovelace" = ps: with ps; [ ]; @@ -2435,7 +2468,8 @@ mastodon-py ]; "matrix" = ps: with ps; [ - matrix-client + matrix-nio + pillow ]; "matter" = ps: with ps; [ aiohttp-cors @@ -2453,6 +2487,31 @@ "meater" = ps: with ps; [ meater-python ]; + "medcom_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ aiohttp-cors yt-dlp @@ -2493,7 +2552,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ @@ -2548,8 +2607,6 @@ "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ - aiodns - getmac mcstatus ]; "minio" = ps: with ps; [ @@ -2580,7 +2637,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "mobile_app" = ps: with ps; [ @@ -2595,7 +2652,7 @@ pynacl pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad @@ -2647,7 +2704,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "motion_blinds" = ps: with ps; [ @@ -2712,8 +2769,7 @@ sqlalchemy ]; "myq" = ps: with ps; [ - pymyq - ]; + ]; # missing inputs: python-myq "mysensors" = ps: with ps; [ aiohttp-cors janus @@ -2771,7 +2827,7 @@ pyatmo pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "netdata" = ps: with ps; [ netdata @@ -3014,7 +3070,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "oru" = ps: with ps; [ @@ -3037,6 +3093,7 @@ pyroute2 pyserial pyserial-asyncio + pyserial-asyncio-fast python-otbr-api pyudev sqlalchemy @@ -3068,7 +3125,7 @@ paho-mqtt pynacl pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ p1monitor @@ -3153,7 +3210,7 @@ mutagen pyplaato pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "plant" = ps: with ps; [ fnv-hash-fast @@ -3184,6 +3241,31 @@ "powerwall" = ps: with ps; [ tesla-powerwall ]; + "private_ble_device" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; "profiler" = ps: with ps; [ guppy3 objgraph @@ -3273,7 +3355,7 @@ pyudev qingping-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "qld_bushfire" = ps: with ps; [ @@ -3308,7 +3390,7 @@ mutagen pyturbojpeg rachiopy - webrtcvad + webrtc-noise-gain ]; "radarr" = ps: with ps; [ aiopyarr @@ -3357,7 +3439,7 @@ pyudev rapt-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "raspberry_pi" = ps: with ps; [ @@ -3481,7 +3563,6 @@ ]; "ruckus_unleashed" = ps: with ps; [ aioruckus - xmltodict ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound-rio @@ -3525,7 +3606,7 @@ pyudev ruuvitag-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "rympro" = ps: with ps; [ @@ -3546,7 +3627,7 @@ psutil-home-assistant pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "saj" = ps: with ps; [ pysaj @@ -3636,7 +3717,7 @@ pyudev sensirion-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sensor" = ps: with ps; [ @@ -3669,7 +3750,7 @@ pyudev sensorpro-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sensorpush" = ps: with ps; [ @@ -3695,7 +3776,7 @@ pyudev sensorpush-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sentry" = ps: with ps; [ @@ -3833,7 +3914,7 @@ pysmartapp pysmartthings pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "smarttub" = ps: with ps; [ python-smarttub @@ -3880,7 +3961,7 @@ pysnooz pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "solaredge" = ps: with ps; [ @@ -4071,9 +4152,11 @@ pyswitchbot pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; + "switchbot_cloud" = ps: with ps; [ + ]; # missing inputs: switchbot-api "switcher_kis" = ps: with ps; [ aioswitcher ]; @@ -4202,7 +4285,7 @@ pyudev sqlalchemy thermobeacon-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "thermoplus" = ps: with ps; [ @@ -4230,7 +4313,7 @@ pyudev sqlalchemy thermopro-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "thermoworks_smoke" = ps: with ps; [ @@ -4290,7 +4373,7 @@ pyudev sqlalchemy tilt-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "time" = ps: with ps; [ @@ -4323,7 +4406,7 @@ mutagen pyturbojpeg toonapi - webrtcvad + webrtc-noise-gain ]; "torque" = ps: with ps; [ aiohttp-cors @@ -4410,6 +4493,10 @@ ttls ]; "twitch" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + psutil-home-assistant + sqlalchemy twitchapi ]; "twitter" = ps: with ps; [ @@ -4427,6 +4514,8 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; + "ultraloq" = ps: with ps; [ + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -4557,7 +4646,7 @@ hassil home-assistant-intents mutagen - webrtcvad + webrtc-noise-gain ]; # missing inputs: voip-utils "volkszaehler" = ps: with ps; [ volkszaehler @@ -4602,6 +4691,11 @@ ]; "weather" = ps: with ps; [ ]; + "weatherflow" = ps: with ps; [ + pyweatherflowudp + ]; + "weatherkit" = ps: with ps; [ + ]; # missing inputs: apple_weatherkit "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -4636,8 +4730,14 @@ "withings" = ps: with ps; [ aiohttp-cors fnv-hash-fast + hass-nabucasa + hassil + home-assistant-intents + mutagen psutil-home-assistant + pyturbojpeg sqlalchemy + webrtc-noise-gain withings-api ]; "wiz" = ps: with ps; [ @@ -4710,7 +4810,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain xiaomi-ble zeroconf ]; @@ -4754,7 +4854,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain yalexs-ble zeroconf ]; @@ -4844,6 +4944,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -4894,6 +4995,7 @@ "adguard" "advantage_air" "aemet" + "aftership" "agent_dvr" "air_quality" "airly" @@ -5071,6 +5173,7 @@ "filter" "fireservicerota" "firmata" + "fitbit" "fivem" "fjaraskupan" "flic" @@ -5168,6 +5271,7 @@ "humidifier" "hunterdouglas_powerview" "hvv_departures" + "hydrawise" "hyperion" "ialarm" "iaqualink" @@ -5252,10 +5356,12 @@ "mailgun" "manual" "manual_mqtt" + "matrix" "matter" "maxcube" "mazda" "meater" + "media_extractor" "media_player" "media_source" "melcloud" @@ -5292,7 +5398,6 @@ "mullvad" "mutesync" "my" - "myq" "mysensors" "mystrom" "mythicbeastsdns" @@ -5372,6 +5477,7 @@ "point" "poolsense" "powerwall" + "private_ble_device" "profiler" "prometheus" "prosegur" @@ -5603,10 +5709,12 @@ "wake_on_lan" "wake_word" "wallbox" + "waqi" "water_heater" "watttime" "waze_travel_time" "weather" + "weatherflow" "webhook" "webostv" "websocket_api" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3d7ea12691b1..eb5367cda93d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,16 +134,6 @@ let }; }); - plexapi = super.plexapi.overridePythonAttrs (oldAttrs: rec { - version = "4.13.2"; - src = fetchFromGitHub { - owner = "pkkid"; - repo = "python-plexapi"; - rev = "refs/tags/${version}"; - hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -282,16 +272,6 @@ let }; }); - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.98.0"; - src = fetchFromGitHub { - owner = "python-zeroconf"; - repo = "python-zeroconf"; - rev = "refs/tags/${version}"; - hash = "sha256-oajSXGQTsJsajRAnS/MkkbSyxTeVvdjvw1eiJaPzZMY="; - }; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -316,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.9.3"; + hassVersion = "2023.10.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -332,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-tcIGYJ+r2+0jnf3xUxnFdwnLiOK9P0Y6sw0Mpd/YIT0="; + hash = "sha256-UmgIQJRQRDMzjUO9lJVpKsIvrFHBzoXc5Kig69ZHttU="; }; # Secondary source is git for tests @@ -340,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-zAUMevj2xvRkhZg4wuHDz0+X//cEU/D/HmokmX9oeCU="; + hash = "sha256-M8TuH9oF4+6PuHDCHiGWxSnrQcOw/OsJVSfX/8XfyIM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 118f179a9c53..39f41f6fca6b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230911.0"; + version = "20231002.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-AcMZYjSbsBrfC0Oh5P+eruNILWdVmk46+p+8xLpqfuo="; + hash = "sha256-19HFMuR7INHM805HwWyWS2qWXPOYuFjnpf0UP93tObg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index f2c904467852..e4561cdcc3ed 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,6 +5,7 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { + airzone_cloud = [ aioairzone ]; alexa = [ av ]; bluetooth = [ pyswitchbot ]; bthome = [ xiaomi-ble ]; @@ -19,6 +20,7 @@ let homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ pychromecast ]; + matrix = [ pydantic ]; mopeka = [ pyswitchbot ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; From 9a206059108ebdb6d79dabf9efc873013cc9ea7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 02:10:06 +0200 Subject: [PATCH 42/48] nixos/home-assistant: update bluetooth integrations --- nixos/modules/services/home-automation/home-assistant.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0b8b1d719418..7dc08d4356aa 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -457,10 +457,12 @@ in { "inkbird" "keymitt_ble" "led_ble" + "medcom_ble" "melnor" "moat" "mopeka" "oralb" + "private_ble_device" "qingping" "rapt_ble" "ruuvi_gateway" From 306ce8c5e20d1fd1b2e3ecaa35acf4a233d0b71e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:07:13 +0200 Subject: [PATCH 43/48] python3Packages.syrupy: 4.2.1 -> 4.5.0 (cherry picked from commit f4e97eb05c88371c3f5a4bed64c1b1fa1675244c) --- pkgs/development/python-modules/syrupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index cd9d2addc604..8759f3562596 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.2.1"; + version = "4.5.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; + hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; }; nativeBuildInputs = [ From 6ef3db48a8e2b40f2dcf95a50b1e3ca46168b404 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 04:04:56 +0200 Subject: [PATCH 44/48] python311Packages.homeassistant-stubs: 2023.9.3 -> 2023.10.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.10.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index af923462a0a6..2ede793de96f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.9.3"; + version = "2023.10.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-dZOpfSfq47sGJJB6CvcBDlSLBG8EVAX8RMuNzbP7bTs="; + hash = "sha256-/RVv2gfODAiG5mPteeHOleqkQwmamCfliCGrf1eSIr4="; }; nativeBuildInputs = [ From f92134d363dfd5f11bd017ca106779bf59aa7866 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Oct 2023 05:24:25 +0200 Subject: [PATCH 45/48] python311Packages.pyenphase: disable tests failing with syrupy 4.5.0 --- pkgs/development/python-modules/pyenphase/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index ca106a91fac4..716846949ade 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -56,6 +56,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # https://github.com/pyenphase/pyenphase/issues/97 + "test_with_7_x_firmware" + ]; + pythonImportsCheck = [ "pyenphase" ]; From 2b2b74526a8fb26f35887103907e74bf33163e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 5 Oct 2023 06:27:42 +0200 Subject: [PATCH 46/48] fzf: add meta.mainProgram MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/tools/misc/fzf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 9aad1529d162..0116ee41104e 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -101,5 +101,6 @@ buildGoModule rec { maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ]; platforms = platforms.unix; changelog = "https://github.com/junegunn/fzf/blob/${version}/CHANGELOG.md"; + mainProgram = "fzf"; }; } From 3e32871bf04132be9ffb0281b9a0be5849339218 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:54:20 +0200 Subject: [PATCH 47/48] ncview: refactor --- pkgs/tools/X11/ncview/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index 2b2aac5f66b0..e06962f2a67d 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -8,18 +8,21 @@ , xorg }: -let +stdenv.mkDerivation (finalAttrs: { pname = "ncview"; version = "2.1.8"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchurl { - url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.8.tar.gz"; - sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; + url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-${finalAttrs.version}.tar.gz"; + hash = "sha256-6LrcUHubd0gBKI0cLVnreasxsATfSFjQZ07Q2H38kb4="; }; + strictDeps = true; + + nativeBuildInputs = [ + netcdf + ]; + buildInputs = [ expat libpng @@ -34,8 +37,10 @@ in stdenv.mkDerivation { meta = with lib; { description = "Visual browser for netCDF format files"; - homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; - license = licenses.gpl3; + homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; + license = licenses.gpl3Plus; + mainProgram = "ncview"; maintainers = with maintainers; [ jmettes ]; + platforms = platforms.all; }; -} +}) From 60607a829db7ab026480c411f0f87c30edb82eb6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:54:44 +0200 Subject: [PATCH 48/48] ncview: 2.1.8 -> 2.1.9 --- pkgs/tools/X11/ncview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index e06962f2a67d..fcfb6661f310 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncview"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-${finalAttrs.version}.tar.gz"; - hash = "sha256-6LrcUHubd0gBKI0cLVnreasxsATfSFjQZ07Q2H38kb4="; + url = "https://cirrus.ucsd.edu/~pierce/ncview/ncview-${finalAttrs.version}.tar.gz"; + hash = "sha256-4jF6wJSvYvCtz2hCHXBlgglDaq40RkCVnsiXWmRYka8="; }; strictDeps = true;