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

Commits on Nov 12, 2017

  1. ocamlPackages.ocaml_gettext: 0.3.5 -> 0.3.7

    @vbgl
    vbgl committed Nov 12, 2017
    Copy the full SHA
    45431be View commit details

  2. ocamlPackages.angstrom: remove spurious dependency on oasis

    @vbgl
    vbgl committed Nov 12, 2017
    Copy the full SHA
    d9dd542 View commit details

  3. ocamlPackages.nocrypto: remove spurious dependency on oasis

    @vbgl
    vbgl committed Nov 12, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd1a9fa View commit details
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/angstrom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }:

let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

createFindlibDestdir = true;

buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild ];
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ result cstruct ];

meta = {
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/nocrypto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
, cpuid, ocb-stubblr
, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib
, cstruct, zarith, ppx_sexp_conv, sexplib
, lwt ? null
}:

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
};

buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr
buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr
ppx_sexp_conv ];
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;

8 changes: 4 additions & 4 deletions pkgs/development/ocaml-modules/ocaml-gettext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }:

stdenv.mkDerivation rec {
name = "ocaml-gettext-${version}";
version = "0.3.5";
name = "ocaml${ocaml.version}-gettext-${version}";
version = "0.3.7";

src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-${version}.tar.gz";
sha256 = "0s625h7y9xxqvzk4bnw45k4wvl4fn8gblv56bp47il0lgsx8956i";
url = "https://forge.ocamlcore.org/frs/download.php/1678/ocaml-gettext-${version}.tar.gz";
sha256 = "1zhvzc9x3j57xf2mzg5rshgp14cb4dsqbnj52jjv1qnja97plyjp";
};

propagatedBuildInputs = [ gettext fileutils camomile ];