.config/nixpkgs/packages: Use lib instead of stdenv.lib

Update youtube-dl custom package.
https://github.com/NixOS/nixpkgs/issues/108938

23 files changed, 56 insertions, 58 deletions

diff --git a/.config/nixpkgs/packages/beaker-browser/default.nix b/.config/nixpkgs/packages/beaker-browser/default.nix
index a827a87..9de96db 100644
--- a/.config/nixpkgs/packages/beaker-browser/default.nix
+++ b/.config/nixpkgs/packages/beaker-browser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, appimageTools }:
+{ lib, fetchurl, appimageTools }:
 
 let version = "1.1.0"; in
 
@@ -10,7 +10,7 @@ appimageTools.wrapType2  {
     sha256 = "07hcyr6vyim8vrvw120v5jjfvy5jkcaqc3wgqgyf6prbqdx71dkp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://beakerbrowser.com";
     license = licenses.mit;
     description = "An experimental peer-to-peer Web browser";
diff --git a/.config/nixpkgs/packages/boomer/default.nix b/.config/nixpkgs/packages/boomer/default.nix
index 417aa22..66e1c58 100644
--- a/.config/nixpkgs/packages/boomer/default.nix
+++ b/.config/nixpkgs/packages/boomer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, nim, libX11, libXrandr, libGL }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, nim, libX11, libXrandr, libGL }:
 
 let
 
@@ -45,13 +45,13 @@ in stdenv.mkDerivation rec {
   fixupPhase = ''
     runHook preFixup
     patchelf --set-rpath ${
-      stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libXrandr libGL ]
+      lib.makeLibraryPath [ stdenv.cc.cc libX11 libXrandr libGL ]
     } $out/bin/boomer
     wrapProgram "$out/bin/boomer" --set LIBGL_ALWAYS_SOFTWARE 1
     runHook postFixup
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     platforms = platforms.linux;
     homepage = "https://github.com/tsoding/boomer";
diff --git a/.config/nixpkgs/packages/chromexup/default.nix b/.config/nixpkgs/packages/chromexup/default.nix
index 78d974b..c6c4622 100644
--- a/.config/nixpkgs/packages/chromexup/default.nix
+++ b/.config/nixpkgs/packages/chromexup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python38 }:
+{ lib, fetchgit, python38 }:
 
 with python38.pkgs;
 
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     cp -rT scripts/systemd $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     inherit (src.meta) homepage;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/csstidy/default.nix b/.config/nixpkgs/packages/csstidy/default.nix
index 7e9a8d0..a20123a 100644
--- a/.config/nixpkgs/packages/csstidy/default.nix
+++ b/.config/nixpkgs/packages/csstidy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sconsPackages, gcc }:
+{ lib, stdenv, fetchgit, sconsPackages, gcc }:
 
 stdenv.mkDerivation rec {
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cp release/csstidy/csstidy $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.lgpl21;
     inherit (src.meta) homepage;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/deepin-gtk-theme/default.nix b/.config/nixpkgs/packages/deepin-gtk-theme/default.nix
index bdddc28..a94a9b2 100644
--- a/.config/nixpkgs/packages/deepin-gtk-theme/default.nix
+++ b/.config/nixpkgs/packages/deepin-gtk-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "deepin-gtk-theme-${version}";
@@ -11,15 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3";
   };
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
   makeFlags = [ "PREFIX=$(out)" ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  meta = {
+  meta = with lib; {
     description = "Deepin GTK Theme";
-    homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    homepage = "https://github.com/linuxdeepin/deepin-gtk-theme";
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }
diff --git a/.config/nixpkgs/packages/dmenu/default.nix b/.config/nixpkgs/packages/dmenu/default.nix
index 2ac9664..35eece9 100644
--- a/.config/nixpkgs/packages/dmenu/default.nix
+++ b/.config/nixpkgs/packages/dmenu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, fetchpatch }:
+{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "dmenu-4.9";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "CC:=$(CC)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     platforms = platforms.all;
     homepage = "https://tools.suckless.org/dmenu";
diff --git a/.config/nixpkgs/packages/edl/default.nix b/.config/nixpkgs/packages/edl/default.nix
index 1830afa..a9dba83 100644
--- a/.config/nixpkgs/packages/edl/default.nix
+++ b/.config/nixpkgs/packages/edl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python38 }:
+{ lib, fetchgit, python38 }:
 
 python38.pkgs.buildPythonApplication rec {
 
@@ -34,7 +34,7 @@ python38.pkgs.buildPythonApplication rec {
     makeWrapper ${pythonEnv}/bin/python $out/bin/edl-fhloaderparse --add-flags $out/share/edl/fhloaderparse.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/gmni/default.nix b/.config/nixpkgs/packages/gmni/default.nix
index 573c9df..fea7e14 100644
--- a/.config/nixpkgs/packages/gmni/default.nix
+++ b/.config/nixpkgs/packages/gmni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkg-config, openssl }:
+{ lib, stdenv, fetchgit, pkg-config, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "gmni";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkg-config openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.gpl3;
     description = "A Gemini client";
diff --git a/.config/nixpkgs/packages/gnaural/default.nix b/.config/nixpkgs/packages/gnaural/default.nix
index 4324736..e4a3849 100644
--- a/.config/nixpkgs/packages/gnaural/default.nix
+++ b/.config/nixpkgs/packages/gnaural/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, portaudio, libsndfile, pkg-config, gtk2, gcc48 }:
+{ lib, stdenv, fetchurl, portaudio, libsndfile, pkg-config, gtk2, gcc48 }:
 
 stdenv.mkDerivation rec {
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gcc48 portaudio pkg-config gtk2 libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2;
     platforms = platforms.linux;
     homepage = "http://gnaural.sourceforge.net/";
diff --git a/.config/nixpkgs/packages/literate/default.nix b/.config/nixpkgs/packages/literate/default.nix
index f5be32e..f0bdd58 100644
--- a/.config/nixpkgs/packages/literate/default.nix
+++ b/.config/nixpkgs/packages/literate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, dmd, dub }:
 
 stdenv.mkDerivation rec {
   name = "Literate";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "install -D bin/lit $out/bin/lit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A literate programming tool for any language";
     homepage = "http://literate.zbyedidia.webfactional.com/";
     license = licenses.mit;
diff --git a/.config/nixpkgs/packages/luaformatter/default.nix b/.config/nixpkgs/packages/luaformatter/default.nix
index 88bbc9f..7cfd5ac 100644
--- a/.config/nixpkgs/packages/luaformatter/default.nix
+++ b/.config/nixpkgs/packages/luaformatter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "LuaFormatter";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Code formatter for Lua";
     license = licenses.asl20;
diff --git a/.config/nixpkgs/packages/mkbootfs/default.nix b/.config/nixpkgs/packages/mkbootfs/default.nix
index 379bb8c..b8c6050 100644
--- a/.config/nixpkgs/packages/mkbootfs/default.nix
+++ b/.config/nixpkgs/packages/mkbootfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp mkbootfs $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     platforms = platforms.linux;
     license = licenses.unlicense;
diff --git a/.config/nixpkgs/packages/mkbootimg/default.nix b/.config/nixpkgs/packages/mkbootimg/default.nix
index 40be21d..738fd33 100644
--- a/.config/nixpkgs/packages/mkbootimg/default.nix
+++ b/.config/nixpkgs/packages/mkbootimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp unpackbootimg $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     platforms = platforms.linux;
     license = licenses.unlicense;
diff --git a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix
index 18d3b15..36f03ed 100644
--- a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix
+++ b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cp -r * $out/share/fonts/nerdfonts-dejavu-sans-mono
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Nerd Fonts is a project that attempts to patch as many developer targeted
       and/or used fonts as possible. The patch is to specifically add a high
diff --git a/.config/nixpkgs/packages/ntrviewer/default.nix b/.config/nixpkgs/packages/ntrviewer/default.nix
index 6a754bf..0f2289d 100644
--- a/.config/nixpkgs/packages/ntrviewer/default.nix
+++ b/.config/nixpkgs/packages/ntrviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, ffmpeg, SDL }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg, ffmpeg, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "ntrviewer";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl3;
     inherit (src.meta) homepage;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/pass-import/default.nix b/.config/nixpkgs/packages/pass-import/default.nix
index 78dded4..ab73656 100644
--- a/.config/nixpkgs/packages/pass-import/default.nix
+++ b/.config/nixpkgs/packages/pass-import/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pass, fetchFromGitHub, python38, makeWrapper, fetchpatch }:
+{ lib, stdenv, pass, fetchFromGitHub, python38, makeWrapper, fetchpatch }:
 
 with python38.pkgs;
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
       --run "export PREFIX"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pass extension for importing data from existing password managers";
     homepage = "https://github.com/roddhjav/pass-import";
     license = licenses.gpl3Plus;
diff --git a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix b/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
index f2dc6f9..61683df 100644
--- a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
+++ b/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, python38 }:
+{ lib, python38 }:
 
 with python38.pkgs;
 
 let
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     description = "Command line utility to manipulate YAML files";
     homepage = "https://sourceforge.net/p/ruamel-yaml-cmd/code/ci/default/tree";
diff --git a/.config/nixpkgs/packages/skeema/default.nix b/.config/nixpkgs/packages/skeema/default.nix
index 4017f75..9e9cee7 100644
--- a/.config/nixpkgs/packages/skeema/default.nix
+++ b/.config/nixpkgs/packages/skeema/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, buildGoModule }:
+{ lib, fetchgit, buildGoModule }:
 
 buildGoModule rec {
   pname = "skeema";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.asl20;
     description = "Schema management CLI for MySQL";
diff --git a/.config/nixpkgs/packages/sqldef/default.nix b/.config/nixpkgs/packages/sqldef/default.nix
index 6829f00..983ea3f 100644
--- a/.config/nixpkgs/packages/sqldef/default.nix
+++ b/.config/nixpkgs/packages/sqldef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, buildGoModule }:
+{ lib, fetchgit, buildGoModule }:
 
 buildGoModule rec {
   pname = "sqldef";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.mit;
     description = "Idempotent MySQL/PostgreSQL schema management by SQL";
diff --git a/.config/nixpkgs/packages/sqlfluff/default.nix b/.config/nixpkgs/packages/sqlfluff/default.nix
index 0030d31..217613a 100644
--- a/.config/nixpkgs/packages/sqlfluff/default.nix
+++ b/.config/nixpkgs/packages/sqlfluff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python36 }:
+{ lib, fetchgit, python36 }:
 
 with python36.pkgs;
 
@@ -49,7 +49,7 @@ in buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/systemd2nix/default.nix b/.config/nixpkgs/packages/systemd2nix/default.nix
index 9d78393..4953183 100644
--- a/.config/nixpkgs/packages/systemd2nix/default.nix
+++ b/.config/nixpkgs/packages/systemd2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python38 }:
+{ lib, fetchgit, python38 }:
 
 python38.pkgs.buildPythonApplication rec {
 
@@ -21,7 +21,7 @@ python38.pkgs.buildPythonApplication rec {
     makeWrapper ${python38}/bin/python $out/bin/${pname} --add-flags $out/share/${pname}/${pname}.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = url;
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/.config/nixpkgs/packages/xprintidle/default.nix b/.config/nixpkgs/packages/xprintidle/default.nix
index 975b464..fc7c3e9 100644
--- a/.config/nixpkgs/packages/xprintidle/default.nix
+++ b/.config/nixpkgs/packages/xprintidle/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, meson, pkg-config
-, ninja }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, meson
+, pkg-config, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "xprintidle";
@@ -13,15 +13,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson pkg-config ninja ];
-
   buildInputs = [ libX11 libXScrnSaver libXext ];
 
-  meta = {
+  meta = with lib; {
     inherit version;
     description = "A command-line tool to print idle time from libXss";
     homepage = "https://github.com/g0hl1n/xprintidle";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/.config/nixpkgs/packages/youtube-dl/default.nix b/.config/nixpkgs/packages/youtube-dl/default.nix
index 3dc4a27..7887edb 100644
--- a/.config/nixpkgs/packages/youtube-dl/default.nix
+++ b/.config/nixpkgs/packages/youtube-dl/default.nix
@@ -6,11 +6,11 @@
 python38Packages.buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2020.12.05";
+  version = "2021.05.16";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "065s45l8qz7wlkaxw9bj20gq9647zpwdj9vc6chhqjscl63z1aqm";
+    sha256 = "1z8sdzvkxhscnzy7cnjag308glif0k8jylr11biqwzypm1f2l0fl";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];