From aa948158a84946fe40c1670ce67a94efebfe16cb Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 2 Jul 2024 04:39:53 -0600 Subject: [PATCH 1/5] maintainers: add ryand56 (cherry picked from commit ec0c14f19ea9d895cef679f5e71d165e6d8171d9) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff068fa28ae5..be71db1ffc39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17305,6 +17305,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"; From 8784ad52de00b72a15424bd5adbede9923778692 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 15 Jul 2024 17:03:57 -0600 Subject: [PATCH 2/5] scrcpy: 2.4 -> 2.5 (cherry picked from commit 5b0bddfae6b39cfe48b3a50ce8a629ca737616a7) --- pkgs/misc/scrcpy/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 30adbf2c62b5..2f41aea56fad 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -16,12 +16,12 @@ }: let - version = "2.4"; + version = "2.5"; 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-FIixEF1q/1NIc6Jr9hDNKuoG7oZ916TZxrssCROW6xU="; }; 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-VdZZ23tlWYvDgETfce7kYy/kdwDGBEBzB6UfplorAbE="; }; # 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"; }; } From 5a3383102b998324f3049067938f8582fbfc30b9 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 1 Aug 2024 16:20:34 -0600 Subject: [PATCH 3/5] scrcpy: 2.5 -> 2.6; migrate to pkgs/by-name (cherry picked from commit abbda0a917257bf07059ef0935a1336c8e2fb296) --- .../scrcpy/default.nix => by-name/sc/scrcpy/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{misc/scrcpy/default.nix => by-name/sc/scrcpy/package.nix} (93%) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/by-name/sc/scrcpy/package.nix similarity index 93% rename from pkgs/misc/scrcpy/default.nix rename to pkgs/by-name/sc/scrcpy/package.nix index 2f41aea56fad..080c6ea37512 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "2.5"; + version = "2.6"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-FIixEF1q/1NIc6Jr9hDNKuoG7oZ916TZxrssCROW6xU="; + hash = "sha256-e3I/95on8U5uuqqufvlUjEBlHJTmTReGErE633FY6y4="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-VdZZ23tlWYvDgETfce7kYy/kdwDGBEBzB6UfplorAbE="; + hash = "sha256-ROtdqWcpMZ+AtKr80QofSlDDaxSFEJQTrlt+8h67uPk="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 512c0534e0f8..25e367c55b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12718,8 +12718,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 { }; From 40e094b48071635fb18db2a47ae073da4cbfa75d Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 2 Aug 2024 15:20:45 -0600 Subject: [PATCH 4/5] scrcpy: 2.6 -> 2.6.1 (cherry picked from commit 6a37f04b9d2c78b3da084fac05f4f1c16bd92585) --- pkgs/by-name/sc/scrcpy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index 080c6ea37512..347f2559c962 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "2.6"; + version = "2.6.1"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-e3I/95on8U5uuqqufvlUjEBlHJTmTReGErE633FY6y4="; + hash = "sha256-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-ROtdqWcpMZ+AtKr80QofSlDDaxSFEJQTrlt+8h67uPk="; + hash = "sha256-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. From 7cfb7afd210e5b8a9266fbb0c5e19d547a5a3754 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 15 Sep 2024 14:38:11 -0600 Subject: [PATCH 5/5] scrcpy: 2.6.1 -> 2.7 (cherry picked from commit 1acbc708787e8dbc2c1a4421c7b90c57059d6a7b) --- pkgs/by-name/sc/scrcpy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index 347f2559c962..06779e7c761d 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "2.6.1"; + 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-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds="; + 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-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE="; + hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.