nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages: rename sedlex_2 into sedlex

Browse Source
This commit is contained in:
Vincent Laporte 2022-05-22 13:28:08 +02:00 committed by Vincent Laporte
parent c3e55aa79a
commit 5637570f51
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/logic/beluga/default.nix
View File

@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
useDune2 = true; useDune2 = true;
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
gen sedlex_2 ocaml_extlib dune-build-info linenoise gen sedlex ocaml_extlib dune-build-info linenoise
]; ];
postPatch = '' postPatch = ''

2
pkgs/development/compilers/fstar/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
fileutils fileutils
menhirLib menhirLib
pprint pprint
sedlex_2 sedlex
ppxlib ppxlib
ppx_deriving ppx_deriving
ppx_deriving_yojson ppx_deriving_yojson

4
pkgs/development/compilers/haxe/default.nix
View File

@ -6,7 +6,7 @@ let
then with ocaml-ng.ocamlPackages_4_12; [ then with ocaml-ng.ocamlPackages_4_12; [
ocaml ocaml
findlib findlib
sedlex_2 sedlex
xml-light xml-light
ptmap ptmap
camlp5 camlp5
@ -18,7 +18,7 @@ let
then with ocaml-ng.ocamlPackages_4_10; [ then with ocaml-ng.ocamlPackages_4_10; [
ocaml ocaml
findlib findlib
sedlex_2 sedlex
xml-light xml-light
ptmap ptmap
camlp5 camlp5

4
pkgs/development/ocaml-modules/higlo/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchFromGitLab, sedlex_2, xtmpl }: { lib, buildDunePackage, fetchFromGitLab, sedlex, xtmpl }:
buildDunePackage rec { buildDunePackage rec {
pname = "higlo"; pname = "higlo";
@ -12,7 +12,7 @@ buildDunePackage rec {
sha256 = "sha256:09hsbwy5asacgh4gdj0vjpy4kzfnq3qji9szbsbyswsf1nbyczir"; sha256 = "sha256:09hsbwy5asacgh4gdj0vjpy4kzfnq3qji9szbsbyswsf1nbyczir";
}; };
propagatedBuildInputs = [ sedlex_2 xtmpl ]; propagatedBuildInputs = [ sedlex xtmpl ];
meta = with lib; { meta = with lib; {
description = "OCaml library for syntax highlighting"; description = "OCaml library for syntax highlighting";

4
pkgs/development/ocaml-modules/iri/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchFromGitLab { lib, buildDunePackage, fetchFromGitLab
, sedlex_2, uunf, uutf , sedlex, uunf, uutf
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -15,7 +15,7 @@ buildDunePackage rec {
sha256 = "sha256:0zk8nnwcyljkc1a556byncv6cn1vqhk4267z1lm15flh1k7chyax"; sha256 = "sha256:0zk8nnwcyljkc1a556byncv6cn1vqhk4267z1lm15flh1k7chyax";
}; };
propagatedBuildInputs = [ sedlex_2 uunf uutf ]; propagatedBuildInputs = [ sedlex uunf uutf ];
meta = { meta = {
description = "IRI (RFC3987) native OCaml implementation"; description = "IRI (RFC3987) native OCaml implementation";

4
pkgs/development/ocaml-modules/piqi/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }: { lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex, easy-format, xmlm, base64 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.6.15"; version = "0.6.15";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ ocaml findlib which ]; nativeBuildInputs = [ ocaml findlib which ];
propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ]; propagatedBuildInputs = [ sedlex xmlm easy-format base64 ];
strictDeps = true; strictDeps = true;

0
pkgs/development/ocaml-modules/sedlex/2.nix → pkgs/development/ocaml-modules/sedlex/default.nix
View File

4
pkgs/development/ocaml-modules/xtmpl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchFromGitLab, iri, re, sedlex_2, uutf }: { lib, buildDunePackage, fetchFromGitLab, iri, re, sedlex, uutf }:
buildDunePackage rec { buildDunePackage rec {
pname = "xtmpl"; pname = "xtmpl";
@ -12,7 +12,7 @@ buildDunePackage rec {
sha256 = "sha256:0vwj0aayg60wm98d91fg3hmj90730liljy4cn8771dpxvz8m07bw"; sha256 = "sha256:0vwj0aayg60wm98d91fg3hmj90730liljy4cn8771dpxvz8m07bw";
}; };
propagatedBuildInputs = [ iri re sedlex_2 uutf ]; propagatedBuildInputs = [ iri re sedlex uutf ];
meta = with lib; { meta = with lib; {
description = "XML templating library for OCaml"; description = "XML templating library for OCaml";

2
pkgs/development/tools/analysis/flow/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
''; '';
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]) buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ])
++ lib.optionals stdenv.isDarwin [ CoreServices ]; ++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; { meta = with lib; {

2
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation {
ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.xmlm ocamlPackages.ocaml_pcre
ocamlPackages.camomile ocamlPackages.camomile
ocamlPackages.fdkaac ocamlPackages.fdkaac
ocamlPackages.srt ocamlPackages.sedlex_2 ocamlPackages.menhir ocamlPackages.menhirLib ocamlPackages.srt ocamlPackages.sedlex ocamlPackages.menhir ocamlPackages.menhirLib
]; ];
hardeningDisable = [ "format" "fortify" ]; hardeningDisable = [ "format" "fortify" ];

2
pkgs/top-level/ocaml-packages.nix
View File

@ -1320,7 +1320,7 @@ let
safepass = callPackage ../development/ocaml-modules/safepass { }; safepass = callPackage ../development/ocaml-modules/safepass { };
sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { }; sedlex = callPackage ../development/ocaml-modules/sedlex { };
semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { };