Merge staging into staging-next

2020-02-09 16:38:32 +01:00
parent 531a48ebdb 3b17e6559b
commit cffec212dc
60 changed files with 1394 additions and 1411 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pcre, libiconv, perl }:

-let version = "3.3"; in
+let version = "3.4"; in

 stdenv.mkDerivation {
  pname = "gnugrep";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r";
+    sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq";
  };

  # Perl is needed for testing