From 3f190aaad8bd2014bac2f2733ce763a6052edaec Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 5 Aug 2024 10:57:04 +0200 Subject: [PATCH 1/2] rustic-rs: move to by-name This is necessary for CI to allow the package to be renamed. --- .../rustic-rs/default.nix => by-name/ru/rustic-rs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/backup/rustic-rs/default.nix => by-name/ru/rustic-rs/package.nix} (100%) diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/by-name/ru/rustic-rs/package.nix similarity index 100% rename from pkgs/tools/backup/rustic-rs/default.nix rename to pkgs/by-name/ru/rustic-rs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83d119d7c6a3..fad4471f0579 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26095,7 +26095,7 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - rustic-rs = callPackage ../tools/backup/rustic-rs { + rustic-rs = callPackage ../by-name/ru/rustic-rs/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From c6711b873c9c4566c1b8ecfab19f5588c9ef1312 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Aug 2024 14:02:08 +0200 Subject: [PATCH 2/2] rustic: rename from rustic-rs As far as I can tell, the name of the software is "rustic". Every other distro calls it "rustic". [1] The crate is presumably called "rustic-rs" because "rustic" is already taken on crates.io, which is not a problem in Nixpkgs. I've added "rustic-rs" as an alias, so the old name will continue working. [1]: https://repology.org/project/rustic/versions --- pkgs/by-name/ru/{rustic-rs => rustic}/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/by-name/ru/{rustic-rs => rustic}/package.nix (93%) diff --git a/pkgs/by-name/ru/rustic-rs/package.nix b/pkgs/by-name/ru/rustic/package.nix similarity index 93% rename from pkgs/by-name/ru/rustic-rs/package.nix rename to pkgs/by-name/ru/rustic/package.nix index b5cae0b17c68..2c49e5a5eb7b 100644 --- a/pkgs/by-name/ru/rustic-rs/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -9,7 +9,7 @@ }: rustPlatform.buildRustPackage rec { - pname = "rustic-rs"; + pname = "rustic"; version = "0.7.0"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jUAmboJTzX4oJZy9rFiPRbm94bVpZGa0SaqotoCU/Ss="; }; - cargoHash = "sha256-iZuWlYDGGziwb49BfKdt9Ahs6oQ0Ij2iiT0tvL7ZIVk="; + cargoHash = "sha256-8YGvxnwD9Vshah2jZ+XxOW0qB4nvWsOyLY1W8k+xQzU="; # At the time of writing, upstream defaults to "self-update" and "webdav". # "self-update" is a self-updater, which we don't want in nixpkgs. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 35d8138fdfa4..814f903008d4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1287,6 +1287,7 @@ mapAliases ({ runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; rustc-wasm32 = rustc; # Added 2023-12-01 + rustic-rs = rustic; # Added 2024-08-02 rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fad4471f0579..6f54ab45bc61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26095,7 +26095,7 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - rustic-rs = callPackage ../by-name/ru/rustic-rs/package.nix { + rustic = callPackage ../by-name/ru/rustic/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; };