BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "teyjus: 2.0b2 -> 2.1"

Browse source 
This reverts commit 7f501d7f02.
This commit is contained in:
Vincent Laporte 2016-12-18 09:25:24 +00:00
parent e76a1f0e7e
commit 3c7bd996e6
3 changed files with 19 additions and 17 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, fetchzip, omake, ocaml, flex, bison }:
{ stdenv, fetchurl, omake, ocaml, flex, bison }:
stdenv.mkDerivation {
name = "teyjus-2.1";
name = "teyjus-2.0b2";
src = fetchzip {
url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz;
sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz";
src = fetchurl {
url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz";
sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052";
};
patches = [ ./fix-lex-to-flex.patch ];

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

@ -1,23 +1,23 @@
--- 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 @@
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
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
CC = i686-pc-mingw32-gcc
CFLAGS += -mno-cygwin
INC_C[] += $(INC)/byteswap $(INC)/search
export

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

@ -5324,7 +5324,9 @@ in
lua = lua5_1;
};
teyjus = callPackage ../development/compilers/teyjus { };
teyjus = callPackage ../development/compilers/teyjus {
omake = omake_rc1;
};
thrust = callPackage ../development/tools/thrust {
gconf = pkgs.gnome2.GConf;