swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222345 from vbgl/ocaml-gen-1.1

Browse source 
ocamlPackages.gen: 1.0 → 1.1
This commit is contained in:
Ulrik Strid 2023-03-22 08:37:13 +01:00 committed by GitHub
parent 1594660ef2 5350e7282d
commit daea3a18bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/science/logic/acgtk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }: { lib, stdenv, fetchFromGitLab, dune_3, ocamlPackages }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
strictDeps = true; strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ]; nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ];
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson

7
pkgs/development/ocaml-modules/gen/default.nix
View file

@ -1,22 +1,21 @@
{ lib, buildDunePackage, fetchFromGitHub, ocaml { lib, buildDunePackage, fetchFromGitHub, ocaml
, dune-configurator
, seq , seq
, qcheck, ounit2 , qcheck, ounit2
}: }:
buildDunePackage rec { buildDunePackage rec {
version = "1.0"; version = "1.1";
pname = "gen"; pname = "gen";
minimalOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c-cube"; owner = "c-cube";
repo = "gen"; repo = "gen";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk=";
}; };
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ seq ]; propagatedBuildInputs = [ seq ];
checkInputs = [ qcheck ounit2 ]; checkInputs = [ qcheck ounit2 ];

2
pkgs/development/ocaml-modules/higlo/default.nix
View file

@ -3,7 +3,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "higlo"; pname = "higlo";
version = "0.8"; version = "0.8";
useDune2 = true; duneVersion = "3";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "framagit.org"; domain = "framagit.org";
owner = "zoggy"; owner = "zoggy";

2
pkgs/development/ocaml-modules/iri/default.nix
View file

@ -5,7 +5,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "iri"; pname = "iri";
version = "0.6.0"; version = "0.6.0";
useDune2 = true; duneVersion = "3";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "framagit.org"; domain = "framagit.org";

1
pkgs/development/ocaml-modules/sedlex/default.nix
View file

@ -47,6 +47,7 @@ buildDunePackage rec {
inherit (param) version; inherit (param) version;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml-community"; owner = "ocaml-community";

2
pkgs/development/ocaml-modules/xtmpl/default.nix
View file

@ -3,7 +3,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "xtmpl"; pname = "xtmpl";
version = "0.19.0"; version = "0.19.0";
useDune2 = true; duneVersion = "3";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "framagit.org"; domain = "framagit.org";
owner = "zoggy"; owner = "zoggy";

3
pkgs/development/ocaml-modules/xtmpl/ppx.nix
View file

@ -3,8 +3,9 @@
buildDunePackage { buildDunePackage {
pname = "xtmpl_ppx"; pname = "xtmpl_ppx";
minimalOCamlVersion = "4.11"; minimalOCamlVersion = "4.11";
duneVersion = "3";
inherit (xtmpl) src version useDune2; inherit (xtmpl) src version;
buildInputs = [ ppxlib xtmpl ]; buildInputs = [ ppxlib xtmpl ];