From 3e3d28cc36e3188ccfbea7e39e5e756b40850455 Mon Sep 17 00:00:00 2001 From: "Luna D. Dragon" Date: Mon, 21 Feb 2022 06:44:22 +0530 Subject: [PATCH 01/14] pridecat: init at unstable-2020-06-19 Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/tools/misc/pridecat/default.nix | 23 ++++++++++++++++++++++ pkgs/tools/misc/pridecat/fix_install.patch | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/pridecat/default.nix create mode 100644 pkgs/tools/misc/pridecat/fix_install.patch diff --git a/pkgs/tools/misc/pridecat/default.nix b/pkgs/tools/misc/pridecat/default.nix new file mode 100644 index 000000000000..d7bf2b86d6da --- /dev/null +++ b/pkgs/tools/misc/pridecat/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "pridecat"; + version = "unstable-2020-06-19"; + + src = fetchFromGitHub { + owner = "lunasorcery"; + repo = "pridecat"; + rev = "92396b11459e7a4b5e8ff511e99d18d7a1589c96"; + sha256 = "sha256-PyGLbbsh9lFXhzB1Xn8VQ9zilivycGFEIc7i8KXOxj8="; + }; + + # fixes the install path in the Makefile + patches = [ ./fix_install.patch ]; + + meta = with lib; { + description = "Like cat, but more colorful"; + homepage = "https://github.com/lunasorcery/pridecat"; + license = licenses.cc-by-nc-sa-40; + maintainers = with maintainers; [ lunarequest ]; + }; +} diff --git a/pkgs/tools/misc/pridecat/fix_install.patch b/pkgs/tools/misc/pridecat/fix_install.patch new file mode 100644 index 000000000000..3d05721ccab8 --- /dev/null +++ b/pkgs/tools/misc/pridecat/fix_install.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile b/Makefile +index 815c27e..1556807 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,5 @@ + CXX ?= clang ++out ?= /usr/local + + all: pridecat + +@@ -6,7 +7,8 @@ pridecat: main.cpp + $(CXX) main.cpp -o pridecat -std=c++11 -lstdc++ -Wall -Wextra -O3 + + install: pridecat +- cp pridecat /usr/local/bin/pridecat ++ mkdir -p ${out}/bin ++ cp pridecat ${out}/bin/pridecat + + uninstall: + rm -f /usr/local/bin/pridecat diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8f375441406..d67ac32bca93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -361,9 +361,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + pridecat = callPackage ../tools/misc/pridecat { }; + proto-contrib = callPackage ../development/tools/proto-contrib { }; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { }; protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; From b9970b4fb4d5703a88f561f5c6566cc655237017 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 17:30:00 +0000 Subject: [PATCH 02/14] yaru-theme: 21.10.2 -> 22.04.1 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 64bd3eb5eebc..eb62da715ce9 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.10.2"; + version = "22.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U="; + sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From a3ccb2105b9304454e238296cb0b9c49de736aae Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 8 Mar 2022 11:13:02 -0800 Subject: [PATCH 03/14] colmena: 0.2.1 -> 0.2.2 --- pkgs/tools/admin/colmena/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index f7ba90ac2ad2..d17366b38a81 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-5UU8iBzwO7xM8B+LulnFkJFv5j5lu7mfq0XMmOCaKcQ="; + sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8="; }; - cargoSha256 = "sha256-wMC2GAVVxkwrgJtOIJL0P+Uxh+ouW4VwLDrXJlD10AA="; + cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw="; nativeBuildInputs = [ installShellFiles ]; From 0b93eabbc0a8a1a060b65e50f68effd61921d8e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 23:54:19 +0000 Subject: [PATCH 04/14] python310Packages.google-cloud-translate: 3.7.1 -> 3.7.2 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index c3008caaf68b..c36bd09ba7ca 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.7.1"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y="; + hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg="; }; propagatedBuildInputs = [ From 569f2fb1f5d241dbea1654eae52951f4b7bc1caf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 19:40:50 +0000 Subject: [PATCH 05/14] python310Packages.google-cloud-org-policy: 1.3.0 -> 1.3.1 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index f30c3f35aa31..2e698db4aef2 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is="; + sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From f3ff118710839ce3263d52e106f87a38471d4244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 23:35:01 +0000 Subject: [PATCH 06/14] python310Packages.google-cloud-asset: 3.8.0 -> 3.8.1 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 7a138eb0b17b..d28cdbf08443 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.8.0"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig="; + sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U="; }; propagatedBuildInputs = [ From 6b99e11697281ec880150558079e57597c1f37ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 23:15:17 +0000 Subject: [PATCH 07/14] python310Packages.google-cloud-trace: 1.6.0 -> 1.6.1 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 6c17d6cb99a3..bb9eb5f477ac 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ="; + sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; From c99ae85b48ba60341c538adad15df93abef6eead Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 22:10:59 +0100 Subject: [PATCH 08/14] python3Packages.censys: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/censys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 4a00155a4ec6..754d7ca0f2aa 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.2"; + version = "2.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d"; + sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; }; nativeBuildInputs = [ From 72473ff0700321d12d71ca0a0a787c00c6c18fa6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Mar 2022 18:42:01 -0800 Subject: [PATCH 09/14] sway: use a more-accurate default for trayEnabled This commit implements @primeos's suggestion here: https://github.com/NixOS/nixpkgs/pull/160972#pullrequestreview-901069355 --- pkgs/applications/window-managers/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 9ea6c1650ee0..727d9b4e6b36 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -11,7 +11,7 @@ , systemdSupport ? stdenv.isLinux , dbusSupport ? true , dbus -, trayEnabled ? dbusSupport +, trayEnabled ? systemdSupport && dbusSupport }: # The "sd-bus-provider" meson option does not include a "none" option, From f73adf70789bc1fc78d348d96e06720a7e742a7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 18:57:20 +0000 Subject: [PATCH 10/14] python310Packages.google-cloud-bigquery-logging: 1.0.1 -> 1.0.2 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 32988e35deac..c26d7582c23d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23"; + sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; }; propagatedBuildInputs = [ From 2c0a9c5ea09d29b362ef7de6db3193afa6c31960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 16:51:31 +0000 Subject: [PATCH 11/14] python310Packages.google-cloud-dataproc: 4.0.0 -> 4.0.1 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 66cca84e9cad..9b97c14b6218 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x4ejr6qj5z4yKOx0pIqK13oVzsKj+uQ43Q5VN48jaFQ="; + sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 44995ccd1dd569a35d30727fa5a31d698c775e50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 20:41:59 +0100 Subject: [PATCH 12/14] python3Packages.google-cloud-dataproc: disable on older Python releases --- .../google-cloud-dataproc/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 9b97c14b6218..d8451ec097cc 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dataproc"; version = "4.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials From 108f4dca28175e7bff434666361f73d55dbd8460 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 16:21:30 +0000 Subject: [PATCH 13/14] python310Packages.google-cloud-language: 2.4.0 -> 2.4.1 --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index c8adfc54469b..341a759032b1 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE="; + sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 6d46e381b9f32403fd6cbec6eb0ededc24e67bf2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 20:50:25 +0100 Subject: [PATCH 14/14] python3Packages.google-cloud-language: disable on older Python releases --- .../google-cloud-language/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 341a759032b1..c4caa9474e40 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; version = "2.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.language"