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: 223c8b6e3274
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86e82f9d9f88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2020

  1. ocaml rresult: Add the result compatibility package as a build input

    @anmonteiro
    anmonteiro authored Jan 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69827da View commit details

Commits on Jan 8, 2020

  1. Merge pull request #76856 from anmonteiro/patch-2 

    ocaml rresult: Add the `result` compatibility package as a build input
    @marsam
    marsam authored Jan 8, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86e82f9 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/ocaml-modules/rresult/default.nix
4 changes: 3 additions & 1 deletion pkgs/development/ocaml-modules/rresult/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-rresult-${version}";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

buildInputs = [ ocaml findlib ocamlbuild topkg ];

propagatedBuildInputs = [ result ];

inherit (topkg) buildPhase installPhase;

meta = {