proxytunnel: init at 1.12.3#501526
Conversation
7487d12 to
71b2568
Compare
|
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 |
06f1566 to
86cde7b
Compare
|
was previously dropped in #150880 |
|
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
];
|
| version = "1.12.3"; | ||
| src = fetchFromGitHub { | ||
| owner = "proxytunnel"; | ||
| repo = finalAttrs.pname; |
There was a problem hiding this comment.
btw this should also be the string "proxytunnel" instead
There was a problem hiding this comment.
I replaced repo with proxytunnel and referenced these variables in meta using finalAttrs.
There was a problem hiding this comment.
Precedent:
e12a77a to
2936811
Compare
2936811 to
9317920
Compare
9317920 to
2b86054
Compare
2b86054 to
b0d2f0b
Compare
|
stepbrobd
left a comment
There was a problem hiding this comment.
Approved automatically following the successful run of nixpkgs-review.
Note that this package doesn't have tests: https://github.com/proxytunnel/proxytunnel
It is packaged in Kali Linux and Debian.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.