swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4808 from henrytill/opam

Browse source 
opam: update to 1.2.0
This commit is contained in:
Arseniy Seroka 2014-11-03 20:01:06 +03:00
parent 9b507ccf02 5f2e7c71a4
commit e167a3cbf1
4 changed files with 93 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -66,6 +66,7 @@
garbas = "Rok Garbas <rok@garbas.si>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";
henrytill = "Henry Till <henrytill@gmail.com>";
hinton = "Tom Hinton <t@larkery.com>";
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";

11
pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch Normal file
View file

@ -0,0 +1,11 @@
--- opam-1.2.0/src_ext/Makefile 2014-10-15 21:32:13.000000000 -0400
+++ opam-1.2.0/src_ext/Makefile.new 2014-10-29 17:37:00.785365601 -0400
@@ -51,7 +51,7 @@ archives: $(SRC_EXTS:=.download)
[ -e $(notdir $(URL_$*)) ] || $(FETCH) $(URL_$*)
$(MD5CHECK) $(notdir $(URL_$*)) $(MD5_$*)
-%.stamp: %.download
+%.stamp:
mkdir -p tmp
cd tmp && tar xf$(if $(patsubst %.tar.gz,,$(URL_$*)),j,z) ../$(notdir $(URL_$*))
rm -rf $*

79
pkgs/development/tools/ocaml/opam/1.2.0.nix Normal file
View file

@ -0,0 +1,79 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
# Opam 1.2.0 only works with ocaml >= 3.12.1 according to ./configure
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
let
srcs = {
cudf = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz";
sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701";
};
extlib = fetchurl {
url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
};
ocaml_re = fetchurl {
url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
};
ocamlgraph = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz";
sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f";
};
dose3 = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/33677/dose3-3.2.2.tar.gz";
sha256 = "a30a189f9f298ed1de96d7098440c951f3df2c8da626f7f37f38cbfddefc909c";
};
cmdliner = fetchurl {
url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.4.tbz";
sha256 = "ecb65e2cfd984ec07e97a78f334a80cda41fb8f8bb5e37c41fd33e6a0e2e69ef";
};
uutf = fetchurl {
url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz";
sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877";
};
jsonm = fetchurl {
url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz";
sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
};
opam = fetchurl {
url = "https://github.com/ocaml/opam/archive/1.2.0.zip";
sha256 = "b78bb9570fbd1dae50583792525a3dd612f8f90db367771fabd7bf4571ba25f7";
};
};
in
stdenv.mkDerivation rec {
name = "opam-1.2.0";
buildInputs = [ unzip curl ncurses ocaml ];
src = srcs.opam;
postUnpack = ''
ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name}
ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name}
'';
patches = [ ./1.2.0-src_ext-Makefile.patch ];
postConfigure = "make lib-ext";
# Dirty, but apparently ocp-build requires a TERM
makeFlags = ["TERM=screen"];
doCheck = false;
meta = {
maintainers = [ stdenv.lib.maintainers.henrytill ];
description = "A package manager for OCaml";
homepage = "http://opam.ocamlpro.com/";
platforms = stdenv.lib.platforms.all;
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -3758,7 +3758,8 @@ let
opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix {
inherit (ocamlPackages_4_01_0) ocaml;
};
opam = opam_1_1;
opam_1_2_0 = callPackage ../development/tools/ocaml/opam/1.2.0.nix { };
opam = opam_1_2_0;
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };