diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:57:10 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:57:10 +0200 |
| commit | 484ee79050976cf1d234b4056d16e5bdc152bed6 (patch) | |
| tree | c38b8141426c5714ed7bc5f9e1ffe008c813507f /pkgs/misc | |
| parent | b6474577b04a86a27a555dafa676670fb3902ec8 (diff) | |
| parent | 2111240b9f7e5704045763fbdc66534609a62a65 (diff) | |
| download | nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.gz nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.bz2 nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.lz nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.xz nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.zst nixpkgs-484ee79050976cf1d234b4056d16e5bdc152bed6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/scrcpy/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 0e3eb2ce698..964e08674ca 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20191224"; - sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66"; + version = "20200412"; + sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index c47825f9010..a93f7e6aeaf 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.12.1"; + version = "1.13"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; + sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; + sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby"; }; # postPatch: |