From 895d3c890848aeed689aa29708430969ef3f35c6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Nov 2016 10:13:13 +0100 Subject: [PATCH 1/4] omake: 0.9.8.5 -> 0.10.1 --- .../development/tools/ocaml/omake/default.nix | 42 +++++++------------ .../ocaml/omake/omake-build-0.9.8.5.diff | 11 ----- .../ocaml/omake/omake-lm_printf-gcc44.diff | 22 ---------- pkgs/top-level/all-packages.nix | 6 ++- pkgs/top-level/ocaml-packages.nix | 1 - 5 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff delete mode 100644 pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 451d025aa3c..53152898fd6 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -1,38 +1,24 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.5-3"; - webpage = "http://omake.metaprl.org"; -in -stdenv.mkDerivation { +{ stdenv, fetchurl, ocaml, ncurses }: - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + + name = "omake-${version}"; + version = "0.10.1"; src = fetchurl { - url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz"; - sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv"; + url = "http://download.camlcity.org/download/${name}.tar.gz"; + sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"; }; - patchFlags = "-p0"; - patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ]; - 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"; + buildInputs = [ ocaml ncurses ]; meta = { description = "A build system designed for scalability and portability"; - homepage = "${webpage}"; - license = "GPL"; - broken = true; + homepage = http://projects.camlcity.org/projects/omake.html; + license = with stdenv.lib.licenses; [ + mit /* scripts */ + gpl2 /* program */ + ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff b/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff deleted file mode 100644 index b0a091e341c..00000000000 --- a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff +++ /dev/null @@ -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 diff --git a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff b/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff deleted file mode 100644 index 03665340f5f..00000000000 --- a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff +++ /dev/null @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676..5eb3006d935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,7 +6337,11 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; 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; + }; + + inherit (ocamlPackages) omake_rc1; omniorb = callPackage ../development/tools/omniorb { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 46f1ce4b023..6e3f98c7ba2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,7 +649,6 @@ let 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 ( From 7f501d7f02ed614f2159ae8b0855f33d796d6819 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:35:11 +0000 Subject: [PATCH 2/4] teyjus: 2.0b2 -> 2.1 --- pkgs/development/compilers/teyjus/default.nix | 10 ++++----- .../compilers/teyjus/fix-lex-to-flex.patch | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 301915b7a26..fafc58371ef 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, omake, ocaml, flex, bison }: +{ stdenv, fetchzip, omake, ocaml, flex, bison }: stdenv.mkDerivation { - name = "teyjus-2.0b2"; + name = "teyjus-2.1"; - src = fetchurl { - url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; - sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; + src = fetchzip { + url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz; + sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz"; }; patches = [ ./fix-lex-to-flex.patch ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index d2da1d3facc..52d259bb64d 100644 --- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -1,23 +1,23 @@ -diff --git a/source/OMakefile b/source/OMakefile -index 6b19d84..095b8b6 100644 ---- a/source/OMakefile -+++ b/source/OMakefile -@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront +--- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000 ++++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000 +@@ -183,18 +183,18 @@ DEP_MAIN = $(FNT)/dependfront + PAR_MAIN = $(FNT)/parsefront - ############################################################ -+# Nixpkgs specific changes -+# -+ +LEX = flex + -+############################################################ + ############################################################ # Platform specific changes # + if $(mem $(SYSNAME), Linux) + YACC = bison -by +- LEX = flex + export + if $(mem $(OSTYPE), Cygwin Win32) YACC = bison -by - LEX = flex - CFLAGS += -mno-cygwin + CC = i686-pc-mingw32-gcc INC_C[] += $(INC)/byteswap $(INC)/search export diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb3006d935..a554f353d1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,9 +5295,7 @@ in lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { - omake = omake_rc1; - }; + teyjus = callPackage ../development/compilers/teyjus { }; thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; From 3d804da98322c4f7daf77bdab78b8a972ee8258f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:36:07 +0000 Subject: [PATCH 3/4] camlimages: use omake rather than omake_rc1 --- pkgs/development/ocaml-modules/camlimages/4.0.nix | 4 ++-- pkgs/development/ocaml-modules/camlimages/4.1.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index 4f47680dcec..0ec3a26d051 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -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 pname = "camlimages"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix index f98d149c482..77a252de52f 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -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"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; From e672fbc6f0e0dd503f78e0c23e6de1795bf81b8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:45:09 +0000 Subject: [PATCH 4/4] omake: remove 0.9.8.6-rc1 --- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 38 ------------------- pkgs/development/tools/ocaml/omake/warn.patch | 10 ----- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/ocaml-packages.nix | 2 - 4 files changed, 52 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix delete mode 100644 pkgs/development/tools/ocaml/omake/warn.patch diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix deleted file mode 100644 index 9f318afc67d..00000000000 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ /dev/null @@ -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 []; - }; -} diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch deleted file mode 100644 index 4459e89d7f9..00000000000 --- a/pkgs/development/tools/ocaml/omake/warn.patch +++ /dev/null @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a554f353d1e..8f512db3895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6339,8 +6339,6 @@ in inherit (ocamlPackages_4_02) ocaml; }; - inherit (ocamlPackages) omake_rc1; - omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e3f98c7ba2..dc497b125e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,8 +649,6 @@ let trv = callPackage ../development/tools/misc/trv { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; }