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

Commits on Oct 27, 2019

  1. ocaml: fix syntax

    @globin
    globin committed Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d107668 View commit details
Showing with 8 additions and 8 deletions.
  1. +3 −3 pkgs/development/compilers/ocaml/3.11.2.nix
  2. +3 −3 pkgs/development/compilers/ocaml/3.12.1.nix
  3. +2 −2 pkgs/development/compilers/ocaml/4.00.1.nix
6 changes: 3 additions & 3 deletions pkgs/development/compilers/ocaml/3.11.2.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ let
in

stdenv.mkDerivation rec {

pname = "ocaml";
version = "3.11.2";

src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" + optionalString useNativeCompilers " bootstrap world.opt" ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
prePatch = ''
6 changes: 3 additions & 3 deletions pkgs/development/compilers/ocaml/3.12.1.nix
View file
Original file line number Diff line number Diff line change
@@ -7,18 +7,18 @@ let
in

stdenv.mkDerivation rec {

pname = "ocaml";
version = "3.12.1";

src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
};

prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" + optionalString useNativeCompilers " bootstrap world.opt" ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ocaml/4.00.1.nix
View file
Original file line number Diff line number Diff line change
@@ -9,15 +9,15 @@ in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "4.00.1";

src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};

prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" + optionalString useNativeCompilers " bootstrap world.opt" ];
buildFlags = [ "world" ] + optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''