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: e7e5fc958486
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68a54726f253
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2020

  1. Revert "ocamlPackages.cppo: 1.6.5 -> 1.6.6" 

    cppo 1.6.6 breaks building it with ocaml 4.02, which is still required
for some packages.

This reverts commit 000f19f.
    @marsam
    marsam committed Jan 4, 2020
    Copy the full SHA
    5d01fd4 View commit details

  2. Merge pull request #76942 from marsam/revert-ocaml-cppo 

    Revert "ocamlPackages.cppo: 1.6.5 -> 1.6.6"
    @marsam
    marsam authored Jan 4, 2020
    Copy the full SHA
    68a5472 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/tools/ocaml/cppo/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/tools/ocaml/cppo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12";

let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.6.6";
sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs";
version = "1.6.5";
sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0";
buildInputs = [ dune ];
extra = {
inherit (dune) installPhase;
@@ -31,7 +31,7 @@ stdenv.mkDerivation ({
name = "${pname}-${param.version}";

src = fetchFromGitHub {
owner = "ocaml-community";
owner = "mjambon";
repo = pname;
rev = "v${param.version}";
inherit (param) sha256;