summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorJude Taylor <me@jude.bio>2015-11-20 19:58:46 -0800
committerJude Taylor <me@jude.bio>2015-11-20 19:58:46 -0800
commit852988348d6e63aa42713a0f07f9801aea082e12 (patch)
tree5e9b307664df54ed5e4d6bae374f325827a1c8fc /pkgs/development/tools
parent4a64687737cbe9deee23d15b431c8a70c804257e (diff)
parent815e9f5af288b3d44a7a926469b25cf58663fe40 (diff)
downloadnixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar.gz
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar.bz2
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar.lz
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar.xz
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.tar.zst
nixlib-852988348d6e63aa42713a0f07f9801aea082e12.zip
Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/misc/help2man/default.nix4
-rw-r--r--pkgs/development/tools/parsing/flex/default.nix (renamed from pkgs/development/tools/parsing/flex/2.5.39.nix)8
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 4386e7eaf741..8f687908017f 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -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 ];
diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/default.nix
index 93d54803e7c7..57ce29f51753 100644
--- a/pkgs/development/tools/parsing/flex/2.5.39.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -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 ];