From 2e2a17a92a8cf42114733ac1030aaba2d18f2a28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:46:09 +0200 Subject: [PATCH] bison: drop obsolete version 1.875 --- .../development/tools/parsing/bison/bison-1.875.nix | 13 ------------- .../parsing/bison/{bison-2.6.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 6 +----- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/tools/parsing/bison/bison-1.875.nix rename pkgs/development/tools/parsing/bison/{bison-2.6.nix => default.nix} (100%) diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix deleted file mode 100644 index 3ee12a252cec..000000000000 --- a/pkgs/development/tools/parsing/bison/bison-1.875.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, m4}: - -assert m4 != null; - -stdenv.mkDerivation { - name = "bison-1.875"; - src = fetchurl { - url = mirror://gnu/bison/bison-1.875.tar.bz2; - md5 = "b7f8027b249ebd4dd0cc948943a71af0"; - }; - buildInputs = [m4]; - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/bison-2.6.nix b/pkgs/development/tools/parsing/bison/default.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/bison-2.6.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 b6037799ac0f..e26da54f6a8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2937,11 +2937,7 @@ let cross = assert crossSystem != null; crossSystem; }); - bison = bison26; - - bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; - - bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; + bison = callPackage ../development/tools/parsing/bison { }; buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted;