Unverified Commit 23c19d9c authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

rquickshare: 0.11.3 -> 0.11.4 (#375553)

parents e87f54c6 9f7e3c9d

pkgs/by-name/rq/rquickshare/package.nix

+8 −9
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "rquickshare" + (app-type-either "" "-legacy");

  version = "0.11.3";

  version = "0.11.4";



  src = fetchFromGitHub {

    owner = "Martichou";

    repo = "rquickshare";

    tag = "v${version}";

    hash = "sha256-6gXt1UGcjOFInsCep56s3K5Zk/KIz2ZrFlmrgXP7/e8=";

    hash = "sha256-Gq78vxM9hJ+dAHM3RAKHtkFIsoV0XQN4vNbOO3amvTs=";

  };



  # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { 
  cargoRoot = "app/${app-type}/src-tauri";

  buildAndTestSubdir = cargoRoot;

  cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ];

  cargoHash = app-type-either "sha256-R1RDBV8lcEuFdkh9vrNxFRSPSYVOWDvafPQAmQiJV2s=" "sha256-tgnSOICA/AFASIIlxnRoSjq5nx30Z7C6293bcvnWl0k=";

  cargoHash = app-type-either "sha256-wraCzzC7YVCXEXBTd8c1cbtCdBunENpUMQ1vZGwfGMs=" "sha256-TBsHlFwbWWa2LEZdmDyz/9vWiFOXKX39PCsjW6OqEGY=";



  nativeBuildInputs = [

    proper-cargo-tauri.hook
@@ -97,17 +97,16 @@ rustPlatform.buildRustPackage rec { 
      libsoup_2_4

    ];



  passthru.updateScript =

    let

  passthru =

    # Don't set an update script for the legacy version

    # so r-ryantm won't create two duplicate PRs

    lib.optionalAttrs (app-type == "main") {

      updateScript = writeShellScript "update-rquickshare.sh" ''

        ${lib.getExe nix-update} rquickshare

        sed -i 's/version = "0.0.0";/' pkgs/by-name/rq/rquickshare/package.nix

        ${lib.getExe nix-update} rquickshare-legacy

      '';

    in

    # Don't set an update script for the legacy version

    # so r-ryantm won't create two duplicate PRs

    app-type-either updateScript null;

    };



  meta = {

    description = "Rust implementation of NearbyShare/QuickShare from Android for Linux and macOS";

pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch

+5 −5
Original line number Diff line number Diff line 
diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock

index 109db68..c3a70c6 100644

index 1bba0ae..af24986 100644

--- a/app/legacy/src-tauri/Cargo.lock

+++ b/app/legacy/src-tauri/Cargo.lock

@@ -4138,7 +4138,7 @@ dependencies = [
@@ -45,7 +45,7 @@ index 109db68..c3a70c6 100644 
  "core-foundation-sys",

  "glob",

diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml

index 5468707..68ed47b 100644

index b971c3d..44abf29 100644

--- a/app/legacy/src-tauri/Cargo.toml

+++ b/app/legacy/src-tauri/Cargo.toml

@@ -20,7 +20,7 @@ notify-rust = "4.10"
@@ -58,7 +58,7 @@ index 5468707..68ed47b 100644 
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }

 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }

diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock

index c1f175c..7bf1450 100644

index bc4753a..ed4c7e8 100644

--- a/app/main/src-tauri/Cargo.lock

+++ b/app/main/src-tauri/Cargo.lock

@@ -4182,7 +4182,7 @@ dependencies = [
@@ -102,7 +102,7 @@ index c1f175c..7bf1450 100644 
 name = "sys_metrics"

 version = "0.2.7"

diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml

index 90dcc88..56abae2 100644

index 5653700..5120513 100644

--- a/app/main/src-tauri/Cargo.toml

+++ b/app/main/src-tauri/Cargo.toml

@@ -20,7 +20,7 @@ notify-rust = "4.10"
@@ -111,6 +111,6 @@ index 90dcc88..56abae2 100644 
 serde_json = "1.0"

-sys_metrics = "0.2"

+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }

 tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored"] }

 tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] }

 tauri-plugin-autostart = "2.2"

 tauri-plugin-process = "2.2"