Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ed: a huge refactor #323718

Merged
merged 2 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions pkgs/applications/editors/ed/default.nix

This file was deleted.

32 changes: 0 additions & 32 deletions pkgs/applications/editors/ed/generic.nix

This file was deleted.

45 changes: 0 additions & 45 deletions pkgs/applications/editors/ed/sources.nix

This file was deleted.

60 changes: 60 additions & 0 deletions pkgs/by-name/ed/ed/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
lib,
fetchurl,
lzip,
runtimeShellPackage,
stdenv,
testers,
}:

# Note: this package is used for bootstrapping fetchurl, and thus cannot use
# fetchpatch! Any mutable patches (retrieved from GitHub, cgit or any other
# place) that are needed here should be directly included together as regular
# files.

stdenv.mkDerivation (finalAttrs: {
pname = "ed";
version = "1.20.2";

src = fetchurl {
url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz";
hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
};

nativeBuildInputs = [ lzip ];

buildInputs = [ runtimeShellPackage ];

configureFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];

strictDeps = true;

doCheck = true;

passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "ed --version";
};
};

meta = {
homepage = "https://www.gnu.org/software/ed/";
description = "GNU implementation of the standard Unix editor";
longDescription = ''
GNU ed is a line-oriented text editor. It is used to create, display,
modify and otherwise manipulate text files, both interactively and via
shell scripts. A restricted version of ed, red, can only edit files in the
current directory and cannot execute shell commands. Ed is the 'standard'
text editor in the sense that it is the original editor for Unix, and thus
widely available. For most purposes, however, it is superseded by
full-screen editors such as GNU Emacs or GNU Moe.
'';
license = lib.licenses.gpl3Plus;
mainProgram = "ed";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ mapAliases ({
ec2_api_tools = ec2-api-tools; # Added 2021-10-08
ec2-utils = amazon-ec2-utils; # Added 2022-02-01

edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
elasticsearch7Plugins = elasticsearchPlugins;

# Electron
Expand Down
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30125,9 +30125,6 @@ with pkgs;

ecs-agent = callPackage ../applications/virtualization/ecs-agent { };

inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { }))
ed edUnstable;

edlin = callPackage ../applications/editors/edlin { };

oed = callPackage ../applications/editors/oed { };
Expand Down