public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: stdenv.lib -> lib

Browse Source
This commit is contained in:
Pavol Rusnak
2021-01-24 01:49:49 +01:00
parent 2f34b4b883
commit 90f7338112
49 changed files with 134 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/ocaml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
{ name, version, buildInputs ? [],
createFindlibDestdir ? true,
@@ -14,7 +14,7 @@ let
};
in
assert minimumSupportedOcamlVersion != null ->
stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
stdenv.mkDerivation (args // {
name = "ocaml-${name}-${version}";
pkgs/build-support/ocaml/dune.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, ocaml, findlib, dune, dune_2 }:
{ lib, stdenv, ocaml, findlib, dune, dune_2 }:
{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:
let Dune = if args.useDune2 or false then dune_2 else dune; in
if args ? minimumOCamlVersion &&
! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
else
pkgs/build-support/ocaml/oasis.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
{ lib, stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
minimumOCamlVersion ? null,
@@ -8,7 +8,7 @@
}@args:
if args ? minimumOCamlVersion &&
! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
else