From 61437e1c44b463cbb9b034fc1b2ce5d76f287ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 26 Feb 2021 12:09:37 -0300 Subject: [PATCH] Replace stdenv.lib with lib This is a local counterpart of github:NixOS/nixpkgs#108938, which does the same for Nixpkgs. Generated files were not altered. --- pkgs/applications/networking/iwgtk/default.nix | 4 ++-- pkgs/os-specific/linux/rtl8723bu/default.nix | 6 +++--- pkgs/tools/networking/dyndnsc/default.nix | 6 +++--- pkgs/tools/text/drep/default.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/iwgtk/default.nix b/pkgs/applications/networking/iwgtk/default.nix index 9b67a29..cbfaa9d 100644 --- a/pkgs/applications/networking/iwgtk/default.nix +++ b/pkgs/applications/networking/iwgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gtk3, gzip, pkgconfig, wrapGAppsHook }: +{ stdenv, lib, fetchFromGitHub, glib, gtk3, gzip, pkgconfig, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "iwgtk"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/applications/iwgtk.desktop" --replace "Exec=iwgtk" "Exec=$out/bin/iwgtk" ''; - meta = with stdenv.lib; { + meta = with lib; { description = " Lightweight, graphical wifi management utility for Linux"; longDescription = '' iwgtk is a lightweight, graphical wifi management utility for Linux. diff --git a/pkgs/os-specific/linux/rtl8723bu/default.nix b/pkgs/os-specific/linux/rtl8723bu/default.nix index dfd704e..19085c1 100644 --- a/pkgs/os-specific/linux/rtl8723bu/default.nix +++ b/pkgs/os-specific/linux/rtl8723bu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, concurrentMode ? false }: +{ stdenv, lib, fetchFromGitHub, kernel, concurrentMode ? false }: stdenv.mkDerivation rec { pname = "rtl8723bu-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-NSLGB0dgDu5TIpS0GszBFjzC+8uIKncs+jeJowtBjLQ="; }; - postPatch = stdenv.lib.optionalString (!concurrentMode) '' + postPatch = lib.optionalString (!concurrentMode) '' sed -i '/-DCONFIG_CONCURRENT_MODE/d' Makefile ''; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Driver for RTL8723BU"; longDescription = '' Kernel driver for Realtek RTL8723BU Wireless Adapter with hardware ID 0bda:b720. diff --git a/pkgs/tools/networking/dyndnsc/default.nix b/pkgs/tools/networking/dyndnsc/default.nix index 947163f..c86b444 100644 --- a/pkgs/tools/networking/dyndnsc/default.nix +++ b/pkgs/tools/networking/dyndnsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ stdenv, lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "dyndnsc"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { checkPhase = let - inherit (stdenv.lib) concatStringsSep optional; + inherit (lib) concatStringsSep optional; # dnswanip connects to an external server to discover the # machine's IP address. # @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { # Allow tests involving localhost on macOS. __darwinAllowLocalNetworking = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic DNS update client with support for multiple protocols"; longDescription = '' Dyndnsc is a command line client for sending updates to Dynamic diff --git a/pkgs/tools/text/drep/default.nix b/pkgs/tools/text/drep/default.nix index 6b452e5..a1d72d4 100644 --- a/pkgs/tools/text/drep/default.nix +++ b/pkgs/tools/text/drep/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, defaultCrateOverrides, CoreServices }: +{ stdenv, lib, callPackage, defaultCrateOverrides, CoreServices }: (callPackage ./Cargo.nix { }).workspaceMembers.drep.build.override { crateOverrides = defaultCrateOverrides // { drep = attrs: { - buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; - meta = with stdenv.lib; { + buildInputs = lib.optional stdenv.isDarwin CoreServices; + meta = with lib; { description = "A grep with runtime reloadable filters"; homepage = "https://github.com/maxpert/drep"; license = licenses.mit; -- 2.38.5