diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-11-13 01:59:55 +0000 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-11-13 01:59:55 +0000 |
| commit | 5b4044ab55a544c5e690e174619aae07c1ef06f2 (patch) | |
| tree | 105f1797d988a2be52cc8f950c7c91127eaea559 | |
| parent | fc11b488597831a70b1ec8e20a503930ce01a325 (diff) | |
| download | nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar.gz nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar.bz2 nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar.lz nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar.xz nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.tar.zst nixpkgs-5b4044ab55a544c5e690e174619aae07c1ef06f2.zip | |
flex_2_6_1: delete in favor of flex 2.6.4 (#50292)
| -rw-r--r-- | pkgs/servers/nas/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 1dba428e0ae..9b8402ec0e0 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, bison, flex_2_6_1, gccmakedep +{ stdenv, fetchurl, imake, bison, flex, gccmakedep , xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; }; - nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ]; + nativeBuildInputs = [ imake bison flex gccmakedep ]; buildInputs = [ xproto libXau libXt libXext libXaw libXpm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef28e809698..f857cc0183d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8510,7 +8510,6 @@ with pkgs; jdepend = callPackage ../development/tools/analysis/jdepend { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; - flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { }; flex = callPackage ../development/tools/parsing/flex { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; |