Unverified Commit 899413b0 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #271794 from christoph-heiss/update/proxmox-backup-client 

proxmox-backup-client: 3.0.1 -> 3.1.2
parents 0e91fd73 dce34a5b

pkgs/applications/backup/proxmox-backup-client/Cargo.lock

+441 −392

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/backup/proxmox-backup-client/default.nix

+43 −27
Original line number Diff line number Diff line 
{ lib,

  fetchgit,

  rustPlatform,

  pkg-config,

  openssl,

  fuse3,

  libuuid,

  acl,

  libxcrypt,

  git,

  installShellFiles,

  sphinx,

  stdenv,

  fetchpatch,

  testers,

  proxmox-backup-client,

{ lib

, fetchgit

, rustPlatform

, pkg-config

, openssl

, fuse3

, libuuid

, acl

, libxcrypt

, git

, installShellFiles

, sphinx

, stdenv

, fetchpatch

, testers

, proxmox-backup-client

}:



let

  pname = "proxmox-backup-client";

  version = "3.0.1";

  version = "3.1.2";



  proxmox-backup_src = fetchgit {

    url = "git://git.proxmox.com/git/proxmox-backup.git";

    rev = "v${version}";

    name = "proxmox-backup";

    hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";

    hash = "sha256-G4wadZelQHlveVhuOpu0FjLvfegoimoxlw3Fe8DhsQA=";

  };



  # Same revision as used in

  # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=proxmox-backup-client

  proxmox_src = fetchgit {

    url = "git://git.proxmox.com/git/proxmox.git";

    rev = "2a070da0651677411a245f1714895235b1caf584";

    rev = "50b79198f83659e77b810fe0eedaa79b140744db";

    name = "proxmox";

    hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";

    hash = "sha256-ffkOXGqe0xjvvhouzemcQ8qNdmJx70x10ny2uhYAYaI=";

  };



  proxmox-fuse_src = fetchgit {
@@ -43,16 +45,30 @@ let 


  proxmox-pxar_src = fetchgit {

    url = "git://git.proxmox.com/git/pxar.git";

    rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";

    rev = "fab647085426dc39c25c137575a3b8fc575c4b78";

    name = "pxar";

    hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";

    hash = "sha256-tedQDQUFSGUZCChGcRRJsh7lIozfispLCLeX1OuUc4k=";

  };



  proxmox-pathpatterns_src = fetchgit {

    url = "git://git.proxmox.com/git/pathpatterns.git";

    rev = "5f625aacbd6f81d97a1c6f5476fb38769d069f26"; # 0.3.0

    name = "pathpatterns";

    hash = "sha256-717XSlvQdvP0Q516fEx04rsrLCk3QI8frTD5NMmkSr4=";

  };



in



rustPlatform.buildRustPackage {

  inherit pname version;



  srcs = [ proxmox-backup_src proxmox_src proxmox-fuse_src proxmox-pxar_src ];

  srcs = [

    proxmox-backup_src

    proxmox_src

    proxmox-fuse_src

    proxmox-pxar_src

    proxmox-pathpatterns_src

  ];



  sourceRoot = proxmox-backup_src.name;
@@ -64,15 +80,15 @@ rustPlatform.buildRustPackage { 
    # works in combination with the other three repos being checked out.

    (fetchpatch {

      name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0";

      hash = "sha256-2YZtjbpYSbRk6rmpjKJeIO+V0YN5PrKsISONXMj4RG0=";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07";

      hash = "sha256-hBct1NVFum7WG0sgdE7DdvjfnC6KPlLG9r4syxgYKWA=";

    })

    # This patch prevents the generation of the man-pages for other components inside the repo,

    # which would require them too be built too. Thus avoid wasting resources and just skip them.

    (fetchpatch {

      name = "0002-docs-drop-all-but-client-man-pages.patch";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0";

      hash = "sha256-oJKQs4SwJvX5Zd0/l/vVr66aPO7Y4AC8byJHg9t1IhY=";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07";

      hash = "sha256-DvWm18udvOpcma0V3JY06Lhn+h0BDPhNqrNOyrgpvWk=";

    })

    # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due

    # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`.