From 34691a0b28eac4d160e885c8711533e18c09d87c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 20 Jan 2025 19:26:46 +0900 Subject: [PATCH 1/2] gurk-rs: move to pkgs/by-name https://github.com/NixOS/nixpkgs/blob/5c6a9a5d8026c80f68395d6a40f9a0776300c79f/pkgs/by-name/README.md#L79-L114 --- .../gurk-rs/default.nix => by-name/gu/gurk-rs/package.nix} | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/networking/instant-messengers/gurk-rs/default.nix => by-name/gu/gurk-rs/package.nix} (95%) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/by-name/gu/gurk-rs/package.nix similarity index 95% rename from pkgs/applications/networking/instant-messengers/gurk-rs/default.nix rename to pkgs/by-name/gu/gurk-rs/package.nix index ef466182c9bd..0fda74becec4 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -4,7 +4,7 @@ protobuf, rustPlatform, fetchFromGitHub, - Cocoa, + darwin, pkgsBuildHost, openssl, pkg-config, @@ -13,6 +13,9 @@ gurk-rs, }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; version = "0.6.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80afbd9a89c4..9d59a84400be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13455,10 +13455,6 @@ with pkgs; fftw = fftwSinglePrec; }; - gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; welle-io = qt6Packages.callPackage ../applications/radio/welle-io { }; From 5904143e8589dc6f0aad6517e0935a185eec6543 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 20 Jan 2025 19:29:48 +0900 Subject: [PATCH 2/2] gurk-rs: 0.6.0 -> 0.6.1 Changelog: https://github.com/boxdot/gurk-rs/blob/v0.6.1/CHANGELOG.md?plain=1#L3-L8 Diff: https://github.com/boxdot/gurk-rs/compare/v0.6.0...v0.6.1 --- pkgs/by-name/gu/gurk-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 0fda74becec4..172490f3a449 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -18,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; tag = "v${version}"; - hash = "sha256-FPbEtk2A7qs/85VsmfV1uPsVZ7V5WKhMKeWrzUt5L4w="; + hash = "sha256-cNKUQlCzhOgyWoitHjRoVdehj8AUEslHBCGxH9nRWF4="; }; postPatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; - cargoHash = "sha256-yLZKat6NNZkbyTpAVpOvDAbbNajh4Vaebc7fmK0I3Mc="; + cargoHash = "sha256-eh7ZD8ZX1oKiJbJcVtk6pczb6HxNM6md93P/22Qn5u0="; nativeBuildInputs = [ protobuf