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

Merge pull request #20867 from vbgl/omake-0.10.1

Browse Source 
omake: update to 0.10.1
This commit is contained in:
vbgl 2016-12-09 21:49:21 +00:00 committed by GitHub
commit 44234570ec
11 changed files with 38 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/teyjus/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, omake, ocaml, flex, bison }: { stdenv, fetchzip, omake, ocaml, flex, bison }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teyjus-2.0b2"; name = "teyjus-2.1";
src = fetchurl { src = fetchzip {
url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz;
sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz";
}; };
patches = [ ./fix-lex-to-flex.patch ]; patches = [ ./fix-lex-to-flex.patch ];

22
pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
View File

@ -1,23 +1,23 @@
diff --git a/source/OMakefile b/source/OMakefile --- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000
index 6b19d84..095b8b6 100644 +++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000
--- a/source/OMakefile @@ -183,18 +183,18 @@
+++ b/source/OMakefile
@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront
DEP_MAIN = $(FNT)/dependfront DEP_MAIN = $(FNT)/dependfront
PAR_MAIN = $(FNT)/parsefront
############################################################
+# Nixpkgs specific changes
+#
+
+LEX = flex +LEX = flex
+ +
+############################################################ ############################################################
# Platform specific changes # Platform specific changes
# #
if $(mem $(SYSNAME), Linux)
YACC = bison -by
- LEX = flex
export
if $(mem $(OSTYPE), Cygwin Win32) if $(mem $(OSTYPE), Cygwin Win32)
YACC = bison -by YACC = bison -by
- LEX = flex - LEX = flex
CFLAGS += -mno-cygwin CC = i686-pc-mingw32-gcc
INC_C[] += $(INC)/byteswap $(INC)/search INC_C[] += $(INC)/byteswap $(INC)/search
export export

4
pkgs/development/ocaml-modules/camlimages/4.0.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: { stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
let let
pname = "camlimages"; pname = "camlimages";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
}; };
buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];

4
pkgs/development/ocaml-modules/camlimages/4.1.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: {stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki";
}; };
buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];

38
pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
View File

@ -1,38 +0,0 @@
{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
let
pname = "omake";
version = "0.9.8.6-0.rc1";
webpage = "http://omake.metaprl.org";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
};
patchFlags = "-p0";
patches = [ ./warn.patch ];
buildInputs = [ ocaml makeWrapper ncurses ];
phases = "unpackPhase patchPhase buildPhase";
buildPhase = ''
make bootstrap
make PREFIX=$out all
make PREFIX=$out install
'';
# prefixKey = "-prefix ";
#
# configureFlags = if transitional then "--transitional" else "--strict";
#
# buildFlags = "world.opt";
meta = {
description = "Omake build system";
homepage = "${webpage}";
license = "GPL";
platforms = ocaml.meta.platforms or [];
};
}

42
pkgs/development/tools/ocaml/omake/default.nix
View File

@ -1,38 +1,24 @@
{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: { stdenv, fetchurl, ocaml, ncurses }:
let
pname = "omake";
version = "0.9.8.5-3";
webpage = "http://omake.metaprl.org";
in
stdenv.mkDerivation {
name = "${pname}-${version}"; stdenv.mkDerivation rec {
name = "omake-${version}";
version = "0.10.1";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz"; url = "http://download.camlcity.org/download/${name}.tar.gz";
sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv"; sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
}; };
patchFlags = "-p0";
patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ];
buildInputs = [ ocaml makeWrapper ncurses ]; buildInputs = [ ocaml ncurses ];
phases = "unpackPhase patchPhase buildPhase";
buildPhase = ''
make bootstrap
make PREFIX=$out all
make PREFIX=$out install
'';
# prefixKey = "-prefix ";
#
# configureFlags = if transitional then "--transitional" else "--strict";
#
# buildFlags = "world.opt";
meta = { meta = {
description = "A build system designed for scalability and portability"; description = "A build system designed for scalability and portability";
homepage = "${webpage}"; homepage = http://projects.camlcity.org/projects/omake.html;
license = "GPL"; license = with stdenv.lib.licenses; [
broken = true; mit /* scripts */
gpl2 /* program */
];
inherit (ocaml.meta) platforms;
}; };
} }

11
pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
View File

@ -1,11 +0,0 @@
--- src/exec/omake_exec.ml 2006-12-08 23:52:01.000000000 +0100
+++ src/exec/omake_exec.ml 2009-04-15 22:19:07.000000000 +0200
@@ -46,7 +46,7 @@
open Omake_options
open Omake_command_type
-external sync : unit -> unit = "caml_sync"
+(*external sync : unit -> unit = "caml_sync"*)
module Exec =
struct

22
pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
View File

@ -1,22 +0,0 @@
--- src/libmojave-external/cutil/lm_printf.c.orig 2007-07-15 19:55:23.000000000 +0200
+++ src/libmojave-external/cutil/lm_printf.c 2009-06-21 19:20:40.000000000 +0200
@@ -144,3 +144,3 @@
if(bufp != buffer)
- free(buffer);
+ free(bufp);
failwith("ml_print_string");
@@ -149,3 +149,3 @@
if(bufp != buffer)
- free(buffer);
+ free(bufp);
return v_result;
@@ -192,3 +192,3 @@
if(bufp != buffer)
- free(buffer);
+ free(bufp);
failwith("ml_print_string");
@@ -197,3 +197,3 @@
if(bufp != buffer)
- free(buffer);
+ free(bufp);
return v_result;

10
pkgs/development/tools/ocaml/omake/warn.patch
View File

@ -1,10 +0,0 @@
diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om
--- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000
+++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000
@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS
public.OCAMLPPFLAGS =
-public.OCAMLFLAGS = -warn-error A
+public.OCAMLFLAGS =
public.OCAMLCFLAGS = -g
Seulement dans ./lib/build: OCaml.om~
Seulement dans .: warn.patch

8
pkgs/top-level/all-packages.nix
View File

@ -5303,9 +5303,7 @@ in
lua = lua5_1; lua = lua5_1;
}; };
teyjus = callPackage ../development/compilers/teyjus { teyjus = callPackage ../development/compilers/teyjus { };
omake = omake_rc1;
};
thrust = callPackage ../development/tools/thrust { thrust = callPackage ../development/tools/thrust {
gconf = pkgs.gnome2.GConf; gconf = pkgs.gnome2.GConf;
@ -6345,7 +6343,9 @@ in
noweb = callPackage ../development/tools/literate-programming/noweb { }; noweb = callPackage ../development/tools/literate-programming/noweb { };
nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
inherit (ocamlPackages) omake omake_rc1; omake = callPackage ../development/tools/ocaml/omake {
inherit (ocamlPackages_4_02) ocaml;
};
omniorb = callPackage ../development/tools/omniorb { }; omniorb = callPackage ../development/tools/omniorb { };

3
pkgs/top-level/ocaml-packages.nix
View File

@ -649,9 +649,6 @@ let
trv = callPackage ../development/tools/misc/trv { }; trv = callPackage ../development/tools/misc/trv { };
omake = callPackage ../development/tools/ocaml/omake { };
omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
verasco = callPackage ../development/tools/analysis/verasco ( verasco = callPackage ../development/tools/analysis/verasco (
if system == "x86_64-linux" if system == "x86_64-linux"
then { tools = pkgs.pkgsi686Linux.stdenv.cc; } then { tools = pkgs.pkgsi686Linux.stdenv.cc; }