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

Commits on Oct 16, 2019

  1. ocamlPackages.lru: 0.2.0 → 0.3.0 

    ocamlPackages.psq: 0.1.0 → 0.2.0
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    8dd417e View commit details
Showing with 18 additions and 29 deletions.
  1. +8 −13 pkgs/development/ocaml-modules/lru/default.nix
  2. +10 −16 pkgs/development/ocaml-modules/psq/default.nix
21 changes: 8 additions & 13 deletions pkgs/development/ocaml-modules/lru/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, psq }:
{ lib, fetchurl, buildDunePackage, psq }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-lru-${version}";
version = "0.2.0";
buildDunePackage rec {
pname = "lru";
version = "0.3.0";

src = fetchurl {
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";
sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0";
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz";
sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4";
};

buildInputs = [ ocaml findlib ocamlbuild topkg ];

propagatedBuildInputs = [ psq ];

inherit (topkg) buildPhase installPhase;

meta = {
homepage = "https://github.com/pqwy/lru";
description = "Scalable LRU caches for OCaml";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.isc;
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.vbgl ];
license = lib.licenses.isc;
};
}
26 changes: 10 additions & 16 deletions pkgs/development/ocaml-modules/psq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
{ lib, buildDunePackage, fetchurl, seq }:

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

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-psq-${version}";
version = "0.1.0";
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "psq";
version = "0.2.0";

src = fetchurl {
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";
sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp";
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";
sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";
};

buildInputs = [ ocaml findlib ocamlbuild topkg ];

inherit (topkg) buildPhase installPhase;
propagatedBuildInputs = [ seq ];

meta = {
description = "Functional Priority Search Queues for OCaml";
homepage = "https://github.com/pqwy/psq";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.isc;
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.vbgl ];
license = lib.licenses.isc;
};
}