diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index fb114580739c12..fc4e3d4b34bd7a 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "bitcoind"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index 974b86d9fda8fa..51cc42eb7eb83e 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "blockbook-frontend"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 852bc1f2d09f85..68430891194a6d 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: let passphrase = "supersecret"; @@ -40,7 +40,7 @@ let in { name = "borgbackup"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/nixos/tests/btrbk-doas.nix b/nixos/tests/btrbk-doas.nix index 543cc60668d4f4..553360f7807aa2 100644 --- a/nixos/tests/btrbk-doas.nix +++ b/nixos/tests/btrbk-doas.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: let privateKey = '' @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "btrbk-doas"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ symphorien tu-maurice ]; }; diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix index 2700fe0f63e43a..69a93e4ee69448 100644 --- a/nixos/tests/btrbk.nix +++ b/nixos/tests/btrbk.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: let privateKey = '' @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "btrbk"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ symphorien ]; }; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index f13d0c09d8fc71..91a8e6f65de0b1 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: let template-bootstrap3 = pkgs.stdenv.mkDerivation rec { @@ -90,7 +90,7 @@ let titleFile = pkgs.writeText "dokuwiki-title" "DokuWiki on site2"; in { name = "dokuwiki"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ _1000101 onny diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index b10f21e575ca7c..55af2de06f2f3f 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "geth"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ bachp ]; }; diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index e7447e1c16cc27..e92dbb1f1c2bb0 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "jibri"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.jitsi.members; }; diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 941dfd81a8ba81..538f74ed25f8de 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "jitsi-meet"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.jitsi.members; }; diff --git a/nixos/tests/matrix/dendrite.nix b/nixos/tests/matrix/dendrite.nix index 4a5b2d2865ecd4..aab212e048d013 100644 --- a/nixos/tests/matrix/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -1,5 +1,5 @@ import ../make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: let homeserverUrl = "http://homeserver:8008"; @@ -9,7 +9,7 @@ import ../make-test-python.nix ( in { name = "dendrite"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.matrix.members; }; diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index f4bd96263a1b54..514097bc4c1268 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -1,5 +1,5 @@ import ../make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: let # Set up SSL certs for Synapse to be happy. runWithOpenSSL = @@ -30,7 +30,7 @@ import ../make-test-python.nix ( in { name = "mjolnir"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.matrix.members; }; diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index 4998f888aff22d..fabb7cf1ceee2d 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -1,5 +1,5 @@ import ../make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: let pantalaimonInstanceName = "testing"; @@ -32,7 +32,7 @@ import ../make-test-python.nix ( in { name = "pantalaimon"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.matrix.members; }; diff --git a/nixos/tests/matrix/synapse-workers.nix b/nixos/tests/matrix/synapse-workers.nix index 7c8d3f357b725d..405ea0e9df907a 100644 --- a/nixos/tests/matrix/synapse-workers.nix +++ b/nixos/tests/matrix/synapse-workers.nix @@ -1,8 +1,8 @@ import ../make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "matrix-synapse-workers"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.matrix.members; }; diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index f00bc1da16ce95..675ffec65c0acd 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -1,5 +1,5 @@ import ../make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: let ca_key = mailerCerts.ca.key; @@ -54,7 +54,7 @@ import ../make-test-python.nix ( { name = "matrix-synapse"; - meta = with pkgs.lib; { + meta = { maintainers = lib.teams.matrix.members; }; diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index b729a2556e6a47..903d74c062d65b 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -59,7 +59,7 @@ import ./make-test-python.nix ( in { name = "mosquitto"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index 7837eb8ef34171..83b2765ef7a362 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { name = "nats"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ c0deaddict ]; }; diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index cf20d24f720d8e..6c5869266bf5a4 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -1,10 +1,14 @@ import ./make-test-python.nix ( { pkgs, ... }: + let + inherit (pkgs) lib; + in + { name = "retroarch"; - meta = with pkgs.lib; { - maintainers = lib.teams.libretro.members ++ [ maintainers.j0hax ]; + meta = { + maintainers = lib.teams.libretro.members ++ [ lib.maintainers.j0hax ]; }; nodes.machine = diff --git a/nixos/tests/sabnzbd.nix b/nixos/tests/sabnzbd.nix index ab20d6406012af..151e2aedb463cb 100644 --- a/nixos/tests/sabnzbd.nix +++ b/nixos/tests/sabnzbd.nix @@ -1,8 +1,11 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: + let + inherit (pkgs) lib; + in { name = "sabnzbd"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ jojosch ]; }; diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index bdff0e03885400..dac5cb4ba82bcb 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,8 +1,8 @@ import ./make-test-python.nix ( - { pkgs, ... }: + { pkgs, lib, ... }: { name = "trezord"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ mmahut _1000101 diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index 43c5db654b34ee..99a2264aa16dec 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,8 +1,11 @@ import ./make-test-python.nix ( { pkgs, ... }: + let + inherit (pkgs) lib; + in { name = "trickster"; - meta = with pkgs.lib; { + meta = { maintainers = with lib.maintainers; [ _1000101 ]; }; diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix index fe6135e6187537..c35673fd7ef7d5 100644 --- a/pkgs/by-name/nv/nvpy/package.nix +++ b/pkgs/by-name/nv/nvpy/package.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, fetchFromGitHub, python3Packages, }: @@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec { install -m644 README.rst "$out/share/doc/nvpy/README" ''; - meta = with pkgs.lib; { + meta = { description = "Simplenote-syncing note-taking tool inspired by Notational Velocity"; homepage = "https://github.com/cpbotha/nvpy"; platforms = lib.platforms.linux; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index cafd7eec465c00..18808920d36bc6 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -5,6 +5,10 @@ config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"), }: +let + inherit (pkgs) lib; +in + rec { composeAndroidPackages = pkgs.callPackage ./compose-android-packages.nix { inherit licenseAccepted; @@ -36,7 +40,7 @@ rec { test-suite = pkgs.callPackage ./test-suite.nix { }; - meta = with pkgs.lib; { + meta = { description = "Android SDK & sdkmanager"; homepage = "https://developer.android.com/tools/sdkmanager"; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 31d57686cc826a..d3d049e81e071b 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, astropy, @@ -77,7 +77,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "astroquery" ]; - meta = with pkgs.lib; { + meta = { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index 88647541ec7644..c928a10ae30d6b 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, python, @@ -28,14 +28,14 @@ buildPythonPackage rec { msrestazure ]; - postInstall = pkgs.lib.optionalString (!isPy3k) '' + postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; doCheck = false; - meta = with pkgs.lib; { + meta = { description = "This is the Microsoft Azure Resource Management common code"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 45c96803588ee0..a3c62570dbf91d 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-core, @@ -32,7 +32,7 @@ buildPythonPackage rec { "azure.core" ]; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index 6b97926ce8ab19..6ea9b152364d44 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-nspkg, @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index 75cbe89e4298ec..c7bdb316ea5e0b 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, django, fetchPypi, @@ -32,7 +32,7 @@ buildPythonPackage rec { # This dosn't work either because of the same exception as above # pythonImportsCheck = [ "leaflet" ]; - meta = with pkgs.lib; { + meta = { description = "Allows you to use Leaflet in your Django projects"; homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 9ab3163a4a205e..fd41e09a3373c7 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -1,6 +1,7 @@ { - pkgs, + lib, buildPythonPackage, + fetchFromGitHub, requests, six, }: @@ -10,7 +11,7 @@ buildPythonPackage { version = "2016-01-04"; format = "setuptools"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "Wiredcraft"; repo = "dopy"; rev = "cb443214166a4e91b17c925f40009ac883336dc3"; @@ -26,7 +27,7 @@ buildPythonPackage { doCheck = false; pythonImportsCheck = [ "dopy" ]; - meta = with pkgs.lib; { + meta = { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 643373e9acb4d3..35ce112fd918f4 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, requests, @@ -25,7 +25,7 @@ buildPythonPackage rec { ${python.interpreter} test/test_facebook.py ''; - meta = with pkgs.lib; { + meta = { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index cbf6e0518d7ffb..f94498b837d31b 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, pythonOlder, fetchFromGitHub, @@ -31,7 +31,7 @@ buildPythonPackage rec { #This test is broken, when updating this package check if the test was fixed. doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; license = lib.licenses.gpl3Only;