From 8be02edd28bfd5baa4c12256d8c160a16105cb65 Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:17:59 +0100 Subject: [PATCH 1/4] handheld-daemon-ui: init at 3.2.3 (#305027) Co-authored-by: Sandro Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> (cherry picked from commit d5808aee19c06e9e6b2603d0b600de34ed890de8) --- .../services/hardware/handheld-daemon.nix | 15 ++++++- .../by-name/ha/handheld-daemon-ui/package.nix | 42 +++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ha/handheld-daemon-ui/package.nix diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix index a5ba1856d015..c1a628e1697d 100644 --- a/nixos/modules/services/hardware/handheld-daemon.nix +++ b/nixos/modules/services/hardware/handheld-daemon.nix @@ -11,6 +11,11 @@ in enable = mkEnableOption "Handheld Daemon"; package = mkPackageOption pkgs "handheld-daemon" { }; + ui = { + enable = mkEnableOption "Handheld Daemon UI"; + package = mkPackageOption pkgs "handheld-daemon-ui" { }; + }; + user = mkOption { type = types.str; description = '' @@ -20,7 +25,10 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + services.handheld-daemon.ui.enable = mkDefault true; + environment.systemPackages = [ + cfg.package + ] ++ lib.optional cfg.ui.enable cfg.ui.package; services.udev.packages = [ cfg.package ]; systemd.packages = [ cfg.package ]; @@ -31,6 +39,11 @@ in restartIfChanged = true; + path = mkIf cfg.ui.enable [ + cfg.ui.package + pkgs.lsof + ]; + serviceConfig = { ExecStart = "${ lib.getExe cfg.package } --user ${ cfg.user }"; Nice = "-12"; diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix new file mode 100644 index 000000000000..00c830bd3fc6 --- /dev/null +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -0,0 +1,42 @@ +{ + lib, + appimageTools, + fetchurl, +}: +let + pname = "handheld-daemon-ui"; + version = "3.2.3"; + + src = fetchurl { + url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; + hash = "sha256-VhJrOvE+BebJIAeQlwOOsPfqSrvBnJQavGT7glTrG2o="; + }; + extractedFiles = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + # Handheld-daemon expects the UI binary to be called hhd-ui + mv $out/bin/${pname}* $out/bin/hhd-ui + + mkdir -p $out/share/applications + substitute ${extractedFiles}/hhd-ui.desktop \ + $out/share/applications/hhd-ui.desktop \ + --replace-fail "Exec=AppRun" "Exec=hhd-ui" \ + --replace-fail "Categories=game;" "Categories=Game;" + iconDir=$out/share/icons/hicolor/512x512/apps + mkdir -p $iconDir + cp ${extractedFiles}/hhd-ui.png $iconDir + ''; + + meta = { + description = "UI for the Handheld Daemon"; + homepage = "https://github.com/hhd-dev/hhd-ui"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ toast ]; + mainProgram = "hhd-ui"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} From cd7e10c127ab5998b1d8b398a611fea26ab0c692 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 23 Nov 2024 04:41:11 +0000 Subject: [PATCH 2/4] vuze: mark insecure CVE-2018-13417 --- pkgs/applications/networking/p2p/vuze/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index 6dc00cba9ee0..5e679afc801c 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.all; maintainers = with maintainers; [ ]; + knownVulnerabilities = [ + "CVE-2018-13417" + ]; }; } From d18fd0f38eead485c1ad7d6ff80686ed5cedbcab Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:07:37 +0000 Subject: [PATCH 3/4] warp-terminal: 0.2024.11.12.08.02.stable_02 -> 0.2024.11.19.08.02.stable_01 Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.11.21-v0.2024.11.19.08.02 (cherry picked from commit fb9d2d5f7d86e89291ab8b689ae072a27e5f60e9) --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 97a38c3898c4..7edef151703d 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-7lxfxKiZ8VxXLGY7ma+ctJzGhKZZgUvtidJDoSjCEVA=", - "version": "0.2024.11.12.08.02.stable_02" + "hash": "sha256-zvM7CcWYFXMN9dLoJqXnQlENmWDGYRKXQACtUQnXmmE=", + "version": "0.2024.11.19.08.02.stable_01" }, "linux_x86_64": { - "hash": "sha256-41icbHntPT52Tc8iW7Tgjr4Su2DkI0SI45d2mQF+9hg=", - "version": "0.2024.11.12.08.02.stable_02" + "hash": "sha256-4uYVA+6NI11X/rYwEzHeTiPnDyntpZcBBBCiZkc9ik8=", + "version": "0.2024.11.19.08.02.stable_01" }, "linux_aarch64": { - "hash": "sha256-r4PYBhJXgB7tTxMP/W/ZuxdsrvVs1BOMpBQIJwZv8uI=", - "version": "0.2024.11.12.08.02.stable_02" + "hash": "sha256-3Tx/NcWV0zyTRp5FVqWTfnhXoxrW3ph/Ytc2tjfNhcs=", + "version": "0.2024.11.19.08.02.stable_01" } } From 601d424fa42e916c9cef8c916db2b20b44870437 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sat, 23 Nov 2024 07:27:07 -0800 Subject: [PATCH 4/4] vscode-extensions.mhutchie.git-graph: correct license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versions ≤1.4.6 are licensed under the MIT License, but versions ≥1.5.0 have a derived unfree license that explicitly prohibits redistribution: > Permission is hereby granted, free of charge, to any person obtaining a copy > of this software and associated documentation files (the "Software"), to use, > copy, modify, merge, and to permit persons to whom the Software is > furnished to do so, subject to the following conditions: > > Permission is NOT GRANTED to publish, distribute, sublicense, and/or sell > derivative works of the Software. > > […] (cherry picked from commit 3e2bc2e9593d5baba84199ed013381d9918cfd81) --- pkgs/applications/editors/vscode/extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ce22447d7937..aa54ae5f7e35 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2797,7 +2797,7 @@ let hash = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA="; }; meta = { - license = lib.licenses.mit; + license = lib.licenses.unfree; }; };