about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-08-25 19:41:28 +0200
committerVladimír Čunát <v@cunat.cz>2021-08-25 19:42:15 +0200
commit70e05c1003f84b503aa8110324c4bb6c54058376 (patch)
treec0d90904f1bf229de41bdb3b620f5cc812c29a79 /pkgs/development/ocaml-modules
parentf19cb76938be94bda1beb15548015ac95253258d (diff)
parent4ffe91a29d5713c3d4b1f6faf1afe56431ee66c5 (diff)
downloadnixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar.gz
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar.bz2
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar.lz
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar.xz
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.tar.zst
nixlib-70e05c1003f84b503aa8110324c4bb6c54058376.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/tezos/stdlib.nix2
-rw-r--r--pkgs/development/ocaml-modules/torch/default.nix7
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/tezos/stdlib.nix b/pkgs/development/ocaml-modules/tezos/stdlib.nix
index d0a734800c43..eff403ba808e 100644
--- a/pkgs/development/ocaml-modules/tezos/stdlib.nix
+++ b/pkgs/development/ocaml-modules/tezos/stdlib.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
     owner = "tezos";
     repo = "tezos";
     rev = "v${version}";
-    sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk";
+    sha256 = "1ykhz5m5sb2hq04nspbsbq8wspkhimagb5g6yi65hpdbn8f4zr6h";
   };
 
   minimalOCamlVersion = "4.0.8";
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index 4126e3304861..1cf84dd4938e 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -17,17 +17,17 @@
 
 buildDunePackage rec {
   pname = "torch";
-  version = "0.12";
+  version = "0.13";
 
   useDune2 = true;
 
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "LaurentMazare";
     repo   = "ocaml-${pname}";
     rev    = version;
-    sha256 = "0nl6hd2rivhgkc3sdkdmrk3j0ij3xjx1clhqm8m5iznir4g77g91";
+    sha256 = "0528h1mkrqbmbf7hy91dsnxcg0k55m3jgharr71c652xyd847yz7";
   };
 
   buildInputs = [ dune-configurator ];
@@ -56,6 +56,5 @@ buildDunePackage rec {
     description = "Ocaml bindings to Pytorch";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.asl20;
-    broken = true;
   };
 }