Merge master into staging-next

2019-11-14 13:31:39 +01:00
parent f799388550 c747894638
commit c6e31d0767
212 changed files with 6404 additions and 2952 deletions
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
  version = "2.4.2";

  src = fetchurl {
-    url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0fl8524vmxb9yxjwrh5varvfp0ff3sgfp627knwbxxr69w45ad8h";
+    url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
+    sha256 = "0y2v8rkfz19nlz8gh0lkh5wx5hyvw5gl4nw1kg8j2pw9jnilq5nb";
  };

  nativeBuildInputs = [ makeWrapper ];