Merge pull request #144931 from marsam/update-opam

opam: 2.1.0 -> 2.1.1
This commit is contained in:
Mario Rodas 2021-11-09 00:16:38 -05:00 committed by GitHub
commit 68f750d91d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,12 +19,12 @@ let
sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv";
}; };
"cudf" = fetchurl { "cudf" = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz";
sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr";
}; };
"dose3" = fetchurl { "dose3" = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; url = "https://gitlab.com/irill/dose3/-/archive/5.0.1/dose3-5.0.1.tar.gz";
sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c";
}; };
"dune-local" = fetchurl { "dune-local" = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz"; url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz";
@ -67,13 +67,13 @@ let
sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
}; };
opam = fetchurl { opam = fetchurl {
url = "https://github.com/ocaml/opam/archive/2.1.0.zip"; url = "https://github.com/ocaml/opam/archive/2.1.1.zip";
sha256 = "063df5gsvp4yrbqbnd8k7a1f04cf12prc5wh4f1200acs3jwjxwb"; sha256 = "0sm9a7yh1iqcd51j5wdrc34w71iga619hvmgyy5fq1hwvgmfssrj";
}; };
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "opam"; pname = "opam";
version = "2.1.0"; version = "2.1.1";
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@ -133,4 +133,4 @@ in stdenv.mkDerivation {
platforms = platforms.all; platforms = platforms.all;
}; };
} }
# Generated by: ./opam.nix.pl -v 2.1.0 -p opam-shebangs.patch # Generated by: ./opam.nix.pl -v 2.1.1 -p opam-shebangs.patch