diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/cups/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/scrcpy/default.nix | 21 | ||||
-rw-r--r-- | pkgs/misc/seafile-shared/default.nix | 8 |
3 files changed, 12 insertions, 21 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 44e46355d0bf..7c809f0c964c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.3"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-nd65jyDpyfSvEhwrEFPnQgt5vWdw8a3tKGYwPSdSb28="; + sha256 = "sha256-mkBN5V90UlsKaFHfDP3r+hIVrsDnwve+a5sJtpFvsAA="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index eadd3d892393..d6fb53dd86d9 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , fetchFromGitHub , makeWrapper @@ -17,10 +16,10 @@ }: let - version = "2.0"; + version = "2.1"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-niQWFfV4zWkLtDMRAA3r3s9qnFCnCCsAGVLxj28h3cI="; + sha256 = "sha256-W4vxlAJkuTDHGhxhTFfaIkf1Ky1CQLyoZcxtNm3/Zog="; }; in stdenv.mkDerivation rec { @@ -31,24 +30,14 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PWH+XLKraFfjXovnZpREXBaQVyOyP8yIMYDMiF6ddXg="; + sha256 = "sha256-M5zOKwqQ0y70gsI+c0Or7hUzz4fH/8DqcOeKq4Vryc4="; }; - # Remove in the next patch release - patches = [ - (fetchpatch { - name = "fix-macos-build-error.patch"; - url = "https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a.patch"; - hash = "sha256-lQx01HI0nTWdZFusLIswZT2iOgkP84btqF6F58tGNko="; - }) - ]; - - # postPatch: - # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. + # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. # It would be better to fix the OpenGL problem, but that seems much more intrusive. postPatch = '' - substituteInPlace app/src/screen.c \ + substituteInPlace app/src/display.c \ --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" ''; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6db3ab932db9..a5bb8835008e 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -9,20 +9,22 @@ , python3 , sqlite , vala +, libwebsockets }: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.3"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "0fdc14d5175979919b7c741f6bb97bfaaacbbfbe"; - sha256 = "1cr1hvpp96s5arnzh1r5sazapcghhvbazbf7zym37yp3fy3lpya1"; + rev = "v${version}"; + sha256 = "sha256-aJJVrKulZVa1LNOUBIwuPrWqlsjz7kyP/LXWwxO8++A="; }; nativeBuildInputs = [ + libwebsockets autoreconfHook vala pkg-config |