181ac79 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commit181ac797ac4a13fb766a57878de8f9dbba0fa0c6 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateSun 26 Sep 2021, 12:01 (5 years ago) parent66715dd 61da869

25 files changed+151−94

compare with master

unifiedsplit

pkgs/applications/editors/apostrophe/default.nix+8−8

@@ -1,8 +1,8 @@

1−{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake

1+{ lib, stdenv, fetchFromGitLab, meson, ninja

22, wrapGAppsHook, pkg-config, desktop-file-utils

33, appstream-glib, pythonPackages, glib, gobject-introspection

44, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive

5−, shared-mime-info, libhandy, fira

5+, shared-mime-info, libhandy, fira, sassc

66}:

88let

@@ -13,18 +13,18 @@ let

1313

1414in stdenv.mkDerivation rec {

1515 pname = "apostrophe";

16− version = "2.4";

16+ version = "2.5";

1717

1818 src = fetchFromGitLab {

19− owner = "somas";

19+ owner = "World";

2020 repo = pname;

2121 domain = "gitlab.gnome.org";

2222 rev = "v${version}";

23− sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz";

23+ sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp";

2424 };

2525

26− nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils

27− appstream-glib wrapGAppsHook ];

26+ nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils

27+ appstream-glib wrapGAppsHook sassc ];

2828

2929 buildInputs = [ glib pythonEnv gobject-introspection gtk3

3030 gnome.adwaita-icon-theme webkitgtk gspell texlive

@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {

4949 '';

5050

5151 meta = with lib; {

52− homepage = "https://gitlab.gnome.org/somas/apostrophe";

52+ homepage = "https://gitlab.gnome.org/World/apostrophe";

5353 description = "A distraction free Markdown editor for GNU/Linux";

5454 license = licenses.gpl3;

5555 platforms = platforms.linux;

pkgs/development/python-modules/aioymaps/default.nix+3−2

@@ -7,12 +7,13 @@

88buildPythonPackage rec {

99 pname = "aioymaps";

10− version = "1.1.0";

10+ version = "1.2.0";

11+

1112 disabled = pythonOlder "3.6";

1213

1314 src = fetchPypi {

1415 inherit pname version;

15− sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm";

16+ sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU=";

1617 };

1718

1819 propagatedBuildInputs = [

pkgs/development/python-modules/arcam-fmj/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313buildPythonPackage rec {

1414 pname = "arcam-fmj";

15− version = "0.11.1";

15+ version = "0.12.0";

1616

1717 disabled = pythonOlder "3.8";

1818

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "elupus";

2121 repo = "arcam_fmj";

2222 rev = version;

23− sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE=";

23+ sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/casbin/default.nix+2−2

@@ -9,7 +9,7 @@

1010buildPythonPackage rec {

1111 pname = "casbin";

12− version = "1.8.1";

12+ version = "1.9.0";

1313

1414 disabled = isPy27;

1515

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = pname;

1818 repo = "pycasbin";

1919 rev = "v${version}";

20− sha256 = "16s1bd8z400cmwz0igai9fdv9qlafwp2fllhy84cfi90yxwh1flp";

20+ sha256 = "01prcwkmh3a4ggzjiaai489rrpmgwvqpjcavwjxw60mspyhsbv86";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/deezer-py/default.nix+2−2

@@ -7,12 +7,12 @@

88buildPythonPackage rec {

99 pname = "deezer-py";

10− version = "1.2.3";

10+ version = "1.2.4";

1111 disabled = pythonOlder "3.6";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "f4dd648e5bf251cb13316145e243d3a08d870840e0ac1525309926e640c91ea9";

15+ sha256 = "1b5664835975fda7a2519ba4b411cc5f2e4113e614ee140389b61844906d0c05";

1616 };

1717

1818 propagatedBuildInputs = [ requests ];

pkgs/development/python-modules/emoji/default.nix+2−2

@@ -6,13 +6,13 @@

77buildPythonPackage rec {

88 pname = "emoji";

9− version = "1.5.0";

9+ version = "1.5.2";

1010

1111 src = fetchFromGitHub {

1212 owner = "carpedm20";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "1b75p1ia4ip6aq1657pdwpspvhyjw6dpsrglj2qlql2gdmcm8sp8";

15+ sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1";

1616 };

1717

1818 checkInputs = [

pkgs/development/python-modules/fe25519/default.nix+2−2

@@ -10,11 +10,11 @@

1010

1111buildPythonPackage rec {

1212 pname = "fe25519";

13− version = "0.2.0";

13+ version = "0.3.0";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "1m85qvw9dwxk81mv9k45c9n75pk8wqn70qkinqh56h5zv56vgq24";

17+ sha256 = "8819659f19b51713199a75fda5107c93fbb6e2cb4afef3164ce7932b5eb276b9";

1818 };

1919

2020 propagatedBuildInputs = [

pkgs/development/python-modules/fountains/default.nix+2−2

@@ -6,11 +6,11 @@

77buildPythonPackage rec {

88 pname = "fountains";

9− version = "1.1.0";

9+ version = "1.1.1";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "47c28e598cc3a723327daee28c757de3a40f4d8eb48e6be37081932c1d00fa6f";

13+ sha256 = "fbf4e2cb11d60d3bafca5bb7c01c254d08a5541ed7ddfe00ef975eb173fb75a4";

1414 };

1515

1616 propagatedBuildInputs = [

pkgs/development/python-modules/imdbpy/default.nix+17−8

@@ -1,25 +1,34 @@

1−{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }:

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, lxml

5+, sqlalchemy

6+}:

38buildPythonPackage rec {

4− pname = "IMDbPY";

9+ pname = "imdbpy";

510 version = "2021.4.18";

611

712 src = fetchPypi {

8− inherit pname version;

13+ pname = "IMDbPY";

14+ inherit version;

915 sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f";

1016 };

1117

12− patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update

18+ propagatedBuildInputs = [

19+ lxml

20+ sqlalchemy

21+ ];

1322

14− propagatedBuildInputs = [ lxml sqlalchemy ];

23+ # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240

24+ doCheck = false;

1525

16− doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240

1726 pythonImportsCheck = [ "imdb" ];

1827

1928 meta = with lib; {

29+ description = "Python package for retrieving and managing the data of the IMDb database";

2030 homepage = "https://imdbpy.github.io/";

21− description = "A Python package for retrieving and managing the data of the IMDb database";

22− maintainers = [ maintainers.ivar ];

2331 license = licenses.gpl2Only;

32+ maintainers = with maintainers; [ ivar ];

2433 };

2534}

pkgs/development/python-modules/imdbpy/sql_error.patchdeleted−39

@@ -1,39 +0,0 @@

1−diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py

2−index cd4a3e3..3fcfdd4 100644

3−--- a/imdb/parser/sql/__init__.py

4−+++ b/imdb/parser/sql/__init__.py

5−@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase):

6− """The class used to access IMDb's data through a SQL database."""

7−

8− accessSystem = 'sql'

9−- _sql_logger = logging.getLogger('imdbpy.parser.sql')

10−

11− def __init__(self, uri, adultSearch=True, *arguments, **keywords):

12− """Initialize the access system."""

13−@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase):

14− except ImportError as e:

15− raise IMDbError('unable to import SQLAlchemy')

16− # Set the connection to the database.

17−- self._sql_logger.debug('connecting to %s', uri)

18−+ logger.debug('connecting to %s', uri)

19− try:

20− self._connection = setConnection(uri, DB_TABLES)

21− except AssertionError as e:

22−@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase):

23− # Maps some IDs to the corresponding strings.

24− self._kind = {}

25− self._kindRev = {}

26−- self._sql_logger.debug('reading constants from the database')

27−+ logger.debug('reading constants from the database')

28− try:

29− for kt in KindType.select():

30− self._kind[kt.id] = kt.kind

31−@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase):

32− return

33− if not hasattr(self, '_connection'):

34− return

35−- self._sql_logger.debug('closing connection to the database')

36−+ logger.debug('closing connection to the database')

37− try:

38− self._connection.close()

39− except:

pkgs/development/python-modules/mypy-boto3-builder/default.nix+16−4

@@ -3,10 +3,11 @@

33, boto3

44, buildPythonPackage

55, fetchFromGitHub

6+, isort

67, jinja2

78, md-toc

8−, isort

99, mdformat

10+, poetry-core

1011, pyparsing

1112, pytestCheckHook

1213, pythonOlder

@@ -14,16 +15,22 @@

1415

1516buildPythonPackage rec {

1617 pname = "mypy-boto3-builder";

17− version = "4.14.1";

18− disabled = pythonOlder "3.6";

18+ version = "5.4.0";

19+ format = "pyproject";

20+

21+ disabled = pythonOlder "3.8";

1922

2023 src = fetchFromGitHub {

2124 owner = "vemel";

2225 repo = "mypy_boto3_builder";

2326 rev = version;

24− sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc=";

27+ sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE=";

2528 };

2629

30+ nativeBuildInputs = [

31+ poetry-core

32+ ];

33+

2734 propagatedBuildInputs = [

2835 black

2936 boto3

@@ -38,6 +45,11 @@ buildPythonPackage rec {

3845 pytestCheckHook

3946 ];

4047

48+ disabledTests = [

49+ # Should be fixed with 5.x

50+ "test_get_types"

51+ ];

52+

4153 pythonImportsCheck = [ "mypy_boto3_builder" ];

4254

4355 meta = with lib; {

pkgs/development/python-modules/niluclient/default.nixnew file+35

@@ -0,0 +1,35 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+, requests

6+}:

8+buildPythonPackage rec {

9+ pname = "niluclient";

10+ version = "0.1.2";

11+ format = "setuptools";

12+

13+ disabled = pythonOlder "3.6";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq";

18+ };

19+

20+ propagatedBuildInputs = [

21+ requests

22+ ];

23+

24+ # Project has no tests

25+ doCheck = false;

26+

27+ pythonImportsCheck = [ "niluclient" ];

28+

29+ meta = with lib; {

30+ description = "Python client for getting air pollution data from NILU sensor stations";

31+ homepage = "https://github.com/hfurubotten/niluclient";

32+ license = with licenses; [ mit ];

33+ maintainers = with maintainers; [ fab ];

34+ };

35+}

pkgs/development/python-modules/pysdcp/default.nixnew file+31

@@ -0,0 +1,31 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+}:

7+buildPythonPackage rec {

8+ pname = "pysdcp";

9+ version = "1";

10+ format = "setuptools";

11+

12+ disabled = pythonOlder "3.6";

13+

14+ src = fetchPypi {

15+ pname = "pySDCP";

16+ inherit version;

17+ sha256 = "07396lsn610izaravqc6j5f6m0wjrzgc0d1r9dwqzj15g5zfc7wm";

18+ };

19+

20+ # Project has no tests

21+ doCheck = false;

22+

23+ pythonImportsCheck = [ "pysdcp" ];

24+

25+ meta = with lib; {

26+ description = "Python library to control SONY projectors";

27+ homepage = "https://github.com/Galala7/pySDCP";

28+ license = licenses.mit;

29+ maintainers = with maintainers; [ fab ];

30+ };

31+}

pkgs/development/python-modules/pysiaalarm/default.nix+2−2

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "pysiaalarm";

15− version = "3.0.0";

15+ version = "3.0.1";

1616

1717 disabled = pythonOlder "3.8";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122";

21+ sha256 = "sha256-96LSD1jL4Za7HF9vgplImeY57EQ9qa/hOdjQ/PPBq4A=";

2222 };

2323

2424 postPatch = ''

pkgs/development/python-modules/types-requests/default.nix+2−2

@@ -5,11 +5,11 @@

66buildPythonPackage rec {

77 pname = "types-requests";

8− version = "2.25.8";

8+ version = "2.25.9";

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "sha256-IlrC6GVJtu86ikS/lV+AtJVYVXBKFdKIPYRFyN9jckI=";

12+ sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k=";

1313 };

1414

1515 # Modules doesn't have tests

pkgs/development/python-modules/velbus-aio/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "velbus-aio";

11− version = "2021.9.2";

11+ version = "2021.9.4";

1212

1313 disabled = pythonOlder "3.7";

1414

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "Cereal2nd";

1717 repo = pname;

1818 rev = version;

19− sha256 = "sha256-pFVhWrMygCwAsAYPnqtoaPcgh6y0Tf9vROYfn0M+g2E=";

19+ sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/yeelight/default.nix+2−2

@@ -9,14 +9,14 @@

1010buildPythonPackage rec {

1111 pname = "yeelight";

12− version = "0.7.4";

12+ version = "0.7.5";

1313 disabled = pythonOlder "3.4";

1414

1515 src = fetchFromGitLab {

1616 owner = "stavros";

1717 repo = "python-yeelight";

1818 rev = "v${version}";

19− sha256 = "sha256-qpyD4o8YMVu6DiizuBs/44Vz0oPIMR4/YQwaCDNKpFI=";

19+ sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/tools/analysis/tfsec/default.nix+2−2

@@ -5,13 +5,13 @@

66buildGoPackage rec {

77 pname = "tfsec";

8− version = "0.58.9";

8+ version = "0.58.10";

1010 src = fetchFromGitHub {

1111 owner = "aquasecurity";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "1i61xls3jj5w3cliqs28m1y6p47yav24m40zxa6kf0jj4s50m1d3";

14+ sha256 = "sha256-VMnc4frDBAkVc9hqUdXAiJ2vNsK9NzkLOUaQWhQQUBU=";

1515 };

1616

1717 goPackagePath = "github.com/aquasecurity/tfsec";

pkgs/development/tools/database/sqlfluff/default.nix+2−2

@@ -5,14 +5,14 @@

66python3.pkgs.buildPythonApplication rec {

77 pname = "sqlfluff";

8− version = "0.6.5";

8+ version = "0.6.6";

99 disabled = python3.pythonOlder "3.6";

1010

1111 src = fetchFromGitHub {

1212 owner = pname;

1313 repo = pname;

1414 rev = version;

15− sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc=";

15+ sha256 = "sha256-I7vsOQtXY/n2Zu0F94f5/uF1ia96R/qQw+duG7X8Dpo=";

1616 };

1717

1818 propagatedBuildInputs = with python3.pkgs; [

pkgs/development/tools/rust/cargo-feature/default.nix+3−3

@@ -2,16 +2,16 @@

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-feature";

5− version = "0.5.2";

5+ version = "0.5.3";

77 src = fetchFromGitHub {

88 owner = "Riey";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n";

11+ sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8=";

1212 };

1313

14− cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq";

14+ cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54=";

1515

1616 buildInputs = lib.optional stdenv.isDarwin libiconv;

1717

pkgs/servers/home-assistant/component-packages.nix+2−2

@@ -574,7 +574,7 @@

574574 "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv

575575 "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout

576576 "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control

577− "nilu" = ps: with ps; [ ]; # missing inputs: niluclient

577+ "nilu" = ps: with ps; [ niluclient ];

578578 "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2

579579 "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup

580580 "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail

@@ -803,7 +803,7 @@

803803 "sonarr" = ps: with ps; [ sonarr ];

804804 "songpal" = ps: with ps; [ python-songpal ];

805805 "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ];

806− "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp

806+ "sony_projector" = ps: with ps; [ pysdcp ];

807807 "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];

808808 "spaceapi" = ps: with ps; [ aiohttp-cors ];

809809 "spc" = ps: with ps; [ pyspcwebgw ];

pkgs/tools/networking/openapi-generator-cli/default.nix+2−2

@@ -1,7 +1,7 @@

11{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:

33let this = stdenv.mkDerivation rec {

4− version = "5.2.0";

4+ version = "5.2.1";

55 pname = "openapi-generator-cli";

77 jarfilename = "${pname}-${version}.jar";

@@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {

1212

1313 src = fetchurl {

1414 url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";

15− sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk=";

15+ sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs=";

1616 };

1717

1818 dontUnpack = true;

pkgs/tools/security/exploitdb/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "exploitdb";

5− version = "2021-09-22";

5+ version = "2021-09-25";

77 src = fetchFromGitHub {

88 owner = "offensive-security";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-axA20Ok+5LgtW4Mf1xMM64Gd6C6joBC5isUdZPncgDw=";

11+ sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU=";

1212 };

1313

1414 installPhase = ''

pkgs/tools/system/foreman/Gemfile.lock+4

@@ -4,6 +4,10 @@ GEM

44 foreman (0.87.2)

66PLATFORMS

7+ aarch64-darwin

8+ aarch64-linux

9+ ruby

10+ x86_64-darwin

711 x86_64-linux

812

913DEPENDENCIES

pkgs/top-level/python-packages.nix+4

@@ -4939,6 +4939,8 @@ in {

49394939

49404940 nilearn = callPackage ../development/python-modules/nilearn { };

49414941

4942+ niluclient = callPackage ../development/python-modules/niluclient { };

4943+

49424944 nimfa = callPackage ../development/python-modules/nimfa { };

49434945

49444946 nine = callPackage ../development/python-modules/nine { };

@@ -6823,6 +6825,8 @@ in {

68236825

68246826 pyscss = callPackage ../development/python-modules/pyscss { };

68256827

6828+ pysdcp = callPackage ../development/python-modules/pysdcp { };

6829+

68266830 pysdl2 = callPackage ../development/python-modules/pysdl2 { };

68276831

68286832 pysendfile = callPackage ../development/python-modules/pysendfile { };