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

Commits on Apr 6, 2020

  1. ocamlPackages.sedlex: fix dependencies 

    (cherry picked from commit 77901a9)
    @bcdarwin
    bcdarwin committed Apr 6, 2020
    Copy the full SHA
    81ae9cb View commit details

  2. Merge pull request #84483 from bcdarwin/backport-fix-sedlex-inputs 

    ocamlPackages.sedlex: fix dependencies
    @Mic92
    Mic92 authored Apr 6, 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
    5d1de8c View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/ocaml-modules/sedlex/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/sedlex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }:
{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "sedlex is not available for OCaml ${ocaml.version}"
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n";
};

buildInputs = [ ocaml findlib ppx_tools_versioned ];
buildInputs = [ ocaml findlib ];

propagatedBuildInputs = [ gen ];
propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ];

buildFlags = [ "all" "opt" ];