Commit 45ea7e42 authored by Weijia Wang's avatar Weijia Wang
Browse files

paru: 2.0.4 -> 2.1.0

parent 90d14631
Loading
Loading
Loading
Loading
+0 −35
Original line number Diff line number Diff line
diff --git a/Cargo.lock b/Cargo.lock
index 404b5cd..bba31c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2613,13 +2613,3 @@ dependencies = [
  "quote",
  "syn",
 ]
-
-[[patch.unused]]
-name = "alpm"
-version = "3.0.4"
-source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63"
-
-[[patch.unused]]
-name = "aur-depends"
-version = "3.0.0"
-source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af"
diff --git a/Cargo.toml b/Cargo.toml
index 020c5c2..f74e9d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,12 +70,3 @@ static = ["alpm/static"]
 mock = ["async-trait"]
 mock_chroot = ["mock"]
 #default = ["git", "generate"]
-
-[patch.crates-io]
-#alpm = { path = "../alpm.rs/alpm" }
-#alpm-utils = { path = "../alpm.rs/alpm-utils" }
-alpm = { git = "https://github.com/archlinux/alpm.rs", rev = "306342" }
-#alpm-utils = { git = "https://github.com/archlinux/alpm.rs", rev = "8da396" }
-#aur-depends = { path = "../aur-depends" }
-aur-depends = { git = "https://github.com/Morganamilo/aur-depends", rev = "30c2c1"}
-#aur-fetch = { path = "../aur-fetch" }
+4 −14
Original line number Diff line number Diff line
@@ -8,26 +8,21 @@
  libarchive,
  openssl,
  pacman,
  stdenv,
}:

rustPlatform.buildRustPackage rec {
  pname = "paru";
  version = "2.0.4";
  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "Morganamilo";
    repo = "paru";
    rev = "v${version}";
    hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8=";
    tag = "v${version}";
    hash = "sha256-i99f2ngYhfVCKpImJ8L7u2T2FgOt7Chp8DHDbrNh1kw=";
  };

  cargoPatches = [
    ./cargo-lock.patch
  ];

  useFetchCargoVendor = true;
  cargoHash = "sha256-3tKoL2I6DHrRodhWFOi3mSxk2P5SxCush/Hz9Dpyo3U=";
  cargoHash = "sha256-USIceRh24WGV0TIrpuyHs4thjaghpxqZmk2uVKBxlm4=";

  nativeBuildInputs = [
    gettext
@@ -42,11 +37,6 @@ rustPlatform.buildRustPackage rec {
    pacman
  ];

  # https://github.com/Morganamilo/paru/issues/1154#issuecomment-2002357898
  buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [
    "generate"
  ];

  postBuild = ''
    sh ./scripts/mkmo locale/
  '';