public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-07-31 09:12:15 +02:00
parent 2a48a62b9c ba68231273
commit 740d76371e
132 changed files with 1447 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/parsing/flex/2.5.35.nix
+4 -6
View File
@@ -1,16 +1,14 @@
{ stdenv, fetchurl, bison, m4 }:
{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
stdenv.mkDerivation rec {
name = "flex-2.5.35";
src = fetchurl {
# Deleted from original SourceForge and GitHub only provides generated file.
# Note: binary cache still seems to serve it, too.
url = "http://downloads.openwrt.org/sources/${name}.tar.bz2";
sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz;
sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm";
};
buildInputs = [ bison ];
nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
propagatedNativeBuildInputs = [ m4 ];
pkgs/development/tools/parsing/flex/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "flex-${version}";
version = "2.6.3";
version = "2.6.4";
src = fetchurl {
url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";
sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8";
sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8";
};
buildInputs = [ bison ];