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

Commits on Jan 21, 2020

  1. ocamlPackages.stdint: disable for OCaml < 4.07

    @vbgl
    vbgl committed Jan 21, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: C5517DE1649AB165
    Learn about vigilant mode
    Copy the full SHA
    cacbe5f View commit details

  2. ocamlPackages.ocaml-migrate-parsetree: 1.4.0 → 1.5.0

    @vbgl
    vbgl committed Jan 21, 2020
    Copy the full SHA
    0f7016d View commit details
Showing with 10 additions and 8 deletions.
  1. +5 −5 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
  2. +5 −3 pkgs/development/ocaml-modules/stdint/default.nix
10 changes: 5 additions & 5 deletions pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, buildDunePackage, result, ppx_derivers }:
{ lib, fetchFromGitHub, buildDunePackage, result, ppx_derivers }:

buildDunePackage rec {
pname = "ocaml-migrate-parsetree";
version = "1.4.0";
version = "1.5.0";

src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = "v${version}";
sha256 = "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2";
sha256 = "0ms7nx7x16nkbm9rln3sycbzg6ad8swz8jw6bjndrill8bg3fipv";
};

propagatedBuildInputs = [ ppx_derivers result ];

meta = {
description = "Convert OCaml parsetrees between different major versions";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
8 changes: 5 additions & 3 deletions pkgs/development/ocaml-modules/stdint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ stdenv, fetchFromGitHub, buildDunePackage }:
{ lib, fetchFromGitHub, buildDunePackage }:

buildDunePackage rec {
pname = "stdint";
version = "0.6.0";

minimumOCamlVersion = "4.07";

src = fetchFromGitHub {
owner = "andrenth";
repo = "ocaml-stdint";
@@ -14,7 +16,7 @@ buildDunePackage rec {
meta = {
description = "Various signed and unsigned integers for OCaml";
homepage = "https://github.com/andrenth/ocaml-stdint";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.gebner ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.gebner ];
};
}