From c5509bfafe44d6bed854a256fb842c410f65ff20 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 29 Mar 2025 16:56:11 -0700 Subject: [PATCH] dozenal: drop --- pkgs/by-name/do/dozenal/lua-header.patch | 16 ----- pkgs/by-name/do/dozenal/package.nix | 80 ------------------------ pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 pkgs/by-name/do/dozenal/lua-header.patch delete mode 100644 pkgs/by-name/do/dozenal/package.nix diff --git a/pkgs/by-name/do/dozenal/lua-header.patch b/pkgs/by-name/do/dozenal/lua-header.patch deleted file mode 100644 index 45b76e159a11..000000000000 --- a/pkgs/by-name/do/dozenal/lua-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c ---- dozenal-12010904/dozenal/dozcal/call_lua.c 2017-09-04 19:25:01.000000000 +0200 -+++ dozenal-patched/dozenal/dozcal/call_lua.c 2018-06-13 10:19:57.821950327 +0200 -@@ -38,9 +38,9 @@ - #include"utility.h" - #include"conv.h" - #include"proc_date.h" --#include --#include --#include -+#include -+#include -+#include - - void bail(lua_State *L, int err_code, char *filename); - int file_prefix(char **s, char *t); diff --git a/pkgs/by-name/do/dozenal/package.nix b/pkgs/by-name/do/dozenal/package.nix deleted file mode 100644 index 4cef1375f4e8..000000000000 --- a/pkgs/by-name/do/dozenal/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - ncurses, - hdate, - lua5_2, -}: - -stdenv.mkDerivation rec { - version = "12010904"; - pname = "dozenal"; - src = fetchFromGitHub { - owner = "dgoodmaniii"; - repo = "dozenal"; - rev = "v${version}"; - sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209"; - }; - makeFlags = [ - # author do not use configure and prefix directly using $prefix - "prefix=$(out)" - # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down - "XFORMS_FLAGS=-UXFORMS" - "LUALIB=-llua" - "bindir=$(prefix)/bin/" - ]; - # some include hardcodes the lua libraries path. This is a patch for that - patches = [ ./lua-header.patch ]; - preBuild = "cd dozenal"; - buildInputs = [ - ncurses - hdate - lua5_2 - ]; - - # Parallel builds fail due to no dependencies between subdirs. - # As a result some subdirs are atempted to build twice: - # ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory - # Let's disable parallelism until it's fixed upstream: - # https://gitlab.com/dgoodmaniii/dozenal/-/issues/8 - enableParallelBuilding = false; - - # I remove gdozdc, as I didn't figure all it's dependency yet. - postInstall = "rm $out/bin/gdozdc"; - - meta = { - description = "Complete suite of dozenal (base twelve) programs"; - longDescription = '' - Programs - - doz --- a converter; converts decimal numbers into dozenal. Accepts - input in standard or exponential notation (i.e., "1492.2" or "1.4922e3"). - dec --- a converter; converts dozenal numbers into decimal. Accepts input - in standard or exponential notation (i.e., "X44;4" or "X;444e2"). - dozword --- converts a dozenal number (integers only) into words, - according to the Pendlebury system. - dozdc --- a full-featured scientific calculator which works in the - dozenal base. RPN command line. - tgmconv --- a converter for all standard measurements; converts to and - from TGM, Imperial, customary, and SI metric. - dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or - other characters) as desired, and can also transform transdecimal digits - from 'X' to 'E' into any character or sequence of characters desired. - dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it - outputs the date and time in dozenal, as well as containing some TGM - extensions. - dozstring --- a simple byte converter; absorbs a string either from - standard input or a command line argument, leaving it identical but - for the numbers, which it converts into dozenal. Options for padding - and for not converting specific numbers. - doman --- a converter which takes a dozenal integer and - emits its equivalent in a non-place-value system, such as - Roman numerals. Arbitrary ranks and symbols may be used. - Defaults to dozenal Roman numerals. - ''; - homepage = "https://github.com/dgoodmaniii/dozenal/"; - maintainers = with lib.maintainers; [ CharlesHD ]; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd3de5da4ec4..10b76f21df3f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -395,6 +395,7 @@ mapAliases { dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25 + dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30 dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03