diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/ocaml-modules/menhir | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/menhir')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix index 23e31e75779d..cbb759205e03 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422" +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild +, version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422" }@args: let diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix index 71561e96cd47..a917d634a19c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: +{ version, src, lib, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { pname = "menhir"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; description = "A LR(1) parser generator for OCaml"; longDescription = '' |