From c062ecef8d0c97f31a3e96ceb4f321922f3382b8 Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Fri, 16 Oct 2026 00:58:09 -0700 Subject: [PATCH 1/4] maintainers: add kallisti-dev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b53c3f251ec..9e927bd962d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14941,6 +14941,12 @@ github = "Kalitsune"; githubId = 74075397; }; + kallisti-dev = { + email = "kallisti.dev@gmail.com"; + github = "kallisti-dev"; + githubId = 1530244; + name = "Adam Curtis"; + }; kamadorueda = { name = "Kevin Amado"; email = "kamadorueda@gmail.com"; From 78fd993b339dd1001f0f4e51d605c11965400df9 Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Fri, 16 Oct 2026 00:59:22 -0700 Subject: [PATCH 2/4] amtterm: add kallisti-dev to maintainers --- pkgs/by-name/am/amtterm/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index dd3b15d92bf7..c6ecd87cd74f 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Intel AMT® SoL client + tools"; homepage = "https://github.com/kraxel/amtterm"; license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ kallisti-dev ]; platforms = lib.platforms.linux; }; }) From 8e656e193471bc8f41290f352e3888297ca56a0d Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Wed, 21 Oct 2026 04:17:13 -0700 Subject: [PATCH 3/4] amtterm: 1.7-1-unstable-2023-10-27 -> 1.8 Assisted-by: Claude Code (Claude Opus 5.5) --- doc/release-notes/rl-2611.section.md | 2 ++ pkgs/by-name/am/amtterm/package.nix | 47 +++++++++++++++++++++------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 4cb16cd654be..1a2a2524cdf1 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -108,6 +108,8 @@ - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. +- `amtterm` has been updated to 1.8. `amtterm` and `amtider` now connect with TLS on port 16995 by default, and verify the certificate only when given `-C `. Use `-P` to connect without TLS on port 16994 as before, for AMT that doesn't have TLS configured. AMT accepts only TLS from CSME 16.1 on. `amttool` no longer verifies certificates for HTTPS connections. + - The existing `wasm32-wasi` target has become `wasm32-wasip1` and `pkgsCross.wasi32` has become `pkgsCross.wasm32-wasip1`, aligning with LLVM's nomenclature. Aliases are in place and old forms will continue to be parsed but there might be some breakage if you're relying on the exact form of these (e.g., in sysroot paths). - `sing-box` has been updated to 1.14.0, which has removed some deprecated options. See [upstream documentation](https://sing-box.sagernet.org/migration/) for details and migration options. diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index c6ecd87cd74f..ff139d6161e6 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -1,10 +1,14 @@ { - fetchFromGitHub, + fetchFromGitLab, + fetchpatch, lib, stdenv, makeWrapper, + glib, + gnutls, gtk3, - openssl, + meson, + ninja, perl, perlPackages, pkg-config, @@ -14,14 +18,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "amtterm"; - version = "1.7-1-unstable-2023-10-27"; + version = "1.8"; buildInputs = (with perlPackages; [ perl SOAPLite ]) - ++ [ openssl ] + ++ [ + glib + gnutls + ] ++ lib.optionals withGamt [ gtk3 @@ -29,27 +36,43 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ makeWrapper + meson + ninja pkg-config ]; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "kraxel"; repo = "amtterm"; - rev = "ed5da502cbb150982ad982211ad9475414b8689a"; - hash = "sha256-JwS2agmJJ6VcGLkNbkFRb5bzKV8el1DMDjalmLnOdE8="; + tag = "amtterm-${finalAttrs.version}-1"; + hash = "sha256-RedbapQgbtAeUmrz8hwuKeFusl/ePSspOjZxW8XYaag="; }; - makeFlags = [ - "prefix=$(out)" - "STRIP=" - "USE_OPENSSL=1" + patches = [ + # In 1.8, plaintext connections fail and gamt ignores -C. + # https://gitlab.com/kraxel/amtterm/-/merge_requests/3 + (fetchpatch { + name = "redir-set-connect-error-before-reporting.patch"; + url = "https://gitlab.com/kraxel/amtterm/-/commit/5b79b25a7933ee4b770b892393f695d31cdaa44d.patch"; + hash = "sha256-yJfwJoZPs/NDoETKd032XtozuVyi2+YETRVwmYNRWos="; + }) + (fetchpatch { + name = "redir-fix-non-ssl-connections.patch"; + url = "https://gitlab.com/kraxel/amtterm/-/commit/649f0654c598b2e8075a3b9f815fa693f4a171fe.patch"; + hash = "sha256-4GRaSyBVAK2ETM8cz5VaXKWcpzNAVctK9PNDJ1OhxAI="; + }) + (fetchpatch { + name = "gamt-use-ssl-when-c-is-given.patch"; + url = "https://gitlab.com/kraxel/amtterm/-/commit/ec2ce0fad989b828c0529b0298d15745987a1092.patch"; + hash = "sha256-NUbaZhi8KqC9CIPwN2GaBZhzz9GCxPKBB2jQT+wz6g8="; + }) ]; postInstall = "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB"; meta = { description = "Intel AMT® SoL client + tools"; - homepage = "https://github.com/kraxel/amtterm"; + homepage = "https://gitlab.com/kraxel/amtterm"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kallisti-dev ]; platforms = lib.platforms.linux; From 8b1e8ad356ec18d6f1cda33b56963bafc212effb Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Wed, 21 Oct 2026 04:17:41 -0700 Subject: [PATCH 4/4] amtterm: support Darwin Assisted-by: Claude Code (Claude Opus 5.5) --- pkgs/by-name/am/amtterm/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index ff139d6161e6..8801261e714b 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/kraxel/amtterm"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kallisti-dev ]; - platforms = lib.platforms.linux; + # gamt uses GTK's X11 backend; nixpkgs' gtk3 uses Quartz on Darwin. + platforms = lib.platforms.linux ++ lib.optionals (!withGamt) lib.platforms.darwin; }; })