diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-12-02 13:34:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-02 13:34:24 -0500 |
commit | 0505c5125ce56aeeb8569b816dec74d757f3050a (patch) | |
tree | 7b070b31db814a355c758b47c5d12bf14ece1b25 /pkgs/development/tools/ocaml | |
parent | 7263951cc87a9cd0bd377cef83c9241d0dffb665 (diff) | |
parent | 9fe1b95c3d62816418ce4422ec138def38bfcbe6 (diff) | |
download | nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar.gz nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar.bz2 nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar.lz nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar.xz nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.tar.zst nixpkgs-0505c5125ce56aeeb8569b816dec74d757f3050a.zip |
Merge branch 'master' into static-fixes
Diffstat (limited to 'pkgs/development/tools/ocaml')
5 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 09de5b02737..309c44d6d46 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" ''; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index bde5cce6048..27c608fc719 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: let pname = "cppo"; - webpage = "http://mjambon.com/${pname}.html"; + webpage = "https://github.com/ocaml-community/${pname}"; in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index cb81a29af8c..9db5ed10c84 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' addOCamlPath () { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" - if test -n "$createFindlibDestdir"; then + if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR fi } diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch index f74ac84ca6b..13aa7a89570 100644 --- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch +++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch @@ -64,7 +64,7 @@ index 00000000..3ea84e2d +header() { echo "$1"; } +stopNest() { true; } + -+fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi') ++fixupOutputHooks+=('if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi') + +patchShebangs() { + local dir="$1" diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 7662041a488..f154b94ae33 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { version = "2.4.2"; src = fetchurl { - url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "0fl8524vmxb9yxjwrh5varvfp0ff3sgfp627knwbxxr69w45ad8h"; + url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; + sha256 = "0y2v8rkfz19nlz8gh0lkh5wx5hyvw5gl4nw1kg8j2pw9jnilq5nb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/${path} for e in OCAMLPATH CAML_LD_LIBRARY_PATH; do + [[ -v "$e" ]] || continue printf %s "''${!e}" > "$out"/${path}/$e done ''; |