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

teyjus: actually update to 2.1

Browse Source 
Note, the version in the source of this release is still 2.0-b2

https://github.com/teyjus/teyjus/issues/117 tracks asking upstream to
release versions with new version numbers.
This commit is contained in:
Ryan Mulligan 2018-03-15 10:37:55 -07:00
parent 28e31f1c07
commit 4332e697df
2 changed files with 13 additions and 7 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,15 @@
{ stdenv, fetchurl, omake, ocaml, flex, bison }: { stdenv, fetchurl, omake, ocaml, flex, bison }:
let
version = "2.1";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teyjus-2.1"; name = "teyjus-${version}";
src = fetchurl { src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz"; url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
sha256 = "0llhm5nrfyj7ihz2qq1q9ijrh6y4f8vl39mpfkkad5bh1m3gp2gm"; sha256 = "0393wpg8v1vvarqy2xh4fdmrwlrl6jaj960kql7cq79mb9p3m269";
}; };
patches = [ ./fix-lex-to-flex.patch ]; patches = [ ./fix-lex-to-flex.patch ];

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

@ -1,9 +1,9 @@
diff --git a/source/OMakefile b/source/OMakefile diff --git a/source/OMakefile b/source/OMakefile
index 6b19d84..095b8b6 100644 index e6bd37e..1bbc0a8 100644
--- a/source/OMakefile --- a/source/OMakefile
+++ b/source/OMakefile +++ b/source/OMakefile
@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront @@ -184,6 +184,12 @@ DEP_MAIN = $(FNT)/dependfront
DEP_MAIN = $(FNT)/dependfront PAR_MAIN = $(FNT)/parsefront
############################################################ ############################################################
+# Nixpkgs specific changes +# Nixpkgs specific changes
@ -15,9 +15,11 @@ index 6b19d84..095b8b6 100644
# Platform specific changes # Platform specific changes
# #
@@ -194,7 +200,6 @@ if $(mem $(SYSNAME), Linux)
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