From 92af417a135c2ec90f0ddf75f269c09fc4b0b73c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 7 May 2024 04:50:27 +0200 Subject: [PATCH] cdecl: adopt, migrate to by-name, reformat --- .../cd}/cdecl/cdecl-2.5-lex.patch | 0 .../cd/cdecl/package.nix} | 21 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-) rename pkgs/{development/tools => by-name/cd}/cdecl/cdecl-2.5-lex.patch (100%) rename pkgs/{development/tools/cdecl/default.nix => by-name/cd/cdecl/package.nix} (77%) diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch similarity index 100% rename from pkgs/development/tools/cdecl/cdecl-2.5-lex.patch rename to pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/by-name/cd/cdecl/package.nix similarity index 77% rename from pkgs/development/tools/cdecl/default.nix rename to pkgs/by-name/cd/cdecl/package.nix index 48870c7d2df1..5bc045bc0edc 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -1,4 +1,13 @@ -{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: +{ + lib, + stdenv, + fetchurl, + bison, + flex, + readline, + ncurses, + gnused, +}: stdenv.mkDerivation rec { pname = "cdecl"; @@ -15,12 +24,18 @@ stdenv.mkDerivation rec { makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; mkdir -p $out/bin; ''; - buildInputs = [bison flex readline ncurses]; + + buildInputs = [ + bison + flex + readline + ncurses + ]; meta = { description = "Translator English -- C/C++ declarations"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 445ae1120707..16ed37cff807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6612,8 +6612,6 @@ with pkgs; ccze = callPackage ../tools/misc/ccze { }; - cdecl = callPackage ../development/tools/cdecl { }; - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; cdist = python3Packages.callPackage ../tools/admin/cdist { };