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

Commits on Jul 8, 2017

  1. ocamlPackages.sequence: 0.8 -> 0.10

    @vbgl
    vbgl committed Jul 8, 2017
    Copy the full SHA
    ec359a8 View commit details

  2. ocamlPackages.qtest: requires OCaml ≥ 4

    @vbgl
    vbgl committed Jul 8, 2017
    Copy the full SHA
    9d52667 View commit details

  3. ocaml: 4.04.1 -> 4.04.2

    @vbgl
    vbgl committed Jul 8, 2017
    Copy the full SHA
    ff24bf1 View commit details

  4. obuild: fix build

    @vbgl
    vbgl committed Jul 8, 2017
    Copy the full SHA
    676156a View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ocaml/4.04.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ./generic.nix {
major_version = "4";
minor_version = "04";
patch_version = "1";
sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12";
patch_version = "2";
sha256 = "0bhgjzi78l10824qga85nlh18jg9lb6aiamf9dah1cs6jhzfsn6i";

# If the executable is stipped it does not work
dontStrip = true;
4 changes: 4 additions & 0 deletions pkgs/development/ocaml-modules/qtest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:

if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "qtest is not available for OCaml ${ocaml.version}"
else

let version = "2.2"; in

stdenv.mkDerivation {
8 changes: 4 additions & 4 deletions pkgs/development/ocaml-modules/sequence/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:

let version = "0.8"; in
let version = "0.10"; in

stdenv.mkDerivation {
name = "ocaml-sequence-${version}";
name = "ocaml${ocaml.version}-sequence-${version}";

src = fetchFromGitHub {
owner = "c-cube";
repo = "sequence";
rev = "${version}";
sha256 = "1y9nkz6g4plnbk1pcdbvs7f719r48zxrp3gsaxyq1vg98i9h8qr3";
rev = version;
sha256 = "0pl8pv758wn8bm555i8f0fvfn2pw88w1bmzjrzrv01092d85wx1g";
};

buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];
1 change: 1 addition & 0 deletions pkgs/development/tools/ocaml/obuild/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml ];

buildPhase = ''
patchShebangs ./bootstrap
./bootstrap
'';