From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/applications/audio/mopidy/gmusic.nix | 4 ++-- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- pkgs/applications/audio/mopidy/moped.nix | 4 ++-- pkgs/applications/audio/mopidy/mopidy.nix | 4 ++-- pkgs/applications/audio/mopidy/mopify.nix | 4 ++-- pkgs/applications/audio/mopidy/mpd.nix | 4 ++-- pkgs/applications/audio/mopidy/mpris.nix | 4 ++-- pkgs/applications/audio/mopidy/musicbox-webclient.nix | 4 ++-- pkgs/applications/audio/mopidy/scrobbler.nix | 4 ++-- pkgs/applications/audio/mopidy/somafm.nix | 4 ++-- pkgs/applications/audio/mopidy/soundcloud.nix | 4 ++-- pkgs/applications/audio/mopidy/spotify-tunigo.nix | 4 ++-- pkgs/applications/audio/mopidy/spotify.nix | 4 ++-- pkgs/applications/audio/mopidy/tunein.nix | 4 ++-- pkgs/applications/audio/mopidy/youtube.nix | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) (limited to 'pkgs/applications/audio/mopidy') diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 1e5e42ac2f3..54af3bc68f1 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Google Play Music"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index a8530a30458..05827b0bb56 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jaedb/Iris"; description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index ffd9af76d17..8daaef7d45d 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, mopidy, glibcLocales }: +{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Moped"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/martijnboland/moped"; description = "A web client for Mopidy"; license = licenses.mit; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 6f7ee0c857a..55b7646af07 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook , gst_all_1, glib-networking, gobject-introspection }: @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index a9902ca4172..17e68c16539 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, mopidy }: +{ lib, stdenv, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dirkgroenen/mopidy-mopify"; description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 4dd32ea3aa3..8d6d7a1528b 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "mopidy_mpd" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-mpd"; description = "Mopidy extension for controlling playback from MPD clients"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 1c6d841a34e..868dbaf3035 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index b10accedc6f..1e2cb8d0609 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix index 19c5a29c8a4..be38c6a7040 100644 --- a/pkgs/applications/audio/mopidy/scrobbler.nix +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Scrobbler"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "mopidy_scrobbler" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-scrobbler"; description = "Mopidy extension for scrobbling played tracks to Last.fm."; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 2e3380fa20f..afa46726db7 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.mopidy.com/; description = "Mopidy extension for playing music from SomaFM"; license = licenses.mit; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index fb2e9474b1f..bdc3523652c 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 4b75af5ed57..8fafab0970f 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify-tunigo"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for providing the browse feature of Spotify"; license = licenses.asl20; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 32019c74f86..57ba6ea1f61 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ lib, stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 90deea7c02b..776b4a0afb5 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_tunein.tunein" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from tunein"; homepage = "https://github.com/kingosticks/mopidy-tunein"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index a115812b86a..e35338a5f0d 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from YouTube"; license = licenses.asl20; maintainers = [ maintainers.spwhitt ]; -- cgit 1.4.1