Conversation
dc28357 to
586ab2d
Compare
|
FYI qcp 0.3.0 has been released. It is a breaking protocol change, dropping the dependency on capnp. |
863e693 to
a47177f
Compare
|
I bumped to 0.3.0 and added the man page handling from our flake discussions. |
a47177f to
9e193b4
Compare
|
Some suggestions: diff --git a/pkgs/by-name/qc/qcp/package.nix b/pkgs/by-name/qc/qcp/package.nix
index 89ac71723a12..ae84c97df689 100644
--- a/pkgs/by-name/qc/qcp/package.nix
+++ b/pkgs/by-name/qc/qcp/package.nix
@@ -1,7 +1,9 @@
{
lib,
- fetchFromGitHub,
rustPlatform,
+ fetchFromGitHub,
+ versionCheckHook,
+ nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@@ -10,31 +12,40 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "crazyscot";
- repo = pname;
- rev = "v${version}";
+ repo = "qcp";
+ tag = "v${version}";
hash = "sha256-9nJ01OPAU60veLpL2BlSSUTMu/xdUBDVkV0YEFNQ3FU=";
};
- cargoHash = "sha256-7LfwJa64ZUE0i8/bMecMoxzykJvuINzXctopyh4Qlak=";
+ useFetchCargoVendor = true;
+ cargoHash = "sha256-vVlwhXaCumgwTcHjnGwD6mi+ZtZvqmtCWukQaPBQcsA=";
+
+ postInstall = ''
+ install -Dm644 $src/misc/qcp.1 $out/share/man/man1/qcp.1
+ install -Dm644 $src/misc/qcp_config.5 $out/share/man/man5/qcp_config.5
+ install -Dm644 $src/misc/20-qcp.conf $out/etc/sysctl.d/20-qcp.conf
+ install -Dm644 $src/misc/qcp.conf $out/etc/qcp.conf
+ install -Dm644 $src/README.md $out/share/doc/qcp/README.md
+ install -Dm644 $src/LICENSE $out/share/doc/qcp/LICENSE
+ '';
checkFlags = [
# SSH home directory tests will not work in nix sandbox
"--skip=config::ssh::includes::test::home_dir"
];
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+ versionCheckProgramArg = "--version";
+
+ passthru.updateScript = nix-update-script {};
+
meta = {
- description = "The QUIC Copier (qcp) is an experimental high-performance remote file copy utility for long-distance internet connections.";
+ description = "Experimental high-performance remote file copy utility for long-distance internet connections";
homepage = "https://github.com/crazyscot/qcp";
- license = lib.licenses.agpl3Only;
+ changelog = "https://github.com/crazyscot/qcp/releases/tag/v{version}";
+ license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ poptart ];
+ mainProgram = "qcp";
};
-
- postInstall = ''
- install -Dm644 $src/misc/qcp.1 $out/share/man/man1/qcp.1
- install -Dm644 $src/misc/qcp_config.5 $out/share/man/man5/qcp_config.5
- install -Dm644 $src/misc/20-qcp.conf $out/etc/sysctl.d/20-qcp.conf
- install -Dm644 $src/misc/qcp.conf $out/etc/qcp.conf
- install -Dm644 $src/README.md $out/share/doc/qcp/README.md
- install -Dm644 $src/LICENSE $out/share/doc/qcp/LICENSE
- '';
} |
|
These are great suggestions and this is my first time packaging a Rust program so I appreciate the feedback. Almost everything I agree with but one thing:
Did you intend to fully replace the |
|
I am not aware of any downsides to using
Source: https://nixos.org/manual/nixpkgs/stable/#fetchfromgithub |
|
Looks like my confusion is because |
5e09262 to
f3cdeae
Compare
0xda157
left a comment
There was a problem hiding this comment.
please also squash everything into one commit
|
Hello! Upstream author of qcp here. Darwin is not (yet) a supported platform, so I'm not surprised that the CI build failed there. Is darwin support essential for this PR to be accepted? |
It's fine is darwin isn't supported |
8cf69a3 to
cff99e7
Compare
Done. I also added a build required flag and bumped the version. |
pkgs/by-name/qc/qcp/package.nix
Outdated
There was a problem hiding this comment.
| maintainers = with lib.maintainers; [ poptart ]; | |
| maintainers = with lib.maintainers; [ poptart ]; | |
| platforms = lib.platforms.linux; |
There was a problem hiding this comment.
actually it's fine to leave platforms as the default, even if it's untested upstream
cff99e7 to
959a9f7
Compare
959a9f7 to
19ff522
Compare
|
We got quite a bit out of sync with upstream so I decided to rebase again, so it may need another re-review. |
|
19ff522 to
40d778d
Compare
I unfortunately do not have a Darwin/mac to test this with, but I applied some buildtime checks for skipping the tests and bumped versions again. |
|
I'll run |
|
|
everything should just be in one |
de6d1e4 to
3512da8
Compare
|
Done. |
3512da8 to
c668a8d
Compare
c668a8d to
b181ded
Compare
b181ded to
2d7b24f
Compare
2d7b24f to
e4a9d7e
Compare
Adds the
qcppackage. This package is an experimental high-performance remote file copy utility used for long-distance transfers.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.