Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles

This commit is contained in:
Jude Taylor
2015-11-20 19:58:46 -08:00
11 changed files with 41 additions and 129 deletions

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
stdenv.mkDerivation rec {
name = "help2man-1.47.2";
name = "help2man-1.47.3";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4";
sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2";
};
buildInputs = [ makeWrapper perl gettext LocaleGettext ];

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bison, m4 }:
stdenv.mkDerivation {
name = "flex-2.5.39";
stdenv.mkDerivation rec {
name = "flex-2.6.0";
src = fetchurl {
url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2;
sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd";
url = "mirror://sourceforge/flex/${name}.tar.bz2";
sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4";
};
buildInputs = [ bison ];