public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'master' into staging.

Browse Source
This commit is contained in:
Peter Simons
2015-02-13 22:17:12 +01:00
parent 7a1d132db9 54ce1a1810
commit 600135bba5
124 changed files with 2676 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@@ -2,7 +2,7 @@
let
pname = "cmdliner";
version = "0.9.6";
version = "0.9.7";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p";
sha256 = "0ymzy1l6z85b6779lfxk179igfpf7rgfik70kr3c7lxmzwy8j6cw";
};
unpackCmd = "tar xjf $src";

4
pkgs/development/ocaml-modules/ezjsonm/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:
let version = "0.3.1"; in
let version = "0.4.1"; in
stdenv.mkDerivation {
name = "ocaml-ezjsonm-${version}";
src = fetchzip {
url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz";
sha256 = "0cz1v75j8j5y4vfcgylp5zaxiy7541qg6pm4wrgmvy6fmh82654f";
sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095";
};
buildInputs = [ ocaml findlib ];

4
pkgs/development/ocaml-modules/re/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchgit, ocaml, findlib }:
stdenv.mkDerivation rec {
name = "ocaml-re-1.2.2";
name = "ocaml-re-1.3.0";
src = fetchgit {
url = https://github.com/ocaml/ocaml-re.git;
rev = "refs/tags/${name}";
sha256 = "1556i1zc6nrg4hxlvidllfhkjwl6n74biyjbvjlby8304n84jrk7";
sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx";
};
buildInputs = [ ocaml findlib ];

13
pkgs/development/ocaml-modules/sqlite3/default.nix
View File

@@ -1,14 +1,15 @@
{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}:
{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }:
stdenv.mkDerivation {
name = "ocaml-sqlite3-2.0.7";
stdenv.mkDerivation rec {
name = "ocaml-sqlite3-${version}";
version = "2.0.9";
src = fetchurl {
url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz;
sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq";
url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/v${version}/sqlite3-ocaml-${version}.tar.gz";
sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551";
};
buildInputs = [ocaml findlib pkgconfig sqlite];
buildInputs = [ ocaml findlib pkgconfig sqlite ];
createFindlibDestdir = true;