mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 03:14:03 +00:00
gnugrep: 3.7 -> 3.11
Also replace myself as a maintainer
This commit is contained in:
parent
b94e59925e
commit
95152ad7a0
@ -5,7 +5,7 @@
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let version = "3.7"; in
|
||||
let version = "3.11"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnugrep";
|
||||
@ -13,12 +13,9 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/grep/grep-${version}.tar.xz";
|
||||
sha256 = "0g42svbc1nq5bamxfj6x7320wli4dlj86padk0hwgbk04hqxl42w";
|
||||
hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs=";
|
||||
};
|
||||
|
||||
# https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=b50c6442e43d79471a31a2a202d3e50c0557446f
|
||||
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./sigsegv-loongarch.patch;
|
||||
|
||||
# Perl is needed for testing
|
||||
nativeBuildInputs = [ perl ] ++ lib.optional stdenv.hostPlatform.isLoongArch64 autoreconfHook;
|
||||
outputs = [ "out" "info" ]; # the man pages are rather small
|
||||
@ -62,7 +59,7 @@ stdenv.mkDerivation {
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
maintainers = [
|
||||
maintainers.eelco
|
||||
maintainers.das_j
|
||||
maintainers.m00wl
|
||||
];
|
||||
platforms = platforms.all;
|
||||
|
@ -1,31 +0,0 @@
|
||||
From b50c6442e43d79471a31a2a202d3e50c0557446f Mon Sep 17 00:00:00 2001
|
||||
From: Sun Haiyong <youbest@sina.com>
|
||||
Date: Sat, 4 Sep 2021 15:06:43 +0200
|
||||
Subject: sigsegv: Improve cross-compilation support for LoongArch CPU.
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): Assume the stack grows
|
||||
down on LoongArch.
|
||||
---
|
||||
m4/stack-direction.m4 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
|
||||
index 9328725..e682be9 100644
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -1,4 +1,4 @@
|
||||
-# stack-direction.m4 serial 7
|
||||
+# stack-direction.m4 serial 8
|
||||
dnl Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--
|
||||
cgit v1.1
|
Loading…
Reference in New Issue
Block a user