From 7f501d7f02ed614f2159ae8b0855f33d796d6819 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 2 Dec 2016 19:35:11 +0000
Subject: 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 301915b7a26b..fafc58371ef9 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 d2da1d3facca..52d259bb64de 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 5eb3006d9352..a554f353d1eb 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;
-- 
cgit 1.4.1