From b8985bb965737ce8d117b7a2c5242aabf0e6062c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 May 2022 00:51:22 -0300 Subject: [PATCH 1/5] teapot: use Museoa as backup The original site is now dead, so I took the liberty of getting the sources and backup it on my personal data hoarder project. --- pkgs/applications/office/teapot/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index 62a48cebf19..d2d44511bc6 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , cmake , libtirpc , ncurses @@ -10,12 +10,18 @@ stdenv.mkDerivation rec { pname = "teapot"; version = "2.3.0"; - src = fetchzip { + src = fetchFromGitHub { name = "${pname}-${version}"; - url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz"; - sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY="; + owner = "museoa"; + repo = pname; + rev = version; + hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k="; }; + prePatch = '' + cd src + ''; + patches = [ # include a local file in order to make cc happy ./001-fix-warning.patch @@ -41,8 +47,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.syntax-k.de/projekte/teapot/"; - description = "Table Editor And Planner, Or: Teapot!"; + inherit (src.meta) homepage; + description = "Table Editor And Planner, Or: Teapot"; longDescription = '' Teapot is a compact spreadsheet software originally written by Michael Haardt. It features a (n)curses-based text terminal interface, and @@ -70,4 +76,4 @@ stdenv.mkDerivation rec { }; } # TODO: patch/fix FLTK building -# TODO: add documentation from +# TODO: add documentation From 18d7643c9d19d89658cc820b474201cea9135af6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 May 2022 00:57:33 -0300 Subject: [PATCH 2/5] dgen-sdl: fixup meta.homepage --- .../emulators/dgen-sdl/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index e56ca12a4e9..cbcdad4a3c2 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -1,39 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , libarchive , SDL }: -let +stdenv.mkDerivation rec { pname = "dgen-sdl"; version = "1.33"; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz"; hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4="; }; - buildInputs = [ SDL libarchive ]; + buildInputs = [ + SDL + libarchive + ]; configureFlags = [ - "--enable-joystick" - "--enable-debugger" "--enable-debug-vdp" + "--enable-debugger" + "--enable-joystick" "--enable-pico" # experimental "--enable-vgmdump" - "--with-star=no" # Needs ASM support - "--with-musa" "--with-cyclone=no" # Needs ASM support - "--with-mz80" "--with-cz80" "--with-drz80=no" # Needs ASM support "--with-dz80" + "--with-musa" + "--with-mz80" + "--with-star=no" # Needs ASM support ]; meta = with lib; { - homepage = "https://dgen.sourceforge.net/"; + homepage = "http://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive From 3d195260adae3ed4436f456a80a563a8844d6aa9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 00:14:23 -0300 Subject: [PATCH 3/5] yex-lang: unstable-2021-12-25 -> 0.pre+date=2022-05-10 --- .../interpreters/yex-lang/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index 7223b7aca78..cc4e7f31f31 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: rustPlatform.buildRustPackage rec { pname = "yex-lang"; - version = "unstable-2021-12-25"; + version = "0.pre+date=2022-05-10"; src = fetchFromGitHub { owner = "nonamescm"; repo = "yex-lang"; - rev = "a97def1431b73b8693700f530ec023f1776eaf83"; - hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw="; + rev = "866c4decbb9340f5af687b145e2c4f47fcbee786"; + hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k="; }; - cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ="; + cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; meta = with lib; { - homepage = "https://github.com/nonamesc/yex-lang"; - description = "A cool functional scripting language written in rust"; + homepage = "https://github.com/nonamescm/yex-lang"; + description = "A functional scripting language written in rust"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; mainProgram = "yex"; From 8cc63bb7866788e582d05c6209abfb5006805b0c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 07:40:24 -0300 Subject: [PATCH 4/5] libast: 0.7.1 -> 0.8 --- pkgs/development/libraries/libast/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index b48971bc431..f4dae188f31 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl -, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: stdenv.mkDerivation rec { pname = "libast"; - version = "0.7.1"; + version = "0.8"; - src = fetchurl { - url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; - sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = version; + hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; meta = with lib; { + inherit (src.meta) homepage; description = "Library of Assorted Spiffy Things"; - homepage = "https://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; From 3f898ed15a4bc20a14687b2384bd991ad7837d6c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 07:40:51 -0300 Subject: [PATCH 5/5] eterm: reformat knownVulnerabilities message Also, with a link to CVE entry --- pkgs/applications/terminal-emulators/eterm/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 769104fea43..a0bccbfcb1e 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6-unstable=2020-03-03"; + version = "0.9.6+date=2020-03-03"; src = fetchFromGitHub { owner = "mej"; @@ -43,7 +43,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; knownVulnerabilities = [ - "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ''Usage of ANSI escape sequences causes unexpected newline-termination, + leading to unexpected command execution. More info at: + - https://www.cve.org/CVERecord?id=CVE-2021-33477 + - https://www.openwall.com/lists/oss-security/2021/05/17/1'' ]; }; }