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

Commits on Apr 4, 2020

  1. ocamlPackages.ocaml_libvirt: ignore warnings

    @vbgl
    vbgl committed Apr 4, 2020
    Copy the full SHA
    d8f5bce View commit details

  2. OCaml: default to version 4.09

    @vbgl
    vbgl committed Apr 4, 2020
    Copy the full SHA
    4dd89ce View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
  2. +1 −1 pkgs/top-level/ocaml-packages.nix
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
autoconf
'';

buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";
buildPhase = "make all opt CPPFLAGS=-Wno-error";

installPhase = "make install-opt";

2 changes: 1 addition & 1 deletion pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1234,5 +1234,5 @@ in let inherit (pkgs) callPackage; in rec

ocamlPackages_latest = ocamlPackages_4_10;

ocamlPackages = ocamlPackages_4_08;
ocamlPackages = ocamlPackages_4_09;
}