forked from mirrors/nixpkgs
Merge pull request #215812 from christoph-heiss/pkgs/proxmox-backup-client
This commit is contained in:
Ninjatrappeur
GitHub
commit
cb80417aad
|
|
@ -2757,6 +2757,15 @@
|
||||||
githubId = 2245737;
|
githubId = 2245737;
|
||||||
name = "Christopher Mark Poole";
|
name = "Christopher Mark Poole";
|
||||||
};
|
};
|
||||||
|
christoph-heiss = {
|
||||||
|
email = "christoph@c8h4.io";
|
||||||
|
github = "christoph-heiss";
|
||||||
|
githubId = 7571069;
|
||||||
|
name = "Christoph Heiss";
|
||||||
|
keys = [{
|
||||||
|
fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A";
|
||||||
|
}];
|
||||||
|
};
|
||||||
chuahou = {
|
chuahou = {
|
||||||
email = "human+github@chuahou.dev";
|
email = "human+github@chuahou.dev";
|
||||||
github = "chuahou";
|
github = "chuahou";
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,182 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||||
|
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||||
|
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||||
|
---
|
||||||
|
Cargo.toml | 130 +++++++++--------------------------------------------
|
||||||
|
1 file changed, 21 insertions(+), 109 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Cargo.toml b/Cargo.toml
|
||||||
|
index 0c86cd1b..7d5c282b 100644
|
||||||
|
--- a/Cargo.toml
|
||||||
|
+++ b/Cargo.toml
|
||||||
|
@@ -41,9 +41,6 @@ members = [
|
||||||
|
|
||||||
|
"proxmox-backup-banner",
|
||||||
|
"proxmox-backup-client",
|
||||||
|
- "proxmox-file-restore",
|
||||||
|
- "proxmox-restore-daemon",
|
||||||
|
- "proxmox-rrd",
|
||||||
|
|
||||||
|
"pxar-bin",
|
||||||
|
]
|
||||||
|
@@ -101,7 +98,6 @@ proxmox-rrd = { path = "proxmox-rrd" }
|
||||||
|
|
||||||
|
# regular crates
|
||||||
|
anyhow = "1.0"
|
||||||
|
-apt-pkg-native = "0.3.2"
|
||||||
|
base64 = "0.13"
|
||||||
|
bitflags = "1.2.1"
|
||||||
|
bytes = "1.0"
|
||||||
|
@@ -114,7 +110,6 @@ flate2 = "1.0"
|
||||||
|
foreign-types = "0.3"
|
||||||
|
futures = "0.3"
|
||||||
|
h2 = { version = "0.3", features = [ "stream" ] }
|
||||||
|
-handlebars = "3.0"
|
||||||
|
hex = "0.4.3"
|
||||||
|
http = "0.2"
|
||||||
|
hyper = { version = "0.14", features = [ "full" ] }
|
||||||
|
@@ -152,120 +147,37 @@ walkdir = "2"
|
||||||
|
xdg = "2.2"
|
||||||
|
zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||||
|
|
||||||
|
-[dependencies]
|
||||||
|
-anyhow.workspace = true
|
||||||
|
-apt-pkg-native.workspace = true
|
||||||
|
-base64.workspace = true
|
||||||
|
-bitflags.workspace = true
|
||||||
|
-bytes.workspace = true
|
||||||
|
-cidr.workspace = true
|
||||||
|
-crc32fast.workspace = true
|
||||||
|
-crossbeam-channel.workspace = true
|
||||||
|
-endian_trait.workspace = true
|
||||||
|
-flate2.workspace = true
|
||||||
|
-futures.workspace = true
|
||||||
|
-h2.workspace = true
|
||||||
|
-handlebars.workspace = true
|
||||||
|
-hex.workspace = true
|
||||||
|
-http.workspace = true
|
||||||
|
-hyper.workspace = true
|
||||||
|
-lazy_static.workspace = true
|
||||||
|
-libc.workspace = true
|
||||||
|
-log.workspace = true
|
||||||
|
-nix.workspace = true
|
||||||
|
-nom.workspace = true
|
||||||
|
-num-traits.workspace = true
|
||||||
|
-once_cell.workspace = true
|
||||||
|
-openssl.workspace = true
|
||||||
|
-pam-sys.workspace = true
|
||||||
|
-pam.workspace = true
|
||||||
|
-percent-encoding.workspace = true
|
||||||
|
-regex.workspace = true
|
||||||
|
-rustyline.workspace = true
|
||||||
|
-serde.workspace = true
|
||||||
|
-serde_json.workspace = true
|
||||||
|
-siphasher.workspace = true
|
||||||
|
-syslog.workspace = true
|
||||||
|
-termcolor.workspace = true
|
||||||
|
-thiserror.workspace = true
|
||||||
|
-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||||
|
-tokio-openssl.workspace = true
|
||||||
|
-tokio-stream.workspace = true
|
||||||
|
-tokio-util = { workspace = true, features = [ "codec" ] }
|
||||||
|
-tower-service.workspace = true
|
||||||
|
-udev.workspace = true
|
||||||
|
-url.workspace = true
|
||||||
|
-walkdir.workspace = true
|
||||||
|
-xdg.workspace = true
|
||||||
|
-zstd.workspace = true
|
||||||
|
-
|
||||||
|
#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||||
|
|
||||||
|
-proxmox-async.workspace = true
|
||||||
|
-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
|
||||||
|
-proxmox-compression.workspace = true
|
||||||
|
-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
|
||||||
|
-proxmox-io.workspace = true
|
||||||
|
-proxmox-lang.workspace = true
|
||||||
|
-proxmox-ldap.workspace = true
|
||||||
|
-proxmox-metrics.workspace = true
|
||||||
|
-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
|
||||||
|
-proxmox-router = { workspace = true, features = [ "cli", "server"] }
|
||||||
|
-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
|
||||||
|
-proxmox-section-config.workspace = true
|
||||||
|
-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
|
||||||
|
-proxmox-shared-memory.workspace = true
|
||||||
|
-proxmox-sortable-macro.workspace = true
|
||||||
|
-proxmox-subscription.workspace = true
|
||||||
|
-proxmox-sys = { workspace = true, features = [ "timer" ] }
|
||||||
|
-proxmox-tfa.workspace = true
|
||||||
|
-proxmox-time.workspace = true
|
||||||
|
-proxmox-uuid.workspace = true
|
||||||
|
-
|
||||||
|
-pathpatterns.workspace = true
|
||||||
|
-proxmox-acme-rs.workspace = true
|
||||||
|
-proxmox-apt.workspace = true
|
||||||
|
-proxmox-openid.workspace = true
|
||||||
|
-pxar.workspace = true
|
||||||
|
-
|
||||||
|
-pbs-api-types.workspace = true
|
||||||
|
-pbs-buildcfg.workspace = true
|
||||||
|
-pbs-client.workspace = true
|
||||||
|
-pbs-config.workspace = true
|
||||||
|
-pbs-datastore.workspace = true
|
||||||
|
-pbs-key-config.workspace = true
|
||||||
|
-pbs-tape.workspace = true
|
||||||
|
-pbs-tools.workspace = true
|
||||||
|
-proxmox-rrd.workspace = true
|
||||||
|
-
|
||||||
|
# Local path overrides
|
||||||
|
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||||
|
[patch.crates-io]
|
||||||
|
#proxmox-acme-rs = { path = "../proxmox-acme-rs" }
|
||||||
|
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||||
|
-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||||
|
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||||
|
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||||
|
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||||
|
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||||
|
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||||
|
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||||
|
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||||
|
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||||
|
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||||
|
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||||
|
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||||
|
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||||
|
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||||
|
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||||
|
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||||
|
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||||
|
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||||
|
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||||
|
+proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||||
|
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||||
|
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||||
|
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||||
|
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||||
|
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||||
|
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||||
|
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||||
|
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||||
|
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||||
|
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||||
|
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||||
|
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||||
|
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
|
||||||
|
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||||
|
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||||
|
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||||
|
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||||
|
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||||
|
|
||||||
|
#proxmox-apt = { path = "../proxmox-apt" }
|
||||||
|
#proxmox-openid = { path = "../proxmox-openid-rs" }
|
||||||
|
|
||||||
|
-#pxar = { path = "../pxar" }
|
||||||
|
+pxar = { path = "../pxar" }
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = []
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||||
|
Date: Tue, 29 Nov 2022 17:20:28 +0100
|
||||||
|
Subject: [PATCH] docs: drop all but client man pages
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||||
|
---
|
||||||
|
docs/Makefile | 16 ----------------
|
||||||
|
docs/conf.py | 19 -------------------
|
||||||
|
2 files changed, 35 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/docs/Makefile b/docs/Makefile
|
||||||
|
index b06badff..94130228 100644
|
||||||
|
--- a/docs/Makefile
|
||||||
|
+++ b/docs/Makefile
|
||||||
|
@@ -1,25 +1,9 @@
|
||||||
|
include ../defines.mk
|
||||||
|
|
||||||
|
GENERATED_SYNOPSIS := \
|
||||||
|
- proxmox-tape/synopsis.rst \
|
||||||
|
proxmox-backup-client/synopsis.rst \
|
||||||
|
proxmox-backup-client/catalog-shell-synopsis.rst \
|
||||||
|
- proxmox-backup-manager/synopsis.rst \
|
||||||
|
- proxmox-backup-debug/synopsis.rst \
|
||||||
|
- proxmox-file-restore/synopsis.rst \
|
||||||
|
pxar/synopsis.rst \
|
||||||
|
- pmtx/synopsis.rst \
|
||||||
|
- pmt/synopsis.rst \
|
||||||
|
- config/media-pool/config.rst \
|
||||||
|
- config/tape/config.rst \
|
||||||
|
- config/tape-job/config.rst \
|
||||||
|
- config/user/config.rst \
|
||||||
|
- config/remote/config.rst \
|
||||||
|
- config/sync/config.rst \
|
||||||
|
- config/verification/config.rst \
|
||||||
|
- config/acl/roles.rst \
|
||||||
|
- config/datastore/config.rst \
|
||||||
|
- config/domains/config.rst
|
||||||
|
|
||||||
|
MAN1_PAGES := \
|
||||||
|
pxar.1 \
|
||||||
|
diff --git a/docs/conf.py b/docs/conf.py
|
||||||
|
index 8944926e..deeb63bf 100644
|
||||||
|
--- a/docs/conf.py
|
||||||
|
+++ b/docs/conf.py
|
||||||
|
@@ -93,26 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}"
|
||||||
|
man_pages = [
|
||||||
|
# CLI
|
||||||
|
('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
|
||||||
|
- ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1),
|
||||||
|
- ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1),
|
||||||
|
- ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1),
|
||||||
|
- ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1),
|
||||||
|
- ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1),
|
||||||
|
- ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1),
|
||||||
|
('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
|
||||||
|
- ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
|
||||||
|
- ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
|
||||||
|
- # configs
|
||||||
|
- ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
|
||||||
|
- ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
|
||||||
|
- ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
|
||||||
|
- ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
|
||||||
|
- ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
|
||||||
|
- ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
|
||||||
|
- ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5),
|
||||||
|
- ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5),
|
||||||
|
- ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5),
|
||||||
|
- ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
From f8c26751c51c1618278689d8b3ce94496c579064 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christoph Heiss <christoph@c8h4.io>
|
||||||
|
Date: Fri, 10 Feb 2023 23:54:41 +0100
|
||||||
|
Subject: [PATCH] docs: Add target path fixup variable
|
||||||
|
|
||||||
|
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
|
||||||
|
---
|
||||||
|
docs/Makefile | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/docs/Makefile b/docs/Makefile
|
||||||
|
index 94130228..f4766a64 100644
|
||||||
|
--- a/docs/Makefile
|
||||||
|
+++ b/docs/Makefile
|
||||||
|
@@ -67,12 +67,13 @@ API_VIEWER_FILES := \
|
||||||
|
SPHINXOPTS =
|
||||||
|
SPHINXBUILD = sphinx-build
|
||||||
|
BUILDDIR = output
|
||||||
|
+RUSTC_TARGET ?=
|
||||||
|
|
||||||
|
ifeq ($(BUILD_MODE), release)
|
||||||
|
-COMPILEDIR := ../target/release
|
||||||
|
+COMPILEDIR := ../target/$(RUSTC_TARGET)/release
|
||||||
|
SPHINXOPTS += -t release
|
||||||
|
else
|
||||||
|
-COMPILEDIR := ../target/debug
|
||||||
|
+COMPILEDIR := ../target/$(RUSTC_TARGET)/debug
|
||||||
|
SPHINXOPTS += -t devbuild
|
||||||
|
endif
|
||||||
|
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,40 +1,45 @@
|
||||||
{ lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, libxcrypt }:
|
{
|
||||||
|
lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl,
|
||||||
|
libxcrypt, git, installShellFiles, sphinx, stdenv,
|
||||||
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "proxmox-backup-client";
|
pname = "proxmox-backup-client";
|
||||||
version = "2.2.1";
|
version = "2.4.1";
|
||||||
|
|
||||||
srcs = [
|
srcs = [
|
||||||
(fetchgit {
|
(fetchgit {
|
||||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
name = pname;
|
name = "proxmox-backup";
|
||||||
hash = "sha256-uOKQe/BzO69f/ggEPoZQ2Rn3quytQrUeH7be19QV3KI=";
|
hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA=";
|
||||||
})
|
})
|
||||||
(fetchgit {
|
(fetchgit {
|
||||||
url = "git://git.proxmox.com/git/proxmox.git";
|
url = "git://git.proxmox.com/git/proxmox.git";
|
||||||
rev = "43b4440ef015d846161657490b18cf6ac7600fc4";
|
rev = "5df815f660e4f3793e974eb8130224538350bb12";
|
||||||
name = "proxmox";
|
name = "proxmox";
|
||||||
hash = "sha256-05Z+IRRIioFGn+iAYG04DyNsgw9gQrJ6qAArpCwoIb0=";
|
hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw=";
|
||||||
})
|
})
|
||||||
(fetchgit {
|
(fetchgit {
|
||||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||||
rev = "d162ef9039878b871e2aa11b7d9a373ae512e2d1";
|
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
|
||||||
name = "proxmox-fuse";
|
name = "proxmox-fuse";
|
||||||
hash = "sha256-w33ViWpBkCkMAhZVXiOdqnGOn/tddNRgzn71WioTnBU=";
|
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
|
||||||
})
|
})
|
||||||
(fetchgit {
|
(fetchgit {
|
||||||
url = "git://git.proxmox.com/git/pxar.git";
|
url = "git://git.proxmox.com/git/pxar.git";
|
||||||
rev = "6f3f889e98c5f4e60c3b2c6bce73bd506b548c21";
|
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
|
||||||
name = "pxar";
|
name = "pxar";
|
||||||
hash = "sha256-GtNq6+O1xnxuR7b4TTWLFxcsejRyadSlk85H8C+yUGA=";
|
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
sourceRoot = pname;
|
sourceRoot = "proxmox-backup";
|
||||||
|
|
||||||
cargoPatches = [
|
cargoPatches = [
|
||||||
./re-route-dependencies.patch
|
./0001-re-route-dependencies-not-available-on-crates.io-to-.patch
|
||||||
|
./0002-docs-drop-all-but-client-man-pages.patch
|
||||||
|
./0003-docs-Add-target-path-fixup-variable.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
@ -42,6 +47,26 @@ rustPlatform.buildRustPackage rec {
|
||||||
rm .cargo/config
|
rm .cargo/config
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postBuild = ''
|
||||||
|
make -C docs \
|
||||||
|
DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \
|
||||||
|
RUSTC_TARGET=${stdenv.targetPlatform.config} \
|
||||||
|
BUILD_MODE=release \
|
||||||
|
proxmox-backup-client.1 pxar.1
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
installManPage docs/output/man/proxmox-backup-client.1
|
||||||
|
installShellCompletion --cmd proxmox-backup-client \
|
||||||
|
--bash debian/proxmox-backup-client.bc \
|
||||||
|
--zsh zsh-completions/_proxmox-backup-client
|
||||||
|
|
||||||
|
installManPage docs/output/man/pxar.1
|
||||||
|
installShellCompletion --cmd pxar \
|
||||||
|
--bash debian/pxar.bc \
|
||||||
|
--zsh zsh-completions/_pxar
|
||||||
|
'';
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFileContents = builtins.readFile ./Cargo.lock;
|
lockFileContents = builtins.readFile ./Cargo.lock;
|
||||||
};
|
};
|
||||||
|
|
@ -50,21 +75,21 @@ rustPlatform.buildRustPackage rec {
|
||||||
"--package=proxmox-backup-client"
|
"--package=proxmox-backup-client"
|
||||||
"--bin=proxmox-backup-client"
|
"--bin=proxmox-backup-client"
|
||||||
"--bin=dump-catalog-shell-cli"
|
"--bin=dump-catalog-shell-cli"
|
||||||
|
|
||||||
"--package=pxar-bin"
|
"--package=pxar-bin"
|
||||||
"--bin=pxar"
|
"--bin=pxar"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ];
|
||||||
buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];
|
buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "The command line client for Proxmox Backup Server";
|
description = "The command line client for Proxmox Backup Server";
|
||||||
homepage = "https://pbs.proxmox.com/docs/backup-client.html";
|
homepage = "https://pbs.proxmox.com/docs/backup-client.html";
|
||||||
license = licenses.agpl3Only;
|
license = licenses.agpl3Only;
|
||||||
maintainers = with maintainers; [ cofob ];
|
maintainers = with maintainers; [ cofob christoph-heiss ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
mainProgram = pname;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,148 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
|
||||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
|
||||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
|
||||||
---
|
|
||||||
Cargo.toml | 112 +++++++-------------------------------------------
|
|
||||||
1 file changed, 15 insertions(+), 97 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Cargo.toml b/Cargo.toml
|
|
||||||
index 41980292..e7daaad5 100644
|
|
||||||
--- a/Cargo.toml
|
|
||||||
+++ b/Cargo.toml
|
|
||||||
@@ -25,94 +25,12 @@ members = [
|
|
||||||
"pbs-config",
|
|
||||||
"pbs-datastore",
|
|
||||||
"pbs-fuse-loop",
|
|
||||||
- "proxmox-rest-server",
|
|
||||||
- "proxmox-rrd",
|
|
||||||
- "pbs-tape",
|
|
||||||
"pbs-tools",
|
|
||||||
|
|
||||||
- "proxmox-backup-banner",
|
|
||||||
"proxmox-backup-client",
|
|
||||||
- "proxmox-file-restore",
|
|
||||||
- "proxmox-restore-daemon",
|
|
||||||
"pxar-bin",
|
|
||||||
]
|
|
||||||
|
|
||||||
-[lib]
|
|
||||||
-name = "proxmox_backup"
|
|
||||||
-path = "src/lib.rs"
|
|
||||||
-
|
|
||||||
-[dependencies]
|
|
||||||
-apt-pkg-native = "0.3.2"
|
|
||||||
-base64 = "0.13"
|
|
||||||
-bitflags = "1.2.1"
|
|
||||||
-bytes = "1.0"
|
|
||||||
-cidr = "0.2.1"
|
|
||||||
-crc32fast = "1"
|
|
||||||
-endian_trait = { version = "0.6", features = ["arrays"] }
|
|
||||||
-flate2 = "1.0"
|
|
||||||
-anyhow = "1.0"
|
|
||||||
-thiserror = "1.0"
|
|
||||||
-futures = "0.3"
|
|
||||||
-h2 = { version = "0.3", features = [ "stream" ] }
|
|
||||||
-handlebars = "3.0"
|
|
||||||
-hex = "0.4.3"
|
|
||||||
-http = "0.2"
|
|
||||||
-hyper = { version = "0.14", features = [ "full" ] }
|
|
||||||
-lazy_static = "1.4"
|
|
||||||
-libc = "0.2"
|
|
||||||
-log = "0.4.17"
|
|
||||||
-nix = "0.19.1"
|
|
||||||
-num-traits = "0.2"
|
|
||||||
-once_cell = "1.3.1"
|
|
||||||
-openssl = "0.10.38" # currently patched!
|
|
||||||
-pam = "0.7"
|
|
||||||
-pam-sys = "0.5"
|
|
||||||
-percent-encoding = "2.1"
|
|
||||||
-regex = "1.5.5"
|
|
||||||
-rustyline = "7"
|
|
||||||
-serde = { version = "1.0", features = ["derive"] }
|
|
||||||
-serde_json = "1.0"
|
|
||||||
-siphasher = "0.3"
|
|
||||||
-syslog = "4.0"
|
|
||||||
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
|
||||||
-tokio-openssl = "0.6.1"
|
|
||||||
-tokio-stream = "0.1.0"
|
|
||||||
-tokio-util = { version = "0.6", features = [ "codec", "io" ] }
|
|
||||||
-tower-service = "0.3.0"
|
|
||||||
-udev = "0.4"
|
|
||||||
-url = "2.1"
|
|
||||||
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
|
||||||
-walkdir = "2"
|
|
||||||
-xdg = "2.2"
|
|
||||||
-nom = "5.1"
|
|
||||||
-crossbeam-channel = "0.5"
|
|
||||||
-
|
|
||||||
-# Used only by examples currently:
|
|
||||||
-zstd = { version = "0.6", features = [ "bindgen" ] }
|
|
||||||
-
|
|
||||||
-pathpatterns = "0.1.2"
|
|
||||||
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
|
|
||||||
-
|
|
||||||
-proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
|
|
||||||
-proxmox-io = "1"
|
|
||||||
-proxmox-lang = "1.1"
|
|
||||||
-proxmox-router = { version = "1.2.2", features = [ "cli" ] }
|
|
||||||
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
|
|
||||||
-proxmox-section-config = "1"
|
|
||||||
-proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
|
|
||||||
-proxmox-time = "1.1.2"
|
|
||||||
-proxmox-uuid = "1"
|
|
||||||
-proxmox-serde = "0.1"
|
|
||||||
-proxmox-shared-memory = "0.2"
|
|
||||||
-proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
|
|
||||||
-proxmox-compression = "0.1"
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-proxmox-acme-rs = "0.4"
|
|
||||||
-proxmox-apt = "0.8.0"
|
|
||||||
-proxmox-async = "0.4"
|
|
||||||
-proxmox-openid = "0.9.0"
|
|
||||||
-
|
|
||||||
pbs-api-types = { path = "pbs-api-types" }
|
|
||||||
pbs-buildcfg = { path = "pbs-buildcfg" }
|
|
||||||
pbs-client = { path = "pbs-client" }
|
|
||||||
@@ -126,22 +44,23 @@ pbs-tape = { path = "pbs-tape" }
|
|
||||||
# Local path overrides
|
|
||||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
|
||||||
[patch.crates-io]
|
|
||||||
-#proxmox = { path = "../proxmox/proxmox" }
|
|
||||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
|
||||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
|
||||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
|
||||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
|
||||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
|
||||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
|
||||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
|
||||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
|
||||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
|
||||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
|
||||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
|
||||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
|
||||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
|
||||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
|
||||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
|
||||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
|
||||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
|
||||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
|
||||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
|
||||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
|
||||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
|
||||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
|
||||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
|
||||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
|
||||||
#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
|
||||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
|
||||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
|
||||||
-#pxar = { path = "../pxar" }
|
|
||||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
|
||||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
|
||||||
+pxar = { path = "../pxar" }
|
|
||||||
|
|
||||||
[features]
|
|
||||||
default = []
|
|
||||||
Loading…
Reference in a new issue