about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorFabián Heredia Montiel <fabianhjr@protonmail.com>2023-12-04 17:44:17 -0600
committerFabián Heredia Montiel <fabianhjr@protonmail.com>2023-12-04 17:44:17 -0600
commit5b8deaceca7538f7f33c7e72464ec2590c14dc43 (patch)
tree5cd2f63728218d2c41f04d77c9a9c9987bc26afa /pkgs/misc
parent360a5f0549cc556bed6bcf5c5ef8d2b603765c19 (diff)
parent00bff935cb14b56a6c268ba149ef16a9f2d8015e (diff)
downloadnixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar.gz
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar.bz2
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar.lz
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar.xz
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.tar.zst
nixlib-5b8deaceca7538f7f33c7e72464ec2590c14dc43.zip
Merge remote-tracking branch 'origin/master' into staging-next
Fixed conflict in pkgs/applications/graphics/krita/

krita: 5.1.5 -> 5.2.0
7a40fdc288e69ba94947c1c4ec29c0f24e461eef
, and
treewide: use kde mirror everywhere, don't use pname in download urls
aa15f5066d695de4c4027bd8bdcf4cedcf58d058
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/scrcpy/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 8630cc859917..a1c8fb43c20f 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "2.2";
+  version = "2.3.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-yFxKqEMF77aRFc1JehIOvdECWJk7TPEjqCRbPZnUmHQ=";
+    hash = "sha256-9oFIIvwwinpTLyU0hckDgYPGKWpsXfRwqeODtPjnYFs=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2/IsDZJAtERs2AG6J4LR/ffy4XYmaj0KeSwZLQ849Lc=";
+    hash = "sha256-RM29WjzsYnn26x/Xr2RKp0p87/v+Jl8skEcAwxhZEtU=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.