From e245ae3c3ac34d24ec6ceb7b86aa74be4fb8e707 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 13:28:56 +0700 Subject: pkgs/shells: stdenv.lib -> lib --- pkgs/shells/zsh/antigen/default.nix | 4 ++-- pkgs/shells/zsh/default.nix | 10 +++++----- pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- pkgs/shells/zsh/zsh-bd/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-completions/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-git-prompt/default.nix | 2 +- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-powerlevel9k/default.nix | 8 ++++---- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'pkgs/shells/zsh') diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index 5603e5edf59..c80471677f0 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.3"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "The plugin manager for zsh"; homepage = "http://antigen.sharats.me"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index eab6d88a0b7..71f526525e4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, buildPackages }: +{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.8"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # the zsh/zpty module is not available on hydra # so skip groups Y Z - checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW"); + checkFlags = map (T: "TESTNUM=${T}") (lib.stringToCharacters "ABCDEVW"); # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' @@ -65,7 +65,7 @@ EOF ${if stdenv.hostPlatform == stdenv.buildPlatform then '' $out/bin/zsh -c "zcompile $out/etc/zprofile" '' else '' - ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; @@ -83,8 +83,8 @@ EOF ''; license = "MIT-like"; homepage = "https://www.zsh.org/"; - maintainers = with stdenv.lib.maintainers; [ pSub ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ pSub ]; + platforms = lib.platforms.unix; }; passthru = { diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1b3a4c21cf3..36ef1843162 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts curl cacert diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index ac7035045bb..dfc9593a532 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index b5b66af6ca3..f2c2dc90fb4 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-bd"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "Jump back to a specific directory, without doing `cd ../../..` "; homepage = "https://github.com/Tarrasch/zsh-bd"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 89a91ad0508..07e538610ba 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-completions"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; homepage = "https://github.com/zsh-users/zsh-completions"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 6aadf3163d3..c0c56570b46 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -65,6 +65,6 @@ haskellPackages.callPackage testHaskellDepends = [HUnit] ++ libraryHaskellDepends; homepage = "https://github.com/olivierverdier/zsh-git-prompt#readme"; description = "Informative git prompt for zsh"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = [lib.maintainers.league]; }) {} diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 0bba4bffdef..0bc46849df2 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, pkgs }: +{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { description = "A fast reimplementation of Powerlevel9k ZSH theme"; homepage = "https://github.com/romkatv/powerlevel10k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.hexa ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.hexa ]; }; } diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 676f9458675..b681dc2d3a3 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` @@ -21,9 +21,9 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; homepage = "https://github.com/bhilburn/powerlevel9k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pierrechevalier83 ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pierrechevalier83 ]; }; } -- cgit 1.4.1