summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-01-16 05:30:00 -0500
committerVincent Laporte <vbgl@users.noreply.github.com>2020-01-16 15:35:29 +0100
commit560f6943a2e1b9360bec81e55466285090002b46 (patch)
treec2bc22ca54a78f7ede0052efa476f509bd65163a /pkgs/development/tools
parent4186705a70fc99b34137abd56dfeee49a3cf34fb (diff)
downloadnixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar.gz
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar.bz2
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar.lz
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar.xz
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.tar.zst
nixpkgs-560f6943a2e1b9360bec81e55466285090002b46.zip
opam: 2.0.5 -> 2.0.6
Changelog: https://github.com/ocaml/opam/blob/2.0.6/CHANGES
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/ocaml/opam/default.nix14
-rwxr-xr-xpkgs/development/tools/ocaml/opam/opam.nix.pl6
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index df4c0f2d12c..f1028208dae 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -31,8 +31,8 @@ let
       sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
     };
     mccs = fetchurl {
-      url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz";
-      sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg";
+      url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz";
+      sha256 = "0mswapf37rav8nvvbjc4c7c7wnl6qwgd3c5v0nfifmr910qygz72";
     };
     ocamlgraph = fetchurl {
       url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
@@ -55,13 +55,13 @@ let
       sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r";
     };
     opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/2.0.5.zip";
-      sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
+      url = "https://github.com/ocaml/opam/archive/2.0.6.zip";
+      sha256 = "076070qwf7rqp5bh0mmgc5b3vyihgp4qpkd6fscxzya4in66bzf8";
     };
   };
 in stdenv.mkDerivation {
   pname = "opam";
-  version = "2.0.5";
+  version = "2.0.6";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
 
@@ -112,9 +112,9 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A package manager for OCaml";
-    homepage = http://opam.ocamlpro.com/;
+    homepage = "https://opam.ocaml.org/";
     maintainers = [ maintainers.henrytill ];
     platforms = platforms.all;
   };
 }
-# Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch
+# Generated by: ./opam.nix.pl -v 2.0.6 -p opam-shebangs.patch
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
index 59a1cd223b5..605d0c41cae 100755
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -64,8 +64,8 @@ print <<"EOF";
       sha256 = "$OPAM_RELEASE_SHA256";
     };
   };
-in stdenv.mkDerivation rec {
-  name = "opam-\${version}";
+in stdenv.mkDerivation {
+  pname = "opam";
   version = "$OPAM_RELEASE";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@@ -122,7 +122,7 @@ print <<'EOF';
 
   meta = with stdenv.lib; {
     description = "A package manager for OCaml";
-    homepage = http://opam.ocamlpro.com/;
+    homepage = "https://opam.ocaml.org/";
     maintainers = [ maintainers.henrytill ];
     platforms = platforms.all;
   };