diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6f7a3e44262..c115c310a35 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4085,6 +4085,16 @@ fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; }]; }; + ivankovnatsky = { + email = "ikovnatsky@protonmail.ch"; + github = "ivankovnatsky"; + githubId = 75213; + name = "Ivan Kovnatsky"; + keys = [{ + longkeyid = "rsa4096/0x3A33FA4C82ED674F"; + fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; + }]; + }; ivar = { email = "ivar.scholten@protonmail.com"; github = "IvarWithoutBones"; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index f52079fc1ef..2111c970d4f 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.minetest-server; - flag = val: name: if val != null then "--${name} ${val} " else ""; + flag = val: name: if val != null then "--${name} ${toString val} " else ""; flags = [ (flag cfg.gameId "gameid") (flag cfg.world "world") diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index de748ea7b32..ebe9885e495 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,16 +1,15 @@ { lib , mopidy , python3Packages -, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Local"; - version = "3.2.0"; + version = "3.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0"; + sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9"; }; propagatedBuildInputs = [ @@ -22,14 +21,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; - patches = [ - # Fix tests for Mopidy≥3.1.0. Remove with the next release. - (fetchpatch { - url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch"; - sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp"; - }) - ]; - meta = with lib; { homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix new file mode 100644 index 00000000000..8f6284c7d60 --- /dev/null +++ b/pkgs/applications/misc/gxkb/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier +, appindicatorSupport ? true, libayatana-appindicator-gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gxkb"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "zen-tools"; + repo = "gxkb"; + rev = "v${version}"; + sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + + configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; + outputs = [ "out" "man" ]; + + meta = with lib; { + description = "X11 keyboard indicator and switcher"; + homepage = "https://zen-tools.github.io/gxkb/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.omgbebebe ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 8207040f1b8..df672e5160b 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.0.1"; + version = "29.1.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq"; + sha256 = "02blhk3v7gpnicd7s5l5fpqvdvj2279g3rq8xyhcd4sw6qnms8m6"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 58952f28b55..daa08899730 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33"; + sha256 = "06w147wzrzp6xbqiz6s5nq5xdjy7jn3f18xajxy50pynjd6vmfh5"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index c742d076f9d..f88a2e3d8e8 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -28,6 +28,19 @@ in stdenv.mkDerivation rec { sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; + passthru = { + updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "anydesk-versionLister" '' + echo "# Versions for $1:" >> "$2" + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL freetype fontconfig diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9d9be8966ca..97ce75dfc9c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.13.1"; + version = "1.14.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1jvmcpyj4k43s4hv753pr9a1qg930nac90d5c8haqv30v1rw5pws"; + sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd"; }; - vendorSha256 = "140b0wqp5ayyyan7ml12jqd72s00cawhmdf8g699j5sav8j6hppi"; + vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3"; doCheck = false; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index c918a3b5d8c..305c1d728f3 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.19.1"; + version = "4.19.2"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c="; + sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index 2a2b237d527..d8eda3e9232 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,25 @@ { lib, fetchurl }: let - version = "2.1"; + version = "2.2"; in fetchurl rec { name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar"; + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; downloadToTemp = true; recursiveHash = true; - sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz"; + sha256 = "sha256-mkZnuW+CB20t6MEpEeQR1CWkIUtqgVwrKN4sezQRaB4="; postFetch = '' - tar xvf $downloadedFile + tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - cp scientifica/ttf/*.ttf $out/share/fonts/truetype - cp scientifica/otb/*.otb $out/share/fonts/misc - cp scientifica/bdf/*.bdf $out/share/fonts/misc + install scientifica/ttf/*.ttf $out/share/fonts/truetype + install scientifica/otb/*.otb $out/share/fonts/misc + install scientifica/bdf/*.bdf $out/share/fonts/misc ''; meta = with lib; { diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 122d0a4a656..6eea90c7119 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; + sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index dade163c527..7dfa462e225 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "unstable-2021-01-26"; + version = "unstable-2021-03-07"; - # commit chosen by using the latest build from http://bin.zetz.it/ + # when updating, choose commit of the latest build on http://bin.zetz.it/ src = fetchFromGitHub { owner = "zetzit"; repo = "zz"; - rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; - sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; + rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4"; + sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; + cargoSha256 = "0i3c459d4699z4dwvdw1495krdv3c2qpygrsw0cz3j0zd2n5gqj6"; postPatch = '' # remove search path entry which would reference /build diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 600e94d0a75..601c27c98ee 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.8"; + version = "3.9.4.3"; src = fetchurl { url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "08jarfcl8l5mrmkx6bcifi3ghkaja9isz77zgggl84yl66js5pc3"; + sha256 = "sha256-U8hXoqBzjSGigOXc29LZQk3KrGiYvBPBJPg5qihcAsY="; }; dontConfigure = true; diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index ddc181a4992..289f6a6cba4 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.4"; + version = "0.2.5"; useDune2 = true; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; + sha256 = "1pbcdwm12hnfpd1jv2b7cjfkj5r7h61xp2gr8dysb8waa455kwln"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 57ace67d3f2..395978396a5 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.8.9"; + version = "0.8.10"; disabled = isPy27; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq"; + sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 410248b0193..e4bd7ab2b62 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.10.0"; + version = "1.10.1"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis"; + sha256 = "1764nfa4frjdd7v6wj35y7prnciaqz57wwygy5zfavl4laxn4nxd"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 45b6dd7b6e1..8f3e4d08583 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,14 @@ , dill , pandas , partd +, pytest-xdist +, withExtraComplete ? false +, distributed }: buildPythonPackage rec { pname = "dask"; version = "2021.03.0"; - disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -27,13 +29,6 @@ buildPythonPackage rec { sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI="; }; - checkInputs = [ - pytestCheckHook - pytest-rerunfailures - ]; - - dontUseSetuptoolsCheck = true; - propagatedBuildInputs = [ bokeh cloudpickle @@ -43,8 +38,20 @@ buildPythonPackage rec { pandas partd toolz + ] ++ lib.optionals withExtraComplete [ + distributed ]; + doCheck = false; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + pytest-xdist + ]; + + dontUseSetuptoolsCheck = true; + postPatch = '' # versioneer hack to set version of github package echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py @@ -54,21 +61,18 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTests = [ - "test_argwhere_str" - "test_count_nonzero_str" - "rolling_methods" # floating percision error ~0.1*10^8 small - "num_workers_config" # flaky - "test_2args_with_array[pandas1-darray1-ldexp]" # flaky + "test_annotation_pack_unpack" + "test_annotations_blockwise_unpack" ]; - meta = { + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 2b11b1ea273..ad5cc8bfb03 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -1,9 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , dask -, distributed , bokeh , toolz , datashape @@ -15,38 +13,26 @@ , colorcet , param , pyct -, pyyaml -, requests -, scikitimage , scipy -, pytest -, pytest-benchmark -, flake8 +, pytestCheckHook , nbsmoke , fastparquet -, testpath , nbconvert -, pytest_xdist +, pytest-xdist +, netcdf4 }: buildPythonPackage rec { pname = "datashader"; - version = "0.11.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; + sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es="; }; - patches = [ (fetchpatch { - # Unpins pyct==0.46 (Sep. 11, 2020). - # Will be incorporated into the next datashader release after 0.11.1 - url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch"; - sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x"; - })]; propagatedBuildInputs = [ dask - distributed bokeh toolz datashape @@ -58,30 +44,29 @@ buildPythonPackage rec { colorcet param pyct - pyyaml - requests - scikitimage scipy - testpath ]; checkInputs = [ - pytest - pytest-benchmark - pytest_xdist # not needed - flake8 + pytestCheckHook + pytest-xdist # not needed nbsmoke fastparquet - pandas nbconvert + netcdf4 ]; - # dask doesn't do well with large core counts - checkPhase = '' - pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' - ''; + pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" + "datashader" + ]; - meta = with lib; { + disabledTestPaths = [ + # 31/50 tests fail with TypeErrors + "datashader/tests/test_datatypes.py" + ]; + + meta = with lib;{ description = "Data visualization toolchain based on aggregating into a grid"; homepage = "https://datashader.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 3abdd0fb792..797fee025be 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, python }: buildPythonPackage rec { @@ -14,6 +15,10 @@ buildPythonPackage rec { sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"; }; + checkPhase = '' + ${python.interpreter} tests.py + ''; + pythonImportsCheck = [ "defusedxml" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 372b931bca2..8ce554e6f6b 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.30.1"; + version = "2021.3.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; + sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s="; }; propagatedBuildInputs = [ @@ -38,11 +38,11 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "distributed" ]; - meta = { + meta = with lib; { description = "Distributed computation in Python."; homepage = "https://distributed.readthedocs.io/en/latest/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.x86; # fails on aarch64 - maintainers = with lib.maintainers; [ teh costrouc ]; + license = licenses.bsd3; + platforms = platforms.x86; # fails on aarch64 + maintainers = with maintainers; [ teh costrouc ]; }; } diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 760091e567d..8e54cb6897c 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.4.1"; + version = "1.4.2"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s"; + sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2"; }; disabled = pythonOlder "3.6"; @@ -18,9 +18,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "fritzconnection" ]; + meta = with lib; { - description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; + description = "Python-Tool to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; + changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html"; license = licenses.mit; maintainers = with maintainers; [ dotlambda valodim ]; }; diff --git a/pkgs/development/python-modules/phonemizer/backend-paths.patch b/pkgs/development/python-modules/phonemizer/backend-paths.patch index 1734addb0ef..5f828aaaae1 100644 --- a/pkgs/development/python-modules/phonemizer/backend-paths.patch +++ b/pkgs/development/python-modules/phonemizer/backend-paths.patch @@ -1,8 +1,8 @@ diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py -index 387c11c..ceb5e7e 100644 +index b4712bf..5628fd5 100644 --- a/phonemizer/backend/espeak.py +++ b/phonemizer/backend/espeak.py -@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend): +@@ -82,10 +82,7 @@ class BaseEspeakBackend(BaseBackend): if _ESPEAK_DEFAULT_PATH: return _ESPEAK_DEFAULT_PATH @@ -15,10 +15,10 @@ index 387c11c..ceb5e7e 100644 @classmethod def is_available(cls): diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py -index b5bc56d..0833160 100644 +index 3037be5..684ffff 100644 --- a/phonemizer/backend/festival.py +++ b/phonemizer/backend/festival.py -@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend): +@@ -80,7 +80,7 @@ class FestivalBackend(BaseBackend): if _FESTIVAL_DEFAULT_PATH: return _FESTIVAL_DEFAULT_PATH @@ -27,3 +27,16 @@ index b5bc56d..0833160 100644 @classmethod def is_available(cls): +diff --git a/test/test_punctuation.py b/test/test_punctuation.py +index 6ed642a..08060df 100644 +--- a/test/test_punctuation.py ++++ b/test/test_punctuation.py +@@ -28,7 +28,7 @@ ESPEAK_143 = (EspeakBackend.version(as_tuple=True) >= (1, 49, 3)) + ESPEAK_150 = (EspeakBackend.version(as_tuple=True) >= (1, 50)) + + # True if we are using festival>=2.5 +-FESTIVAL_25 = (FestivalBackend.version(as_tuple=True) >= (2, 5)) ++FESTIVAL_25 = False + + + @pytest.mark.parametrize( diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 7be95b97088..fbe474166c1 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -6,13 +6,13 @@ buildPythonPackage { pname = "tlsh"; - version = "3.4.5"; + version = "4.5.0"; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930"; - sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"; + rev = "f2bb7a97cfb0f9418a750ba92c182d1091e6c159"; + sha256 = "1kxfhdwqjd4pjdlr1gjh2am8mxpaqmfq7rrxkjfi0mbisl1krkwb"; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ buildPythonPackage { meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; - homepage = "https://github.com/trendmicro/tlsh"; + homepage = "http://tlsh.org/"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 3d69f5ce0e5..e542c0dbc63 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,24 +6,26 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20201003"; + version = "20210302"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "07s5fdjbk5q4km6gz9759ngdavrqdgbnkd2b7z9z5lqw1q0b2422"; + sha256 = "sha256-yIVHcaQAr2gKH/NZeN+vRmGS8OgyNeRsZkCYyqjsSsI="; }; installPhase = '' + runHook preInstall install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 96363583b62..ac870a8d5d1 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -2,15 +2,25 @@ let version = "1.12"; + + inherit (stdenv.hostPlatform) system; + + srcs = { + x86_64-linux = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; + }; + x86_64-darwin = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; + sha256 = "01gn3m6qacp3ibvp0rcvm2pq7fi1xds02ws0irypldh7vz3930jl"; + }; + }; in stdenv.mkDerivation { inherit version; pname = "meteor"; - src = fetchurl { - url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; - }; + src = srcs.${system}; #dontStrip = true; @@ -30,38 +40,6 @@ stdenv.mkDerivation { toolsDir=$(dirname $(find $out/packages -print | grep "meteor-tool/.*/tools/index.js$")) ln -s $toolsDir $out/tools - # Patch Meteor to dynamically fixup shebangs and ELF metadata where - # necessary. - pushd $out - patch -p1 < ${./main.patch} - popd - substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - --replace "@PATCHELF@" "${patchelf}/bin/patchelf" - - # Patch node. - node=$devBundle/bin/node - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ - $node - - # Patch mongo. - for p in $devBundle/mongodb/bin/mongo{,d}; do - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - $p - done - - # Patch node dlls. - for p in $(find $out/packages -name '*.node'); do - patchelf \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ - $p || true - done - # Meteor needs an initial package-metadata in $HOME/.meteor, # otherwise it fails spectacularly. mkdir -p $out/bin @@ -75,16 +53,49 @@ stdenv.mkDerivation { chmod +w "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" fi - $node \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" + $out/dev_bundle/bin/node --no-wasm-code-gc \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" EOF chmod +x $out/bin/meteor ''; + postFixup = lib.optionalString stdenv.isLinux '' + # Patch Meteor to dynamically fixup shebangs and ELF metadata where + # necessary. + pushd $out + patch -p1 < ${./main.patch} + popd + substituteInPlace $out/tools/cli/main.js \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + --replace "@PATCHELF@" "${patchelf}/bin/patchelf" + + # Patch node. + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \ + $out/dev_bundle/bin/node + + # Patch mongo. + for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + $p + done + + # Patch node dlls. + for p in $(find $out/packages -name '*.node'); do + patchelf \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ + $p || true + done + ''; + meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; homepage = "http://www.meteor.com"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames srcs; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index ba6f9d074b2..eb748cc42ca 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.11"; + version = "4.12"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x"; + sha256 = "1qgi9ciljq8h3ja9kalfvnxnjymddd5j4agv984137z443mqfnrw"; }; postPatch = '' @@ -55,7 +55,7 @@ buildGoPackage rec { ) } - installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client + installShellCompletion --bash --name lxd go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix new file mode 100644 index 00000000000..0db042120ca --- /dev/null +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -0,0 +1,43 @@ +{ lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub +, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tremor"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "tremor-rs"; + repo = "tremor-runtime"; + rev = "v${version}"; + sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; + }; + + cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + + buildInputs = [ openssl ]; + + postInstall = '' + installShellCompletion --cmd tremor \ + --bash <($out/bin/tremor completions bash) \ + --fish <($out/bin/tremor completions fish) \ + --zsh <($out/bin/tremor completions zsh) + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. + OPENSSL_NO_VENDOR = 1; + + cargoBuildFlags = [ "--all" ]; + + meta = with lib; { + description = + "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; + homepage = "https://www.tremor.rs/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix new file mode 100644 index 00000000000..1f33855017d --- /dev/null +++ b/pkgs/tools/networking/dnsviz/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, dnspython +, m2crypto +, pygraphviz +}: + +buildPythonApplication rec { + pname = "dnsviz"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "dnsviz"; + repo = "dnsviz"; + rev = "v${version}"; + sha256 = "sha256-tIxjlNtncZJSdfQelIR9fTohBDkyC0+YwEcs2gNfKec="; + }; + + patches = [ + # override DNSVIZ_INSTALL_PREFIX with $out + ./fix-path.patch + ]; + + propagatedBuildInputs = [ + dnspython + m2crypto + pygraphviz + ]; + + postPatch = '' + substituteInPlace dnsviz/config.py.in --replace '@out@' $out + ''; + + # Tests require network connection and /etc/resolv.conf + doCheck = false; + + pythonImportsCheck = [ "dnsviz" ]; + + meta = with lib; { + description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior"; + longDescription = '' + DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior, + including its security extensions (DNSSEC). + + This tool suite powers the Web-based analysis available at https://dnsviz.net/ + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/tools/networking/dnsviz/fix-path.patch b/pkgs/tools/networking/dnsviz/fix-path.patch new file mode 100644 index 00000000000..7906058cd98 --- /dev/null +++ b/pkgs/tools/networking/dnsviz/fix-path.patch @@ -0,0 +1,18 @@ +diff --git a/dnsviz/config.py.in b/dnsviz/config.py.in +index 373fde2..007f0f1 100644 +--- a/dnsviz/config.py.in ++++ b/dnsviz/config.py.in +@@ -26,12 +26,7 @@ from __future__ import unicode_literals + import os + import sys + +-_prefix = '__DNSVIZ_INSTALL_PREFIX__' +-if (hasattr(sys, 'real_prefix') or hasattr(sys, 'base_prefix')) and \ +- not _prefix: +- DNSVIZ_INSTALL_PREFIX = sys.prefix +-else: +- DNSVIZ_INSTALL_PREFIX = _prefix ++DNSVIZ_INSTALL_PREFIX = "@out@" + DNSVIZ_SHARE_PATH = os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz') + JQUERY_PATH = __JQUERY_PATH__ + JQUERY_UI_PATH = __JQUERY_UI_PATH__ diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/tools/wayland/swaykbdd/default.nix new file mode 100644 index 00000000000..4584018596d --- /dev/null +++ b/pkgs/tools/wayland/swaykbdd/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, json_c, pkg-config }: + +stdenv.mkDerivation rec { + pname = "swaykbdd"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "artemsen"; + repo = "swaykbdd"; + rev = "v${version}"; + sha256 = "101mbf7pvm4ykmkh29g5xswrzdhdwq0rslzxqqfd5ksf1fphzgxd"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ json_c ]; + + meta = with lib; { + description = "Per-window keyboard layout for Sway"; + homepage = "https://github.com/artemsen/swaykbdd"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c25c3b8adb..3e6416b0c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2000,6 +2000,8 @@ in slurp = callPackage ../tools/wayland/slurp { }; + swaykbdd = callPackage ../tools/wayland/swaykbdd { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wev = callPackage ../tools/wayland/wev { }; @@ -3663,6 +3665,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { }; + dnsx = callPackage ../tools/security/dnsx { }; dhcp = callPackage ../tools/networking/dhcp { }; @@ -9006,6 +9010,8 @@ in tre = callPackage ../development/libraries/tre { }; + tremor-rs = callPackage ../tools/misc/tremor-rs { }; + ts = callPackage ../tools/system/ts { }; transfig = callPackage ../tools/graphics/transfig { @@ -9091,6 +9097,8 @@ in xwallpaper = callPackage ../tools/X11/xwallpaper { }; + gxkb = callPackage ../applications/misc/gxkb { }; + xxkb = callPackage ../applications/misc/xxkb { }; ugarit = callPackage ../tools/backup/ugarit { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 476f9e89b70..10d699e9ee1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -589,7 +589,7 @@ in { withPython = true; }); - av = callPackage ../development/python-modules/av { inherit (pkgs) pkg-config; }; + av = callPackage ../development/python-modules/av { }; avea = callPackage ../development/python-modules/avea { }; @@ -1622,7 +1622,9 @@ in { dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { + inherit (pkgs) go; + }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -1640,7 +1642,9 @@ in { databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { + inherit (pkgs) jdk; + }; dataclasses = callPackage ../development/python-modules/dataclasses { }; @@ -1656,7 +1660,9 @@ in { datasette = callPackage ../development/python-modules/datasette { }; - datashader = callPackage ../development/python-modules/datashader { }; + datashader = callPackage ../development/python-modules/datashader { + dask = self.dask.override { withExtraComplete = true; }; + }; datashape = callPackage ../development/python-modules/datashape { }; @@ -1674,7 +1680,9 @@ in { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkg-config; }; + dbus-python = callPackage ../development/python-modules/dbus { + inherit (pkgs) dbus; + }; dbutils = callPackage ../development/python-modules/dbutils { }; @@ -1838,8 +1846,8 @@ in { django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - django_hijack = callPackage ../development/python-modules/django-hijack - { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django_hijack = callPackage ../development/python-modules/django-hijack { }; + # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -1927,7 +1935,9 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; - dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; + dlib = callPackage ../development/python-modules/dlib { + inherit (pkgs) dlib; + }; dlx = callPackage ../development/python-modules/dlx { }; @@ -1990,7 +2000,9 @@ in { dotty-dict = callPackage ../development/python-modules/dotty-dict { }; - dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; + dot2tex = callPackage ../development/python-modules/dot2tex { + inherit (pkgs) graphviz; + }; dparse = callPackage ../development/python-modules/dparse { }; @@ -2008,11 +2020,15 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; - ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; + ds4drv = callPackage ../development/python-modules/ds4drv { + inherit (pkgs) bluez; + }; dtopt = callPackage ../development/python-modules/dtopt { }; - duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; + duckdb = callPackage ../development/python-modules/duckdb { + inherit (pkgs) duckdb; + }; duecredit = callPackage ../development/python-modules/duecredit { }; @@ -2095,9 +2111,13 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + entrance = callPackage ../development/python-modules/entrance { + routerFeatures = false; + }; - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + entrance-with-router-features = callPackage ../development/python-modules/entrance { + routerFeatures = true; + }; entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; @@ -2248,7 +2268,9 @@ in { feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { + inherit (pkgs) glibcLocales; + }; feedparser = if isPy3k then callPackage ../development/python-modules/feedparser { } @@ -2256,7 +2278,6 @@ in { callPackage ../development/python-modules/feedparser/5.nix { }; fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; pytest = self.pytest_4; }; @@ -2280,7 +2301,9 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + fiona = callPackage ../development/python-modules/fiona { + gdal_2 = pkgs.gdal_2; + }; fipy = callPackage ../development/python-modules/fipy { }; @@ -2501,7 +2524,9 @@ in { furl = callPackage ../development/python-modules/furl { }; - fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkg-config; }; + fuse = callPackage ../development/python-modules/fuse-python { + inherit (pkgs) fuse; + }; fusepy = callPackage ../development/python-modules/fusepy { }; @@ -2796,7 +2821,7 @@ in { inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkg-config; }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; @@ -2836,7 +2861,7 @@ in { graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -2881,7 +2906,7 @@ in { gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkg-config; + inherit (pkgs) meson; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -3037,7 +3062,7 @@ in { html5lib = callPackage ../development/python-modules/html5lib { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkg-config; }; + html5-parser = callPackage ../development/python-modules/html5-parser { }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -3200,8 +3225,9 @@ in { importmagic = callPackage ../development/python-modules/importmagic { }; - imread = - callPackage ../development/python-modules/imread { inherit (pkgs) pkg-config libjpeg libpng libtiff libwebp; }; + imread = callPackage ../development/python-modules/imread { + inherit (pkgs) libjpeg libpng libtiff libwebp; + }; imutils = callPackage ../development/python-modules/imutils { }; @@ -3584,7 +3610,6 @@ in { kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkg-config; withPython = true; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); @@ -3674,7 +3699,7 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkg-config; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3784,15 +3809,20 @@ in { else (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + libusb1 = callPackage ../development/python-modules/libusb1 { + inherit (pkgs) libusb1; + }; - libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkg-config; }; + libversion = callPackage ../development/python-modules/libversion { + inherit (pkgs) libversion; + }; libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkg-config; }) + (callPackage ../development/python-modules/libvirt { + inherit (pkgs) libvirt; + }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkg-config; libvirt = pkgs.libvirt_5_9_0; }); @@ -3848,8 +3878,8 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkg-config; - }; # use "real" fuse and pkg-config, not the python modules + inherit (pkgs) fuse; + }; llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; @@ -4028,7 +4058,6 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkg-config; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4980,7 +5009,7 @@ in { pkce = callPackage ../development/python-modules/pkce { }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -5056,7 +5085,7 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkg-config; }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { }; polib = callPackage ../development/python-modules/polib { }; @@ -5075,7 +5104,6 @@ in { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkg-config; }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -5299,7 +5327,9 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; - pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkg-config; }; + pyarrow = callPackage ../development/python-modules/pyarrow { + inherit (pkgs) arrow-cpp cmake; + }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5307,7 +5337,7 @@ in { pyatmo = callPackage ../development/python-modules/pyatmo { }; - pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkg-config; }; + pyatspi = callPackage ../development/python-modules/pyatspi { }; pyatv = callPackage ../development/python-modules/pyatv { }; @@ -5347,13 +5377,15 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; + pycairo = callPackage ../development/python-modules/pycairo { + inherit (pkgs) meson; + }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkg-config; }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5579,19 +5611,19 @@ in { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkg-config; }; + pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkg-config; } + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson; } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkg-config; }; + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson; }; pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkg-config; + inherit (pkgs) graphviz; }; # not the python package pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5600,14 +5632,13 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkg-config; - libglade = null; + pygtk = callPackage ../development/python-modules/pygtk { }; + + pyGtkGlade = self.pygtk.override { + inherit (pkgs.gnome2) libglade; }; - pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkg-config; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -5932,7 +5963,7 @@ in { pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -6081,7 +6112,7 @@ in { pysmb = callPackage ../development/python-modules/pysmb { }; - pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; + pysmbc = callPackage ../development/python-modules/pysmbc { }; pysmf = callPackage ../development/python-modules/pysmf { }; @@ -6413,7 +6444,7 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; - pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkg-config; }; + pythonefl = callPackage ../development/python-modules/python-efl { }; python-engineio = callPackage ../development/python-modules/python-engineio { }; @@ -6442,14 +6473,12 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; python-igraph = callPackage ../development/python-modules/python-igraph { - pkg-config = pkgs.pkg-config; - igraph = pkgs.igraph; + inherit (pkgs) igraph; }; pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) pkg-config; meson = pkgs.meson.override { python3 = self.python; }; }; @@ -6502,9 +6531,9 @@ in { python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage - ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + ../development/python-modules/pythonnet { + # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; - inherit (pkgs) pkg-config; }; python-nmap = callPackage ../development/python-modules/python-nmap { }; @@ -6522,7 +6551,7 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkg-config; }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6693,7 +6722,7 @@ in { pyvizio = callPackage ../development/python-modules/pyvizio { }; pyvips = callPackage ../development/python-modules/pyvips { - inherit (pkgs) pkg-config vips glib; + inherit (pkgs) vips glib; }; pyvlx = callPackage ../development/python-modules/pyvlx { }; @@ -7004,7 +7033,6 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkg-config; # use normal pkg-config, not the python package inherit (pkgs.qt5) qtbase; }; @@ -7240,7 +7268,7 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkg-config; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -7269,7 +7297,7 @@ in { sendgrid = callPackage ../development/python-modules/sendgrid { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7733,7 +7761,7 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; suds = callPackage ../development/python-modules/suds { }; @@ -7775,14 +7803,16 @@ in { sybil = callPackage ../development/python-modules/sybil { }; - symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; + symengine = callPackage ../development/python-modules/symengine { + inherit (pkgs) symengine; + }; sympy = if isPy3k then callPackage ../development/python-modules/sympy { } else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkg-config systemd; }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; @@ -8354,7 +8384,7 @@ in { vine = callPackage ../development/python-modules/vine { }; - virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkg-config; }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -8551,11 +8581,9 @@ in { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkg-config; }; wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkg-config; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; @@ -8564,7 +8592,6 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs) pkg-config; wxGTK = pkgs.wxGTK31.override { withGtk2 = false; withWebKit = true; @@ -8826,7 +8853,7 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkg-config; }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd; }; zulip = callPackage ../development/python-modules/zulip { };