diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-12-18 09:25:24 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-12-18 09:51:00 +0000 |
| commit | 3c7bd996e686b8dd51020f3ac0b767098664c136 (patch) | |
| tree | 76c34ed3ce6233e3e43a4b3e00afbfe729e25ae9 /pkgs/development/compilers | |
| parent | e76a1f0e7ea630b3f5f282d0dccdaecc272873ca (diff) | |
| download | nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar.gz nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar.bz2 nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar.lz nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar.xz nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.tar.zst nixlib-3c7bd996e686b8dd51020f3ac0b767098664c136.zip | |
Revert "teyjus: 2.0b2 -> 2.1"
This reverts commit 7f501d7f02ed614f2159ae8b0855f33d796d6819.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/teyjus/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/compilers/teyjus/fix-lex-to-flex.patch | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index fafc58371ef9..301915b7a26b 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index 52d259bb64de..d2da1d3facca 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 @@ ---- 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 |