From 6ef367a5e8cdad4e9195d027b51c534b0a8d7c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Tue, 6 Aug 2019 06:46:03 +0200 Subject: [PATCH] Suggested changes --- pkgs/build-support/ocaml/oasis.nix | 2 +- pkgs/development/ocaml-modules/tcslib/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 2ada920338e..7ad761bde28 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -1,6 +1,6 @@ { buildOcaml, ocaml_oasis }: -{ name, version, buildInputs ? [], ... +{ buildInputs ? [], ... }@args: buildOcaml (args // { diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index 40481c89937..7eafb2e6993 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, buildOasisPackage }: +{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }: buildOasisPackage rec { name = "tcslib"; - version = "v0.3"; + version = "0.3"; minimumSupportedOCamlVersion = "4.03.0"; src = fetchFromGitHub { owner = "tcsprojects"; repo = "tcslib"; - rev = version; + rev = "v${version}"; sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi"; }; - buildInputs = with ocamlPackages; [ ounit ]; - propagatedBuildInputs = with ocamlPackages; [ ocaml_extlib num ]; + buildInputs = [ ounit ]; + propagatedBuildInputs = [ ocaml_extlib num ]; meta = { homepage = https://github.com/tcsprojects/tcslib; description = "A multi-purpose library for OCaml"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ mgttlinger ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mgttlinger ]; }; }