Skip to content

Commit

Permalink
ed: a huge refactor
Browse files Browse the repository at this point in the history
- Delete `edUnstable` (since it was deleted upstream);
- migrate to `pkgs/by-name`
- strictDeps
- testVersion
- meta.mainProgram
  • Loading branch information
AndersonTorres committed Jul 1, 2024
1 parent 8a99623 commit 2638c9e
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 94 deletions.
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.

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

# Note: this package is used for bootstrapping fetchurl, and thus cannot use
# fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed
# here should be included directly in Nixpkgs as files; further, those patches
# should be included in the directory (or subdirectories) where this package file
# belongs, given that ed now follows RFC 140.

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;
};
})
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30250,9 +30250,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

0 comments on commit 2638c9e

Please sign in to comment.