Merge pull request #64790 from marsam/update-opam

opam: 2.0.4 -> 2.0.5
This commit is contained in:
Mario Rodas 2019-07-15 21:00:38 -05:00 committed by GitHub
commit d3a5c2a114
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,7 +7,7 @@ assert lib.versionAtLeast ocaml.version "4.02.3";
let let
srcs = { srcs = {
cmdliner = fetchurl { cmdliner = fetchurl {
url = "https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz";
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
}; };
cppo = fetchurl { cppo = fetchurl {
@ -23,16 +23,16 @@ let
sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm";
}; };
dune-local = fetchurl { dune-local = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; url = "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz";
sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz";
}; };
extlib = fetchurl { extlib = fetchurl {
url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz";
sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
}; };
mccs = fetchurl { mccs = fetchurl {
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz";
sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg";
}; };
ocamlgraph = fetchurl { ocamlgraph = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
@ -55,13 +55,13 @@ let
sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r";
}; };
opam = fetchurl { opam = fetchurl {
url = "https://github.com/ocaml/opam/archive/2.0.4.zip"; url = "https://github.com/ocaml/opam/archive/2.0.5.zip";
sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c"; sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
}; };
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "opam-${version}"; name = "opam-${version}";
version = "2.0.4"; version = "2.0.5";
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@ -117,4 +117,4 @@ in stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
}; };
} }
# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch # Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch