diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index a4ec0beb51b5..f00f18011ec6 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ lib, ... }: { name = "bitcoind"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index bf6d6bb458c4..2851bf97650f 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "blockbook-frontend"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index ed965600d277..d26ad166de5d 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -42,8 +42,8 @@ let in { name = "borgbackup"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ dotlambda ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ dotlambda ]; }; nodes = { diff --git a/nixos/tests/btrbk-doas.nix b/nixos/tests/btrbk-doas.nix index 326998b16b49..4443cf43523f 100644 --- a/nixos/tests/btrbk-doas.nix +++ b/nixos/tests/btrbk-doas.nix @@ -16,8 +16,8 @@ let in { name = "btrbk-doas"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien tu-maurice ]; diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix index 10ca8c3ca95e..b7f3ee1da5e6 100644 --- a/nixos/tests/btrbk.nix +++ b/nixos/tests/btrbk.nix @@ -16,8 +16,8 @@ let in { name = "btrbk"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ symphorien ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien ]; }; nodes = { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 8307c443f16d..2e30ab269c22 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -102,8 +102,8 @@ let in { name = "dokuwiki"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 onny e1mo diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index 49a2c4f11701..37d55cfe697e 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "geth"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ bachp ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ bachp ]; }; nodes.machine = diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 2bfc41ed188d..9199f347fb2c 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jibri"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes.machine = diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 2181ed863a88..1237f442c24e 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jitsi-meet"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes = { diff --git a/nixos/tests/matrix/dendrite.nix b/nixos/tests/matrix/dendrite.nix index 4477f522a37b..0540cb3b7f3c 100644 --- a/nixos/tests/matrix/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -8,8 +8,8 @@ let in { name = "dendrite"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes = { diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index eb2123ee3ca6..b2538ca17dfb 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -31,8 +31,8 @@ let in { name = "pantalaimon"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes.machine = diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index e4bdb106b8e0..bb21c4b1a5ad 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -58,8 +58,8 @@ let in { name = "mosquitto"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ peterhoeg ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ peterhoeg ]; }; nodes = diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index 2ed97ee86b09..ea9dcf34e4d8 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -6,11 +6,11 @@ let topic = "foo.bar"; in -{ pkgs, lib, ... }: +{ lib, ... }: { name = "nats"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ c0deaddict ]; + meta = { + maintainers = with lib.maintainers; [ c0deaddict ]; }; nodes = diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 5f4fe101b46d..08661a0ed0bf 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -2,8 +2,8 @@ { name = "retroarch"; - meta = with pkgs.lib; { - maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + meta = { + maintainers = pkgs.lib.teams.libretro.members ++ [ pkgs.lib.maintainers.j0hax ]; }; nodes.machine = diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 4955ecb9c714..3d7658754bc8 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trezord"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ mmahut _1000101 ]; diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e987341bc7de..6710af753c7c 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trickster"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes = { diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix index d17d640701a7..e1dda170ce99 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, }: @@ -41,11 +41,11 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "nvpy" ]; - meta = with pkgs.lib; { + meta = { description = "Simplenote-syncing note-taking tool inspired by Notational Velocity"; homepage = "https://github.com/cpbotha/nvpy"; - platforms = platforms.linux; - license = licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; mainProgram = "nvpy"; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index cecaf2dd2bd4..c928a10ae30d 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,18 +28,18 @@ 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 = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index e9e2eb34c9c2..db00dd7143b8 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, @@ -33,10 +33,10 @@ 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 = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index 27fa690bb52e..6ea9b152364d 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,11 +20,11 @@ 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 = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index d68a6f15d084..b43f0c721ffd 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,11 +32,11 @@ 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"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 684f4c17ad45..68c64292d683 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -1,4 +1,5 @@ { + lib, pkgs, buildPythonPackage, requests, @@ -26,10 +27,10 @@ buildPythonPackage { doCheck = false; pythonImportsCheck = [ "dopy" ]; - meta = with pkgs.lib; { + meta = { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop ]; }; } diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 1146c3cb67d9..80b754aaf3ab 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, }: @@ -17,10 +17,10 @@ buildPythonPackage rec { # No tests distributed doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Simple, generic API for escaping strings"; homepage = "https://github.com/minrk/escapism"; - license = licenses.mit; - maintainers = with maintainers; [ bzizou ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bzizou ]; }; } diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 7ef73d1a1fa6..35ce112fd918 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,10 +25,10 @@ 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 = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index f12d7140ea62..1d35bf820fe6 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,10 +31,10 @@ 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 = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }