diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87b95c332096..5903d7b88b1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17368,6 +17368,12 @@ githubId = 70191398; name = "Ryan Cao"; }; + ryand56 = { + email = "git@ryand.ca"; + github = "ryand56"; + githubId = 22267679; + name = "Ryan Omasta"; + }; ryane = { email = "ryanesc@gmail.com"; github = "ryane"; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/by-name/sc/scrcpy/package.nix similarity index 85% rename from pkgs/misc/scrcpy/default.nix rename to pkgs/by-name/sc/scrcpy/package.nix index 30adbf2c62b5..06779e7c761d 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "2.4"; + version = "2.7"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-k8Jyt0OGBcBV4Sf3REBk7Xj6nKSfgRVnd/0gHnnOe6M="; + hash = "sha256-ojxWWfNsJg8QXAItJ7yz6v/6JgcOe6qe2mbQE3ehrbo="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-x1feZgCR3ZUi40/YZSjDULYk4W9Pjo17cn8RqcOoeoE="; + hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. @@ -63,17 +63,17 @@ stdenv.mkDerivation rec { --replace "/bin/bash" "${runtimeShell}" ''; - meta = with lib; { + meta = { description = "Display and control Android devices over USB or TCP/IP"; homepage = "https://github.com/Genymobile/scrcpy"; changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # server ]; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ deltaevo ryand56 ]; mainProgram = "scrcpy"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7df1d07e687..9cd99d8c9c10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12727,8 +12727,6 @@ with pkgs; inherit (darwin.apple_sdk.libs) utmp; }; - scrcpy = callPackage ../misc/scrcpy { }; - screen-message = callPackage ../tools/X11/screen-message { }; screenkey = callPackage ../applications/video/screenkey { };