Skip to content

proxytunnel: init at 1.12.3#501526

Merged
stepbrobd merged 2 commits intoNixOS:masterfrom
lenianiva:pkgs/proxytunnel
Mar 20, 2026
Merged

proxytunnel: init at 1.12.3#501526
stepbrobd merged 2 commits intoNixOS:masterfrom
lenianiva:pkgs/proxytunnel

Conversation

@lenianiva
Copy link
Copy Markdown
Contributor

@lenianiva lenianiva commented Mar 20, 2026

Note that this package doesn't have tests: https://github.com/proxytunnel/proxytunnel

It is packaged in Kali Linux and Debian.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@nixos-discourse
Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/6582

@nixpkgs-ci nixpkgs-ci bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle! 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Mar 20, 2026
@lenianiva lenianiva force-pushed the pkgs/proxytunnel branch 6 times, most recently from 06f1566 to 86cde7b Compare March 20, 2026 08:46
@stepbrobd
Copy link
Copy Markdown
Member

was previously dropped in #150880

@stepbrobd
Copy link
Copy Markdown
Member

i would do it like this (also it builds fine on darwin):

diff --git i/pkgs/by-name/pr/proxytunnel/package.nix w/pkgs/by-name/pr/proxytunnel/package.nix
index 5eef7d6d320b..7f1af08492f5 100644
--- i/pkgs/by-name/pr/proxytunnel/package.nix
+++ w/pkgs/by-name/pr/proxytunnel/package.nix
@@ -1,15 +1,19 @@
 {
-  config,
   lib,
   stdenv,
-  openssl,
   fetchFromGitHub,
+  openssl,
+  asciidoc,
+  xmlto,
+  docbook-xsl-nons,
+  docbook_xml_dtd_45,
   versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxytunnel";
   version = "1.12.3";
+
   src = fetchFromGitHub {
     owner = "proxytunnel";
     repo = finalAttrs.pname;
@@ -17,29 +21,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+IRbL3VcnW+uYLIkwvaFJ8zBYbQAkqmzVluDsCrdURk=";
   };
 
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+
   buildInputs = [ openssl ];
 
-  # `makeFlags` doesn't like the space inside `optflags` and cannot be used here.
-  buildPhase =
-    let
-      optflags = "-DUSE_SSL -DHAVE_GETOPT_LONG -DSETPROCTITLE -DSPT_TYPE=2";
-    in
-    ''
-      make OPTFLAGS="${optflags}"
-    '';
+  nativeBuildInputs = [
+    asciidoc
+    xmlto
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+  ];
+
+  doInstallCheck = true;
 
-  installPhase = ''
-    mkdir -p $out/bin
-    mv ./proxytunnel $out/bin
-  '';
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
+    mainProgram = "proxytunnel";
     homepage = "http://proxytunnel.sf.net/";
     description = "Stealth tunneling through HTTP(S) proxies";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;
-    changelog = "https://github.com/proxytunnel/${finalAttrs.pname}/blob/v${finalAttrs.version}/CHANGES";
+    changelog = "https://github.com/proxytunnel/proxytunnel/raw/v${finalAttrs.version}/CHANGES";
     maintainers = with lib.maintainers; [
       lenianiva
     ];

Comment thread pkgs/by-name/pr/proxytunnel/package.nix Outdated
version = "1.12.3";
src = fetchFromGitHub {
owner = "proxytunnel";
repo = finalAttrs.pname;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw this should also be the string "proxytunnel" instead

Copy link
Copy Markdown
Contributor Author

@lenianiva lenianiva Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I replaced repo with proxytunnel and referenced these variables in meta using finalAttrs.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Precedent:

changelog = "https://github.com/${finalAttrs.src.owner}/${finalAttrs.src.repo}/blob/${finalAttrs.src.rev}/changelog.md";

@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Mar 20, 2026
@lenianiva lenianiva force-pushed the pkgs/proxytunnel branch 2 times, most recently from e12a77a to 2936811 Compare March 20, 2026 10:31
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Mar 20, 2026
@lenianiva lenianiva requested a review from stepbrobd March 20, 2026 15:50
@stepbrobd
Copy link
Copy Markdown
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 501526
Commit: b0d2f0b30a2a4223c25ad53579864bc0113e7079 (subsequent changes)
Merge: d7ff111cc13ac56e8e940ca7b0b8539444e5b6ce

Logs: https://github.com/stepbrobd/nixpkgs-review-gha/actions/runs/23364700136

Download packages from cache:
  • x86_64-linux
    nix-store -r --add-root nixpkgs-pr-501526-x86_64-linux \
      --option binary-caches 'https://cache.nixos.org/ https://cache.ysun.co/public' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      public:Y9EARSt+KLUY1JrY4X8XWmzs6uD+Zh2hRqN9eCUg55U=
      ' \
      /nix/store/s4i8xwfar04gqiikz7lk6ni8vvm8v3yc-proxytunnel-1.12.3
  • aarch64-linux
    nix-store -r --add-root nixpkgs-pr-501526-aarch64-linux \
      --option binary-caches 'https://cache.nixos.org/ https://cache.ysun.co/public' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      public:Y9EARSt+KLUY1JrY4X8XWmzs6uD+Zh2hRqN9eCUg55U=
      ' \
      /nix/store/yrigl6y5kxjgk1b1w6ngxhh2dd4z7shp-proxytunnel-1.12.3
  • x86_64-darwin
    nix-store -r --add-root nixpkgs-pr-501526-x86_64-darwin \
      --option binary-caches 'https://cache.nixos.org/ https://cache.ysun.co/public' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      public:Y9EARSt+KLUY1JrY4X8XWmzs6uD+Zh2hRqN9eCUg55U=
      ' \
      /nix/store/z937ij16afm5inssm0d0g71ap7gvyndc-proxytunnel-1.12.3
  • aarch64-darwin
    nix-store -r --add-root nixpkgs-pr-501526-aarch64-darwin \
      --option binary-caches 'https://cache.nixos.org/ https://cache.ysun.co/public' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      public:Y9EARSt+KLUY1JrY4X8XWmzs6uD+Zh2hRqN9eCUg55U=
      ' \
      /nix/store/fihp4m222140znbk2p2w616wn7savysw-proxytunnel-1.12.3

x86_64-linux

✅ 1 package built:
  • proxytunnel

aarch64-linux

✅ 1 package built:
  • proxytunnel

x86_64-darwin (sandbox = relaxed)

✅ 1 package built:
  • proxytunnel

aarch64-darwin (sandbox = relaxed)

✅ 1 package built:
  • proxytunnel

Copy link
Copy Markdown
Member

@stepbrobd stepbrobd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved automatically following the successful run of nixpkgs-review.

@stepbrobd stepbrobd added this pull request to the merge queue Mar 20, 2026
Merged via the queue into NixOS:master with commit 72896eb Mar 20, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants