treewide: stdenv.lib -> lib
This commit is contained in:
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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})
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user