From ec24d988f678f3636da709929f34844bba137cdc Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Sun, 24 Jul 2022 17:17:04 +0200 Subject: [PATCH 1/7] samtools: Fix cross-compilation Tests require bgzip which comes from the htslib package. This did not cause problems prior to 41485e7337baca768dc542c553a9d66030df7b33 as tests were not run in cross-compilation. (cherry picked from commit 5877d8e072d382ec5da6d83219e52df0a90f9f52) --- pkgs/applications/science/biology/samtools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index ec61e0bd7ce4..29ba667b0552 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { }) ]; + # tests require `bgzip` from the htslib package + checkInputs = [ htslib ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ncurses htslib ]; From 345c6c61108823afa761fada3271d78f2111682e Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Fri, 12 Aug 2022 04:37:28 +0200 Subject: [PATCH 2/7] freetube: 0.17.0 -> 0.17.1 (cherry picked from commit 9951ffc06eaa0ab9f04693bed628a047a6f4be5c) --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 3ceda283d3d8..b507c0d31947 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.17.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk="; + sha256 = "1n5r1h2khjwdsckiviv8f2pflxibk8rs68fs08jak0kbm0kkyj18"; }; appimageContents = appimageTools.extractType2 { From 15e66dc65d28652bb9f0ef361506548578713cfd Mon Sep 17 00:00:00 2001 From: QuantMint Date: Tue, 9 Aug 2022 22:27:26 +0200 Subject: [PATCH 3/7] steamPackages.steam-runtime: 0.20211102.0 -> 0.20220601.1 (cherry picked from commit 7e2760130b0015ace19d168cdd681f17e7465ede) --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 8f2398255a41..c8c67e94b4a4 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20211102.0"; + version = "0.20220601.1"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI="; + sha256 = "sha256-uYauNtbUlvrnATGks7hWy1zt4Y7AEeADrCr1eVylPbY="; name = "scout-runtime-${version}.tar.gz"; }; From eb139be584aa2aa1d1177531b7e85558b37ef84b Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sat, 22 Jan 2022 20:10:02 -0500 Subject: [PATCH 4/7] mpvacious: remove hack for multi-file script loading (cherry picked from commit 90bfb6dc4b5407fe6b52988c6261e97343cc3e4e) --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 9ddd6e308c3b..071f762ff4a7 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -18,10 +18,7 @@ stdenvNoCC.mkDerivation rec { }; postPatch = '' - # 'require' replaced with 'dofile' to work around - # https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious substituteInPlace subs2srs.lua \ - --replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \ --replace "'curl'" "'${curl}/bin/curl'" \ --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ --replace "xclip" "${xclip}/bin/xclip" @@ -36,7 +33,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.scriptName = "mpvacious/subs2srs.lua"; + passthru.scriptName = "mpvacious"; meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; From aa5a0dcaec2a161bce0909c64639a24ebe268e1e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 11 Aug 2022 22:22:56 +0200 Subject: [PATCH 5/7] zeronet-conservancy: 0.7.6 -> 0.7.7 (cherry picked from commit b0461c474e3fd66859507b7264f9629c4a5e766a) --- .../networking/p2p/zeronet-conservancy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 951e42475e18..f04a3e07a052 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,19 +6,20 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.6"; + version = "0.7.7"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY="; + sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0="; }; propagatedBuildInputs = with python3Packages; [ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client - gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich + gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml + pyaes ]; buildPhase = '' From e728d4728e1731a7538a7766350d1fbb4cfb7f2f Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 3 Aug 2022 23:21:26 +0200 Subject: [PATCH 6/7] hydrus: 493 -> 494 (cherry picked from commit 0d565a3e8559b2b64f115751499559b494275e5b) --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 954f97bf9b4a..ee54acc3521e 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "493"; + version = "494"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc="; + sha256 = "sha256-cFgDi/PVfmFtBd3u4H2iWXboN5ay9UwG7rqLtZYLwDs="; }; nativeBuildInputs = [ From d0b60a6f39e037bf2e1910451ec923c3939c7b0f Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 11 Aug 2022 16:24:05 +0200 Subject: [PATCH 7/7] hydrus: 494 -> 495 (cherry picked from commit 28f39c389f90386343d7bbffd60d421088461178) --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index ee54acc3521e..bc9d1a82a0f3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "494"; + version = "495"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cFgDi/PVfmFtBd3u4H2iWXboN5ay9UwG7rqLtZYLwDs="; + sha256 = "sha256-MuSK19oSrRJZebATRpDW1CmUq4NKcpuoPmOuLyvL8A8="; }; nativeBuildInputs = [