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: 4186705a70fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 560f6943a2e1
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 16, 2020

  1. opam: 2.0.5 -> 2.0.6 

    Changelog: https://github.com/ocaml/opam/blob/2.0.6/CHANGES
    @marsam @vbgl
    marsam authored and vbgl committed Jan 16, 2020
    Copy the full SHA
    560f694 View commit details
Showing with 10 additions and 10 deletions.
  1. +7 −7 pkgs/development/tools/ocaml/opam/default.nix
  2. +3 −3 pkgs/development/tools/ocaml/opam/opam.nix.pl
14 changes: 7 additions & 7 deletions pkgs/development/tools/ocaml/opam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions pkgs/development/tools/ocaml/opam/opam.nix.pl
View file
Original file line number Diff line number Diff line change
@@ -64,8 +64,8 @@
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 @@
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;
};