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

Merge pull request #212910 from vbgl/ocaml-javalib-3.2.2

Browse Source 
ocamlPackages.javalib: 3.2.1 → 3.2.2; sawja: 1.5.11 → 1.5.12
This commit is contained in:
Weijia Wang
2023-01-28 04:10:20 +01:00
committed by GitHub
parent 03c9c3e544 3968d0e5b9
commit 9469779ebe
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/javalib/default.nix
+5 -6
View File
@@ -8,19 +8,18 @@
, extlib
}:
if lib.versionOlder ocaml.version "4.04"
then throw "javalib is not available for OCaml ${ocaml.version}"
else
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"javalib is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-javalib";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "javalib-team";
repo = "javalib";
rev = "v${version}";
sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo=";
rev = version;
hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
};
nativeBuildInputs = [ which ocaml findlib ];
pkgs/development/ocaml-modules/sawja/default.nix
+4 -5
View File
@@ -2,12 +2,11 @@
let
pname = "sawja";
version = "1.5.11";
version = "1.5.12";
in
if lib.versionOlder ocaml.version "4.07"
then throw "${pname} is not available for OCaml ${ocaml.version}"
else
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"${pname} is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation {
@@ -19,7 +18,7 @@ stdenv.mkDerivation {
owner = "javalib-team";
repo = pname;
rev = version;
sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8=";
hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
};
nativeBuildInputs = [ which ocaml findlib ];