From 95c198a8ae06b3f045b7457fc623c792087319e2 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Mon, 6 Jan 2020 11:20:00 +0000 Subject: [PATCH] bison2: remove --- pkgs/development/tools/parsing/bison/2.x.nix | 43 ------------------- .../parsing/bison/darwin-vasnprintf.patch | 12 ------ .../parsing/bison/{3.x.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/development/tools/parsing/bison/2.x.nix delete mode 100644 pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch rename pkgs/development/tools/parsing/bison/{3.x.nix => default.nix} (100%) diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix deleted file mode 100644 index e9aa33d2f60..00000000000 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchurl, m4, perl }: - -stdenv.mkDerivation rec { - name = "bison-2.7.1"; - - src = fetchurl { - url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8"; - }; - - nativeBuildInputs = [ m4 ]; - propagatedBuildInputs = [ m4 ]; - checkInputs = [ perl ]; - - patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch; - - doCheck = true; - # M4 = "${m4}/bin/m4"; - - meta = { - homepage = https://www.gnu.org/software/bison/; - description = "Yacc-compatible parser generator"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - Bison is a general-purpose parser generator that converts an - annotated context-free grammar into an LALR(1) or GLR parser for - that grammar. Once you are proficient with Bison, you can use - it to develop a wide range of language parsers, from those used - in simple desk calculators to complex programming languages. - - Bison is upward compatible with Yacc: all properly-written Yacc - grammars ought to work with Bison with no change. Anyone - familiar with Yacc should be able to use Bison with little - trouble. You need to be fluent in C or C++ programming in order - to use Bison. - ''; - - platforms = stdenv.lib.platforms.unix; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch deleted file mode 100644 index 84b0e6d39d8..00000000000 --- a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c ---- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900 -+++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900 -@@ -4870,7 +4870,7 @@ - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/default.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/3.x.nix rename to pkgs/development/tools/parsing/bison/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b6b2d210b..3e065d47198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9715,9 +9715,7 @@ in }; }); - bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; - bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = bison3; + bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { };