From 16b094714a9a8d282f9c44da1d312643fdb73c28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Oct 2022 09:16:53 +0000 Subject: [PATCH 01/48] k3s: 1.25.2+k3s1 -> 1.25.3+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 0fdc7cc4f429..116fd7de9bab 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -47,15 +47,15 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.25.2+k3s1"; # k3s git tag - k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version - k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y"; - k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo="; + k3sVersion = "1.25.3+k3s1"; # k3s git tag + k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version + k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; + k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.19.3"; - traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; + traefikChartVersion = "12.0.0"; + traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion = "0.11.0"; From 5ab7ec1e321a82f20b7ab2baa4cabfeb9c5f7e9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 10:51:59 +0000 Subject: [PATCH 02/48] kind: 0.15.0 -> 0.17.0 --- pkgs/development/tools/kind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 6fc217006f00..15cf9c30322d 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "kind"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "sha256-IDSWmNWHnTKOl6/N1Mz+OKOkZSBarpuN39CBsSjYhKY="; + sha256 = "sha256-YAa5Dr8Pc6P3RZ3SCiyi7zwmVd5tPalM88R8bxgg6JU="; }; patches = [ @@ -18,7 +18,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorSha256 = "sha256-FE1GvNgXkBt2cH4YB3jTsPXp91DSiYlniQLtMwvi384="; + vendorSha256 = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g="; CGO_ENABLED = 0; GOFLAGS = [ "-trimpath" ]; From 77dec2d67b20b6f1b08a063888a210b7253e0aee Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 28 Oct 2022 03:10:46 +0200 Subject: [PATCH 03/48] python3Packages.hydrus-api: init at 4.0.0 --- .../python-modules/hydrus-api/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/hydrus-api/default.nix diff --git a/pkgs/development/python-modules/hydrus-api/default.nix b/pkgs/development/python-modules/hydrus-api/default.nix new file mode 100644 index 000000000000..d9afe61a65e0 --- /dev/null +++ b/pkgs/development/python-modules/hydrus-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "hydrus-api"; + version = "4.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-4by2TlZJIKElGgaof1w555ik2hUNbg16YekSWwICGmg="; + }; + + disabled = pythonOlder "3.9"; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ "hydrus_api" ]; + + # There are no unit tests + doCheck = false; + + meta = with lib; { + description = "Python module implementing the Hydrus API"; + homepage = "https://gitlab.com/cryzed/hydrus-api"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04c9ec2047cb..b19971362b08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4309,6 +4309,8 @@ self: super: with self; { hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hydrus-api = callPackage ../development/python-modules/hydrus-api { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hypercorn = callPackage ../development/python-modules/hypercorn { }; From 7af141305e944f152fa598c9784e82c4d8f31de6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Oct 2022 04:20:00 +0000 Subject: [PATCH 04/48] millet: 0.5.8 -> 0.5.10 --- pkgs/development/tools/millet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 6322e5b2bc5a..f0620b36278c 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.5.8"; + version = "0.5.10"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AsI0n76ZWzW326/kpzP+6zjVA42WrhPqnid02OJ5fEo="; + sha256 = "sha256-6TFXaVIbdHO6smM20I2olURdBPZfcPBQ4Pyk5hU9Mx8="; }; - cargoSha256 = "sha256-tHa/DXcWLdOlMlauerSiLsLImYrbnslN6R991mSTyvs="; + cargoSha256 = "sha256-fsguAk77XXMaGokqyGEumngBW2G4lmSU3Q2HMo5EtKY="; postPatch = '' rm .cargo/config.toml From e2f0896eb9156a7b109b7c4ca29ad78a3068ddce Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sat, 29 Oct 2022 13:55:54 +0530 Subject: [PATCH 05/48] toast: init at 0.45.5 --- pkgs/development/tools/toast/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/toast/default.nix diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix new file mode 100644 index 000000000000..1fd8392c9576 --- /dev/null +++ b/pkgs/development/tools/toast/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "toast"; + version = "0.45.5"; + + src = fetchFromGitHub { + owner = "stepchowfun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c="; + }; + + cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM="; + + checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails + + meta = with lib; { + description = "Containerize your development and continuous integration environments"; + homepage = "https://github.com/stepchowfun/toast"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01034566a665..e4a60de025d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1425,6 +1425,8 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; + toast = callPackage ../development/tools/toast { }; + topicctl = callPackage ../tools/misc/topicctl { }; ttchat = callPackage ../tools/misc/ttchat { }; From 7a1914356e6ab0c0e8a7a4ba06ec891f78301281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 29 Oct 2022 19:48:16 +0200 Subject: [PATCH 06/48] patchelf_0_9: drop From the commit messages in 2020 it's not clear why this package was added back. But since there are no consumers, let's drop it. --- pkgs/development/tools/misc/patchelf/0.9.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/tools/misc/patchelf/0.9.nix diff --git a/pkgs/development/tools/misc/patchelf/0.9.nix b/pkgs/development/tools/misc/patchelf/0.9.nix deleted file mode 100644 index 142e6b0d7603..000000000000 --- a/pkgs/development/tools/misc/patchelf/0.9.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, patchelf }: - -stdenv.mkDerivation rec { - pname = "patchelf"; - version = "0.9"; - - src = fetchurl { - url = "https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"; - sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; - }; - - setupHook = [ ./setup-hook.sh ]; - - doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 - - inherit (patchelf) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc9750804988..1d72bd0113b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17334,7 +17334,6 @@ with pkgs; patchelf_0_13 else patchelf_0_14; - patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { patchelf = patchelf_0_14; }; From ea0f2f725084c2f29a976c06b5b9e3fcb1c01f7c Mon Sep 17 00:00:00 2001 From: Laurent Canis Date: Fri, 28 Oct 2022 16:20:23 -0400 Subject: [PATCH 07/48] ligo: 0.54.0 -> 0.54.1 --- pkgs/development/compilers/ligo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 0858711c9033..1f6492b911a6 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -9,12 +9,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-Iq72gDaS05yhxAYjIUrqiCwBkx5aWbVpYPcQlgojhNU="; + sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ="; fetchSubmodules = true; }; From ad826d15b6e66d71b6b0bed7bc3cadb01d2e3d1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 21:56:59 +0200 Subject: [PATCH 08/48] python310Packages.nasdaq-data-link: init at 1.0.4 --- .../nasdaq-data-link/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/nasdaq-data-link/default.nix diff --git a/pkgs/development/python-modules/nasdaq-data-link/default.nix b/pkgs/development/python-modules/nasdaq-data-link/default.nix new file mode 100644 index 000000000000..ac1141af34ef --- /dev/null +++ b/pkgs/development/python-modules/nasdaq-data-link/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, factory_boy +, fetchFromGitHub +, httpretty +, inflection +, jsondate +, mock +, more-itertools +, numpy +, pandas +, parameterized +, pytestCheckHook +, python-dateutil +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "nasdaq-data-link"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Nasdaq"; + repo = "data-link-python"; + rev = "refs/tags/${version}"; + hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE="; + }; + + propagatedBuildInputs = [ + inflection + more-itertools + numpy + pandas + python-dateutil + requests + six + ]; + + checkInputs = [ + factory_boy + httpretty + jsondate + mock + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nasdaqdatalink" + ]; + + meta = with lib; { + description = "Library for Nasdaq Data Link's RESTful API"; + homepage = "https://github.com/Nasdaq/data-link-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4714ffe9a52..0e14fd5f403c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5987,6 +5987,8 @@ self: super: with self; { napari-svg = callPackage ../development/python-modules/napari-svg { }; + nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { }; + nats-py = callPackage ../development/python-modules/nats-py { }; nats-python = callPackage ../development/python-modules/nats-python { }; From 32034da16cc2050c5c8703c5c4a13d62507bd79f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Oct 2022 00:56:43 +0200 Subject: [PATCH 09/48] python3Packages.enlighten: fix build --- pkgs/development/python-modules/enlighten/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 1946aa614974..b808801928e3 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { disabledTests = [ # AssertionError: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'> is not... "test_init" + # AssertionError: Invalid format specifier (deprecated since prefixed 0.4.0) + "test_floats_prefixed" + "test_subcounter_prefixed" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 "test_autorefresh" From b517f6794dbd7ff88c928f563cd585b9d4ecb960 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:28:35 +0200 Subject: [PATCH 10/48] python310Packages.aiorecollect: 2021.10.0 -> 2022.10.0 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 79bc2a787b96..71a2f8d6f1f9 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ="; + sha256 = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM="; }; nativeBuildInputs = [ From ea21be3c67e758d5841f42c019d46e3439b7e935 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:29:19 +0200 Subject: [PATCH 11/48] python310Packages.aioridwell: 2022.03.0 -> 2022.10.0 --- pkgs/development/python-modules/aioridwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 2b4cb28bbb59..26c7f2e9809a 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2022.03.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI="; + hash = "sha256-cc5l72QHcyCBFZtw3F9EFFtmz58NnZ9gkDTcFZFlL4E="; }; nativeBuildInputs = [ From 56703430700889a029a673e47ff042cf33072102 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:31:37 +0200 Subject: [PATCH 12/48] python310Packages.aioambient: 2021.12.0 -> 2022.10.0 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 2396b24f6d9f..6a9ade641dbd 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2021.12.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY="; + sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; }; postPatch = '' From c22386ca2a19cdc05c55497f7bd4643acfd34a20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:33:46 +0200 Subject: [PATCH 13/48] python310Packages.aioguardian: 2022.07.0 -> 2022.10.0 --- pkgs/development/python-modules/aioguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 511400ccfc59..aa5b31972221 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.07.0"; + version = "2022.10.0"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw="; + sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; }; format = "pyproject"; From 21e95fef889baf18bb64cea155726508defdc380 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:36:55 +0200 Subject: [PATCH 14/48] python310Packages.peaqevcore: 7.0.10 -> 7.0.13 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 8ca7b10fb561..17c6ff296319 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.0.10"; + version = "7.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-97Evn/FT1SCQaiSNKBi0akajc7LkywqzJQEaqxm6s+U="; + hash = "sha256-0qzqnmMzgiUBe2NQsYC/EmjmoBmZsG+tUkfGc9cyKP8="; }; postPatch = '' From 96596bec5f0702870dc2f761743ff80799f13b3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:43:22 +0200 Subject: [PATCH 15/48] python310Packages.velbus-aio: 2022.10.3 -> 2022.10.4 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 62596add2c86..664ff0d1fe96 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.10.3"; + version = "2022.10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-p/oWyi5417rTSG2+xYsPlaiiHfdyAACyvRwTsmqAoUI="; + sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4="; fetchSubmodules = true; }; From 38090aea8938b320f8014831dee9b3aed7c28877 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:45:26 +0200 Subject: [PATCH 16/48] python310Packages.teamcity-messages: 1.31 -> 1.32 --- pkgs/development/python-modules/teamcity-messages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index 4f2b7f76de89..482386ac89b3 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "teamcity-messages"; - version = "1.31"; + version = "1.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JetBrains"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k="; + sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; }; checkInputs = [ From 8f4dd2cad1cf1299dbb0c6610685936ad76d0c57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:49:52 +0200 Subject: [PATCH 17/48] python310Packages.shtab: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/shtab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index f5a276497502..4e8ba675b9c1 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.5"; + version = "1.5.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-I6De64eawNi36c8NiyVxj63PkxnZfUYYT4Dw4l42Ztk="; + hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5b4f0e60911acadf5b69958aa8ce76e64750a922 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:52:41 +0200 Subject: [PATCH 18/48] python310Packages.md-toc: 8.1.4 -> 8.1.5 --- pkgs/development/python-modules/md-toc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 0510aed835ad..40a637dda188 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.4"; + version = "8.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7bXd+kTB1NF5KfcDVsvemCfIbZxv6nAw851bNo375Xs="; + hash = "sha256-jt2ZZV63s7LL0R9ay/tvMH3cIDElYXiNPBuHlxj/Z8E="; }; propagatedBuildInputs = [ From 3171790bc778180e5a1fc8f490300e9b3f42bc3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:55:21 +0200 Subject: [PATCH 19/48] python310Packages.aionotion: 2021.10.0 -> 2022.10.0 --- pkgs/development/python-modules/aionotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 4e161ba6804b..4ea83ea22a6b 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-5bu2XveDi2e6lGdI/T+0apqXzcnqdztVtaHEpp+Vkzs="; + sha256 = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; }; nativeBuildInputs = [ poetry-core ]; From 556082b2f533f4b6dc0c308cf9c0a3d0a059af19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:57:23 +0200 Subject: [PATCH 20/48] python310Packages.aionotion: update disabled --- .../python-modules/aionotion/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 4ea83ea22a6b..71fc39dead59 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -15,16 +15,19 @@ buildPythonPackage rec { pname = "aionotion"; version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; + hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -38,9 +41,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ "examples" ]; + disabledTestPaths = [ + "examples" + ]; - pythonImportsCheck = [ "aionotion" ]; + pythonImportsCheck = [ + "aionotion" + ]; meta = with lib; { description = "Python library for Notion Home Monitoring"; From e8119355961b95db09c1bd9f590ee5bfba163783 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 02:07:15 +0200 Subject: [PATCH 21/48] python310Packages.aioswitcher: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 2b6b7fede1d8..4c7a382813c5 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UnKi9/+BmQoJcv/Mlv9C9FYUgMy3J8KCGRrWPMGrM8Y="; + hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0="; }; nativeBuildInputs = [ From 651e30bc43698df2117958d67df04e8b6df0ceff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 01:01:05 +0000 Subject: [PATCH 22/48] python310Packages.meshtastic: 1.3.42 -> 1.3.43 --- pkgs/development/python-modules/meshtastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index a98d3354ef2f..0e6fe74bc728 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.3.42"; + version = "1.3.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meshtastic"; repo = "Meshtastic-python"; - rev = version; - hash = "sha256-yQjUepoKHYsQg49hY3ABtRGBxAppqm/DODnCM4tBH5A="; + rev = "refs/tags/${version}"; + hash = "sha256-Gy9fnYUbv5jR+YeFjbNGdng+loM/J71Yn9Y1mKERVUA="; }; propagatedBuildInputs = [ From 907817187980cedc9e048045276002379fd19063 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 01:17:48 +0000 Subject: [PATCH 23/48] python310Packages.motor: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/motor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 06a17ffab15c..c25070a7fa86 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "motor"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Wc0C4sO33v/frBtZVV2u9ESunHKyJI+eQ59l72h2eFk="; + sha256 = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; }; propagatedBuildInputs = [ pymongo ]; From e81347c4ecd6924dcedb84cb8d7bef4d9f4d5d75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 02:55:04 +0000 Subject: [PATCH 24/48] python310Packages.mss: 6.1.0 -> 7.0.1 --- pkgs/development/python-modules/mss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index a0d74719e794..ef10915f9a62 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mss"; - version = "6.1.0"; + version = "7.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394"; + sha256 = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; }; # By default it attempts to build Windows-only functionality From 8eecb712e7f9f233e37e0f1f2e38370d18501916 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 03:59:26 +0000 Subject: [PATCH 25/48] python310Packages.panel: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index d59fb9bf3bcd..1271fb3b4da0 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.0"; + version = "0.14.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-3kZba0R9J978bvjsjRMLSTo7dOPd5Ml7VPkZqMQV2uY="; + hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI="; }; propagatedBuildInputs = [ From c2e1495fd7a0f88b84cdd83afeb0113e6d640df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:33:45 +0000 Subject: [PATCH 26/48] python310Packages.progressbar2: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 5678eefc212c..892655a4ffeb 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y5odWSJ4RIg5kwvf/SQrTU6pzgyeZWrqgQKCwtNrwSE="; + sha256 = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; }; propagatedBuildInputs = [ python-utils ]; From 3c2305ebc320840db33847db45a134118383211e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:39:11 +0000 Subject: [PATCH 27/48] python310Packages.psygnal: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/psygnal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index a62e90a80e71..778c5516c635 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tlambert03"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; + hash = "sha256-KCdX+pMUAQxeQRZhkrdGCKGjBaB1Ode/r1W8LJQPxyM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e90683d79f50aa600e3e918273490497c8fce358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:44:15 +0000 Subject: [PATCH 28/48] python310Packages.pulumi-aws: 5.18.0 -> 5.19.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index ee3f7d22f35f..8627c4f3d519 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.18.0"; + version = "5.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-IHvmiX5drRm4PNY+N5VZ7OjsH5xIswr/G7AREN1XYtM="; + hash = "sha256-ZpbWqhTScWOlcVsX4OYlA5dYQg0UsfOhMLllXjEDdUI="; }; sourceRoot = "${src.name}/sdk/python"; From ec02fca53a70b069c5e708a7bdad6859e2c47f53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 09:08:18 +0100 Subject: [PATCH 29/48] python310Packages.mss: disable on older Python releases --- .../development/python-modules/mss/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index ef10915f9a62..a707ccefda1a 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -1,13 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "mss"; version = "7.0.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; + hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; }; # By default it attempts to build Windows-only functionality @@ -16,10 +22,12 @@ buildPythonPackage rec { ''; # Skipping tests due to most relying on DISPLAY being set - pythonImportsCheck = [ "mss" ]; + pythonImportsCheck = [ + "mss" + ]; meta = with lib; { - description = "Cross-platform multiple screenshots module in pure Python"; + description = "Cross-platform multiple screenshots module"; homepage = "https://github.com/BoboTiG/python-mss"; license = licenses.mit; maintainers = with maintainers; [ austinbutler ]; From 54cb67ac972aebf45cf8bd6330d72fe6ba30fa38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 09:17:08 +0100 Subject: [PATCH 30/48] python310Packages.motor: update disabled --- .../python-modules/motor/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index c25070a7fa86..cd819a14a879 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -9,23 +9,31 @@ buildPythonPackage rec { pname = "motor"; version = "3.1.1"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; + hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; }; - propagatedBuildInputs = [ pymongo ]; + propagatedBuildInputs = [ + pymongo + ]; - checkInputs = [ mockupdb ]; + checkInputs = [ + mockupdb + ]; # network connections doCheck = false; - pythonImportsCheck = [ "motor" ]; + pythonImportsCheck = [ + "motor" + ]; meta = with lib; { description = "Non-blocking MongoDB driver for Tornado or asyncio"; From b91b22248c0479e74789ed9b94393ea84c3fe411 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 29 Oct 2022 13:03:58 +1000 Subject: [PATCH 31/48] lima: 0.12.0 -> 0.13.0 https://github.com/lima-vm/lima/releases/tag/v0.13.0 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 8da73d834aa8..03d049477b5d 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ="; + sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; }; - vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE="; + vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From d654690be5aee7d227d7426e92e167f7afe1d451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 09:01:11 +0000 Subject: [PATCH 32/48] yq-go: 4.28.2 -> 4.29.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 795147640ab1..c9c439c7a052 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.28.2"; + version = "4.29.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-wLb7M/M/t6CCpjTyhMMDODaQUp1t6gbQaCY+JPBi/4Q="; + sha256 = "sha256-aZMlWC6qtN2TvND18QO8Q3UicSNa9cZT/xPmia3V6FM="; }; - vendorSha256 = "sha256-5GHkl9bwzf0ZUQXjhDPke4Fm7ffH+GqbTXC1Qd71B7M="; + vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; nativeBuildInputs = [ installShellFiles ]; From 170c46ce2b75d67d7a98cc262b52f8155e9610e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 10:05:03 +0100 Subject: [PATCH 33/48] python310Packages.progressbar2: use pytestCheckHook - add pythonImportsCheck - disable on older Python releases --- .../python-modules/progressbar2/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 892655a4ffeb..e3ee0a208a6a 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,26 +1,44 @@ { lib -, python , buildPythonPackage , fetchPypi +, freezegun +, pytestCheckHook , python-utils +, pythonOlder }: buildPythonPackage rec { pname = "progressbar2"; version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; + hash = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; }; - propagatedBuildInputs = [ python-utils ]; + postPatch = '' + sed -i "/-cov/d" pytest.ini + ''; - pythonImportsCheck = [ "progressbar" ]; + propagatedBuildInputs = [ + python-utils + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ + "progressbar" + ]; meta = with lib; { - homepage = "https://progressbar-2.readthedocs.io/en/latest/"; - description = "Text progressbar library for python"; + description = "Text progressbar library"; + homepage = "https://progressbar-2.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman turion ]; }; From c0eb1f38f821d75066fac0d335ba76fa3552d10e Mon Sep 17 00:00:00 2001 From: Victor Buttner Date: Sun, 30 Oct 2022 11:02:11 +0100 Subject: [PATCH 34/48] netdiscover: 0.9 -> 0.10 --- pkgs/tools/networking/netdiscover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netdiscover/default.nix b/pkgs/tools/networking/netdiscover/default.nix index 2146dd63b99e..471dd55c4e17 100644 --- a/pkgs/tools/networking/netdiscover/default.nix +++ b/pkgs/tools/networking/netdiscover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "netdiscover"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = pname; rev = version; - sha256 = "sha256-4pSGWMTOMECXKpba5739OQA8FIuNmffFbniU9Gd4GlM="; + sha256 = "sha256-Pd/Rf1G9z8sBZA5i+bzuzYUCiNI0Tv7Bz0lJDJCQU9I="; }; nativeBuildInputs = [ autoreconfHook ]; From 4eb6161eeeb7c35647fe9dd230c5a2e4028614db Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 00:26:48 +0100 Subject: [PATCH 35/48] oneko: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/misc/oneko/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index e8399aeb098f..17a94511e3fc 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, imake +, gccmakedep +, libX11 +, libXext +}: stdenv.mkDerivation rec { version_name = "1.2.hanami.6"; @@ -11,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc"; }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper ]; + buildInputs = [ libX11 libXext ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; installTargets = [ "install" "install.man" ]; From 4cef88b8526cd9de2eb742fea179e169ed7d8a7b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 00:22:54 +0100 Subject: [PATCH 36/48] openrw: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/games/openrw/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 95ec3d64cfb4..cd7d9cc1ae03 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -8,7 +8,6 @@ , bullet , glm , libmad -, xlibsWrapper , openal , SDL2 , boost @@ -36,7 +35,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { From d09843bf11098b696fc2831f47287369745c6a56 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 29 Oct 2022 16:44:06 -0400 Subject: [PATCH 37/48] blender: 3.3.0 -> 3.3.1 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e6bdd340c979..1d617718ff90 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-IsUaTmY4XLFIGKpNdtz3+m1uEDr7DTaRbhLqFZiNIfA="; + hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From b4530d1ed4f3dc5cbf1d2a08fb8ed4cbb5b94114 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 23:03:46 +0100 Subject: [PATCH 38/48] povray: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/graphics/povray/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 537e5d0a6db0..f9a08543fb95 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, boost +, zlib +, libX11 +, libICE +, libSM +, libpng +, libjpeg +, libtiff +, SDL }: stdenv.mkDerivation rec { @@ -14,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; + buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out From d5b82c0a63c9faea8109c04f243aab7dafb2cd76 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 22:41:03 +0100 Subject: [PATCH 39/48] fox: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/development/libraries/fox/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 14233488844d..2eda944048ab 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft -, CoreServices ? null }: +{ lib +, stdenv +, fetchurl +, libpng +, libjpeg +, libtiff +, zlib +, bzip2 +, libXcursor +, libXext +, libXrandr +, libXft +, CoreServices ? null +}: stdenv.mkDerivation rec { pname = "fox"; @@ -12,7 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./clang.patch ]; - buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] + buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; From f88447d108b9da9dbf300fb7b249e703ac8a9e53 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 22:14:27 +0100 Subject: [PATCH 40/48] soxt: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/development/libraries/soxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 5ea23aae8791..4e155f496ec2 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: +{ fetchhg, lib, stdenv, cmake, coin3d, motif, libXext, libXmu, libGLU, libGL }: stdenv.mkDerivation { pname = "soxt"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; + buildInputs = [ coin3d motif libGLU libGL libXext libXmu ]; meta = with lib; { homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; From e8229690bb1fdc41b44fbc432a0df559bd6457cc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 23:08:28 +0100 Subject: [PATCH 41/48] pasystray: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/audio/pasystray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index be9dbca4baa9..8df578d03109 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook , gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio -, xlibsWrapper, gsettings-desktop-schemas +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme - avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator libnotify libpulseaudio gsettings-desktop-schemas ]; From d9ffff599a22c8091687d4e5f56140a838ba337a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 21:16:50 +0100 Subject: [PATCH 42/48] unclutter: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/misc/unclutter/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 74fc46563c7e..b11df6655bf3 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,8 @@ -{lib, stdenv, fetchurl, xlibsWrapper}: +{ lib +, stdenv +, fetchurl +, libX11 +}: stdenv.mkDerivation rec { pname = "unclutter"; @@ -8,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; - buildInputs = [xlibsWrapper]; + buildInputs = [ libX11 ]; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 3d5f6e4c314662988aeb49680f431bfc5e23dea6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 21:11:44 +0100 Subject: [PATCH 43/48] unclutter-xfixes: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/misc/unclutter-xfixes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index d04846637a0c..93e0d750a2ac 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - xlibsWrapper, libev, libXi, libXfixes, + libev, libX11, libXext, libXi, libXfixes, pkg-config, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; - buildInputs = [ xlibsWrapper libev libXi libXfixes ]; + buildInputs = [ libev libX11 libXext libXi libXfixes ]; prePatch = '' substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' From 3fd2a24468aad7fc0faab16fcd639c2dbb36be58 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 30 Oct 2022 11:24:02 +0100 Subject: [PATCH 44/48] bitcoind-knots: 22.0.knots20211108 -> 23.0.knots20220529 --- pkgs/applications/blockchains/bitcoin-knots/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 803e27969e7a..ca998248a6c5 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -26,11 +26,11 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "22.0.knots20211108"; + version = "23.0.knots20220529"; src = fetchurl { - url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz"; - sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i"; + url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz"; + sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi"; }; nativeBuildInputs = From 3809602fd4cc838f0a35e79f94afed056db814cc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 17:58:24 +0100 Subject: [PATCH 45/48] wordnet: drop unused xlibsWrapper Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/misc/wordnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5b52caeaf1ad..d49f55574a86 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, Cocoa, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tcl tk xlibsWrapper ] + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; From bfa191404f33bc72d6b6fa1647ea3462ebacdbe4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 19:19:41 +0100 Subject: [PATCH 46/48] voxelands: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/games/voxelands/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 0d28a93e401e..906c3b9bd36c 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -3,9 +3,14 @@ , bzip2 , cmake , expat +, freetype , irrlicht +, libICE , libGL , libGLU +, libSM +, libX11 +, libXext , libXxf86vm , libjpeg , libpng @@ -13,7 +18,6 @@ , openal , pkg-config , sqlite -, xlibsWrapper }: stdenv.mkDerivation rec { @@ -39,18 +43,24 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + # has to go before others to override transitive libpng-1.6 + libpng + bzip2 expat + freetype irrlicht + libICE libGL libGLU + libSM + libX11 + libXext libXxf86vm libjpeg - libpng libvorbis openal sqlite - xlibsWrapper ]; meta = with lib; { From 229fa2fd6da968085fc3a4225c5ed84ab76fc02b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 16:50:36 +0100 Subject: [PATCH 47/48] xautolock: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/misc/screensavers/xautolock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cdb12b554647..fc87290da69a 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, xorgproto +{ lib, stdenv, fetchFromGitHub +, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; + buildInputs = [ libX11 libXext libXScrnSaver xorgproto ]; makeFlags = [ "BINDIR=$(out)/bin" From 593929c7484e1113b6759c69bcd27993b7fa2347 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 16:45:11 +0100 Subject: [PATCH 48/48] xfe: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- .../file-managers/xfe/default.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 160363937840..92b3fae31596 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }: +{ lib +, stdenv +, fetchurl +, fox +, fontconfig +, freetype +, pkg-config +, gettext +, xcbutil +, gcc +, intltool +, file +, libpng +, xorg +}: stdenv.mkDerivation rec { pname = "xfe"; @@ -10,7 +24,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ]; + buildInputs = [ + fox + gettext + xcbutil + gcc + file + libpng + fontconfig + freetype + xorg.libX11 + xorg.libXft + ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h