From dc5bd4b375fce716050adc8a3487227012dd8faa Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 28 Feb 2022 00:11:41 +0900 Subject: [PATCH 01/21] nixos/keycloak: fix database provisioning issues This fixes the following issues with the database provisioning script included in the services.keycloak module: - It lacked permission to access the DB password file specified in the module option 'services.keycloak.database.passwordFile'. - It prevented Keycloak from starting after the second time if the user chose MySQL for the database. --- nixos/modules/services/web-apps/keycloak.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index a01f0049b2c7..22c16be76139 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -693,6 +693,7 @@ in RemainAfterExit = true; User = "postgres"; Group = "postgres"; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace @@ -701,7 +702,8 @@ in create_role="$(mktemp)" trap 'rm -f "$create_role"' ERR EXIT - echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role" psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role" psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' ''; @@ -717,14 +719,14 @@ in RemainAfterExit = true; User = config.services.mysql.user; Group = config.services.mysql.group; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit - - db_password="$(<'${cfg.database.passwordFile}')" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" - echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" + echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" ) | mysql -N ''; From 0334498c74e97409ec7ab730aa61e821bf675cac Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 28 Feb 2022 00:38:14 +0900 Subject: [PATCH 02/21] nixosTests.keycloak: replace libtidy with html-tidy Follow-up of cc700ad55b3fc4bc257826b3167c3a1247b50a5b. --- nixos/tests/keycloak.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 1be3fed6acc9..6367ed808e06 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -40,7 +40,7 @@ let environment.systemPackages = with pkgs; [ xmlstarlet - libtidy + html-tidy jq ]; }; From 8ef54b283be728e6c476d35d9c2f016453c223cc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 6 Mar 2022 17:42:09 +0100 Subject: [PATCH 03/21] intel-{gmmlib,media-driver}: Remove myself as maintainer My hardware has become too old to profit from new features so I'll rather spend my time on other packages. --- pkgs/development/libraries/intel-gmmlib/default.nix | 2 +- pkgs/development/libraries/intel-media-driver/default.nix | 2 +- pkgs/development/libraries/vaapi-intel/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 8581ab729a63..ee33909d0aa6 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 08ce42354985..6a9d523f9031 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ jfrankenau SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f21a947a533f..2a9f0cf74032 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } From 7f21ce8f6f5199ba867118491b6a6e1709e6a268 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 7 Mar 2022 02:17:49 +0000 Subject: [PATCH 04/21] hilbish: 0.7.1 -> 1.0.2 --- pkgs/shells/hilbish/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index 55a28ceb8892..08ee5d664fab 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "hilbish"; - version = "0.7.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-YQNLv6/4I5WM/xhlWIjThgO23tN+ZCyJVZVatnIUllc="; + sha256 = "sha256-BsN2v6OEWOtk8ENKr5G+lSmNIUA89VfpO+QQoBizx9g="; fetchSubmodules = true; }; - vendorSha256 = "sha256-xzB6sqBnDuvqTFMmLcXdSj6UFWYzA54PxUBKrFKhyQk="; - - buildInputs = [ readline ]; + vendorSha256 = "sha256-Bmst1oJMuSXGvL8Syw6v2BqrbO5McHKkTufFs6iuxzs="; ldflags = [ "-s" @@ -28,7 +26,7 @@ buildGoModule rec { cp .hilbishrc.lua $out/share/hilbish/ cp -r docs -t $out/share/hilbish cp -r libs -t $out/share/hilbish/ - cp preload.lua $out/share/hilbish/ + cp -r prelude/ $out/share/hilbish/ # segfaults and it's already been generated upstream # we copy the docs over with the above cp command From 5d4c910b5457248649302b086824fd0d47b00e58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 14:12:53 +0100 Subject: [PATCH 05/21] sonarr: 3.0.6.1342 -> 3.0.7.1477 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a2d6d94d3b59..fcab3a8e560e 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.6.1342"; + version = "3.0.7.1477"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-6RMthsf60FJLDHB72QJkPeF7vXmjBgcqKujO0IOjVIk="; + sha256 = "sha256-xB7kWWxx+ymBxyxBzwY7gZfw9kMHi2MSsrUp8GIOiws="; }; nativeBuildInputs = [ makeWrapper ]; From 3b61ae7507197a5995da0fbdf5c0ee8b6ccd457a Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 7 Mar 2022 17:25:48 +0100 Subject: [PATCH 06/21] CODEOWNERS: remove deleted user volth --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 44007ca4828f..c4662b044aa7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -104,9 +104,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp @zakame -/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame -/pkgs/development/perl-modules @volth @stigtsp @zakame +/pkgs/development/interpreters/perl @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @stigtsp @zakame +/pkgs/development/perl-modules @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin From 5d78fa265bae6f31ee0323e695222be093385145 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 7 Mar 2022 11:19:11 -0600 Subject: [PATCH 07/21] python310Packages.single-version: init at 1.5.1 --- .../single-version/0001-set-poetry-core.patch | 21 +++++++++++++ .../python-modules/single-version/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/single-version/0001-set-poetry-core.patch create mode 100644 pkgs/development/python-modules/single-version/default.nix diff --git a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch new file mode 100644 index 000000000000..4c6f869c0c27 --- /dev/null +++ b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch @@ -0,0 +1,21 @@ +From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Mon, 6 Dec 2021 15:26:19 -0600 +Subject: [PATCH] set poetry-core + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d3fdc52..bd7ddc2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,4 +27,4 @@ black = "^19.10b0" + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.33.1 diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix new file mode 100644 index 000000000000..39cd92f5f67e --- /dev/null +++ b/pkgs/development/python-modules/single-version/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: + +buildPythonPackage rec { + pname = "single-version"; + version = "1.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + }; + + patches = [ + ./0001-set-poetry-core.patch + ]; + + nativeBuildInputs = [ poetry-core ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "single_version" ]; + + meta = with lib; { + description = "Utility to let you have a single source of version in your code base"; + homepage = "https://github.com/hongquan/single-version"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b72a6fb062d9..a99399e8befe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9196,6 +9196,8 @@ in { simpy = callPackage ../development/python-modules/simpy { }; + single-version = callPackage ../development/python-modules/single-version { }; + signify = callPackage ../development/python-modules/signify { }; siosocks = callPackage ../development/python-modules/siosocks { }; From 4797442a7221a636f556b46c359b8369f1572318 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 7 Mar 2022 11:20:26 -0600 Subject: [PATCH 08/21] python310Packages.kiss-headers: init at 2.3.0 --- .../python-modules/kiss-headers/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/kiss-headers/default.nix diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix new file mode 100644 index 000000000000..0ceced85cacf --- /dev/null +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }: + +buildPythonPackage rec { + pname = "kiss-headers"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = pname; + rev = version; + sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ="; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" + ''; + + disabledTestPaths = [ + # Tests require internet access + "kiss_headers/__init__.py" + "tests/test_serializer.py" + "tests/test_with_http_request.py" + ]; + + pythonImportsCheck = [ "kiss_headers" ]; + + meta = with lib; { + description = "Python package for HTTP/1.1 style headers"; + homepage = "https://github.com/Ousret/kiss-headers"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a99399e8befe..47b51b9790dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4476,6 +4476,8 @@ in { kinparse = callPackage ../development/python-modules/kinparse { }; + kiss-headers = callPackage ../development/python-modules/kiss-headers { }; + kitchen = callPackage ../development/python-modules/kitchen { }; kivy = callPackage ../development/python-modules/kivy { From 0d6e095755621d2f4a650ce7cb7e3c2179fbed75 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 7 Mar 2022 11:29:45 -0600 Subject: [PATCH 09/21] python310Packages.python-zbar: init at 0.23.90 --- .../python-modules/python-zbar/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/python-zbar/default.nix diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix new file mode 100644 index 000000000000..04e89b664c49 --- /dev/null +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -0,0 +1,42 @@ +{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-zbar"; + version = "0.23.90"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + }; + + propagatedBuildInputs = [ pillow ]; + + buildInputs = [ zbar ]; + + checkInputs = [ pytestCheckHook ]; + + preBuild = '' + cd python + ''; + + disabledTests = [ + #AssertionError: b'Y800' != 'Y800' + "test_format" + "test_new" + #Requires loading a recording device + #zbar.SystemError: + "test_processing" + ]; + + pythonImportsCheck = [ "zbar" ]; + + meta = with lib; { + description = "Python bindings for zbar"; + homepage = "https://github.com/mchehab/zbar"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47b51b9790dd..8b290529ce14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8277,6 +8277,8 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; + pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; }; From 104a7fe846743d1d858c8a32e026aa55620fb20f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 09:41:38 -0800 Subject: [PATCH 10/21] nghttp2: add curl and libsoup as tests --- pkgs/development/libraries/nghttp2/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 86edacc6166b..bd639ec3041a 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -10,6 +10,10 @@ , enableJemalloc ? false, jemalloc ? null , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null + +# downstream dependencies, for testing +, curl +, libsoup }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + passthru.tests = { + inherit curl libsoup; + }; + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; From 834e7e8b73b8e681e8c40d522fb81a9d25234c57 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 7 Mar 2022 11:49:21 -0600 Subject: [PATCH 11/21] cobang: init at 0.9.6 --- .../0001-Poetry-core-and-pillow-9.patch | 31 ++++++ pkgs/applications/misc/cobang/default.nix | 102 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 137 insertions(+) create mode 100644 pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch create mode 100644 pkgs/applications/misc/cobang/default.nix diff --git a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch new file mode 100644 index 000000000000..d3c32cf96407 --- /dev/null +++ b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch @@ -0,0 +1,31 @@ +From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Fri, 4 Mar 2022 07:03:17 -0600 +Subject: [PATCH] Pillow update + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 5dc25e0..b3ba397 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,7 +11,7 @@ readme = "README.rst" + [tool.poetry.dependencies] + python = "^3.7" + logbook = "^1.5.3" +-Pillow = "^8.2.0" ++Pillow = "^9.0.0" + requests = "^2.24.0" + kiss-headers = "^2.2.3" + single-version = "^1.5.1" +@@ -33,4 +33,4 @@ skip-string-normalization = true + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.35.1 + diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix new file mode 100644 index 000000000000..1401a7a8df28 --- /dev/null +++ b/pkgs/applications/misc/cobang/default.nix @@ -0,0 +1,102 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, atk +, gdk-pixbuf +, gobject-introspection +, gtk3 +, gst-plugins-good +, libhandy +, librsvg +, networkmanager +, pango +, gst-python +, kiss-headers +, Logbook +, pillow +, poetry-core +, pygobject3 +, python +, python-zbar +, requests +, single-version +, pytestCheckHook }: + +buildPythonApplication rec { + pname = "cobang"; + version = "0.9.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = "CoBang"; + rev = "v${version}"; + sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + }; + + patches = [ + ./0001-Poetry-core-and-pillow-9.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gst-python + kiss-headers + Logbook + pillow + poetry-core + pygobject3 + python-zbar + requests + single-version + ]; + + buildInputs = [ + atk + gdk-pixbuf + # Needed to detect namespaces + gobject-introspection + gst-plugins-good + libhandy + networkmanager + pango + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Wrapping this manually for SVG recognition + dontWrapGApps = true; + + postInstall = '' + # Needed by the application + cp -R data $out/${python.sitePackages}/ + + # Icons and applications + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \ + --replace "Exec=" "Exec=$out/bin/" + ''; + + preFixup = '' + wrapProgram $out/bin/cobang \ + ''${gappsWrapperArgs[@]} \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ''; + + meta = with lib; { + description = "A QR code scanner desktop app for Linux"; + homepage = "https://github.com/hongquan/CoBang"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24785322b0d3..f48203741d52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4484,6 +4484,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + cobang = python3Packages.callPackage ../applications/misc/cobang { + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; + }; + cocoapods = callPackage ../development/mobile/cocoapods { }; cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); From 946455fe58ac36062749c7fa3b991aae02d48cf4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Feb 2022 19:42:34 +0000 Subject: [PATCH 12/21] python3Packages.pillow: add some reverse dependencies to passthru.tests picked for importance or sensitivity to pillow changes --- pkgs/development/python-modules/pillow/default.nix | 6 ++++++ pkgs/development/python-modules/pillow/generic.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 57b085a54051..c1df3ce27513 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +# for passthru.tests +, imageio, matplotlib, pilkit, pydicom, reportlab }@args: import ./generic.nix (rec { @@ -14,6 +16,10 @@ import ./generic.nix (rec { sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; + passthru.tests = { + inherit imageio matplotlib pilkit pydicom reportlab; + }; + meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 3e33f1a8aa0f..97c67fd5fa49 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -3,13 +3,14 @@ , disabled , src , meta +, passthru ? {} , ... }@args: with args; buildPythonPackage rec { - inherit pname version src meta; + inherit pname version src meta passthru; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 From d63249ac27e90fbbe8c9707b61e9ae89bcd241da Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 4 Mar 2022 09:45:40 -0600 Subject: [PATCH 13/21] PULL_REQUEST_TEMPLATE.md: Request PRs describe themselves There are a lot of PRs for updates that don't make it easy to find out what changes might be breaking and lots of PRs for new packages that don't describe what the new packages is or does. --- .github/PULL_REQUEST_TEMPLATE.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 268b1594de71..91d61aef23b2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,8 +8,12 @@ List of open PRs: https://github.com/NixOS/nixpkgs/pulls Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions --> -###### Motivation for this change +###### Description of changes + ###### Things done From 0d651072c3701e1a3b401044eb4d1c73afae3ac2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 7 Mar 2022 13:11:01 -0600 Subject: [PATCH 14/21] iosevka-bin: 10.1.0 -> 15.0.1 (#162244) (used ./update-bin.sh) --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 08c4a1b145e2..3ebaf49abebc 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "10.1.0"; + version = "15.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0ce5212b1311..f67f97dfaaf8 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1"; - iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn"; - iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc"; - iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b"; - iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51"; - iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf"; - iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj"; - iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb"; - iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8"; - iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4"; - iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7"; - iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9"; - iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x"; - iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv"; - iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw"; - iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7"; - iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h"; - iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h"; - iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix"; - iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6"; - iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am"; - iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i"; - iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9"; - iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716"; - sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm"; - sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57"; - sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj"; - sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr"; - sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4"; - sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m"; - sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712"; - sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw"; - sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq"; - sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g"; - sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b"; - sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd"; - sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v"; - sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1"; - sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5"; - sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv"; - sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a"; - sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg"; - sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd"; - sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684"; - sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp"; - sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2"; - sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58"; - sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn"; - sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an"; - sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5"; - sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n"; - sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8"; - sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4"; - sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9"; - sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr"; - sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9"; - sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n"; - sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2"; - sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q"; - sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk"; - sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq"; - sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69"; - sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616"; - sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52"; - sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh"; - sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3"; - sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp"; - sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8"; - sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns"; - sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2"; - sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj"; - sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc"; - sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1"; - sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw"; - sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2"; - sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd"; - sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd"; - sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd"; - sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n"; - sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd"; - sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q"; - sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw"; - sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r"; - sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1"; - sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw"; - sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1"; - sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc"; - sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2"; - sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx"; - sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk"; - sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r"; - sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6"; + iosevka = "1g8x2bjhnhiq46mx02rhp0wphi7rj21m1nh2gx6rxly2ybms3pnw"; + iosevka-aile = "1hvrzycsilvjl3a90n2sk5sznkjvrn9r6yqaad397rbd309w46ai"; + iosevka-curly = "0df15zbjs9xpqm5032vmjmnp4ay545bs4i8xr6rd37slb8a8x2bf"; + iosevka-curly-slab = "0n57gz1v12l01khy3y0i0yd4w88jz6izwl4iav4679qjfhhd206c"; + iosevka-etoile = "1mq1mqxkj5y3r9xwjy7pbrvnv72zkj2hnh48kac0xr414yrqql3n"; + iosevka-slab = "0srnbwxj03is9d8q0y0k55dr35s747p8xbiz7xany5piljl68f42"; + iosevka-ss01 = "1rm514g3x510dcpn9hn98kl2pv4h9rxmkgp2wvxxhg3s47x0462n"; + iosevka-ss02 = "0p8h1khzxsi4c6wmwri9vvbcv2qy4nksnhmyhksb0b8yw22s9iyk"; + iosevka-ss03 = "1rsw5gx5l5mi8ljvgrrir4bnhy8mvx3rkr9d4vba8wzvvqvc74nv"; + iosevka-ss04 = "02rcdfrnhqdjlks26968mxsrdyfalk3h985bf9vi03sf9nqmmfpz"; + iosevka-ss05 = "1qn323iawpvjqhmx6s7i8irjqkxq9yya5dxp87m452hq9zm2jynq"; + iosevka-ss06 = "0zyg2afzmzdm7gd2c9i9vp751xapajabjm85sri3mcyvgkbcxqai"; + iosevka-ss07 = "1qfalhxl2vxflwn3f73bdq5q1p8zblmswdfw5mrl3b5nzy8y40nw"; + iosevka-ss08 = "0idj19nk7mq6z4yphmxa09c5azgxyi38zlq7y872s0dl9j2qbi5f"; + iosevka-ss09 = "1zwwlb9c34q36kflc6r4wygv3rpkd7y6n1xpkql02w6rb1gp7nd9"; + iosevka-ss10 = "0j01j7frkv2ldz3hqn65r3b56yn63fchhhkghs95v4cln27qzmxx"; + iosevka-ss11 = "0imwzcxh7cqmqcsdlg5nay12jql8dq1hk0h7a0i1igrn3fflga5g"; + iosevka-ss12 = "0z5smyxx5szz5ky4lxmscf44a5pzkjm590cihmcnjw3nxiw84bs1"; + iosevka-ss13 = "0pyq12n7h1adhs5rbkrx9b64rpwvd9nj8vjmwzf3qmdc39bx6rfv"; + iosevka-ss14 = "0v3aipgvw1ygs6v839cw17arm5iag57aqdkr35n0wx3yl5h3v9wg"; + iosevka-ss15 = "0vhwi4b2nmshx7lh5d4fr3swfx58sxwn6w38kvp5p27jp68azbbz"; + iosevka-ss16 = "1rzrd0swjaacbjpxniglkkwsn4dfhvb8f70g8nigc2mah3md62gp"; + iosevka-ss17 = "184acjrqdlw38lzizwxp02lwmc8jznrb55krlvrxkd2lkj4r6gni"; + iosevka-ss18 = "0sza6q6yisjsk5gkkj1z7qbrhpvqv18nykgdwqraa3im66bkl1v9"; + sgr-iosevka = "1n1i12d9891il20ry3vkv5503d9j541w17imh09dbn5r0lrjr40r"; + sgr-iosevka-aile = "0y1nx1xk7fn8dj5jc6zyva593vdxngjc61j717jlqh855fpz5v04"; + sgr-iosevka-curly = "03x2w2arkbhnpl3rlsdgpldqnfrd14q55kf5rf5lsrnmdndg706s"; + sgr-iosevka-curly-slab = "0vncsw3k56cqzpp5rpllz4azklib0vq7rah0ssz2syh43zffsyw3"; + sgr-iosevka-etoile = "0plk2c7ckxm0f7aa9wd1qpi3dfb2gap0222jhx906clx04kb6bp0"; + sgr-iosevka-fixed = "147qjfqwdr0l29ljbn0c73m2wg1vm9qdn5fjika8z1wy7mbrmbsl"; + sgr-iosevka-fixed-curly = "1222ms9kpgcah531ik7h9qkprpq4dd98p41xrsxad3hvr4aa6x05"; + sgr-iosevka-fixed-curly-slab = "1fcg0afhan0ym15c10qikfa4hadgzj0aabymac0qq74l5dn8lmx7"; + sgr-iosevka-fixed-slab = "174xgxrwy50gnm53qhr9mf5cwkbwgalw6ypbz6r68fhyk70dbjvx"; + sgr-iosevka-fixed-ss01 = "16wpj0yvkavhlvz5xzfa5mr219wlynqlfg1am1y1b9w647ypx6q6"; + sgr-iosevka-fixed-ss02 = "1ya9riiiphv6fmirg5r0va06xvcgq8j41vmibqrzld7sjk26yrll"; + sgr-iosevka-fixed-ss03 = "1l6dc7sl5a9p076a7jp2lfwrn1xh0rlp8v3d9k5m9gjghr62b288"; + sgr-iosevka-fixed-ss04 = "1fmbdjgkvaw30x9wycdfzk9n9c1a2vznx8fnxc3xjps4xw5vd4h3"; + sgr-iosevka-fixed-ss05 = "1f66q69wgqxqzkf5r54cjqg66lnfpk7w9lf1hk59v3vmxjxy39xh"; + sgr-iosevka-fixed-ss06 = "1lfjnjn3k6wj03gxpvzc73zj98iy0x447pigxln911ai3v2mcmz5"; + sgr-iosevka-fixed-ss07 = "0567x6rvikpn2cn9prrym0rlw5swa4rb7wihmhpgal64ygysipq4"; + sgr-iosevka-fixed-ss08 = "0b81a3841c2fdfrpsiq8cyly9mzrk0974na53b505wasj5jvikqb"; + sgr-iosevka-fixed-ss09 = "1p5w7m5r11m94icyv8fnwzmpnsih9s8p8iq8hg6iasawqzh60ll3"; + sgr-iosevka-fixed-ss10 = "0c0dhi2c84km1vhbiifv95x4yf03jz12jax2vvc68hhi3w4gmg68"; + sgr-iosevka-fixed-ss11 = "10jp3i36sv4jl2887g1ir1dc2gy1iyhzf2f396jchi5dadzfpgwj"; + sgr-iosevka-fixed-ss12 = "14pq3l6241ylpxlx2n483g1ghlhqahk8dla0frvb572k0bvl4vh5"; + sgr-iosevka-fixed-ss13 = "0js73rildzz24v4alj2xfl5n5wvmlxk18qzdchzrb78lq6bifvvd"; + sgr-iosevka-fixed-ss14 = "0f47d6khi5kr10xlm61pbwr1xk5kqgj82abcaxmvbf5c3jj3v1lr"; + sgr-iosevka-fixed-ss15 = "1nkyfmx4ps8mbnz7ap0vzgwgrxm6nbi4fhvalr6w2dk521inyfn7"; + sgr-iosevka-fixed-ss16 = "0fykkgksdmni80v3q513xwxnay9l73viwj9qbn4bc58ljzd5hffr"; + sgr-iosevka-fixed-ss17 = "09n1vl8m2drg5zs05hvdp7yy47a9s927a8ndxqsa34klanz7c04j"; + sgr-iosevka-fixed-ss18 = "1rmfnnsi9c6alifhnfa4yc9gfgk687zxhrsyrjizwg9r19b2k34m"; + sgr-iosevka-slab = "1nffh7iy3gn5v2yqilq57x6nvk25jh9jmbdmdfyra19nwfn601ja"; + sgr-iosevka-ss01 = "1nwl7psz11jnyldry3wa3wfki28wghqq8f7vz8gmmcvv98caga80"; + sgr-iosevka-ss02 = "1clk233v4ycfqmbv7whmbvm2l1qr1kf75kdca1r4c5y4wjmsh1ap"; + sgr-iosevka-ss03 = "1lxn8hgz0qxs39d1jvr855h8zi3dv1k56v99q0ivrnp5y7aclia5"; + sgr-iosevka-ss04 = "03nz6864i5s6gpjy7jjj52062ivd57wh90j6p8x4lj72479fwfsy"; + sgr-iosevka-ss05 = "1bfgdnc44vmj3hxifz0kb5bfbv3bj9dglp4l7p781chi0m9yrmm8"; + sgr-iosevka-ss06 = "1zcqq2kv080xsfll6zap3hm2l0kx6sr378iq7qrfpavmfifc3rk8"; + sgr-iosevka-ss07 = "1phy7gdx5j5rww54mmzvi5f401lxqxxrwmh0hrhl0bvsxybhdcgm"; + sgr-iosevka-ss08 = "1wyznlzpbv8vb1sny4f1v8x4azfbcp2ajml4aram9k9cx3zkvd8s"; + sgr-iosevka-ss09 = "0q4sla496pdhfv4v15y5ax0h4pr4n47bfrvs27lq26x4p1fhgwdg"; + sgr-iosevka-ss10 = "1iyr4vfs2dp26vi26libv5k18mvdnfzmwmvzdczkh8cyc9hwp36d"; + sgr-iosevka-ss11 = "083pfql4nlq2847csqskb2qxrsnlvfwz198ybnfd97lxa1zczj6k"; + sgr-iosevka-ss12 = "08isy55m7dqpyhbzf5jkamnr8c135850dwpqp380g991h5sp3vnm"; + sgr-iosevka-ss13 = "1vjv198pkvnnxxcbyc5fy54ld4phf52nhybqc9hyf8d7806wrvyn"; + sgr-iosevka-ss14 = "1y4iclzcfb2q0172xag3zqabw03q89jqb7asi0x9zkrhcd1i512y"; + sgr-iosevka-ss15 = "1zxxn6s418gpx2ndknqdwp132p0sr3smsqhavpl5kw5cxrgxa9q6"; + sgr-iosevka-ss16 = "132xmf4rlsa3d0j2s9hmfih6s32wm1na0hs72h7padnh6c7di3rl"; + sgr-iosevka-ss17 = "1bb94ladk0qvzmvb2gc1561xfy7ddgqkqgcgigkkhdab7cfw0cxq"; + sgr-iosevka-ss18 = "15rrngd4qnzqk06whczsmfdf5c1k3nm4m8ga691i1rjxwc5dwycc"; + sgr-iosevka-term = "09m74mqczkm0pirahlisdw2mafyzq7wpzplyqg51221x2m01px7z"; + sgr-iosevka-term-curly = "19ralig26akrabclnniwvimqkcrd0agcwyxakinb7qcbm8p4x30x"; + sgr-iosevka-term-curly-slab = "01zwrlkrp840ah5fclxxl17vckcx4wnv3vwlz6nch2igy965k6qs"; + sgr-iosevka-term-slab = "0520d21x04fvc2b3aa6kzdhwvf24s8yd8vkbl400i0x78gyrlnzv"; + sgr-iosevka-term-ss01 = "0q64vcp4djk0mdfc05a9bz0nqc2a7dr0gdvj2d2kfpbqsg4i32qq"; + sgr-iosevka-term-ss02 = "0h8a4wc5ck1p7gaf1r08h4irj10kqbpm2jkb2p63gybi9gp6ivwg"; + sgr-iosevka-term-ss03 = "0608yhvkbv1hkdj7c347r9q7wbm9bvy6lnhhs6gb0ndkx596pnzm"; + sgr-iosevka-term-ss04 = "1yfpkczgfjfr52ilinzi2dfyw11mmsilxjpl9r9yh0fxmr48c976"; + sgr-iosevka-term-ss05 = "1brrfhkj7wlyhfdfhafkqw8kgsfy7fsi7567ayxii5b05wn9g6mr"; + sgr-iosevka-term-ss06 = "0vksv1k9wvyfiifxnajvmi8b5mx8w72d80y3r9ic7rz36l0rbl3x"; + sgr-iosevka-term-ss07 = "0n5hz3zdp7flbr2xh4yddwkxvpcd0v55m274w15s9q6wln0knwhy"; + sgr-iosevka-term-ss08 = "1qknqr11imcrr0iqpa9qpf70m7505wl81k48igdyqgmimgksrlji"; + sgr-iosevka-term-ss09 = "1j53n5fv2y97bj7n4kx8h8v5isflbmgdqh0hz58ilp06v6rd6j5i"; + sgr-iosevka-term-ss10 = "1bzi39n4x4qa7vyhv5yh875n8gbyjkiaqfhj2xh8pj88b8064cw0"; + sgr-iosevka-term-ss11 = "0xxyh1zxy1jdy0b110f7rallhf0vicsw0snyh3bf3v0mnkimk0y4"; + sgr-iosevka-term-ss12 = "1hpbpqnkd4jzcqkg424y3d6i6nn5gyqlpqsfxrvfvx4igmm75vs5"; + sgr-iosevka-term-ss13 = "12fg2j5xw6vcpczc5kgq6q29cq579l1wyv5ag9r4kxqg541s3frl"; + sgr-iosevka-term-ss14 = "02qkmzr5kn5p69nqk59j6431313apy861yphbzpy56k4g80j0gy4"; + sgr-iosevka-term-ss15 = "0pcb91b8iic6blsgz0sw5hv2d9add355dizpvhc6m8rmp6l5pnqq"; + sgr-iosevka-term-ss16 = "081g07cav6k36k78bmdrx0z9jj2xzx3p1midzsxgsqp3ns2qxk7s"; + sgr-iosevka-term-ss17 = "1bx7mx75344i4807aq1xk0rw03hnv24wn3kj247hv3b1lxx14285"; + sgr-iosevka-term-ss18 = "068vy78d710aszk5s9kwf56rxg17qm8pphd329cmwknxsyan139g"; } From 9b4a0294612340daaec49e24c1cae228715a942d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 20:03:12 +0000 Subject: [PATCH 15/21] terraria-server: 1.4.3.2 -> 1.4.3.5 --- pkgs/games/terraria-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index c4094f2816d2..0100418326dc 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.3.2"; + version = "1.4.3.5"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-/OClQTO9iBRQk3iTvYbjG1cCicKIBh+yi2OFpurJx8U="; + sha256 = "sha256-N1GnxEe0A6Wuzy08lL3CFPWjQJECGGf504FE+lnhDcw="; }; buildInputs = [ file ]; From 031ab3327467c0ba63ff50304489b5d3c31a1d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 13:15:47 +0000 Subject: [PATCH 16/21] nerdctl: 0.17.0 -> 0.17.1 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 9a3a5f3a3d5f..48ac2dc983e5 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs="; + sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY="; }; - vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY="; + vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From aa9b3f4a934ca30dcc31893f51ec39e8e31ebb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 7 Mar 2022 19:55:16 +0000 Subject: [PATCH 17/21] python3Packages.twitchapi: 2.5.2 -> 2.5.3 https://github.com/Teekeks/pyTwitchAPI/releases/tag/v2.5.3 --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index c6d5fbffc500..8024a645e2b4 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.2"; + version = "2.5.3"; format = "setuptools"; src = fetchPypi { pname = "twitchAPI"; inherit version; - sha256 = "f0ee5388911154375170a83df9a18e8a698fe382cea5d94a3e33ad27a7ce9133"; + sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; }; propagatedBuildInputs = [ From 0482396f2f69e8a2c19c945b6ba91f3409dc9ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 7 Mar 2022 20:02:23 +0000 Subject: [PATCH 18/21] python3Packages.pytwitchapi: make alias of twitchapi The project is called twitchapi on PyPI. --- .../python-modules/pytwitchapi/default.nix | 45 ------------------- .../python-modules/twitchapi/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/python-modules/pytwitchapi/default.nix diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix deleted file mode 100644 index 9777f3331307..000000000000 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, aiohttp -, python-dateutil -, requests -, websockets -}: - -buildPythonPackage rec { - pname = "pytwitchapi"; - version = "2.5.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Teekeks"; - repo = "pyTwitchAPI"; - rev = "v${version}"; - hash = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc="; - }; - - propagatedBuildInputs = [ - aiohttp - python-dateutil - requests - websockets - ]; - - # Project has no tests. - doCheck = false; - - pythonImportsCheck = [ - "twitchAPI" - ]; - - meta = with lib; { - description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; - homepage = "https://github.com/Teekeks/pyTwitchAPI"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 8024a645e2b4..ce4ae1a8874d 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; homepage = "https://github.com/Teekeks/pyTwitchAPI"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda wolfangaukang ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44c5c11ceb92..2ac1f83917a0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -96,6 +96,7 @@ mapAliases ({ python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 + pytwitchapi = twitchapi; # added 2022-03-07 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b72a6fb062d9..20a757033a18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8341,8 +8341,6 @@ in { pytweening = callPackage ../development/python-modules/pytweening { }; - pytwitchapi = callPackage ../development/python-modules/pytwitchapi { }; - pytz = callPackage ../development/python-modules/pytz { }; pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; From 64a0f750dba08e09a10c91f7f06ff0cd3ecbf93a Mon Sep 17 00:00:00 2001 From: Dmitriy <43755002+psydvl@users.noreply.github.com> Date: Mon, 7 Mar 2022 23:36:18 +0300 Subject: [PATCH 19/21] obsidian: 0.13.23 -> 0.13.30 (#160469) --- pkgs/applications/misc/obsidian/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 5e71f7d0d107..607d02a484ec 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick +{ stdenv, fetchurl, lib, makeWrapper, electron_16, makeDesktopItem, graphicsmagick , writeScript }: let - electron = electron_13; + electron = electron_16; icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.13.23"; + version = "0.13.30"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c"; + sha256 = "ymdqdDD7WWfol/jLBsz8tEzcN7Ed1HSIrkuA51cvKKw="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; @@ -68,6 +68,7 @@ in stdenv.mkDerivation rec { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; + downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; maintainers = with maintainers; [ conradmearns zaninime ]; platforms = [ "x86_64-linux" ]; From 4dfc00c1910890fb176e0b21fe2bb665dd713a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 14:17:32 +0000 Subject: [PATCH 20/21] pass-git-helper: 1.1.2 -> 1.2.0 --- .../git-and-tools/pass-git-helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index a431a50af3b7..63f7a459a70a 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; + sha256 = "sha256-An9JKnS/Uor7iZ+lbBGR3eOkxOgV+SjnCWN/QmqFI/I="; }; propagatedBuildInputs = [ pyxdg ]; From b7deb4cf7598330a450b8ad2174424daa1611e8b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 7 Mar 2022 12:13:04 -0500 Subject: [PATCH 21/21] terraform-providers.snowflake: init at 0.25.36 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c6ce0c209c31..73c76101397c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1005,6 +1005,15 @@ "vendorSha256": null, "version": "0.14.5" }, + "snowflake": { + "owner": "chanzuckerberg", + "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", + "repo": "terraform-provider-snowflake", + "rev": "v0.25.36", + "sha256": "sha256-AeIQfdn68EnSj2BXZIsC0+L3EJ6tRHLD0NYHdPcf89w=", + "vendorSha256": "sha256-oYjoTZ79ricoFZTokiFcCKNXAeqFvW4RIMQmTp763gE=", + "version": "0.25.36" + }, "sops": { "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops",