From 9f69ce405973ba32f07f1607aa3aa83b6adc2192 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 24 Mar 2022 00:03:59 +0100 Subject: [PATCH] gnused_422: drop this version was re-introduced in cb70a594cbf6cc097d9ac57d3b036d2418452006 should not be needed anymore --- pkgs/tools/text/gnused/422.nix | 35 --------------------------------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/tools/text/gnused/422.nix diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix deleted file mode 100644 index 15e57e319019..000000000000 --- a/pkgs/tools/text/gnused/422.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gnused"; - version = "4.2.2"; - - src = fetchurl { - url = "mirror://gnu/sed/sed-${version}.tar.bz2"; - sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; - }; - - configureFlags = lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; - - outputs = [ "out" "info" ]; - - meta = { - homepage = "https://www.gnu.org/software/sed/"; - description = "GNU sed, a batch stream editor"; - - longDescription = '' - Sed (stream editor) isn't really a true text editor or text - processor. Instead, it is used to filter text, i.e., it takes - text input and performs some operation (or set of operations) on - it and outputs the modified text. Sed is typically used for - extracting part of a file using pattern matching or substituting - multiple occurrences of a string within a file. - ''; - - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; - mainProgram = "sed"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 705900fdbd0e..6d33af2b17ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6164,11 +6164,7 @@ with pkgs; gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; - gnused = if !stdenv.hostPlatform.isWindows - then callPackage ../tools/text/gnused { } # broken on Windows - else gnused_422; - # This is an easy work-around for [:space:] problems. - gnused_422 = callPackage ../tools/text/gnused/422.nix { }; + gnused = callPackage ../tools/text/gnused { }; gnutar = callPackage ../tools/archivers/gnutar { };