From 08691e47ce29320f11e67c5d45245db42b48af5d Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 3 Dec 2021 17:07:05 +0530 Subject: [PATCH 01/79] broot: 1.7.3 -> 1.7.4 --- pkgs/tools/misc/broot/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 6a8ace3b2a98..2f953dfd032f 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.7.3"; + version = "1.7.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-qu8COcMuReV8zbDK5lm378SQY+TwDy/lo9T/ldNMfz0="; + sha256 = "sha256-laFLm6A0EeprSHuqBi3p4ykgBbCinYU1sf0iRV0PY/M="; }; - cargoHash = "sha256-ndFymXT2hA4ZztePDFhAYlMh8Iwxi1/ULZYGq+W5vpE="; + cargoHash = "sha256-0ybig1S56cJjf6QGWuDasfsIiwRhK+bpWNKOjs4D7P8="; nativeBuildInputs = [ installShellFiles @@ -76,6 +76,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; + changelog = "https://github.com/Canop/broot/releases/tag/v${version}"; maintainers = with maintainers; [ dywedir ]; license = with licenses; [ mit ]; }; From 46b2d1f93a519f6d7b152759fb15190eb40e766f Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 3 Dec 2021 17:45:33 +0530 Subject: [PATCH 02/79] broot: add package test --- pkgs/tools/misc/broot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 2f953dfd032f..d1cc0503efc2 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -73,6 +73,11 @@ rustPlatform.buildRustPackage rec { installManPage man/broot.1 ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/broot --version | grep "${version}" + ''; + meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; From 37211393e8ccd7f8426b1aa23cbcae0cf8bc3b00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 18:09:46 +0100 Subject: [PATCH 03/79] python3Packages.moonraker-api: init at 2.0.2 --- .../python-modules/moonraker-api/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/moonraker-api/default.nix diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix new file mode 100644 index 000000000000..ac991e25f41d --- /dev/null +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "moonraker-api"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cmroche"; + repo = pname; + rev = "v${version}"; + sha256 = "1ODfwuO8XeleOnpp/dD+8jfEAIesXT1BuImtXTn289U="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "moonraker_api" + ]; + + meta = with lib; { + description = "Python API for the Moonraker API"; + homepage = "https://github.com/cmroche/moonraker-api"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..fc14e60dbb84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4914,6 +4914,8 @@ in { monty = callPackage ../development/python-modules/monty { }; + moonraker-api = callPackage ../development/python-modules/moonraker-api { }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; From 84d9b84360a2cedf8f26c5dc79610dc5d34ca637 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 18:19:17 +0100 Subject: [PATCH 04/79] python3Packages.pyecowitt: init at 0.21 --- .../python-modules/pyecowitt/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyecowitt/default.nix diff --git a/pkgs/development/python-modules/pyecowitt/default.nix b/pkgs/development/python-modules/pyecowitt/default.nix new file mode 100644 index 000000000000..b5f4a5fadbac --- /dev/null +++ b/pkgs/development/python-modules/pyecowitt/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyecowitt"; + version = "0.21"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "garbled1"; + repo = pname; + rev = version; + sha256 = "5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project thas no tests + doCheck = false; + + pythonImportsCheck = [ + "pyecowitt" + ]; + + meta = with lib; { + description = "Python module for the EcoWitt Protocol"; + homepage = "https://github.com/garbled1/pyecowitt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..8e6f4f974d9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6442,6 +6442,8 @@ in { pyeconet = callPackage ../development/python-modules/pyeconet { }; + pyecowitt = callPackage ../development/python-modules/pyecowitt { }; + pyedimax = callPackage ../development/python-modules/pyedimax { }; pyee = callPackage ../development/python-modules/pyee { }; From 38213f24a401bb67ec83904118248d0b56a8d6a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 18:37:41 +0100 Subject: [PATCH 05/79] python3Packages.rki-covid-parser: init at 1.3.1 --- .../rki-covid-parser/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/rki-covid-parser/default.nix diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix new file mode 100644 index 000000000000..ec201fcd9f57 --- /dev/null +++ b/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rki-covid-parser"; + version = "1.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "thebino"; + repo = pname; + rev = "v${version}"; + sha256 = "UTLWBbNjvRuBwc5JD8l+izJu5vODLwS16ExdxUPT14A="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-aiohttp + pytestCheckHook + ]; + + disabledTestPaths = [ + # Tests require netowrk access + "tests/test_districts.py" + "tests/test_endpoint_availibility.py" + ]; + + pythonImportsCheck = [ + "rki_covid_parser" + ]; + + meta = with lib; { + description = "Python module for working with data from the Robert-Koch Institut"; + homepage = "https://github.com/thebino/rki-covid-parser"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..0a96ad1cfd5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8292,6 +8292,8 @@ in { rjsmin = callPackage ../development/python-modules/rjsmin { }; + rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { }; + rl-coach = callPackage ../development/python-modules/rl-coach { }; rlp = callPackage ../development/python-modules/rlp { }; From ab10be129eed0f7a5c832b85c561262a3156d559 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 19:26:08 +0100 Subject: [PATCH 06/79] python3Packages.pysolcast: init at 1.0.7 --- .../python-modules/pysolcast/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/pysolcast/default.nix diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix new file mode 100644 index 000000000000..fea0b68dcce9 --- /dev/null +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isodate +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, responses +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pysolcast"; + version = "1.0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mcaulifn"; + repo = "solcast"; + rev = "v${version}"; + sha256 = "J4D7W89Qz1Nv4DeqOmHVAWfmThlY5puBjSClRkfwhVw="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + isodate + pyyaml + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; + + pythonImportsCheck = [ + "pysolcast" + ]; + + meta = with lib; { + description = "Python library for interacting with the Solcast API"; + homepage = "https://github.com/mcaulifn/solcast"; + # No license statement present + # https://github.com/mcaulifn/solcast/issues/70 + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..b42beaed0623 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5845,6 +5845,8 @@ in { pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; + pysolcast = callPackage ../development/python-modules/pysolcast { }; + pysyncthru = callPackage ../development/python-modules/pysyncthru { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; From c9d0f80597cd9fdedfaf6925844aedca6c4faf25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 21:51:21 +0100 Subject: [PATCH 07/79] python3Packages.pyhomeworks: init at 0.0.6 --- .../python-modules/pyhomeworks/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyhomeworks/default.nix diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix new file mode 100644 index 000000000000..085107c4ad26 --- /dev/null +++ b/pkgs/development/python-modules/pyhomeworks/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyhomeworks"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "Eqbm8274B2hBuF+mREe8lqGhpzZExPJ29jzvwB5RNR8="; + }; + + # Project has no real tests + doCheck = false; + + pythonImportsCheck = [ + "pyhomeworks" + ]; + + meta = with lib; { + description = "Python interface to Lutron Homeworks Series 4/8"; + homepage = "https://github.com/dubnom/pyhomeworks"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..7c37d9bf7fec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6610,6 +6610,8 @@ in { pyhomepilot = callPackage ../development/python-modules/pyhomepilot { }; + pyhomeworks = callPackage ../development/python-modules/pyhomeworks { }; + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; From 5c6d41e19c506de662d2bd9e7b3e5bfdcbea50c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 21:52:20 +0100 Subject: [PATCH 08/79] 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 4367f423cce9..5fccf5816d8c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -370,7 +370,7 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; - "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks + "homeworks" = ps: with ps; [ pyhomeworks ]; "honeywell" = ps: with ps; [ somecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ python-hpilo ]; From ad9b07370e59ae1e3f8288d9217bd3b19795b793 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 22:05:11 +0100 Subject: [PATCH 09/79] python3Packages.luxor: init at 0.0.1 --- .../python-modules/luxor/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/luxor/default.nix diff --git a/pkgs/development/python-modules/luxor/default.nix b/pkgs/development/python-modules/luxor/default.nix new file mode 100644 index 000000000000..ebebdd0d9bc9 --- /dev/null +++ b/pkgs/development/python-modules/luxor/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest-aiohttp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "luxor"; + version = "0.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "GIwVEOKZAudTu2M3OM4LFVR8e22q52m/AN0anskdmWQ="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "luxor" + ]; + + meta = with lib; { + description = "Python module to control FX Luminaire controllers"; + homepage = "https://github.com/pbozeman/luxor"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..5dcb67b317ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4579,6 +4579,8 @@ in { luftdaten = callPackage ../development/python-modules/luftdaten { }; + luxor = callPackage ../development/python-modules/luxor { }; + luxtronik = callPackage ../development/python-modules/luxtronik { }; lupa = callPackage ../development/python-modules/lupa { }; From 274f0a71fe7d31309abe38a079ea3af2af21809a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 23:13:36 +0100 Subject: [PATCH 10/79] python3Packages.pescea: init at 1.0.10 --- .../python-modules/pescea/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/pescea/default.nix diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix new file mode 100644 index 000000000000..c4a6feb6896c --- /dev/null +++ b/pkgs/development/python-modules/pescea/default.nix @@ -0,0 +1,58 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pescea"; + version = "1.0.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "lazdavila"; + repo = pname; + rev = "v${version}"; + sha256 = "Q38mLGjrRdXEvT+PCNsil1e2p0mmM0Xy8TUx9QOnFRA="; + }; + + propagatedBuildInputs = [ + async-timeout + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/lazdavila/pescea/pull/1 + substituteInPlace setup.py \ + --replace '"asyncio",' "" + ''; + + disabledTests = [ + # AssertionError: assert ... + "test_updates_while_busy" + # Test requires network access + "test_flow_control" + ]; + + pythonImportsCheck = [ + "pescea" + ]; + + meta = with lib; { + description = "Python interface to Escea fireplaces"; + homepage = "https://github.com/lazdavila/pescea"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..4fda3ff4637f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5682,6 +5682,8 @@ in { persisting-theory = callPackage ../development/python-modules/persisting-theory { }; + pescea = callPackage ../development/python-modules/pescea { }; + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { }; From 47d6b71b4c2116968ae4ecc3ebe1348012cff654 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 01:00:23 +0100 Subject: [PATCH 11/79] python3Packages.pykeyatome: init at 1.1.2 --- .../python-modules/pykeyatome/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/pykeyatome/default.nix diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix new file mode 100644 index 000000000000..8dd6d7fc45d4 --- /dev/null +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fake-useragent +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, responses +, simplejson +}: + +buildPythonPackage rec { + pname = "pykeyatome"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jugla"; + repo = "pyKeyAtome"; + rev = "V${version}"; + sha256 = "sha256-5aKZaS+BFKR1ldAY3BlS/oqYGz1C+ZRkNL9ez/etWh4="; + }; + + propagatedBuildInputs = [ + fake-useragent + requests + simplejson + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + requests-mock + responses + ]; + + disabledTests = [ + # Tests require network access + "test_consumption" + "test_get_live" + "test_login" + "test_relog_after_session_down" + ]; + + pythonImportsCheck = [ + "pykeyatome" + ]; + + meta = with lib; { + description = "Python module to get data from Atome Key"; + homepage = "hhttps://github.com/jugla/pyKeyAtome"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6569bf250ddb..3fda5e88e2bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6674,6 +6674,8 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; + pykeyatome = callPackage ../development/python-modules/pykeyatome { }; + pykira = callPackage ../development/python-modules/pykira { }; pykka = callPackage ../development/python-modules/pykka { }; From b604d6e02e30538935470bb5ec9c8a4307738f89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 12:20:50 +0100 Subject: [PATCH 12/79] python3Packages.dingz: init at 0.5.0 --- .../python-modules/dingz/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/dingz/default.nix diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix new file mode 100644 index 000000000000..c02746695e88 --- /dev/null +++ b/pkgs/development/python-modules/dingz/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, click +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dingz"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-dingz"; + rev = version; + sha256 = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4="; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + click + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "dingz" + ]; + + meta = with lib; { + description = "Python API for interacting with Dingz devices"; + homepage = "https://github.com/home-assistant-ecosystem/python-dingz"; + 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 6569bf250ddb..cf5ede310951 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2078,6 +2078,8 @@ in { dill = callPackage ../development/python-modules/dill { }; + dingz = callPackage ../development/python-modules/dingz { }; + diofant = callPackage ../development/python-modules/diofant { }; dipy = callPackage ../development/python-modules/dipy { }; From c1d0a084a990f6057988dfd1e4de6de1cf847f5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 13:22:15 +0100 Subject: [PATCH 13/79] python3Packages.hahomematic: init at 0.0.16 --- .../python-modules/hahomematic/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/hahomematic/default.nix diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix new file mode 100644 index 000000000000..3b50bd1dfd54 --- /dev/null +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, pythonOlder +, voluptuous +, websocket-client +, xmltodict +}: + +buildPythonPackage rec { + pname = "hahomematic"; + version = "0.0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "sha256-c+0CjERZX55A1Y73tqf6awe68TPw5pqXEIlBD5C8L8c="; + }; + + propagatedBuildInputs = [ + aiohttp + voluptuous + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "hahomematic" + ]; + + meta = with lib; { + description = "Python module to interact with HomeMatic devices"; + homepage = "https://github.com/danielperna84/hahomematic"; + 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 6569bf250ddb..074b1c01f890 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3490,6 +3490,8 @@ in { ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; + hahomematic = callPackage ../development/python-modules/hahomematic { }; + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; From 6529116b050880742d7d3fa578cf64ae3fcbe9f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 13:42:01 +0100 Subject: [PATCH 14/79] python3Packages.reolink: init at 0.0.53 --- .../python-modules/reolink/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/reolink/default.nix diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix new file mode 100644 index 000000000000..3616eb1e3c0f --- /dev/null +++ b/pkgs/development/python-modules/reolink/default.nix @@ -0,0 +1,67 @@ +{ lib +, aiohttp +, aiounittest +, buildPythonPackage +, fetchFromGitHub +, ffmpeg-python +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "reolink"; + version = "0.0.53"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "fwestenberg"; + repo = pname; + # https://github.com/fwestenberg/reolink/issues/78 + rev = "0053"; + sha256 = "sha256-kEG+kRTWaC6eQbmlasAWIESFdKPoxQCdZLRrQwb2aRU="; + }; + + propagatedBuildInputs = [ + aiohttp + ffmpeg-python + requests + ]; + + checkInputs = [ + aiounittest + pytestCheckHook + ]; + + postPatch = '' + # Packages in nixpkgs is different than the module name + substituteInPlace setup.py \ + --replace "ffmpeg" "ffmpeg-python" + ''; + + pytestFlagsArray = [ + "test.py" + ]; + + disabledTests = [ + # Tests require network access + "test1_settings" + "test2_states" + "test3_images" + "test4_properties" + "test_succes" + ]; + + pythonImportsCheck = [ + "reolink" + ]; + + meta = with lib; { + description = "Python module to interact with the Reolink IP camera API"; + homepage = "https://github.com/fwestenberg/reolink"; + 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 6569bf250ddb..6ac71e1240e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8194,6 +8194,8 @@ in { rencode = callPackage ../development/python-modules/rencode { }; + reolink = callPackage ../development/python-modules/reolink { }; + reparser = callPackage ../development/python-modules/reparser { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; From 4d336c5202ef9633e5069d3143a940714af03265 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 14:05:19 +0100 Subject: [PATCH 15/79] python3Packages.seatconnect: init at 1.1.3 --- .../python-modules/seatconnect/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/seatconnect/default.nix diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix new file mode 100644 index 000000000000..7adef77210ab --- /dev/null +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -0,0 +1,63 @@ +{ lib +, aiohttp +, beautifulsoup4 +, buildPythonPackage +, cryptography +, fetchFromGitHub +, lxml +, pyjwt +, pythonOlder +, setuptools-scm +, xmltodict +}: + +buildPythonPackage rec { + pname = "seatconnect"; + version = "1.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "farfar"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-EOaFZch/C9N4lacZ4IqIJUVSaEn8wOFN/WN6WOL/1mo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + cryptography + lxml + pyjwt + xmltodict + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest>=5,<6'," "" + substituteInPlace requirements.txt \ + --replace "pytest-asyncio" "" + ''; + + # Project only has a dummy test + doCheck = false; + + pythonImportsCheck = [ + "seatconnect" + ]; + + meta = with lib; { + description = "Python module to communicate with Seat Connect"; + homepage = "https://github.com/farfar/seatconnect"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6569bf250ddb..2bcffbc67cb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8550,6 +8550,8 @@ in { seaserv = toPythonModule pkgs.seafile-server; + seatconnect = callPackage ../development/python-modules/seatconnect { }; + seccomp = callPackage ../development/python-modules/seccomp { }; secp256k1 = callPackage ../development/python-modules/secp256k1 { From e6d3584063ee236b4beedcbc6f4e259573564157 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 14:28:20 +0100 Subject: [PATCH 16/79] python3Packages.skodaconnect: init at 1.1.12 --- .../python-modules/skodaconnect/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/skodaconnect/default.nix diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix new file mode 100644 index 000000000000..5196651959c7 --- /dev/null +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, beautifulsoup4 +, buildPythonPackage +, cryptography +, fetchFromGitHub +, lxml +, pyjwt +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "skodaconnect"; + version = "1.1.12"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "lendy007"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + cryptography + lxml + pyjwt + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest>=5,<6'," "" + substituteInPlace requirements.txt \ + --replace "pytest-asyncio" "" + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "skodaconnect" + ]; + + meta = with lib; { + description = "Python module to communicate with Skoda Connect"; + homepage = "https://github.com/lendy007/skodaconnect"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6569bf250ddb..b6a603dff3ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8717,6 +8717,8 @@ in { sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + skodaconnect = callPackage ../development/python-modules/skodaconnect { }; + skorch = callPackage ../development/python-modules/skorch { }; skybellpy = callPackage ../development/python-modules/skybellpy { }; From 30d18d1889e7898c6163651e6b984601e72c4329 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 15:59:54 +0100 Subject: [PATCH 17/79] python3Packages.lightwave2: init at 0.7.7 --- .../python-modules/lightwave2/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/lightwave2/default.nix diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix new file mode 100644 index 000000000000..9246c6d42dac --- /dev/null +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lightwave2"; + version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-89REmMsZ79OsjhxAuxyTfRKy1+4cYDB9suiZLTXNntA="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "lightwave2" + ]; + + meta = with lib; { + description = "Python library to interact with LightWaveRF 2nd Gen lights and switches"; + homepage = "https://github.com/bigbadblunt/lightwave2"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6569bf250ddb..aad6bd8a823d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4490,6 +4490,8 @@ in { lightparam = callPackage ../development/python-modules/lightparam { }; + lightwave2 = callPackage ../development/python-modules/lightwave2 { }; + lima = callPackage ../development/python-modules/lima { }; limiter= callPackage ../development/python-modules/limiter { }; From eea46bee36c8b9af66bff2226a88c56aa8305545 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 16:38:54 +0100 Subject: [PATCH 18/79] python3Packages.wavinsentio: init at 0.3.0 --- .../python-modules/wavinsentio/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/wavinsentio/default.nix diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix new file mode 100644 index 000000000000..21dbe7b8ae82 --- /dev/null +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "wavinsentio"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-3mzK+YBRhLDqcEJDyMK43Le6eCH3B89unXpuu8nIe1g="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "wavinsentio" + ]; + + meta = with lib; { + description = "Python module to interact with the Wavin Sentio underfloor heating system"; + homepage = "https://github.com/djerik/wavinsentio"; + 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 b05183e99425..b46480028fe4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9970,6 +9970,8 @@ in { wavefile = callPackage ../development/python-modules/wavefile { }; + wavinsentio = callPackage ../development/python-modules/wavinsentio { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; From 591ada5c7af8ba44101d3192b5384f6caebc277d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 16:45:07 +0100 Subject: [PATCH 19/79] python3Packages.aiobroadlink: init at 0.1.3 --- .../python-modules/aiobroadlink/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/aiobroadlink/default.nix diff --git a/pkgs/development/python-modules/aiobroadlink/default.nix b/pkgs/development/python-modules/aiobroadlink/default.nix new file mode 100644 index 000000000000..d921f3c08049 --- /dev/null +++ b/pkgs/development/python-modules/aiobroadlink/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiobroadlink"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-uTUtDhL9VtWZE+Y6ZJY4prmlE+Yh2UrCg5+eSyAQzMk="; + }; + + propagatedBuildInputs = [ + cryptography + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "aiobroadlink" + ]; + + meta = with lib; { + description = "Python module to control various Broadlink devices"; + homepage = "https://github.com/frawau/aiobroadlink"; + 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 b05183e99425..f8efebc4eb1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -317,6 +317,8 @@ in { aiobotocore = callPackage ../development/python-modules/aiobotocore { }; + aiobroadlink = callPackage ../development/python-modules/aiobroadlink { }; + aiohue = callPackage ../development/python-modules/aiohue { }; aiohwenergy = callPackage ../development/python-modules/aiohwenergy { }; From 0e670d9df7673f974538b949254c285d4d378ae4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 06:23:08 +0000 Subject: [PATCH 20/79] buildkit: 0.9.0 -> 0.9.3 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 12d35c07db3e..b9ae4e4dd887 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.9.0"; + version = "0.9.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0i04b5ngvhkan45mx6xjcia0dsx0dc6w8bwy90yg3qnz7yzidm2d"; + sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk="; }; vendorSha256 = null; From 66c60d196bd480f2a5a659e1b2e029c1b301073e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 08:01:30 +0000 Subject: [PATCH 21/79] apprise: 0.9.5.1 -> 0.9.6 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index fbcd7addb2a5..18b829249198 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.5.1"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vwkHA66xK4LGhdazZ0o93+cSpGwgiTCMm8IC8D4G1Y0="; + sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g="; }; nativeBuildInputs = [ Babel installShellFiles ]; From c760b5282e8b65a185be258ca592feae40616280 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 08:06:58 +0000 Subject: [PATCH 22/79] viddy: 0.3.1 -> 0.3.4 --- pkgs/tools/misc/viddy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index 1b9158df1ae3..4b65a63431bd 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "viddy"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "sachaos"; repo = pname; rev = "v${version}"; - sha256 = "18ms4kfv332863vd8b7mmrz39y4b8gvhi6lx9x5385jfzd19w5wx"; + sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc="; }; - vendorSha256 = "0789wq4d9cynyadvlwahs4586gc3p78gdpv5wf733lpv1h5rjbv3"; + vendorSha256 = "sha256-iSgFDTNeRPpCMxNqj2LhYV+6/eskGa58e+rT0Nhg+pE="; ldflags = [ "-s" From b24f58671c1f50ad60e9025b6de9ec67e66eebaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 08:38:14 +0000 Subject: [PATCH 23/79] chezmoi: 2.9.0 -> 2.9.2 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index debbe6c0a53b..16a251c9cc65 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-jeg9XI2enNyZvv2D4URWluCaT+oD8QbHItx2etrGBpQ="; + sha256 = "sha256-tGmyn6RCr+1JiSAaoSDzk9rG2+y8G2Eot3srXEJ0Re0="; }; vendorSha256 = "sha256-jaEaVfPlYbmQ998KwZm8PUfbNlPEIr1lX5fx90jcqV4="; From b16aa54b4496c264d3eb7263a50e81172ecfb1e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 08:49:07 +0000 Subject: [PATCH 24/79] circleci-cli: 0.1.16122 -> 0.1.16535 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 70d68e92b4e9..77fe16c442d3 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.16122"; + version = "0.1.16535"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zIBEKGp9icdBLwZBMf30d8JxmJwwWrO/arh8ZvMHTSI="; + sha256 = "sha256-IsFvUWNuQsECh47M6wDpuyDYXrKKaZp2SSmEGFryzM0="; }; vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo="; From d70281593fbc1ce61d6a5e2f1bc712b76ea1f992 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 08:53:36 +0000 Subject: [PATCH 25/79] clair: 4.3.2 -> 4.3.5 --- pkgs/tools/admin/clair/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 752644c40cb4..bfeb636cb16e 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.3.2"; + version = "4.3.5"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E5hMjGsub3HWzvQYLUnSHmSfiW1uaZCyJndyasrjzw8="; + sha256 = "sha256-XV1lSEg6ksa5Y1jPKpVw3l+3pWkf6iBrJ+TBqVoj60k="; }; - vendorSha256 = "sha256-J0AOgget9SpV+tKhzHINfsc7Vbxc2zVWIeFHruPc2BE="; + vendorSha256 = "sha256-U5uPTd9RHJnt3It7iluu73ihuDiIl3kCy/1f2bRqhBY="; doCheck = false; From 1b9e74a8ded639e1d4da83a2c8656458cb048cd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 12:03:03 +0000 Subject: [PATCH 26/79] nodejs-16_x: 16.13.0 -> 16.13.1 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a1b0f1ea8c42..6eff31e3b02a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.13.0"; - sha256 = "1k6bgs83s5iaawi63dcc826g23lfqr13phwbbzwx0pllqcyln49j"; + version = "16.13.1"; + sha256 = "1bb3rjb2xxwn6f4grjsa7m1pycp0ad7y6vz7v2d7kbsysx7h08sc"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 7cee057ae5a00fa61a5e3785ebeb7a88b7cd5940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 12:45:10 +0000 Subject: [PATCH 27/79] traefik: 2.5.3 -> 2.5.4 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index fab7806bac53..a707a4b98714 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.3"; + version = "2.5.4"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-Bq7wuc127aC/GO5wsgNkwvZsRbxFnZk2fzTWTygl6Sw="; + sha256 = "sha256-OMzLRgpTUIosmlAdMiNplOx/Oj28gcqamsOPJdoFkN0="; stripRoot = false; }; - vendorSha256 = "sha256-NyIPT2NmJFB1wjNNteAEpTPYSYQZtEWJBOvG0YtxUGc="; + vendorSha256 = "sha256-BSempfKgRCj87XM8qPNEUs+sMILVS6bWwWgf7wWQviI="; doCheck = false; From fdeae3334584944c3b4559814dc319d2acd58101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 18:00:57 +0000 Subject: [PATCH 28/79] ergo: 4.0.15 -> 4.0.16 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 422ad8210de6..428919a55970 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.15"; + version = "4.0.16"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-4omuu/9EeywWDkk//4TTal/1siCe/4YMmEsIefBxsuY="; + sha256 = "sha256-cdfpXJtN/JXQNBnCyTIvJLQQhjzDV3+l4WoASII9uuU="; }; nativeBuildInputs = [ makeWrapper ]; From 3adc92feb3dc69578b1e40b948629747417cae02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 18:06:14 +0000 Subject: [PATCH 29/79] esbuild: 0.13.12 -> 0.14.2 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2c8e18f062e3..1258df45639b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.13.12"; + version = "0.14.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-1SjLbrOYEh0g9weVEqcOT7hMr9asxgSr+rKDNP75Sc4="; + sha256 = "sha256-ou1fkmlychf6VbKQD/PT1ehfyIQMIpbwEKlxpfncfEo="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From 942263df96dbbe2461b9f2a76f7f16e93ef87cf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 22:26:54 +0000 Subject: [PATCH 30/79] flow: 0.163.0 -> 0.166.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 54cea3727f21..9c84ba8979e2 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.163.0"; + version = "0.166.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-8O7EuYMNEa0M3HS0U10VbkevxL/cnySXHkT1WdI4Z84="; + sha256 = "sha256-n07P7C+RehZJ+s7ZAgtHBMUwG62rxbjcXKLjKJf+rDA="; }; installPhase = '' From abe233632fd07b736e90fc3f7440811cf802b9d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 23:35:33 +0000 Subject: [PATCH 31/79] rocksdb: 6.26.0 -> 6.26.1 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 83cdeecab2eb..b6a745566b70 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.26.0"; + version = "6.26.1"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1nd8ixj249qiw089piw28aly0zmlla2k62gd6axd0bs2wfc4zma8"; + sha256 = "sha256-Tx809Q/Mn5C9LbtmTlJN9eDGWPDpJSRhnyNxA4Kq1Fc="; }; nativeBuildInputs = [ cmake ninja ]; From 7d1ec570c9ef8a62ab4617798a1a7e093786cb38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 00:23:17 +0000 Subject: [PATCH 32/79] git-town: 7.5.0 -> 7.6.0 --- pkgs/tools/misc/git-town/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 18f251fb7208..27eb1275a2da 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.5.0"; + version = "7.6.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; + sha256 = "sha256-yarJWIEIZuBcXXxltkiM7LwrEM8fveD3+JVoPGarhJQ="; }; ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; From ee1c65e483e49058e5827d9eabdbbc280f3ab7b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 00:26:26 +0000 Subject: [PATCH 33/79] shadowsocks-rust: 1.11.2 -> 1.12.4 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 065b842c384f..c2ae4020eedf 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.11.2"; + version = "1.12.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0ry3zfwxs5j243jpbp5ymnz14ycyk6gpgb50lcazhn1yy52p8wac"; + sha256 = "sha256-gPeikQ6a7GFgjGIwcufMCnGgqqVzHkMbQIgIPpBuOLE="; }; - cargoSha256 = "1hvrp3zf5h33j6fgqyzn2jvjbyi8c8pyqwrj5wg3lw38h0z5rvaj"; + cargoSha256 = "sha256-8qt8uapiFMhmPnbihqWoBalGV6LLsgg0pfxzw+gi4TI="; RUSTC_BOOTSTRAP = 1; From 491ef7707daa3e2e1276efa12f91256aebb848e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 01:01:43 +0000 Subject: [PATCH 34/79] scowl: 2019.10.06 -> 2020.12.07 --- pkgs/data/misc/scowl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 15c2699d8bba..e1709ae35cf3 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "scowl"; - version = "2019.10.06"; + version = "2020.12.07"; src = fetchFromGitHub { owner = "en-wl"; repo = "wordlist"; rev = "rel-${version}"; - sha256 = "1daag7h63gdijp1lv3v93bx5kmcb5zsyydsd57kv0a6kk3vs819x"; + sha256 = "sha256-J61jhpnZcXMnoGlSuSCrKDZnnyp3Snjr+fUpTVKX64g="; }; postPatch = '' From 978eae58e594b0bec842a851696428302a5d4d0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 01:17:53 +0000 Subject: [PATCH 35/79] go-tools: 2021.1.1 -> 2021.1.2 --- pkgs/development/tools/go-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 38ed470cbe90..0812c949e37e 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2021.1.1"; + version = "2021.1.2"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-Vj5C+PIzZUSD16U4KFO3jR/Gq11P8v3my5eODWb//4c="; + sha256 = "sha256-C6ekgrc+zvm8ZLvw1uYR3ZiMLCNSUw1ANEuM4bT4C/o="; }; vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY="; From b9fc29de15712ca062329a1ec84040d0a1f81c04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 05:20:04 +0000 Subject: [PATCH 36/79] icingaweb2: 2.9.4 -> 2.9.5 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 3602f5b01047..7a0d75dab24d 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256:1fd5d2vhiq3s7qr4hnvnh9vv4ns7dvqwq8s67av89hjf3sqgw13j"; + sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8="; }; nativeBuildInputs = [ makeWrapper ]; From 6fa6514e56b4b752c5d2025042ac2e74af386d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 7 Dec 2021 08:25:15 +0100 Subject: [PATCH 37/79] radare2: 5.4.2 -> 5.5.2 --- .../development/tools/analysis/radare2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 8cbfed0b16f9..ef311a8c6ed2 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -34,21 +34,31 @@ let rev = "3c5eaba46dab72ecb7d5f5b865a13fdeee95b464"; sha256 = "sha256-alcGEi+D8CptXzfznnuxQKCvU2mbzn2sQge5jSqLVpg="; }; + armv7 = fetchFromGitHub { + owner = "radareorg"; + repo = "vector35-arch-armv7"; + rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30"; + + sha256 = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU="; + }; in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.4.2"; + version = "5.5.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-5GvJ7J+pAL8GIZ4Tv09wdGyihfMm1bUABhmf7ozQoxc="; + sha256 = "sha256-7nygSugqOYhK0lXEy3BSr5h5+GTfLBG/1O6TyKhk++c="; }; preBuild = '' cp -r ${arm64} libr/asm/arch/arm/v35arm64/arch-arm64 chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64 + + cp -r ${armv7} libr/asm/arch/arm/v35arm64/arch-armv7 + chmod -R +w libr/asm/arch/arm/v35arm64/arch-armv7 ''; postFixup = lib.optionalString stdenv.isDarwin '' From a10948e8b2c181118a3ba91bddbbc4a2008de65d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Dec 2021 09:59:17 +0100 Subject: [PATCH 38/79] emacs.pkgs.bqn-mode: 2021-10-26 -> 2021-12-04 --- .../editors/emacs/elisp-packages/bqn-mode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index f74402f5e6ef..591777831ed4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+unstable=2021-10-26"; + version = "0.pre+unstable=2021-12-04"; src = fetchFromGitHub { - owner = "AndersonTorres"; + owner = "museoa"; repo = "bqn-mode"; - rev = "89d6928d0653518c97bcb06ae156f8b1de1b8768"; - sha256 = "0pnvfssglaqbjw6hw7vf7vffzjdbqscqhyl62vknml29yl7mjq05"; + rev = "38fba1193e0d1101f3b90bd76e419c011651ad6f"; + sha256 = "0fdfz3kmrdgmx2i6fgrrj1cvapvrgnc3ahnwx3aayrpl1f091439"; }; meta = with lib; { From 48dc356d6d26445d4fa095a5722e9cfaf1874902 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Dec 2021 17:17:21 +0100 Subject: [PATCH 39/79] dnstwist: 20201228 -> 20211204 --- pkgs/tools/networking/dnstwist/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index e19b4dabd78b..034b69d2ecd7 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,14 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20201228"; - disabled = python3.pythonOlder "3.6"; + version = "20211204"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = version; - sha256 = "0bxshi1p0va2f449v6vsm8bav5caa3r3pyknj3zf4n5rvk6say70"; + sha256 = "sha256-D7qesxkJMx/N0oyaw3ev007SLCm4RKhZSNW22CNgKPw="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -26,7 +25,10 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "dnstwist" ]; + + pythonImportsCheck = [ + "dnstwist" + ]; meta = with lib; { description = "Domain name permutation engine for detecting homograph phishing attacks"; From cfcbea7a3f8fcb8c80ff4f1760e71ff0b2d136f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Dec 2021 17:28:05 +0100 Subject: [PATCH 40/79] nuclei: 2.5.3 -> 2.5.4 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index a9785cde190b..396b8e03792c 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LcOErqnjnBjC2OKObI1r4ydJ2mes2j6WdQpyHi0rLoU="; + sha256 = "sha256-r6nOVTg/vZr2somTCoEJQHtbMMZ1RCkdDzGQeTISreU="; }; - vendorSha256 = "sha256-lC88sV/WGZuiFZhXNdmMhDyrBdCxbspvpl8JPBS4in4="; + vendorSha256 = "sha256-/TFg+ztubfZfyUbRabVr943oF9R0Xg8mIDxUl/MFbJE="; modRoot = "./v2"; subPackages = [ From 8f7f6fbf91da5a7ba9fa527896c1a12a0f09a768 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 16:45:28 +0000 Subject: [PATCH 41/79] navi: 2.17.0 -> 2.18.0 --- pkgs/applications/misc/navi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 04fe08e1f386..2075f96285b3 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-WH8FfQ7cD4aFUi9iE0tR/B+5oWy8tMVmMLxusDwXF7w="; + sha256 = "sha256-JG0MZrvpx+cAFcZJK05GUI10PG53UmxjJjveAZA7k/M="; }; - cargoSha256 = "sha256-TH9DNCoUVqH5g05Z4Vdv7F8CCLnaYezupI5FeJhYTaQ="; + cargoSha256 = "sha256-S2DBzeir6+JS1jfVxCQ68v4Rl7UBpghbtE+wdu341xw="; nativeBuildInputs = [ makeWrapper ]; From 82b8a4a185c0058ea1d3b8b1245e3b4ed514a845 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 17:17:39 +0000 Subject: [PATCH 42/79] nfpm: 2.7.1 -> 2.10.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 6f30a76bcd98..777aadfa96de 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.7.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GKX+5N8BPm4VmI10mzPJORjwLpuOLLjO+Q+RNelKUVI="; + sha256 = "sha256-ZLlTcybBoLfiSWb0DKn+U+S/LbekZvTRyDV6b1q9FDU="; }; - vendorSha256 = "sha256-NPMJ5sCdbfDraRoK5fSdaxMpYS2i8ir0cklGDoHNLAY="; + vendorSha256 = "sha256-uGpMOKqNgGOtgLU9ztg3GmR4FYBaldgZf6BZWxn08W8="; doCheck = false; From 46c88e2c58bcca1911cdf66acbb6d7a77b76ced5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 19:02:26 +0000 Subject: [PATCH 43/79] odpic: 4.2.1 -> 4.3.0 --- pkgs/development/libraries/odpic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 9e4b01ef172c..b9095f214814 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.2.1"; + version = "4.3.0"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-jdDMG6+bvsKQkHSpUrwtwU/ngq1iINcUhWu2b9lJgPY="; + sha256 = "sha256-oL2yehjP8JJxU19VY4e/ueh2xjo1yp4X7FGslqCXO8A="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; From 0bd5c9c7c7a56851e2c5596f1474cbbcfeb51ea4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Dec 2021 00:05:50 +0100 Subject: [PATCH 44/79] tfsec: 0.61.3 -> 0.63.1 --- 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 9bd7a4c8daf4..75d1b3035ee3 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.61.3"; + version = "0.63.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hMLUdUZz7IUTldiJQLKwq0AJdpQqTTzuorfzaUR+ao8="; + sha256 = "sha256-khAVb+uwr3qyAWjvMjPG//+FKQJ9qoVwmhsej++IQhs="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 83e078ecb35d7c04eb0131d5163f3d876b173cc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 00:24:28 +0000 Subject: [PATCH 45/79] postgresql11Packages.pgtap: 1.1.0 -> 1.2.0 --- pkgs/servers/sql/postgresql/ext/pgtap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 396e743e70b4..7e59eb4e953e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgtap"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; rev = "v${version}"; - sha256 = "09fvzsl8m18yzpvrz6cqvs1ffzs451iwmb2mw39yq69jgqby5kqy"; + sha256 = "sha256-lb0PRffwo6J5a6Hqw1ggvn0cW7gPZ02OEcLPi9ineI8="; }; nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; From d7f8016963cc006c044d0d5985ffeb79903f6966 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:58:09 +1000 Subject: [PATCH 46/79] delta: 0.11.1 -> 0.11.2 https://github.com/dandavison/delta/releases/tag/0.11.2 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index b09b92842f31..3b1c648144d3 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-coxETvB/uKTgg5VFlvcFmbNj95paDWkpq0zUIeR9//8="; + sha256 = "sha256-GboG7Ia27CTisY0YCFiAhzoCMxMAXlCeAPll19+JoxM="; }; - cargoSha256 = "sha256-V6px+OGe9vHg/OgiEbT+TG1PmUIgWPVuv+AD176W0Bo="; + cargoSha256 = "sha256-JEIMZFDEWaKXfe4OzaAxMop0XYQAcz8L7hcTBD8DJio="; nativeBuildInputs = [ installShellFiles ]; From ffd1e95bcbacd9f33aff482ffc5ac3abca4f9931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 04:12:31 +0000 Subject: [PATCH 47/79] php74Extensions.ast: 1.0.12 -> 1.0.16 --- pkgs/development/php-packages/ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index 65e734e9254d..7ab4ff13b402 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "ast"; - version = "1.0.12"; - sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x"; + version = "1.0.16"; + sha256 = "sha256-Rb2jS3gMRmHOd89lzYpQT7VlJtS0Vu3Ml9eRyG84ec4="; meta = with lib; { description = "Exposes the abstract syntax tree generated by PHP"; From 42fb1714d703a01666e24ae8c69285c927256671 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Dec 2021 04:20:00 +0000 Subject: [PATCH 48/79] navi: make fzf optional Navi also allows to configure Skim as finder --- pkgs/applications/misc/navi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 2075f96285b3..840db0400f54 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget, libiconv }: +{ stdenv, fetchFromGitHub, lib, makeWrapper, rustPlatform, wget, libiconv, withFzf ? true, fzf }: rustPlatform.buildRustPackage rec { pname = "navi"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/navi \ --prefix PATH : "$out/bin" \ - --prefix PATH : ${lib.makeBinPath [ fzf wget ]} + --prefix PATH : ${lib.makeBinPath([ wget ] ++ lib.optionals withFzf [ fzf ])} ''; checkFlags = [ From 46a15c08380556bd837beffce866deb5e519819b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 04:32:38 +0000 Subject: [PATCH 49/79] postgresql11Packages.pg_partman: 4.5.1 -> 4.6.0 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index d2e7dd37be15..9e4b3171dd38 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.5.1"; + version = "4.6.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "182yqvgcpgw99swn7w516f6d1bid2gnmf6dfsgmldx5viz0d6vi0"; + sha256 = "sha256-DpK3D7PEZ1sO9bYvwwT9L8jtDmUGMbHtx2s9juzL6RQ="; }; installPhase = '' From a7c3993132c69f49eab78a4b74a0f8c3ddd1ff55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 04:58:37 +0000 Subject: [PATCH 50/79] php74Packages.php-cs-fixer: 3.0.0 -> 3.3.2 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 2e6cc6723be4..02461ca7188b 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.0.0"; + version = "3.3.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "141rkcr0wbsqnc4s5vg4bk4dmxwigwxa3j0vi5c42b5k1lq3sgwr"; + sha256 = "sha256-iny2/L+RbwHUtCO3hQtEAbxocnUBG29DcyJnmk/EYT8="; }; dontUnpack = true; From e248329f1c0ad9e97122e22f7450071a2be129c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 05:04:00 +0000 Subject: [PATCH 51/79] php74Extensions.protobuf: 3.17.3 -> 3.19.1 --- pkgs/development/php-packages/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 87007b1ea12b..2d4a1af9af6c 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.17.3"; - sha256 = "05nn6ps271vwrbr9w08lyyzsszabnqhz1x0vbblg0q8y2xrmb6dl"; + version = "3.19.1"; + sha256 = "sha256-kAPNPnvbCrmGITM3Hjpsn62TASV8eNCizFN8+1+I6bY="; buildInputs = [ pcre2 ]; From 452f9ac4e72f8620e3616a433b1484e074cfe6a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 05:29:43 +0000 Subject: [PATCH 52/79] php74Extensions.couchbase: 3.2.0 -> 3.2.1 --- pkgs/development/php-packages/couchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 18513945bf99..1b90e71fd209 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "3.2.0"; + version = "3.2.1"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "sha256-rvlyH28xWLIVwK3yqqdhkoD1h6kl8FDq3Byo7mhV3jM="; + sha256 = "sha256-Ti1jo1do0xiY/FAfyG/YI/TTcgFTMWy8cuhorDodUko="; }; configureFlags = [ "--with-couchbase" ]; From 17d7c20a493709c09df5eee7810119decf9cdb90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 05:43:34 +0000 Subject: [PATCH 53/79] php74Extensions.mongodb: 1.9.1 -> 1.11.1 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index b65862750e72..7e34d875905f 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.9.1"; - sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9"; + version = "1.11.1"; + sha256 = "sha256-g4pQUN5Q1R+VkCa9jOxzSdivNwWMD+BylaC8lgqC1+8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From c9a8ebe3756011d6887ee4ec86290344a1e5436e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 05:55:03 +0000 Subject: [PATCH 54/79] php74Extensions.pcov: 1.0.9 -> 1.0.10 --- pkgs/development/php-packages/pcov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index f0e3e75c71c3..a6905f0daee1 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pcov"; - version = "1.0.9"; - sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710"; + version = "1.0.10"; + sha256 = "sha256-M0oPauqLPNR8QmcGHxR9MDP9rd0vj2iLMj6Wlm2a+Zw="; buildInputs = [ pcre2 ]; From 65bbefdaa78ffa4dff1b4e4b9b0c379725c1b25b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:00:27 +0000 Subject: [PATCH 55/79] php74Extensions.igbinary: 3.2.3 -> 3.2.6 --- pkgs/development/php-packages/igbinary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 258b0debbae0..886f75ecc9f3 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.2.3"; - sha256 = "1ffaqhckkk1qr5dk1fl7f8dm2w4lj4gqrgazzmc67acsdmp7z5f0"; + version = "3.2.6"; + sha256 = "sha256-yjLjlezbREemnV6lGzX+sZw7xXWbRolv729+LKQajkM="; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; From 13e2f5c8e04e5e49f45ce8e08fed8530d9a707b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:26:56 +0000 Subject: [PATCH 56/79] php74Extensions.yaml: 2.2.1 -> 2.2.2 --- pkgs/development/php-packages/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index ef58b315faee..d4803c9d21ac 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "yaml"; - version = "2.2.1"; - sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk="; + version = "2.2.2"; + sha256 = "sha256-EZBS8EYdV9hvRMJS+cmy3XQ0hscBwaCroK6+zdDYuCo="; configureFlags = [ "--with-yaml=${libyaml}" ]; From 0ef8a922bfd0195625bc3e5211ea436a7e833b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:36:01 +0000 Subject: [PATCH 57/79] postgresql11Packages.pgrouting: 3.2.1 -> 3.3.0 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 36d44c82c9dc..f75fbe7137a4 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.2.1"; + version = "3.3.0"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "1zn3yyp4zz14yn2mmqwn7c4m65zfb2nj9zg4qj97ppsahs5xc6vw"; + sha256 = "sha256-GWufuOsAYLIOy5MXYVNFWVeVdLntd5ZeUnSdEahlkak="; }; installPhase = '' From 089ce59f6cedee228493131be2edba2efb55cbcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:49:46 +0000 Subject: [PATCH 58/79] php74Extensions.xdebug: 3.0.4 -> 3.1.2 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 43387380ddac..a7a710b3193e 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.4"; - sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj"; + version = "3.1.2"; + sha256 = "sha256-CD9r4RAN95zL3wSdr8OTC6s18OuA+bGawa2E+md5zPM="; doCheck = true; checkTarget = "test"; From 0301f18dfff9f59e537258fdb273905843f396c1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Dec 2021 06:26:23 +1000 Subject: [PATCH 59/79] podman: 3.4.2 -> 3.4.3 https://github.com/containers/podman/releases/tag/v3.4.3 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 0f12d11cc381..235578b965c2 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-VkKFlOm5r+a9+4em1oisjXNwK9mCCCPViql6g0O7PWw="; + sha256 = "sha256-SZHonZdUTJisFMjvUBst1HErvKWEcYZYhK++G+S4sEg="; }; vendorSha256 = null; From 39f695ffefb2317f575e2d3885d4880398bfe4e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:58:24 +0000 Subject: [PATCH 60/79] pfstools: 2.1.0 -> 2.2.0 --- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index a81321204757..d815b6ac83e2 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "pfstools"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six"; + sha256 = "sha256-m/aESYVmMibCGZjutDwmGsuOSziRuakbcpVUQGKJ18o="; }; outputs = [ "out" "dev" "man"]; From 823279a78606b39fa62a6428c2defb8c5ddab6f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 07:04:25 +0000 Subject: [PATCH 61/79] php74Extensions.maxminddb: 1.10.1 -> 1.11.0 --- pkgs/development/php-packages/maxminddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index eae232b6c017..852a86a7b178 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub, libmaxminddb }: let pname = "maxminddb"; - version = "1.10.1"; + version = "1.11.0"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k"; + sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI="; }; buildInputs = [ libmaxminddb ]; From 1f8ee144f9a67a30f7fc50d031dd98a647da824f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 07:28:14 +0000 Subject: [PATCH 62/79] postgresql11Packages.plpgsql_check: 2.0.5 -> 2.0.6 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4de703ccded8..eb04a473d250 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "1n5csi0lxghlrhyk1wz45a95ikzblkvc5r7pb7jqq3cpk110biy4"; + sha256 = "sha256-M/kvfGhB2s8TvmpL7KihorVTOfwp7HmKka4IAgnIQ6M="; }; buildInputs = [ postgresql ]; From 43df7a5af099aba9be4f00b79b8a4bff8aa71874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 07:33:28 +0000 Subject: [PATCH 63/79] php74Extensions.event: 3.0.5 -> 3.0.6 --- pkgs/development/php-packages/event/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index ed23bcc4b0b6..f10b474f7b1b 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "3.0.5"; - sha256 = "0q5a83mcl97cyry5rd85j5xsjvflnki6s5cm56igjm0szxvgj39c"; + version = "3.0.6"; + sha256 = "sha256-BN43wydPQBCVla29YoPqKSVihSZCkLAIgDZb+CNQecw="; configureFlags = [ "--with-event-libevent-dir=${libevent.dev}" From 202e44f6750ff1e972896e695088245653f8d776 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 22:27:10 +0000 Subject: [PATCH 64/79] python38Packages.django-csp: 3.5 -> 3.7 --- pkgs/development/python-modules/django-csp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index 1f7b28114054..c54583447671 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-csp"; - version = "3.5"; + version = "3.7"; src = fetchPypi { inherit version; pname = "django_csp"; - sha256 = "0ks4zszbjx5lyqlc34pjica8hfcjzw4i5m6pivvnyv8yf0vh4q04"; + sha256 = "01eda02ad3f10261c74131cdc0b5a6a62b7c7ad4fd017fbefb7a14776e0a9727"; }; # too complicated to setup - needs a running django instance From f328fd0ce522b009f9adfc6c2fbab67d6cb1e306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 22:50:31 +0000 Subject: [PATCH 65/79] python38Packages.djangorestframework-simplejwt: 4.8.0 -> 5.0.0 --- .../python-modules/djangorestframework-simplejwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 6c54f3ded292..4c616bdeb274 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "4.8.0"; + version = "5.0.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; + sha256 = "30b10e7732395c44d21980f773214d2b9bdeadf2a6c6809cd1a7c9abe272873c"; }; nativeBuildInputs = [ From 6315ad6346b1a21172a3d8ed536d7ca9a4236ba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 23:14:52 +0000 Subject: [PATCH 66/79] python38Packages.eggdeps: 0.4 -> 1.0 --- pkgs/development/python-modules/eggdeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 02c2c6444493..9f17306b7bdc 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "tl-eggdeps"; - version = "0.4"; + version = "1.0"; src = fetchPypi { inherit version; pname = "tl.eggdeps"; - sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; + sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323"; }; propagatedBuildInputs = [ zope_interface zope_testing ]; From 63cdf83699bd72a67ab7aa758369a40676be2914 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:31:19 +0100 Subject: [PATCH 67/79] python3Packages.potentials: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/potentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index ea7fc4654284..f3542c13972e 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "0.3.1"; + version = "0.3.2"; pname = "potentials"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "02l1rav5jdfsb00byxbswyhqdnjljp9y7g4ddn4mivzi7x39qa52"; + sha256 = "sha256-u++ClAAc96u7k8w756sFR4oCtIOgERQ7foklxWWPprY="; }; propagatedBuildInputs = [ From 5103e78f95e04676f7d59204472840f14c7420a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Dec 2021 09:57:05 +0100 Subject: [PATCH 68/79] python3Packages.atomman: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/atomman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 8e03dbe67af7..7f5b08fd4fe3 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "atomman"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "atomman"; rev = "v${version}"; - sha256 = "sha256-Kq4mDykYf74ylWw2golxc81CYKGokXro64YUsFctLmk="; + sha256 = "sha256-is47O59Pjrh9tPC1Y2+DVVcHbxmcjUOFOVGnNHuURoM="; }; propagatedBuildInputs = [ From 2b6facfed201666453c1ca147d6b82747fe7c9b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 23:41:02 +0000 Subject: [PATCH 69/79] python38Packages.zigpy-znp: 0.6.1 -> 0.6.4 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 74295782a4a6..8a3bd0e41fd2 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.6.1"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dj8gduDyE3JpcNwzXmDjZLbX0QmUQmptuAKRBQJkdaA="; + sha256 = "0hz483wqzpdaap96gbjasisxd4wy8f4lslnspcvzqcf4dy1mxln6"; }; propagatedBuildInputs = [ From 4a7ba4621b1a86daf5c6e71542c673542fb4c62a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 06:03:28 +0000 Subject: [PATCH 70/79] evolution: 3.42.1 -> 3.42.2 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 34b25c17a254..3ccf066831c1 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.1"; + version = "3.42.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU="; + sha256 = "C+QT8W3WjsjUNCpPJpVlryp0oZpb+hxcv2Y1I6W1ujg="; }; nativeBuildInputs = [ From 1540a5115f8f221cc824be699a7b5771d5b77435 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 08:01:45 +0000 Subject: [PATCH 71/79] gnome.gnome-calculator: 41.0 -> 41.1 --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 58c079078d64..6a7a8ccec06b 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "41.0"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "pm3AS9hYfnbWc3Wmrvp5VTtWnJvfeOvcKBfxwK3j3Jk="; + sha256 = "AmdhSv2yXTi3hBG0Lrq3vFDBtjQMxJu2jA5DLX3fijQ="; }; nativeBuildInputs = [ From fe73fe0c6e14f9bdb635c07fd7ab0f9f14caed85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 08:22:03 +0000 Subject: [PATCH 72/79] gnome.gnome-terminal: 3.42.1 -> 3.42.2 --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 1c905eec41b7..69fb69261f98 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.42.1"; + version = "3.42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wxmxQFUBuMdpPmFvSOztQWldLnhhSMpfnie8fZj0rrE="; + sha256 = "ipyOXvejpzskapR+EZC7COyYk1r4YM8LOqL79GBoF6A="; }; nativeBuildInputs = [ From a93106d0d2b8ad111d65eab341a2ce35cbda85a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:16:04 +0000 Subject: [PATCH 73/79] php74Extensions.swoole: 4.6.7 -> 4.8.3 --- pkgs/development/php-packages/swoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index a6687922bc17..411e2a3f0f0e 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.6.7"; - sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165"; + version = "4.8.3"; + sha256 = "sha256-Oa/SnmmMc/KZXyP/qX9BT7V1xPa4EWJa/GUNngpA4pw="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; From 21b121dc619da589213fdef177dd0bee529bd85f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:39:38 +0000 Subject: [PATCH 74/79] php74Extensions.rdkafka: 5.0.0 -> 5.0.2 --- pkgs/development/php-packages/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index 1b963a01ad5d..6ac94b8eb025 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "5.0.0"; - sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs="; + version = "5.0.2"; + sha256 = "sha256-slCwtt8ySE5Zk2tnaYO6E0N20VZS8CVSsr8EgqssvOk="; buildInputs = [ rdkafka pcre2 ]; From 497dcab51ae611a81daa3ee92099ed467b0a3d54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:48:43 +0000 Subject: [PATCH 75/79] php74Packages.phpstan: 0.12.99 -> 1.2.0 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 029d9f467763..4a193d9eaac1 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.99"; + version = "1.2.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0rv8xf5yx88wh95myysqmv29n5rr15zgwsvh8a4xb1pmw3h9kb6q"; + sha256 = "sha256-WA1N6fOibS0+txaGxH+cOgec9CsrIYzQbpjQCfQf/ao="; }; dontUnpack = true; From 20a9dc6bdb6138b3d50e61ce53c543f96a25b375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:04:11 +0000 Subject: [PATCH 76/79] gnome-builder: 41.2 -> 41.3 --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 1619ff1e6174..d9092b550117 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VjF7Vn94Yd2gNzKVsk6U7fSRnMlV+0XtYqyllGIY4BI="; + sha256 = "4iUPyOnp8gAsRS5ZUNgmhXNNPESAs1Fnq1CKyHAlCeE="; }; nativeBuildInputs = [ From 0ea3426d4da282d3abb392404f49c68610f7ce2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:58:38 +0000 Subject: [PATCH 77/79] php74Extensions.apcu: 5.1.20 -> 5.1.21 --- pkgs/development/php-packages/apcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 0cfc7b4b44fd..150c761ae511 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.20"; - sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A="; + version = "5.1.21"; + sha256 = "sha256-EDNTBEhpbufK3shQUPbfUTX7EzAHLvKnRWk5Ks/s+8E="; buildInputs = [ pcre2 ]; doCheck = true; From 0782984c0593939330fe14c6fd1f70105742ddfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 10:57:41 +0000 Subject: [PATCH 78/79] php74Packages.composer: 2.1.9 -> 2.1.14 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 2ae6ec055476..c2e88bd20303 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.9"; + version = "2.1.14"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1fj8sq21qdsdidj5zh8s3c12pmf9nkmj36igmmixc5vc2h7bf02d"; + sha256 = "sha256-1EqQRSD5qqdm6LSwXS2admrZpvA/oaSFGCJKrXAwYaQ="; }; dontUnpack = true; From 24c6b28737966e42d306a0a191db8ea90c09b144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 8 Dec 2021 11:23:26 +0100 Subject: [PATCH 79/79] libspf2: Switch to a more supported upstream --- .../development/libraries/libspf2/default.nix | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index dc46e356e2c8..6ec8f24b7132 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,29 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: with lib; stdenv.mkDerivation rec { pname = "libspf2"; - version = "1.2.10"; + version = "2.2.12"; - src = fetchurl { - url = "https://www.libspf2.org/spf/libspf2-${version}.tar.gz"; - sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr"; + src = fetchFromGitHub { + owner = "helsinki-systems"; + repo = "libspf2"; + rev = "v${version}"; + sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; }; - patches = [ - (fetchurl { - name = "0001-gcc-variadic-macros.patch"; - url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; - sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk"; - }) - (fetchurl { - name = "0002-CVE-2021-20314.patch"; - url = "https://github.com/shevek/libspf2/commit/c37b7c13c30e225183899364b9f2efdfa85552ef.patch"; - sha256 = "190nnh7mlz6328829ba6jajad16s3md8kraspn81qnvhwh0nkiak"; - }) - ]; - postPatch = '' # disable static bins compilation sed -i \ @@ -42,7 +31,7 @@ stdenv.mkDerivation rec { description = "Implementation of the Sender Policy Framework for SMTP authorization"; homepage = "https://www.libspf2.org"; license = with licenses; [ lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien ajs124 das_j ]; platforms = platforms.all; }; }