From ed1c0495d057f0fc0cd2d109483a5b5f49375227 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 16 Nov 2023 04:20:00 +0000 Subject: rqbit: 2.2.1 -> 2.2.2 Diff: https://github.com/ikatson/rqbit/compare/v2.2.1...v2.2.2 --- pkgs/applications/networking/p2p/rqbit/default.nix | 29 --------------------- pkgs/by-name/rq/rqbit/package.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/rqbit/default.nix create mode 100644 pkgs/by-name/rq/rqbit/package.nix diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix deleted file mode 100644 index a60b3e9ddf7..00000000000 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: - -rustPlatform.buildRustPackage rec { - pname = "rqbit"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "ikatson"; - repo = "rqbit"; - rev = "v${version}"; - hash = "sha256-7n+T+y60RjmZC7bE96Ljg0xVg4bSzV/LFgezTld4zfI="; - }; - - cargoHash = "sha256-hcuZ4hqGJT/O7vFefKPGZlkqhdsAl5LGAcSRQAEopnM="; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - - doCheck = false; - - meta = with lib; { - description = "A bittorrent client in Rust"; - homepage = "https://github.com/ikatson/rqbit"; - license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; - }; -} diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix new file mode 100644 index 00000000000..0505cbb1b69 --- /dev/null +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "rqbit"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "ikatson"; + repo = "rqbit"; + rev = "v${version}"; + hash = "sha256-9yYHxlvRlO8iJ3SPi0+4lEgBgAaqaDffKChqAe4OsYU="; + }; + + cargoHash = "sha256-dUQiW6J3Wycp5D3mAwGwruU6CkQ534OyP1GdsY7jzEw="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + + doCheck = false; + + meta = with lib; { + description = "A bittorrent client in Rust"; + homepage = "https://github.com/ikatson/rqbit"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + mainProgram = "rqbit"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ed360c16d2..caef0bfaf5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34213,10 +34213,6 @@ with pkgs; roxctl = callPackage ../applications/networking/cluster/roxctl { }; - rqbit = callPackage ../applications/networking/p2p/rqbit { - inherit (darwin.apple_sdk.frameworks) Security; - }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; -- cgit 1.4.1