teyjus: unstable-2019-07-26 -> 2.1.1

authored by Ben Darwin and committed by Vincent Laporte 3c614fbc b763c20e

+11 -48
+8 -22
pkgs/development/compilers/teyjus/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, omake, ocaml, flex, bison }: 2 3 - stdenv.mkDerivation rec { 4 pname = "teyjus"; 5 - version = "unstable-2019-07-26"; 6 7 src = fetchFromGitHub { 8 owner = "teyjus"; 9 repo = "teyjus"; 10 - rev = "e63f40aa9f1d0ea5e7bac41aae5e479c3616545c"; 11 - sha256 = "sha256-gaAWKd5/DZrIPaaQzx9l0KtCMW9LPw17vvNPsnopZA0="; 12 }; 13 14 - patches = [ 15 - ./fix-lex-to-flex.patch 16 - ]; 17 - 18 - postPatch = '' 19 - sed -i "/TST/d" source/OMakefile 20 - rm -rf source/front/caml 21 - ''; 22 - 23 strictDeps = true; 24 25 - nativeBuildInputs = [ omake ocaml flex bison ]; 26 27 hardeningDisable = [ "format" ]; 28 29 - env.NIX_CFLAGS_COMPILE = "-I${ocaml}/include"; 30 - 31 - buildPhase = "omake all"; 32 - 33 - checkPhase = "omake check"; 34 - 35 - installPhase = "mkdir -p $out/bin && cp tj* $out/bin"; 36 37 meta = with lib; { 38 description = "An efficient implementation of the Lambda Prolog language"; 39 homepage = "https://github.com/teyjus/teyjus"; 40 license = lib.licenses.gpl3; 41 maintainers = [ maintainers.bcdarwin ]; 42 platforms = platforms.unix;
··· 1 + { lib, fetchFromGitHub, buildDunePackage, flex, bison }: 2 3 + buildDunePackage rec { 4 pname = "teyjus"; 5 + version = "2.1.1"; 6 7 src = fetchFromGitHub { 8 owner = "teyjus"; 9 repo = "teyjus"; 10 + rev = "refs/tags/v${version}"; 11 + hash = "sha256-N4XKDd0NFr501PYUdb7PM2sWh0uD1/SUFXoMr10f064="; 12 }; 13 14 strictDeps = true; 15 16 + nativeBuildInputs = [ flex bison ]; 17 18 hardeningDisable = [ "format" ]; 19 20 + doCheck = true; 21 22 meta = with lib; { 23 description = "An efficient implementation of the Lambda Prolog language"; 24 homepage = "https://github.com/teyjus/teyjus"; 25 + changelog = "https://github.com/teyjus/teyjus/releases/tag/v${version}"; 26 license = lib.licenses.gpl3; 27 maintainers = [ maintainers.bcdarwin ]; 28 platforms = platforms.unix;
-25
pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
··· 1 - diff --git a/source/OMakefile b/source/OMakefile 2 - index e6bd37e..1bbc0a8 100644 3 - --- a/source/OMakefile 4 - +++ b/source/OMakefile 5 - @@ -184,6 +184,12 @@ DEP_MAIN = $(FNT)/dependfront 6 - PAR_MAIN = $(FNT)/parsefront 7 - 8 - ############################################################ 9 - +# Nixpkgs specific changes 10 - +# 11 - + 12 - +LEX = flex 13 - + 14 - +############################################################ 15 - # Platform specific changes 16 - # 17 - 18 - @@ -194,7 +200,6 @@ if $(mem $(SYSNAME), Linux) 19 - 20 - if $(mem $(OSTYPE), Cygwin Win32) 21 - YACC = bison -by 22 - - LEX = flex 23 - CC = i686-pc-mingw32-gcc 24 - INC_C[] += $(INC)/byteswap $(INC)/search 25 - export
···
+3 -1
pkgs/top-level/all-packages.nix
··· 16960 inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; 16961 }; 16962 16963 - teyjus = callPackage ../development/compilers/teyjus { }; 16964 16965 thrust = callPackage ../development/tools/thrust { 16966 gconf = gnome2.GConf;
··· 16960 inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; 16961 }; 16962 16963 + teyjus = callPackage ../development/compilers/teyjus { 16964 + inherit (ocamlPackages) buildDunePackage; 16965 + }; 16966 16967 thrust = callPackage ../development/tools/thrust { 16968 gconf = gnome2.GConf;