From a281c4ab3ecf703bb2994299075f1ed2844c61d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Dec 2022 01:09:08 +0100 Subject: [PATCH 01/15] bird: 2.0.10 -> 2.0.11 Changelog: https://gitlab.nic.cz/labs/bird/-/blob/v2.0.11/NEWS --- pkgs/servers/bird/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 8b0de8f53880..03bbafce8d4e 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - sha256 = "sha256-ftNB3djch/qXNlhrNRVEeoQ2/sRC1l9AIhVaud4f/Vo="; url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; + hash = "sha256-YKe4O2e50InSp0WhH93RJGH2MavHtkW2wIWt+Qs/VdY="; }; nativeBuildInputs = [ flex bison ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.bird; meta = with lib; { + changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS"; description = "BIRD Internet Routing Daemon"; homepage = "http://bird.network.cz"; license = licenses.gpl2Plus; From 40fe7f93306e3aa74f83cfa3f1dca24b1fe80279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Dec 2022 18:17:59 +0000 Subject: [PATCH 02/15] tauon: 7.4.5 -> 7.4.6 --- pkgs/applications/audio/tauon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 89adea497c24..777f7c171c10 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.5"; + version = "7.4.6"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-fxmCLjnYO7ZblEiRoByxuFzw9xFHqbQvne1WNcFnnwI="; + sha256 = "sha256-G3DDr2ON35ctjPkRMJDjnfDHMHMhR3tlTgJ65DXvzwk="; }; postUnpack = '' From e6bac9563a12c3f106683e6f74cc24825ab62a71 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 14 Dec 2022 20:00:25 -0300 Subject: [PATCH 03/15] steghide: init at 0.5.1.1 --- pkgs/tools/graphics/steghide/default.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/graphics/steghide/default.nix diff --git a/pkgs/tools/graphics/steghide/default.nix b/pkgs/tools/graphics/steghide/default.nix new file mode 100644 index 000000000000..74011917d5fb --- /dev/null +++ b/pkgs/tools/graphics/steghide/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libjpeg +, libmcrypt +, libmhash +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "steghide"; + version = "0.5.1.1"; + + src = fetchFromGitHub { + owner = "museoa"; + repo = "steghide"; + rev = finalAttrs.version; + hash = "sha256-uUXEipIUfu9AbG7Ekz+25JkWSEGzqA7sJHZqezLzUto="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + libjpeg + libmcrypt + libmhash + zlib + ]; + + postPatch = '' + cd src + ''; + + meta = with lib; { + homepage = "https://github.com/museoa/steghide"; + description = "Open source steganography program"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f3f144d80a..887b29613371 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22760,6 +22760,8 @@ with pkgs; stduuid = callPackage ../development/libraries/stduuid { }; + steghide = callPackage ../tools/graphics/steghide { }; + stegsolve = callPackage ../tools/graphics/stegsolve { }; StormLib = callPackage ../development/libraries/StormLib { }; From 1666dc68b7edc3d5a9e65feac54a95dacdbcea92 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 14 Dec 2022 23:34:10 +0000 Subject: [PATCH 04/15] qgis: drop unused xlibsWrapper inputs Validated as no material change in `out` output with `diffoscope`. --- pkgs/applications/gis/qgis/unwrapped.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 047173f00f30..57913c3e17e6 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -7,7 +7,6 @@ , bison , proj , geos -, xlibsWrapper , sqlite , gsl , qwt @@ -92,7 +91,6 @@ in mkDerivation rec { openssl proj geos - xlibsWrapper sqlite gsl qwt From dce61952e202b11d43bc5b27c00d0c1e6bf2969d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 14 Dec 2022 23:35:58 +0000 Subject: [PATCH 05/15] qgis-ltr: drop unused xlibsWrapper inputs Validated as no material change in `out` output with `diffoscope`. --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e0023f84faab..c694d5da3dbb 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -7,7 +7,6 @@ , bison , proj , geos -, xlibsWrapper , sqlite , gsl , qwt @@ -92,7 +91,6 @@ in mkDerivation rec { openssl proj geos - xlibsWrapper sqlite gsl qwt From 3dda6800a60a231b50221d2abc9bc075ba1f30f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 00:10:55 +0000 Subject: [PATCH 06/15] python310Packages.pynetbox: 6.6.2 -> 7.0.0 https://github.com/netbox-community/pynetbox/releases/tag/v7.0.0 --- pkgs/development/python-modules/pynetbox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e92776e72a29..45bc76aa713d 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.6.2"; + version = "7.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w="; + hash = "sha256-PFSnINbXSnEo1gvntjfH6KCVa/LeaNrsiuWM4H+fOvQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,6 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/netbox-community/pynetbox/releases/tag/v${version}"; description = "API client library for Netbox"; homepage = "https://github.com/netbox-community/pynetbox"; license = licenses.asl20; From e0f2dcdab6245df76c56703275db924cf213d459 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 00:36:25 +0000 Subject: [PATCH 07/15] python310Packages.pyomo: 6.4.3 -> 6.4.4 --- pkgs/development/python-modules/pyomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index a068b4a14072..e5c20f18dc9b 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.4.3"; + version = "6.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-EHttGeQUI8SWo8R9zRchguvDA6U8EKhDbBf5jdwl4dI="; + hash = "sha256-FVpwJRCRlc537tJomB4Alxx8zJj8FpZp+LxB0f12rGE="; }; propagatedBuildInputs = [ From f2711088ee1ea543d737fee6dab06f7c028e4abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Dec 2022 16:30:32 -0800 Subject: [PATCH 08/15] python310Packages.bonsai: init at 5.1.1 --- .../python-modules/bonsai/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/bonsai/default.nix diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix new file mode 100644 index 000000000000..b50293d0b848 --- /dev/null +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, cyrus_sasl +, openldap +, typing-extensions +, gevent +, tornado +, trio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bonsai"; + version = "1.5.1"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "noirello"; + repo = "bonsai"; + rev = "v${version}"; + hash = "sha256-UR/Ds5famD8kuDa6IIIyEv45eJuAcoygXef8XE+5Cxk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + cyrus_sasl + openldap + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + gevent = [ gevent ]; + tornado = [ tornado ]; + trio = [ trio ]; + }; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires running LDAP server + "tests/test_asyncio.py" + "tests/test_ldapclient.py" + "tests/test_ldapconnection.py" + "tests/test_ldapentry.py" + "tests/test_ldapreference.py" + "tests/test_pool.py" + ]; + + disabledTests = [ + # requires running LDAP server + "test_set_async_connect" + ]; + + pythonImportsCheck = [ "bonsai" ]; + + meta = { + changelog = "https://github.com/noirello/bonsai/blob/${src.rev}/CHANGELOG.rst"; + description = "Python 3 module for accessing LDAP directory servers"; + homepage = "https://github.com/noirello/bonsai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26071b03393a..5da24e7d828f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1347,6 +1347,8 @@ self: super: with self; { bond-async = callPackage ../development/python-modules/bond-async { }; + bonsai = callPackage ../development/python-modules/bonsai { }; + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; boolean-py = callPackage ../development/python-modules/boolean-py { }; From 9630cb38d954aaf690e667ddf53db8d71f5c51ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Dec 2022 12:29:18 -0800 Subject: [PATCH 09/15] python310Packages.pikepdf: 6.2.4 -> 6.2.5 https://github.com/pikepdf/pikepdf/blob/v6.2.5/docs/releasenotes/version6.rst --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 97ada3b69928..3ced41ba80c1 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.4"; + version = "6.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g="; + hash = "sha256-5ADRKFGQ1k/O/r9CgEWCbOZLgasUJVXtPm+5ocRE4Fk="; }; patches = [ From 9a6a5c7cf9c13dddd1cef14b5a3ff812764af0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Dec 2022 12:18:07 -0800 Subject: [PATCH 10/15] python310Packages.mastodon-py: 1.7.0 -> 1.8.0 https://github.com/halcy/Mastodon.py/releases/tag/1.8.0 --- pkgs/development/python-modules/mastodon-py/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index e0d7928e54b2..a31f3a07b3b3 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -18,13 +18,15 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.7.0"; + version = "1.8.0"; + + format = "setuptools"; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; rev = "refs/tags/${version}"; - sha256 = "sha256-QavgCWWiGmGnNoEX7pxzUyujEQObXhkaucv4FduZ/Vg="; + hash = "sha256-T/yG9LLdttBQ+9vCSit+pyQX/BPqqDXbrTcPfTAUu1U="; }; postPatch = '' @@ -53,6 +55,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mastodon" ]; meta = with lib; { + changelog = "https://github.com/halcy/Mastodon.py/blob/${src.rev}/CHANGELOG.rst"; description = "Python wrapper for the Mastodon API"; homepage = "https://github.com/halcy/Mastodon.py"; license = licenses.mit; From 03339a584081c375450e8a061f29bf67ce27db01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Dec 2022 12:12:28 -0800 Subject: [PATCH 11/15] python310Packages.safety: 2.3.3 -> 2.3.5 https://github.com/pyupio/safety/blob/2.3.5/CHANGELOG.md --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 57f0c708da1c..06475eba264c 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.3.3"; + version = "2.3.5"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-LhfPEnRyynIM3MZfg0AItVWhD+VmJ2RgCat1Zd0kWc8="; + hash = "sha256-pgwR+JUvQSy7Fl1wyx9nOjtDorqak84R+X5qTeg0qjo="; }; postPatch = '' From 5c6b747f087c7ba838de85f82d9f8eb8b0b52e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Dec 2022 11:17:03 -0800 Subject: [PATCH 12/15] python310Packages.micloud: 0.5 -> 0.6 https://github.com/Squachen/micloud/releases/tag/v_0.6 --- pkgs/development/python-modules/micloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix index 07db8906c5d3..1cd2c43ea9e5 100644 --- a/pkgs/development/python-modules/micloud/default.nix +++ b/pkgs/development/python-modules/micloud/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "micloud"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "Squachen"; repo = "micloud"; rev = "v_${version}"; - sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ="; + hash = "sha256-IsNXFs1N+rKwqve2Pjp+wRTZCxHF4acEo6KyhsSKuqI="; }; propagatedBuildInputs = [ From 73a9427360a30d36f0921c110d7a9ac95830a4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Dec 2022 15:04:31 -0800 Subject: [PATCH 13/15] python310Packages.cartopy: 0.21.0 -> 0.21.1 https://github.com/SciTools/cartopy/releases/tag/v0.21.1 --- .../python-modules/cartopy/default.nix | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 5d635d5a52b2..62b5f5a42b91 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,28 +1,39 @@ -{ buildPythonPackage, lib, fetchPypi -, pytestCheckHook, filelock, mock, pep8 -, cython, setuptools-scm -, six, pyshp, shapely, geos, numpy -, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona -, proj, flufl_lock +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cython +, setuptools-scm +, geos +, proj +, matplotlib +, numpy +, pyproj +, pyshp +, shapely +, owslib +, pillow +, gdal +, scipy +, fontconfig +, pytest-mpl +, pytestCheckHook }: buildPythonPackage rec { pname = "cartopy"; - version = "0.21.0"; + version = "0.21.1"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI="; + hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo="; }; - postPatch = '' - # https://github.com/SciTools/cartopy/issues/1880 - substituteInPlace lib/cartopy/tests/test_crs.py \ - --replace "test_osgb(" "dont_test_osgb(" \ - --replace "test_epsg(" "dont_test_epsg(" - ''; - nativeBuildInputs = [ cython geos # for geos-config @@ -35,14 +46,27 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - # required - six pyshp shapely numpy - - # optional - gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib + matplotlib + numpy + pyproj + pyshp + shapely ]; - checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ]; + passthru.optional-dependencies = { + ows = [ owslib pillow ]; + plotting = [ gdal pillow scipy ]; + }; + + checkInputs = [ + pytest-mpl + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + preCheck = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + export HOME=$TMPDIR + ''; pytestFlagsArray = [ "--pyargs" "cartopy" @@ -50,8 +74,6 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_nightshade_image" - "background_img" "test_gridliner_labels_bbox_style" ]; From 5953f6926f2d99b2056aa6513a9545e0b1b9d1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Dec 2022 20:56:55 -0800 Subject: [PATCH 14/15] python310Packages.bashlex: 0.15 -> 0.16 --- .../python-modules/bashlex/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 0ee12c414804..f850c5640c65 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -1,33 +1,31 @@ -{ enum-compat -, lib +{ lib , buildPythonPackage , fetchFromGitHub -, nose , python +, pytestCheckHook }: buildPythonPackage rec { pname = "bashlex"; - version = "0.15"; + version = "0.16"; + + format = "setuptools"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; + hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ enum-compat ]; - # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' ${python.interpreter} -c 'import bashlex' ''; - checkPhase = '' - ${python.interpreter} -m nose --with-doctest - ''; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "bashlex" ]; From a715b7b909978cca6f16993b9f8d68add4e132a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 01:34:24 +0000 Subject: [PATCH 15/15] v2ray-geoip: 202212080044 -> 202212150047 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index f548148c524c..2842394f7347 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202212080044"; + version = "202212150047"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "b8fc720b187e59a55609b2db8cf971a6c938be83"; - sha256 = "sha256-Fg+r23V5gs9wQKfgH/xkUqJvSOc8daaWLuNiDWD2Nz8="; + rev = "29c096b1285812a0a9a955b98ff2998c46f9b80a"; + sha256 = "sha256-44kP+4Bc7fwxNViWiKo7jLtUov+7k60v+7NF7CTkbjg="; }; installPhase = ''