From 36c91cea1dbe396b92b20bdab3d0d7ad2f294eeb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 12:59:00 +0700 Subject: treewide: stdenv.lib -> lib --- pkgs/development/lisp-modules/asdf/2.26.nix | 10 +++++----- pkgs/development/lisp-modules/asdf/3.1.nix | 10 +++++----- pkgs/development/lisp-modules/asdf/default.nix | 10 +++++----- pkgs/development/lisp-modules/clwrapper/default.nix | 4 ++-- pkgs/development/lisp-modules/define-package.nix | 4 ++-- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/development/lisp-modules/quicklisp-to-nix.nix | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'pkgs/development/lisp-modules') diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix index 41b971ebae2..e2f655a5b6e 100644 --- a/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [maintainers.raskin]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix index 9149155fb2f..7e697d3a637 100644 --- a/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 57978819447..eecea3f98b6 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 821fe892048..69872eb41af 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, asdf, which, bash, lisp ? null}: +{lib, stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { description = "Script used to wrap Common Lisp implementations"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 96ceb76f6f2..ca969ab2327 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,4 +1,4 @@ -args @ {stdenv, clwrapper, baseName, packageName ? baseName +args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName , parasites ? [] , buildSystems ? ([packageName] ++ parasites) , version ? "latest" @@ -89,7 +89,7 @@ basePackage = { env -i \ NIX_LISP="$NIX_LISP" \ NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn - ${stdenv.lib.concatMapStrings (system: '' + ${lib.concatMapStrings (system: '' (asdf:compile-system :${system}) (asdf:load-system :${system}) (asdf:operate (quote asdf::compile-bundle-op) :${system}) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 63b9540522e..831edcaee27 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -1,6 +1,6 @@ -{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: +{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: let lispPackages = rec { - inherit pkgs clwrapper stdenv; + inherit lib pkgs clwrapper stdenv; nixLib = pkgs.lib; callPackage = nixLib.callPackageWith lispPackages; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index cbaa13af962..df6d908ba9d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgs, clwrapper}: +{lib, stdenv, fetchurl, pkgs, clwrapper}: let quicklisp-to-nix-packages = rec { - inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; buildLispPackage = callPackage ./define-package.nix; -- cgit 1.4.1