diff --git a/pkgs/applications/networking/feedreaders/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix deleted file mode 100644 index 3fbaa2108d60..000000000000 --- a/pkgs/applications/networking/feedreaders/russ/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -}: - -rustPlatform.buildRustPackage { - pname = "russ"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "ckampfe"; - repo = "russ"; - rev = "1482bb1df13738fdd4ea1badf2146a9ed8e6656e"; - hash = "sha256-MvTMo2q/cQ/LQNdUV8SmHgGlA42kLl0i9mdcoAFV/I4="; - }; - - cargoHash = "sha256-ObWrwXMGXkLqqM7VXhOXArshk2lVkbOTXhrQImDQp1s="; - - # tests are network based :( - doCheck = false; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreServices - AppKit - ]); - - meta = with lib; { - description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; - mainProgram = "russ"; - homepage = "https://github.com/ckampfe/russ"; - license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ blusk ]; - changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; - }; -} diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix new file mode 100644 index 000000000000..98d460b6d43f --- /dev/null +++ b/pkgs/by-name/ru/russ/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: + +rustPlatform.buildRustPackage { + pname = "russ"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "ckampfe"; + repo = "russ"; + rev = "b21aa80ebc9dc2668463386f9eb270b1782d5842"; + hash = "sha256-/76CvSBYim831OZzLhsj2Hm+0hoY/FLtKQqt19E5YOI="; + }; + + cargoHash = "sha256-d3lJQafvBuj9Sb2Tuep3Ypt1sP+vlWHk4kuP99gMly8="; + + # tests are network based :( + doCheck = false; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + AppKit + ] + ); + + meta = { + changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; + description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; + homepage = "https://github.com/ckampfe/russ"; + license = with lib.licenses; [ agpl3Only ]; + maintainers = with lib.maintainers; [ blusk ]; + mainProgram = "russ"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 736cb135f8ec..aee293106d71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13096,8 +13096,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - russ = callPackage ../applications/networking/feedreaders/russ { }; - tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; };