From a2092b6ec522b1d414235416060a10d41975bdca Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 4 Feb 2022 18:04:49 -0300 Subject: [PATCH 1/2] reorder all-packages.nix --- pkgs/top-level/all-packages.nix | 72 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6688d6f2466b..f97547586154 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1100,6 +1100,10 @@ with pkgs; stdenv = clangStdenv; }; + archi = callPackage ../tools/misc/archi { }; + + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1107,10 +1111,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - archi = callPackage ../tools/misc/archi { }; - - breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1131,21 +1131,13 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; - iqueue = callPackage ../development/libraries/iqueue {}; - - iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; - lifecycled = callPackage ../tools/misc/lifecycled { }; - - lilo = callPackage ../tools/misc/lilo { }; - - logseq = callPackage ../applications/misc/logseq { }; - lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; microcom = callPackage ../applications/terminal-emulators/microcom { }; @@ -1158,16 +1150,8 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - natls = callPackage ../tools/misc/natls { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; - - pikchr = callPackage ../tools/graphics/pikchr { }; - - popsicle = callPackage ../tools/misc/popsicle { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; @@ -1190,16 +1174,12 @@ with pkgs; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; - snowflake = callPackage ../tools/networking/snowflake { }; - stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -1209,36 +1189,54 @@ with pkgs; termonad = termonad-with-packages; - termsyn = callPackage ../data/fonts/termsyn { }; - tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; tilix = callPackage ../applications/terminal-emulators/tilix { }; - timedoctor = callPackage ../applications/office/timedoctor { }; - - tvnamer = callPackage ../tools/misc/tvnamer { }; - - twine = with python3Packages; toPythonApplication twine; - wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; - writefreely = callPackage ../applications/misc/writefreely { }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { }; yaft = callPackage ../applications/terminal-emulators/yaft { }; + writefreely = callPackage ../applications/misc/writefreely { }; + + iqueue = callPackage ../development/libraries/iqueue { }; + + lifecycled = callPackage ../tools/misc/lifecycled { }; + + lilo = callPackage ../tools/misc/lilo { }; + + logseq = callPackage ../applications/misc/logseq { }; + + natls = callPackage ../tools/misc/natls { }; + + notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; + + pikchr = callPackage ../tools/graphics/pikchr { }; + + popsicle = callPackage ../tools/misc/popsicle { }; + + terminal-colors = callPackage ../applications/misc/terminal-colors { }; + + termsyn = callPackage ../data/fonts/termsyn { }; + + timedoctor = callPackage ../applications/office/timedoctor { }; + + tvnamer = callPackage ../tools/misc/tvnamer { }; + + twine = with python3Packages; toPythonApplication twine; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -5075,6 +5073,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; + snowflake = callPackage ../tools/networking/snowflake { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; From aab17d11d784281dfce4d174351365a6905f92cd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 4 Feb 2022 19:44:10 -0300 Subject: [PATCH 2/2] kermit: init at 3.5 --- .../kermit-terminal/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/kermit-terminal/default.nix diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix new file mode 100644 index 000000000000..c9672389d3cc --- /dev/null +++ b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, gtk3 +, pcre +, pkg-config +, vte +}: + +stdenv.mkDerivation rec { + pname = "kermit"; + version = "3.5"; + + src = fetchFromGitHub { + name = "${pname}-${version}-src"; + owner = "orhun"; + repo = pname; + rev = version; + hash = "sha256-bdy2iPUV3flZrf4otuw40Xn1t/82H7ayjr7yzHLPo74="; + }; + + patches = [ + # Manpage installation. Remove it when next release arrives + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/orhun/kermit/pull/21.patch"; + hash = "sha256-mcsKQNEPgJOWFmOxKii2en2CwpUbT6tO2/YAlRSUL2A="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + gtk3 + pcre + vte + ]; + + meta = with lib; { + homepage = "https://github.com/orhun/kermit"; + description = "A VTE-based, simple and froggy terminal emulator"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f97547586154..21a7c9233831 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1133,6 +1133,8 @@ with pkgs; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; + kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; + kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;