Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f42b0a5abfd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b86837cce35
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 16, 2020

  1. ocamlPackages.owl: 0.10.0 -> 1.0.0

    @bcdarwin @vbgl
    bcdarwin authored and vbgl committed Nov 16, 2020
    Copy the full SHA
    1b86837 View commit details
Showing with 4 additions and 5 deletions.
  1. +2 −2 pkgs/development/ocaml-modules/owl-base/default.nix
  2. +2 −3 pkgs/development/ocaml-modules/owl/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/owl-base/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildDunePackage rec {
pname = "owl-base";
version = "0.10.0";
version = "1.0.0";

useDune2 = true;

src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
sha256 = "148ny2cdzga1l36kcibvlz5xlyi5zvkywifxaqn8lf79n1swmlzf";
sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
};

minimumOCamlVersion = "4.10";
5 changes: 2 additions & 3 deletions pkgs/development/ocaml-modules/owl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
, alcotest
, eigen
, stdio
, stdlib-shims
, openblasCompat
, owl-base
, npy
@@ -18,9 +17,9 @@ buildDunePackage rec {
inherit (owl-base) version src meta useDune2;

checkInputs = [ alcotest ];
buildInputs = [ dune-configurator ];
buildInputs = [ dune-configurator stdio ];
propagatedBuildInputs = [
eigen stdio stdlib-shims openblasCompat owl-base npy
eigen openblasCompat owl-base npy
];

doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462