From 5717b97d6ad3385e39ac80a841a5e372ae0a2f57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:16:48 +0000 Subject: [PATCH 01/25] openapi-generator-cli: 5.2.0 -> 5.2.1 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 606b3b4ee9e6..e3491460e0ae 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.2.0"; + version = "5.2.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; + sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs="; }; dontUnpack = true; From d380611baa5d502576c5da315431de7d82327f33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Sep 2021 09:11:27 +0200 Subject: [PATCH 02/25] python3Packages.yeelight: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/yeelight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 36b67e2daa22..b7472d68a83d 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.4"; + version = "0.7.5"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-qpyD4o8YMVu6DiizuBs/44Vz0oPIMR4/YQwaCDNKpFI="; + sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0="; }; propagatedBuildInputs = [ From 21fdca8720c596f923c7b22121f53126b08e402c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Sep 2021 09:13:18 +0200 Subject: [PATCH 03/25] python3Packages.arcam-fmj: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/arcam-fmj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 8d74db04d1fa..a1f4892a245f 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.11.1"; + version = "0.12.0"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = version; - sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE="; + sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U="; }; propagatedBuildInputs = [ From 78d06ff3f35376e0f104b6b1a92a2630572d1df8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Sep 2021 22:04:28 +0200 Subject: [PATCH 04/25] python3Packages.aioymaps: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/aioymaps/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index 4a6d806dee1d..01765f6eedff 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.1.0"; + version = "1.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm"; + sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU="; }; propagatedBuildInputs = [ From bb083e6229266cda7561d64c2eb95f2f07670b91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Sep 2021 23:25:07 +0200 Subject: [PATCH 05/25] python3Packages.pysiaalarm: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/pysiaalarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 206d24a40dc5..6d59006fab47 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pysiaalarm"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122"; + sha256 = "sha256-96LSD1jL4Za7HF9vgplImeY57EQ9qa/hOdjQ/PPBq4A="; }; postPatch = '' From 3512d59e6c263adc82dabfe6effaa59d18fcd79c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 00:01:21 +0200 Subject: [PATCH 06/25] python3Packages.velbus-aio: 2021.9.2 -> 2021.9.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 d4ddd6fa3cc8..b9d6b7151665 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.9.2"; + version = "2021.9.4"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-pFVhWrMygCwAsAYPnqtoaPcgh6y0Tf9vROYfn0M+g2E="; + sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc="; }; propagatedBuildInputs = [ From 9d6fbb6b2cb036c8206e3bfb18aafc13493f286a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 10:33:53 +0200 Subject: [PATCH 07/25] python3Packages.pysdcp: init at 1 --- .../python-modules/pysdcp/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pysdcp/default.nix diff --git a/pkgs/development/python-modules/pysdcp/default.nix b/pkgs/development/python-modules/pysdcp/default.nix new file mode 100644 index 000000000000..b6b1798f7ae1 --- /dev/null +++ b/pkgs/development/python-modules/pysdcp/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysdcp"; + version = "1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "pySDCP"; + inherit version; + sha256 = "07396lsn610izaravqc6j5f6m0wjrzgc0d1r9dwqzj15g5zfc7wm"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pysdcp" ]; + + meta = with lib; { + description = "Python library to control SONY projectors"; + homepage = "https://github.com/Galala7/pySDCP"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50803af17df7..6f31589a3336 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6805,6 +6805,8 @@ in { pyscss = callPackage ../development/python-modules/pyscss { }; + pysdcp = callPackage ../development/python-modules/pysdcp { }; + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; pysendfile = callPackage ../development/python-modules/pysendfile { }; From c4fc5f5dda7a87317e7d9856c30a2e4f4c3f19cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 10:34:33 +0200 Subject: [PATCH 08/25] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b1363880f9f8..d69173351582 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -803,7 +803,7 @@ "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; - "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp + "sony_projector" = ps: with ps; [ pysdcp ]; "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw From 5ff1057ec4134d76481d9761ebed76d1cb1d3452 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 14:47:53 +0200 Subject: [PATCH 09/25] python3Packages.types-requests: 2.25.8 -> 2.25.9 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 798dbd6c42de..464b0d58762e 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.8"; + version = "2.25.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IlrC6GVJtu86ikS/lV+AtJVYVXBKFdKIPYRFyN9jckI="; + sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k="; }; # Modules doesn't have tests From 048af0cd5ff53c31eff561b25b9b558e62f82817 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 15:13:12 +0200 Subject: [PATCH 10/25] python3Packages.niluclient: init at 0.1.2 --- .../python-modules/niluclient/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/niluclient/default.nix diff --git a/pkgs/development/python-modules/niluclient/default.nix b/pkgs/development/python-modules/niluclient/default.nix new file mode 100644 index 000000000000..7f6aa69da61e --- /dev/null +++ b/pkgs/development/python-modules/niluclient/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "niluclient"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "niluclient" ]; + + meta = with lib; { + description = "Python client for getting air pollution data from NILU sensor stations"; + homepage = "https://github.com/hfurubotten/niluclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50803af17df7..52c8e83ca964 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4923,6 +4923,8 @@ in { nilearn = callPackage ../development/python-modules/nilearn { }; + niluclient = callPackage ../development/python-modules/niluclient { }; + nimfa = callPackage ../development/python-modules/nimfa { }; nine = callPackage ../development/python-modules/nine { }; From 539b9b26aa702e5114595ecb58ae36ebde6ee62b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 15:14:30 +0200 Subject: [PATCH 11/25] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b1363880f9f8..0e504f38ac85 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -574,7 +574,7 @@ "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control - "nilu" = ps: with ps; [ ]; # missing inputs: niluclient + "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail From cda1e49784034826eb04a67cfe6fff5e226cc609 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 25 Sep 2021 19:11:54 +0200 Subject: [PATCH 12/25] foreman: add more platform support See https://www.moncefbelyamani.com/understanding-the-gemfile-lock-file/ Apparently you now have to manually add all the platforms that a gem is supported on. --- pkgs/tools/system/foreman/Gemfile.lock | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock index 1bafc658cbc0..dac60786a63f 100644 --- a/pkgs/tools/system/foreman/Gemfile.lock +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -4,6 +4,10 @@ GEM foreman (0.87.2) PLATFORMS + aarch64-darwin + aarch64-linux + ruby + x86_64-darwin x86_64-linux DEPENDENCIES From fce1ac0d62b496d11f5dd4700524f92c2b844905 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 20:23:18 +0200 Subject: [PATCH 13/25] sqlfluff: 0.6.5 -> 0.6.6 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 348111c5e4f9..62bef68b5064 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.5"; + version = "0.6.6"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc="; + sha256 = "sha256-I7vsOQtXY/n2Zu0F94f5/uF1ia96R/qQw+duG7X8Dpo="; }; propagatedBuildInputs = with python3.pkgs; [ From d3e59373610389ff65ff025231c70695362b09dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 22:07:58 +0200 Subject: [PATCH 14/25] python3Packages.imdbpy: remove patch --- .../python-modules/imdbpy/default.nix | 25 ++++++++---- .../python-modules/imdbpy/sql_error.patch | 39 ------------------- 2 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/imdbpy/sql_error.patch diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix index ab7575f99be8..ab4d2a5ce0c1 100644 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ b/pkgs/development/python-modules/imdbpy/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }: +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, sqlalchemy +}: buildPythonPackage rec { - pname = "IMDbPY"; + pname = "imdbpy"; version = "2021.4.18"; src = fetchPypi { - inherit pname version; + pname = "IMDbPY"; + inherit version; sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; }; - patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update + propagatedBuildInputs = [ + lxml + sqlalchemy + ]; - propagatedBuildInputs = [ lxml sqlalchemy ]; + # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 + doCheck = false; - doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 pythonImportsCheck = [ "imdb" ]; meta = with lib; { + description = "Python package for retrieving and managing the data of the IMDb database"; homepage = "https://imdbpy.github.io/"; - description = "A Python package for retrieving and managing the data of the IMDb database"; - maintainers = [ maintainers.ivar ]; license = licenses.gpl2Only; + maintainers = with maintainers; [ ivar ]; }; } diff --git a/pkgs/development/python-modules/imdbpy/sql_error.patch b/pkgs/development/python-modules/imdbpy/sql_error.patch deleted file mode 100644 index 10770f4f1135..000000000000 --- a/pkgs/development/python-modules/imdbpy/sql_error.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py -index cd4a3e3..3fcfdd4 100644 ---- a/imdb/parser/sql/__init__.py -+++ b/imdb/parser/sql/__init__.py -@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase): - """The class used to access IMDb's data through a SQL database.""" - - accessSystem = 'sql' -- _sql_logger = logging.getLogger('imdbpy.parser.sql') - - def __init__(self, uri, adultSearch=True, *arguments, **keywords): - """Initialize the access system.""" -@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase): - except ImportError as e: - raise IMDbError('unable to import SQLAlchemy') - # Set the connection to the database. -- self._sql_logger.debug('connecting to %s', uri) -+ logger.debug('connecting to %s', uri) - try: - self._connection = setConnection(uri, DB_TABLES) - except AssertionError as e: -@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase): - # Maps some IDs to the corresponding strings. - self._kind = {} - self._kindRev = {} -- self._sql_logger.debug('reading constants from the database') -+ logger.debug('reading constants from the database') - try: - for kt in KindType.select(): - self._kind[kt.id] = kt.kind -@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase): - return - if not hasattr(self, '_connection'): - return -- self._sql_logger.debug('closing connection to the database') -+ logger.debug('closing connection to the database') - try: - self._connection.close() - except: From bd0ea72925ec64f0613240894313ad778871e477 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 01:47:01 +0000 Subject: [PATCH 15/25] python38Packages.casbin: 1.8.1 -> 1.9.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 5dcdf1cf3f25..b813eb47c697 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.8.1"; + version = "1.9.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "16s1bd8z400cmwz0igai9fdv9qlafwp2fllhy84cfi90yxwh1flp"; + sha256 = "01prcwkmh3a4ggzjiaai489rrpmgwvqpjcavwjxw60mspyhsbv86"; }; propagatedBuildInputs = [ From f1a8d087eb59b4513b37873c4b96bf7d63ec41b1 Mon Sep 17 00:00:00 2001 From: Riey Date: Sun, 26 Sep 2021 13:35:15 +0900 Subject: [PATCH 16/25] cargo-feature: 0.5.2 -> 0.5.3 --- pkgs/development/tools/rust/cargo-feature/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 062cb9f027d6..0f21e4326f3a 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-feature"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n"; + sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8="; }; - cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq"; + cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 628f61fe1a5830787ae359aa61be877858c36100 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 05:28:48 +0000 Subject: [PATCH 17/25] python38Packages.deezer-py: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/deezer-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index a79a30da822a..12ee63c0fd16 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4dd648e5bf251cb13316145e243d3a08d870840e0ac1525309926e640c91ea9"; + sha256 = "1b5664835975fda7a2519ba4b411cc5f2e4113e614ee140389b61844906d0c05"; }; propagatedBuildInputs = [ requests ]; From ecd334772cdf2a57bab4d88ec6f761e2ba38e420 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 06:08:15 +0000 Subject: [PATCH 18/25] python38Packages.emoji: 1.5.0 -> 1.5.2 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 1c800cdce63b..2b20c7de4a39 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "1b75p1ia4ip6aq1657pdwpspvhyjw6dpsrglj2qlql2gdmcm8sp8"; + sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1"; }; checkInputs = [ From 5fa508d98fe3de78fe8e882ce703ea9ee7144468 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 06:46:13 +0000 Subject: [PATCH 19/25] python38Packages.fe25519: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/fe25519/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 466de64453f4..89890b8e8cf2 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "fe25519"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1m85qvw9dwxk81mv9k45c9n75pk8wqn70qkinqh56h5zv56vgq24"; + sha256 = "8819659f19b51713199a75fda5107c93fbb6e2cb4afef3164ce7932b5eb276b9"; }; propagatedBuildInputs = [ From 33d3f1d8207a411d5b343c74e409cab3a2608788 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 06:58:53 +0000 Subject: [PATCH 20/25] python38Packages.fountains: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/fountains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index 690f3dcbd3d3..aec78779a7a4 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fountains"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "47c28e598cc3a723327daee28c757de3a40f4d8eb48e6be37081932c1d00fa6f"; + sha256 = "fbf4e2cb11d60d3bafca5bb7c01c254d08a5541ed7ddfe00ef975eb173fb75a4"; }; propagatedBuildInputs = [ From 2eb62bb92e78402557b9f7fe38561f1154ad1aee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Sep 2021 10:07:04 +0200 Subject: [PATCH 21/25] tfsec: 0.58.9 -> 0.58.10 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 99138a612441..66e876ec81a8 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.9"; + version = "0.58.10"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1i61xls3jj5w3cliqs28m1y6p47yav24m40zxa6kf0jj4s50m1d3"; + sha256 = "sha256-VMnc4frDBAkVc9hqUdXAiJ2vNsK9NzkLOUaQWhQQUBU="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 4e27609642ce2a57539c103ca9a995ad761d53aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Sep 2021 10:18:05 +0200 Subject: [PATCH 22/25] exploitdb: 2021-09-22 -> 2021-09-25 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a2d0ac08d5ed..c2aafacee4f9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-22"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-axA20Ok+5LgtW4Mf1xMM64Gd6C6joBC5isUdZPncgDw="; + sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU="; }; installPhase = '' From aef78fae439df7663e4e2268fc8230d5bedebb63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 08:36:50 +0200 Subject: [PATCH 23/25] python3Packages.mypy-boto3-builder: 4.14.1 -> 4.22.1 --- .../mypy-boto3-builder/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 0c871c90a3a5..5098daeafd4b 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -3,10 +3,11 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, isort , jinja2 , md-toc -, isort , mdformat +, poetry-core , pyparsing , pytestCheckHook , pythonOlder @@ -14,16 +15,22 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.14.1"; - disabled = pythonOlder "3.6"; + version = "4.22.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc="; + sha256 = "0xljddjhq7b0344mpiymjrjym40xgda1vmwygjk1gikakhr61hh4"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ black boto3 @@ -38,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Should be fixed with 5.x + "test_get_types" + ]; + pythonImportsCheck = [ "mypy_boto3_builder" ]; meta = with lib; { From 293c04c6a9898847f6c22d9bd4bc83e8f3434b8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Sep 2021 10:43:21 +0200 Subject: [PATCH 24/25] python3Packages.mypy-boto3-builder: 4.22.1 -> 5.4.0 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 5098daeafd4b..e0a67d4f6505 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.22.1"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "0xljddjhq7b0344mpiymjrjym40xgda1vmwygjk1gikakhr61hh4"; + sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE="; }; nativeBuildInputs = [ From 61da86928406435694525d7b9553f6ee2703fd77 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 24 Sep 2021 00:15:04 +0200 Subject: [PATCH 25/25] apostrophe: 2.4 -> 2.5 --- pkgs/applications/editors/apostrophe/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index df0be4ccfbea..e5cfeb964bd7 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, meson, ninja , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive -, shared-mime-info, libhandy, fira +, shared-mime-info, libhandy, fira, sassc }: let @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.4"; + version = "2.5"; src = fetchFromGitLab { - owner = "somas"; + owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz"; + sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp"; }; - nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils - appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils + appstream-glib wrapGAppsHook sassc ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 gnome.adwaita-icon-theme webkitgtk gspell texlive @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://gitlab.gnome.org/somas/apostrophe"; + homepage = "https://gitlab.gnome.org/World/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; platforms = platforms.linux;