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

Commits on Nov 23, 2016

  1. trv: fix installation of binaries

    @vbgl
    vbgl committed Nov 23, 2016
    Copy the full SHA
    b75e13b View commit details

  2. ocamlPackages.ocplib-simplex: init at 0.3 

    ocplib-simplex is a (fully) functional OCaml implementation of the simplex algorithm for solving systems of linear inequalities.

homepage: https://github.com/OCamlPro-Iguernlala/ocplib-simplex
    @vbgl
    vbgl committed Nov 23, 2016
    Copy the full SHA
    97a496a View commit details
Showing with 32 additions and 1 deletion.
  1. +29 −0 pkgs/development/ocaml-modules/ocplib-simplex/default.nix
  2. +1 −1 pkgs/development/tools/misc/trv/default.nix
  3. +2 −0 pkgs/top-level/ocaml-packages.nix
29 changes: 29 additions & 0 deletions pkgs/development/ocaml-modules/ocplib-simplex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }:

let
pname = "ocplib-simplex";
version = "0.3";
in

stdenv.mkDerivation {
name = "ocaml${ocaml.version}-${pname}-${version}";

src = fetchFromGitHub {
owner = "OCamlPro-Iguernlala";
repo = pname;
rev = version;
sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa";
};

buildInputs = [ autoreconfHook ocaml findlib ];

createFindlibDestdir = true;

meta = {
description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities";
homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex;
inherit (ocaml.meta) platforms;
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/trv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
dontStrip = true;

installFlags = "SEMVER=${version} PREFIX=$out";
installFlags = "SEMVER=${version} PREFIX=$(out)";

meta = with stdenv.lib; {
homepage = https://github.com/afiniate/trv;
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -339,6 +339,8 @@ let

ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { };

ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };

ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };

ojquery = callPackage ../development/ocaml-modules/ojquery { };