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

Commits on Nov 20, 2017

  1. ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8

    @vbgl
    vbgl committed Nov 20, 2017
    Copy the full SHA
    7c749ba View commit details

  2. ocamlPackages.rope: 0.5 -> 0.6

    @vbgl
    vbgl committed Nov 20, 2017
    Copy the full SHA
    c890abb View commit details
Showing with 30 additions and 14 deletions.
  1. +3 −3 pkgs/development/ocaml-modules/ocaml-gettext/default.nix
  2. +27 −11 pkgs/development/ocaml-modules/rope/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/ocaml-gettext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

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

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

propagatedBuildInputs = [ gettext fileutils camomile ];
38 changes: 27 additions & 11 deletions pkgs/development/ocaml-modules/rope/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, benchmark }:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder, benchmark }:

let version = "0.5"; in
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03"
then {
version = "0.6";
url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6/rope-0.6.tbz";
sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc";
buildInputs = [ jbuilder ];
extra = {
unpackCmd = "tar -xjf $curSrc";
buildPhase = "jbuilder build -p rope";
inherit (jbuilder) installPhase;
};
} else {
version = "0.5";
url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-0.5.tar.gz";
sha256 = "05fr2f5ch2rqhyaj06rv5218sbg99p1m9pq5sklk04hpslxig21f";
buildInputs = [ ocamlbuild ];
extra = { createFindlibDestdir = true; };
};
in

stdenv.mkDerivation {
name = "ocaml${ocaml.version}-rope-${version}";
stdenv.mkDerivation ({
name = "ocaml${ocaml.version}-rope-${param.version}";

src = fetchzip {
url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-${version}.tar.gz";
sha256 = "1i8kzg19jrapl30mq8m91vy09z0r0dl4bnpw24ga96w8pxqf9qhd";
src = fetchurl {
inherit (param) url sha256;
};

buildInputs = [ ocaml findlib ocamlbuild benchmark ];

createFindlibDestdir = true;
buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs;

meta = {
homepage = http://rope.forge.ocamlcore.org/;
@@ -21,4 +37,4 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ volth ];
};
}
} // param.extra)