From 987f6a5bf2b05b29409183c2981f65153dd77251 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Tue, 13 Aug 2024 10:56:32 +0200 Subject: [PATCH 01/25] nixos/systemd/initrd: Fix emergencyAccess to work with `null`. Implementation is now compatible with the option's .type already defined. This allows us to pass `config.users.users..hashedPassword` even if this is null (the default). Before: true => access false => no access hash => access via password null => eval error After: true => access false => no access hash => access via password null => no access (cherry picked from commit b33bf6b99a4b3d6771013cb99ed230f9a8682e95) --- nixos/modules/system/boot/systemd/initrd.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 6107a2594baf..0c24069b0456 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -226,8 +226,8 @@ in { emergencyAccess = mkOption { type = with types; oneOf [ bool (nullOr (passwdEntry str)) ]; description = '' - Set to true for unauthenticated emergency access, and false for - no emergency access. + Set to true for unauthenticated emergency access, and false or + null for no emergency access. Can also be set to a hashed super user password to allow authenticated access to the emergency mode. @@ -428,7 +428,12 @@ in { # We can use either ! or * to lock the root account in the # console, but some software like OpenSSH won't even allow you # to log in with an SSH key if you use ! so we use * instead - "/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then optionalString (!cfg.emergencyAccess) "*" else cfg.emergencyAccess}:::::::"; + "/etc/shadow".text = let + ea = cfg.emergencyAccess; + access = ea != null && !(isBool ea && !ea); + passwd = if isString ea then ea else ""; + in + "root:${if access then passwd else "*"}:::::::"; "/bin".source = "${initrdBinEnv}/bin"; "/sbin".source = "${initrdBinEnv}/sbin"; From 60ac12a4f89e8488f4f60bd851a94369042a5658 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 Aug 2024 15:14:43 +0200 Subject: [PATCH 02/25] lomiri.lomiri-gallery-app: init at 3.0.2 (cherry picked from commit 8ef8e7fd8abadc05e92f7869541e2a03bbeaa96d) --- .../lomiri-gallery-app/default.nix | 187 ++++++++++++++++++ pkgs/desktops/lomiri/default.nix | 1 + 2 files changed, 188 insertions(+) create mode 100644 pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix new file mode 100644 index 000000000000..cdff3e2c60e7 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -0,0 +1,187 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + content-hub, + exiv2, + imagemagick, + libglvnd, + libmediainfo, + lomiri-thumbnailer, + lomiri-ui-extras, + lomiri-ui-toolkit, + pkg-config, + qqc2-suru-style, + qtbase, + qtdeclarative, + qtmultimedia, + qtsvg, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-gallery-app"; + version = "3.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-gallery-app"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nX9dTL4W0WxrwvszGd4AUIx4yUrghMM7ZMtGZLhZE/8="; + }; + + patches = [ + # Remove when version > 3.0.2 + (fetchpatch { + name = "0001-lomiri-gallery-app-Newer-Evix2-compat.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/afa019b5e9071fbafaa9afb3b4effdae6e0774c5.patch"; + hash = "sha256-gBc++6EQ7t3VcBZTknkIpC0bJ/P15oI+G0YoQWtjnSY="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/147 merged & in release + (fetchpatch { + name = "0002-lomiri-gallery-app-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/0149c8d422c3e0889d7d523789dc65776a52c4f9.patch"; + hash = "sha256-jS81F7KNbAn5J8sDDXzhXARNYAu6dEKcbNHpHp/3MaI="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/148 merged & in release + (fetchpatch { + name = "0003-lomiri-gallery-app-Fix-GNUInstallDirs.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/805121b362a9b486094e570053884b9ffa92b152.patch"; + hash = "sha256-fyAqKjZ0g7Sw7fWP1IW4SpZ+g0xi/pH6RJie1K3doP0="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release + (fetchpatch { + name = "0004-lomiri-gallery-app-Fix-icons.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/906966536363e80fe9906dee935d991955e8f842.patch"; + hash = "sha256-LJ+ILhokceXFUvP/G1BEBE/J1/XUAmNBxu551x0Q6nk="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/150 merged & in release + (fetchpatch { + name = "0005-lomiri-gallery-app-Add-ENABLE_WERROR.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/fe32a3453b88cc3563e53ab124f669ce307e9688.patch"; + hash = "sha256-nFCtY3857D5e66rIME+lj6x4exEfx9D2XGEgyWhemgI="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/151 merged & in release + (fetchpatch { + name = "0006-lomiri-gallery-app-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/51f3d5e643db5576b051da63c58ba3492c851e44.patch"; + hash = "sha256-5aGx2xfCDgq/khgkzGsvUOmTIYALjyfn6W7IR5dldr8="; + }) + (fetchpatch { + name = "0007-lomiri-gallery-app-Top-level-Qt5Test.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/c308c689c2841d71554ff6397a110d1a12016b70.patch"; + hash = "sha256-fXVOKjnj4EPeby9iEp3mZRqx9MLqdF8SUVEouCkyDRc="; + }) + + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release + (fetchpatch { + name = "0008-lomiri-gallery-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch"; + hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c="; + }) + ]; + + postPatch = '' + # 0003-lomiri-gallery-app-Fix-icons.patch cannot be fully applied via patches due to binary diffs + # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release + for size in 64x64 128x128 256x256; do + rm desktop/icons/hicolor/"$size"/apps/gallery-app.png + magick desktop/lomiri-gallery-app.svg -resize "$size" desktop/icons/hicolor/"$size"/apps/lomiri-gallery-app.png + done + + # Make splash path in desktop file relative + substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \ + --replace-fail 'X-Lomiri-Splash-Image=@SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-gallery-app.svg' + + # Tried to open videos via 'gio open video://', don't know how this is supposed to be set up yet + # Just leave it as file:// schema, which resolves fine + substituteInPlace rc/qml/MediaViewer/SingleMediaViewer.qml \ + --replace-fail '"file://", "video://"' '"file://", "file://"' + + # This makes it harder to see what went wrong in the tests + substituteInPlace tests/unittests/mediaobjectfactory/CMakeLists.txt \ + --replace-fail ' -xunitxml -o test_mediaobjectfactory.xml' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + imagemagick + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + exiv2 + libglvnd + libmediainfo + qtbase + qtdeclarative + qtsvg + + # QML + content-hub + lomiri-thumbnailer + lomiri-ui-extras + lomiri-ui-toolkit + qqc2-suru-style + qtmultimedia + ]; + + cmakeFlags = [ + (lib.cmakeBool "CLICK_MODE" false) + (lib.cmakeBool "INSTALL_TESTS" false) + (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = + let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; + in + '' + export QT_PLUGIN_PATH=${ + listToQtVar qtbase.qtPluginPrefix [ + qtbase + qtsvg + ] + } + export XDG_RUNTIME_DIR=$TMP + ''; + + postInstall = '' + # Link splash to splash dir + mkdir -p $out/share/lomiri-app-launch/splash + ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg} + + # Old name + mv $out/share/content-hub/peers/{,lomiri-}gallery-app + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Photo gallery application for Ubuntu Touch devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ + gpl3Only + cc-by-sa-30 + ]; + maintainers = lib.teams.lomiri.members; + mainProgram = "lomiri-gallery-app"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 59cd0d9d2d9c..99a585a5eec8 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -13,6 +13,7 @@ let lomiri-camera-app = callPackage ./applications/lomiri-camera-app { }; lomiri-clock-app = callPackage ./applications/lomiri-clock-app { }; lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; + lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { }; lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; From d86677556f87e20dc84f2f12647c242db808ae97 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 Aug 2024 15:26:08 +0200 Subject: [PATCH 03/25] tests/lomiri-gallery-app: init (cherry picked from commit cb0faa488a8cb204203bee71b6d96d3c504826ff) --- nixos/tests/all-tests.nix | 1 + nixos/tests/lomiri-gallery-app.nix | 156 ++++++++++++++++++ .../lomiri-gallery-app/default.nix | 2 + 3 files changed, 159 insertions(+) create mode 100644 nixos/tests/lomiri-gallery-app.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a15b0702f8d3..22e019b86505 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -522,6 +522,7 @@ in { lomiri-camera-app = runTest ./lomiri-camera-app.nix; lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; + lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; maddy = discoverTests (import ./maddy { inherit handleTest; }); diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix new file mode 100644 index 000000000000..65afefc313f4 --- /dev/null +++ b/nixos/tests/lomiri-gallery-app.nix @@ -0,0 +1,156 @@ +{ lib, ... }: +{ + name = "lomiri-gallery-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = + with pkgs; + [ + ffmpeg # make a video from the image + (imagemagick.override { ghostscriptSupport = true; }) # example image creation + mpv # URI dispatching for video support + xdotool # mouse movement + ] + ++ (with pkgs.lomiri; [ + suru-icon-theme + lomiri-gallery-app + lomiri-thumbnailer # finds new images & generates thumbnails + ]); + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + }; + + enableOCR = true; + + testScript = + let + imageLabel = "Image"; + in + '' + machine.wait_for_x() + + with subtest("lomiri gallery launches"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.sleep(2) + machine.wait_for_text(r"(Albums|Events|Photos)") + machine.screenshot("lomiri-gallery_open") + + machine.succeed("pkill -f lomiri-gallery-app") + + machine.succeed("mkdir /root/Pictures /root/Videos") + # Setup example data, OCR-friendly: + # - White square, black text + # - uppercase extension + machine.succeed("magick -size 500x500 -background white -fill black canvas:white -pointsize 70 -annotate +100+300 '${imageLabel}' /root/Pictures/output.PNG") + + # Different image formats + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG") + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.BMP") + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.GIF") + + # Video for dispatching + machine.succeed("ffmpeg -loop 1 -r 1 -i /root/Pictures/output.PNG -t 100 -pix_fmt yuv420p /root/Videos/output.MP4") + + with subtest("lomiri gallery handles files"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.sleep(2) + machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})") + + machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories + machine.sleep(2) + machine.succeed("xdotool mousemove 30 180 click 1") # photos + machine.sleep(2) + machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them + machine.screenshot("lomiri-gallery_photos") + + machine.succeed("xdotool mousemove 80 140 click 1") # select newest one + machine.sleep(2) + machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar + machine.sleep(2) + + with subtest("lomiri gallery handles mp4"): + machine.succeed("xdotool mousemove 870 50 click 1") # open media information + machine.sleep(2) + machine.wait_for_text("MP4") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_mp4_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure thumbnail rendering worked + + machine.succeed("xdotool mousemove 450 350 click 1") # dispatch to system's video handler + machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start + machine.sleep(10) + machine.succeed("pgrep -u root -f mpv") # should still be playing + machine.screenshot("lomiri-gallery_mp4_dispatch") + + machine.send_key("q") + machine.wait_until_fails("pgrep mpv") # wait for video to stop + + machine.send_key("right") + + with subtest("lomiri gallery handles gif"): + machine.succeed("xdotool mousemove 870 50 click 1") # open media information + machine.sleep(2) + machine.wait_for_text("GIF") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_gif_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles bmp"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("BMP") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_bmp_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles jpg"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("JPG") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_jpg_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles png"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("PNG") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_png_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + + machine.succeed("pkill -f lomiri-gallery-app") + + with subtest("lomiri gallery localisation works"): + machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &") + machine.wait_for_text(r"(Alben|Ereignisse|Fotos)") + machine.screenshot("lomiri-gallery_localised") + ''; +} diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index cdff3e2c60e7..deed853358b4 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, fetchpatch, gitUpdater, + nixosTests, cmake, content-hub, exiv2, @@ -169,6 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tests.vm = nixosTests.lomiri-gallery-app; updateScript = gitUpdater { rev-prefix = "v"; }; }; From 669d0c9dea216f3a37d289ff4174abdead850b7c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 Aug 2024 15:54:36 +0200 Subject: [PATCH 04/25] nixos/lomiri: Add gallery app (cherry picked from commit 8c1cb41408c4c6381646aea834c0b8350bdc370e) --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 2e293dff4f74..8c74efd9d72a 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -26,6 +26,7 @@ in { lomiri-clock-app lomiri-download-manager lomiri-filemanager-app + lomiri-gallery-app lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session From ec4dd6d792601e092d383d7f6e177c9a17239ac6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 22 Aug 2024 19:00:12 +0200 Subject: [PATCH 05/25] tests/lomiri-camera-app: Fix backported test --- nixos/tests/lomiri-camera-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix index ccd53a37135b..2aaf1865a39a 100644 --- a/nixos/tests/lomiri-camera-app.nix +++ b/nixos/tests/lomiri-camera-app.nix @@ -35,7 +35,7 @@ fonts = { packages = with pkgs; [ # Intended font & helps with OCR - ubuntu-classic + ubuntu_font_family ]; }; From 1bae4c84ee430f046d55453cb4c84486bade05fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 18:22:55 +0000 Subject: [PATCH 06/25] morgen: 3.4.2 -> 3.4.3 (cherry picked from commit ceb8e1aaaeecd9f7722ad08d97f74c3c12d8ee90) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5f6c9ea5c119..4bd45374ece2 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-N9G9yfUhKZd3dcsyBKODL6vnMqQgLk2DRQ+YZAYdPks="; + hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; }; nativeBuildInputs = [ From 4cefad5a46f18256953b885dfa982c559e36fc69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 19:34:14 +0000 Subject: [PATCH 07/25] morgen: 3.4.3 -> 3.4.4 (cherry picked from commit 62942da8548170c1d78e1799558a1e3ccb1f2672) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 4bd45374ece2..d14fd28d9db1 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; + hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; }; nativeBuildInputs = [ From ed32d0ab100308107975288533eb42c818a1bbe3 Mon Sep 17 00:00:00 2001 From: Ariel Ebersberger Date: Wed, 12 Jun 2024 13:20:08 +0200 Subject: [PATCH 08/25] morgen: electron_28 -> electron_29 (cherry picked from commit 286beb5f80e10bfc4e2acf81c1a5596236b0b635) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f54fce79166d..67abe98a43af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10663,7 +10663,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_28; + electron = electron_29; }; mosh = callPackage ../tools/networking/mosh { }; From f99b0ce108efc10e47dc729237b4e3247371dd79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 09:10:34 +0000 Subject: [PATCH 09/25] morgen: 3.4.4 -> 3.4.5 (cherry picked from commit 40eb861d785391ea8a26988c78cbe078b8dc1bda) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d14fd28d9db1..7bae5b5388d7 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ From 04113f1cde36c2ee1218b688eb920ddc28713bb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jun 2024 03:59:55 +0000 Subject: [PATCH 10/25] morgen: 3.4.5 -> 3.5.1 (cherry picked from commit 47c6c7b15e654c5894df5203d6b92ccd7fb606cb) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 7bae5b5388d7..56ab32c3439c 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ From 1620cf62264da436a4d527662b1f209004031f2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Aug 2024 09:43:51 +0000 Subject: [PATCH 11/25] morgen: 3.5.1 -> 3.5.5 (cherry picked from commit 48a9a6a9b3de23f3025d0489dc8adba24bd33460) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 56ab32c3439c..522a43881180 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; + hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8="; }; nativeBuildInputs = [ From fdd1865a4853bcc5f713bb0fe9c34ac5a682e386 Mon Sep 17 00:00:00 2001 From: justanotherariel Date: Tue, 20 Aug 2024 10:52:29 +0200 Subject: [PATCH 12/25] morgen: electron_29 -> electron_30 (cherry picked from commit 4a463f1c60d9e37f34b93a02b713a948c3d833b2) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67abe98a43af..01ad5173c63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10663,7 +10663,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_29; + electron = electron_30; }; mosh = callPackage ../tools/networking/mosh { }; From e4066581c7245ce574c43f1afc6702d868c42923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 06:45:52 +0000 Subject: [PATCH 13/25] simplex-chat-desktop: 5.8.1 -> 6.0.3 (cherry picked from commit a852d3de67e7660446f61191739e88486eea9bed) --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index c3e5c618a7ae..2464d7a2b7cb 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.7.0"; + version = "6.0.3"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-T8ojnay/FCa9Q4PObqlfy2MC4pKTF73taNW8elNDjIg="; + hash = "sha256-No3nS1AUOxhaxvaPvc8tLW+fj59P4AT/bt0dZobdGAw="; }; appimageContents = appimageTools.extract { From 29e54dda68d2807998c86365f65f5eba0c3a46c8 Mon Sep 17 00:00:00 2001 From: Vri Date: Sun, 25 Aug 2024 13:41:17 +0200 Subject: [PATCH 14/25] maintainer: add vrifox (cherry picked from commit 83df8cead3521bb8d4986ccac780c525097d2ac8) --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e3f45435799..6c41940a3a51 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20934,6 +20934,14 @@ githubId = 230381; name = "Daniel Nilsson"; }; + vrifox = { + email = "vrifox@vrifox.cc"; + github = "vrifox"; + githubId = 109021367; + keys = [ { fingerprint = "413C 73F0 C5BD 6318 826A 42D9 D400 98E5 B60B 2197"; } ]; + matrix = "@vri:cozy.town"; + name = "Vri"; + }; vrinek = { email = "vrinek@hey.com"; github = "vrinek"; From 528398da643ebc0695264f32853c4b96a05a7091 Mon Sep 17 00:00:00 2001 From: Vri Date: Sun, 25 Aug 2024 13:44:01 +0200 Subject: [PATCH 15/25] netbird: 0.28.8 -> 0.28.9 (cherry picked from commit 0b1f19f48571e64ac4fc5a4426c00e6dbafa4887) --- pkgs/tools/networking/netbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index e33c43e806a2..c4bce67ff89d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.28.8"; + version = "0.28.9"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-DfY8CVBHgE/kLALKNzSgmUxM0flWLesU0XAgVsHHLKc="; + hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw="; }; - vendorHash = "sha256-CqknRMijAkWRLXCcIjRBX2wB64+RivD/mXq28TqzNjg="; + vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -110,7 +110,7 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ misuzu ]; + maintainers = with maintainers; [ misuzu vrifox ]; mainProgram = "netbird"; }; } From 08e5e55c2a2e27e43ee3dab85828a3dac87ad705 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Aug 2024 04:17:03 +0200 Subject: [PATCH 16/25] pretix: apply patch for CVE-2024-8113 https://pretix.eu/about/en/blog/20240823-release-2024-7-1/ --- pkgs/by-name/pr/pretix/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index a45fdbdf2ff3..15167a4383a2 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -2,6 +2,7 @@ , buildNpmPackage , fetchFromGitHub , fetchPypi +, fetchpatch2 , nodejs , python3 , gettext @@ -65,6 +66,12 @@ python.pkgs.buildPythonApplication rec { # Discover pretix.plugin entrypoints during build and add them into # INSTALLED_APPS, so that their static files are collected. ./plugin-build.patch + + (fetchpatch2 { + name = "CVE-2024-8113.patch"; + url = "https://github.com/pretix/pretix/commit/0f44a2ad4e170882dbe6b9d95dba6c36e4e181cf.patch"; + hash = "sha256-N5Fvf7tfZvtqDy7fO7sPBhtew8uGFLzK+kVO/hMgEIY="; + }) ]; postPatch = '' From 2e7721ba4d887893e7c6f958a419aaf76039f803 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 22 Aug 2024 04:42:57 +0100 Subject: [PATCH 17/25] signal-desktop: add myself to maintainers (cherry picked from commit 8bd7a3b3b1e0955b60c1a724653cfd8fb77dcdbe) --- .../instant-messengers/signal-desktop/generic.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 558ace43ec16..81b05a865dc7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -181,7 +181,15 @@ stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr teutat3s ]; + maintainers = with lib.maintainers; [ + eclairevoyant + mic92 + equirosa + urandom + bkchr + teutat3s + emily + ]; mainProgram = pname; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From c4205633715ec541d62a55f36345e93fe5e48187 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 22 Aug 2024 04:42:57 +0100 Subject: [PATCH 18/25] signal-desktop: replace unlicensed Apple emoji MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signal ships the Apple emoji set without a licence via an npm package and upstream does not seem terribly interested in fixing this; see: * * I don’t want to mark Signal as `lib.licenses.unfree`, so this change instead replaces the bundled Apple emoji PNGs with ones generated from our freely‐licensed Noto Color Emoji font. I chose Noto Color Emoji because it is the best‐maintained FOSS emoji font, and because Signal Android will also use the Noto emoji if the “Chats → Keyboard → Use system emoji” setting is turned on. Therefore, Noto Color Emoji is both within the bounds of the Signal user experience on other platforms, and more likely to match the emoji font installed on a NixOS system to boot. I have verified that Noto Color Emoji covers all the standalone emoji that the bundled Apple set does, and could not find any emoji sequence that reliably displayed correctly in Signal before these changes but did not afterwards. (Though I sure did find a good number of emoji that displayed weirdly in Signal both before and after.) Signal will also download and cache large versions of the Apple emoji from their own update server at runtime. This does not pose a copyright concern for the Nixpkgs cache, but would result in inconsistent presentation between small and large emoji. Therefore, we also point these to our Noto Color Emoji PNGs, and gain a little privacy in the process. **No invasive patches are made to the Signal code;** the only changes are to replace the unlicensed Apple emoji files with our own, and replace the URL that large versions are fetched from to point to them. There is no functional change to the application other than showing different images on the client and not requesting the jumbomoji pack files from the Signal update server. Ideally we’d build this package from source and simply omit the problematic files in the first place, but apparently that’s a little tricky and we should solve the compliance problem now. The best solution, of course, would be for Signal to replace their unlicensed copy of Apple’s emoji with a freely‐licensed set compatible with their AGPLv3 licence. I may try and raise this situation again with Signal, although given the past response I am not optimistic, but I wanted to first address the potential copyright violation in Nixpkgs as swiftly as possible. Although the Python script used to copy and rename the Noto PNGs is very simple, I have extensively documented it to help increase confidence in it and ease further maintenance. To reflect my willingness to keep this change maintained and take responsibility for it, I have added myself to the package maintainer list. These changes actually result in the uncompressed size of the resulting package decreasing from 450 MiB to 435 MiB; as Signal would ordinarily download and cache up to 27 MiB of jumbomoji sheets from their servers during use, the effective disk space savings are likely to be higher. Thanks to @mjm for helping test this. (cherry picked from commit 98648422e8a3a57f55109c51acdd795d40183949) --- .../signal-desktop/copy-noto-emoji.py | 118 ++++++++++++++++++ .../signal-desktop/generic.nix | 90 ++++++++++++- .../signal-desktop/pyproject.toml | 15 +++ .../signal-desktop/signal-desktop-aarch64.nix | 2 +- .../signal-desktop/signal-desktop-beta.nix | 2 +- .../signal-desktop/signal-desktop.nix | 2 +- 6 files changed, 222 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py create mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py b/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py new file mode 100644 index 000000000000..393519e5c1f0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py @@ -0,0 +1,118 @@ +"""Copy Noto Color Emoji PNGs into an extracted Signal ASAR archive. + +Signal loads small Apple emoji PNGs directly from +`node_modules/emoji-datasource-apple/img/apple/64`, and downloads and +caches large Apple emoji WebP files in `.proto` bundles on the fly. The +latter are not a copyright concern for the Nixpkgs cache, but would +result in inconsistent presentation between small and large emoji. + +We skip the complexity and buy some additional privacy by replacing the +`emoji://jumbo?emoji=` URL prefix with a `file://` path to the copied +PNGs inside the ASAR archive, and linking the `node_modules` PNG paths +directly to them. +""" + +import json +import shutil +import sys +from pathlib import Path + + +def signal_name_to_emoji(signal_emoji_name: str) -> str: + r"""Return the emoji corresponding to a Signal emoji name. + + Signal emoji names are concatenations of UTF‐16 code units, + represented in lowercase big‐endian hex padded to four digits. + + >>> signal_name_to_emoji("d83dde36200dd83cdf2bfe0f") + '😶‍🌫️' + >>> b"\xd8\x3d\xde\x36\x20\x0d\xd8\x3c\xdf\x2b\xfe\x0f".decode("utf-16-be") + '😶‍🌫️' + """ + hex_bytes = zip(signal_emoji_name[::2], signal_emoji_name[1::2]) + emoji_utf_16_be = bytes( + int("".join(hex_pair), 16) for hex_pair in hex_bytes + ) + return emoji_utf_16_be.decode("utf-16-be") + + +def emoji_to_noto_name(emoji: str) -> str: + r"""Return the Noto emoji name of an emoji. + + Noto emoji names are underscore‐separated Unicode scalar values, + represented in lowercase big‐endian hex padded to at least four + digits. Any U+FE0F variant selectors are omitted. + + >>> emoji_to_noto_name("😶‍🌫️") + '1f636_200d_1f32b' + >>> emoji_to_noto_name("\U0001f636\u200d\U0001f32b\ufe0f") + '1f636_200d_1f32b' + """ + return "_".join( + f"{ord(scalar_value):04x}" + for scalar_value in emoji + if scalar_value != "\ufe0f" + ) + + +def emoji_to_emoji_data_name(emoji: str) -> str: + r"""Return the npm emoji-data emoji name of an emoji. + + emoji-data emoji names are hyphen‐minus‐separated Unicode scalar + values, represented in lowercase big‐endian hex padded to at least + four digits. + + >>> emoji_to_emoji_data_name("😶‍🌫️") + '1f636-200d-1f32b-fe0f' + >>> emoji_to_emoji_data_name("\U0001f636\u200d\U0001f32b\ufe0f") + '1f636-200d-1f32b-fe0f' + """ + return "-".join(f"{ord(scalar_value):04x}" for scalar_value in emoji) + + +def _main() -> None: + noto_png_path, asar_root = (Path(arg) for arg in sys.argv[1:]) + asar_root = asar_root.absolute() + + out_path = asar_root / "images" / "nixpkgs-emoji" + out_path.mkdir(parents=True) + + emoji_data_out_path = ( + asar_root + / "node_modules" + / "emoji-datasource-apple" + / "img" + / "apple" + / "64" + ) + emoji_data_out_path.mkdir(parents=True) + + jumbomoji_json_path = asar_root / "build" / "jumbomoji.json" + with jumbomoji_json_path.open() as jumbomoji_json_file: + jumbomoji_packs = json.load(jumbomoji_json_file) + + for signal_emoji_names in jumbomoji_packs.values(): + for signal_emoji_name in signal_emoji_names: + emoji = signal_name_to_emoji(signal_emoji_name) + + try: + shutil.copy( + noto_png_path / f"emoji_u{emoji_to_noto_name(emoji)}.png", + out_path / emoji, + ) + except FileNotFoundError: + print( + f"Missing Noto emoji: {emoji} {signal_emoji_name}", + file=sys.stderr, + ) + continue + + ( + emoji_data_out_path / f"{emoji_to_emoji_data_name(emoji)}.png" + ).symlink_to(out_path / emoji) + + print(out_path.relative_to(asar_root)) + + +if __name__ == "__main__": + _main() diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 81b05a865dc7..2b60e2ae6b84 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,8 +1,13 @@ { stdenv , lib +, callPackage , fetchurl , autoPatchelfHook +, noto-fonts-color-emoji , dpkg +, asar +, rsync +, python3 , wrapGAppsHook3 , makeWrapper , nixosTests @@ -57,6 +62,27 @@ let inherit (stdenv) targetPlatform; ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; + + # Noto Color Emoji PNG files for emoji replacement; see below. + noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { + pname = "noto-fonts-color-emoji-png"; + + # The build produces 136×128 PNGs by default for arcane font + # reasons, but we want square PNGs. + buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; + + makeTargets = [ "compressed" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png + python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png + + runHook postInstall + ''; + }); in stdenv.mkDerivation rec { inherit pname version; @@ -71,11 +97,36 @@ stdenv.mkDerivation rec { src = fetchurl { inherit url hash; + recursiveHash = true; + downloadToTemp = true; + nativeBuildInputs = [ dpkg asar ]; + # Signal ships the Apple emoji set without a licence via an npm + # package and upstream does not seem terribly interested in fixing + # this; see: + # + # * + # * + # + # We work around this by replacing it with the Noto Color Emoji + # set, which is available under a FOSS licence and more likely to + # be used on a NixOS machine anyway. The Apple emoji are removed + # during `fetchurl` to ensure that the build doesn’t cache the + # unlicensed emoji files, but the rest of the work is done in the + # main derivation. + postFetch = '' + dpkg-deb -x $downloadedFile $out + asar extract "$out/opt/${dir}/resources/app.asar" $out/asar-contents + rm -r \ + "$out/opt/${dir}/resources/app.asar"{,.unpacked} \ + $out/asar-contents/node_modules/emoji-datasource-apple + ''; }; nativeBuildInputs = [ + rsync + asar + python3 autoPatchelfHook - dpkg (wrapGAppsHook3.override { inherit makeWrapper; }) ]; @@ -127,11 +178,13 @@ stdenv.mkDerivation rec { wayland ]; - unpackPhase = "dpkg-deb -x $src ."; - dontBuild = true; dontConfigure = true; + unpackPhase = '' + rsync -a --chmod=+w $src/ . + ''; + installPhase = '' runHook preInstall @@ -147,6 +200,30 @@ stdenv.mkDerivation rec { # Create required symlinks: ln -s libGLESv2.so "$out/lib/${dir}/libGLESv2.so.2" + # Copy the Noto Color Emoji PNGs into the ASAR contents. See `src` + # for the motivation, and the script for the technical details. + emojiPrefix=$( + python3 ${./copy-noto-emoji.py} \ + ${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png \ + asar-contents + ) + + # Replace the URL used for fetching large versions of emoji with + # the local path to our copied PNGs. + substituteInPlace asar-contents/preload.bundle.js \ + --replace-fail \ + 'emoji://jumbo?emoji=' \ + "file://$out/lib/${lib.escapeURL dir}/resources/app.asar/$emojiPrefix/" + + # `asar(1)` copies files from the corresponding `.unpacked` + # directory when extracting, and will put them back in the modified + # archive if you don’t specify them again when repacking. Signal + # leaves their native `.node` libraries unpacked, so we match that. + asar pack \ + --unpack '*.node' \ + asar-contents \ + "$out/lib/${dir}/resources/app.asar" + runHook postInstall ''; @@ -180,7 +257,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; + license = [ + lib.licenses.agpl3Only + + # Various npm packages + lib.licenses.free + ]; maintainers = with lib.maintainers; [ eclairevoyant mic92 diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml b/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml new file mode 100644 index 000000000000..eeee9c7287a0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml @@ -0,0 +1,15 @@ +[tool.mypy] +files = ["*.py"] +strict = true + +[tool.ruff] +line-length = 80 + +[tool.ruff.lint] +select = ["ALL"] +ignore = ["COM812", "D203", "D213", "ISC001", "T201"] +allowed-confusables = ["‐"] + +[tool.ruff.format] +docstring-code-format = true +docstring-code-line-length = "dynamic" diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index a06e91b08938..72cde3388e82 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix { } rec { dir = "Signal"; version = "7.19.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-L5Wj1ofMR+QJezd4V6pAhkINLF6y9EB5VNFAIOZE5PU="; + hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index ffb73d9e9150..0f3e57148987 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix { } rec { dir = "Signal Beta"; version = "7.19.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-kD08xke+HYhwAZG7jmU1ILo013556vNcvAFc/+9BTjg="; + hash = "sha256-dIZvzJ45c5kL+2HEaKrtbck5Zz572pQAj3YTenzz6Zs="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index e736d20fe4e4..de6e6620757c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix { } rec { dir = "Signal"; version = "7.21.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-mjf27BISkvN9Xsi36EXtiSkvaPEc4j/Cwjlh4gkfdsA="; + hash = "sha256-c4INjHMqTH2B71aUJtzgLSFZSe/KFo1OW/wv7rApSxA="; } From f44a0b4e110e512a3d796e5749cbe67cdb01fd57 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 22 Aug 2024 03:35:18 +0100 Subject: [PATCH 19/25] picosnitch: mark as vulnerable (cherry picked from commit 98f36e5c989ea57386a4e1f945bbe8318b0f736a) --- pkgs/tools/networking/picosnitch/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix index c874fbf80c1b..d0cb9f82c56b 100644 --- a/pkgs/tools/networking/picosnitch/default.nix +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -39,5 +39,8 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = [ maintainers.elesiuta ]; platforms = platforms.linux; + knownVulnerabilities = [ + "Allows an unprivileged user to write to arbitrary files as root; see https://github.com/elesiuta/picosnitch/issues/40" + ]; }; } From a4eae08694c9c88773d3d2c9a7e11bb9f1f43dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 27 Aug 2024 20:49:56 +0200 Subject: [PATCH 20/25] hydra_unstable: Fix CVE-2024-45049 --- pkgs/development/tools/misc/hydra/unstable.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 972f13703441..a8750bbb2b7a 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -213,6 +213,15 @@ stdenv.mkDerivation rec { url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch"; hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU="; }) + (fetchpatch2 { + url = "https://github.com/NixOS/hydra/commit/916531dc9ccee52e6dab256232933fcf6d198158.patch"; + hash = "sha256-JOtlYr+K934UIqHvfLMd/jfRRU+Tci0kvtyhOvlwxEs="; + }) + (fetchpatch2 { + name = "CVE-2024-45049.patch"; + url = "https://github.com/NixOS/hydra/commit/f73043378907c2c7e44f633ad764c8bdd1c947d5.patch"; + hash = "sha256-IS6GCuRLW+ULDD7udpGX2tO85bV2gGOX6DLLw3NTkJU="; + }) ]; postPatch = '' From 665a1853b5523c35872ccc16054c6f2484a19e15 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 26 Aug 2024 09:40:02 +0300 Subject: [PATCH 21/25] nixos/eris-server: update comment (cherry picked from commit f5b732e9bf207a4812e354e3401acb48b696c911) --- nixos/modules/services/network-filesystems/eris-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/eris-server.nix b/nixos/modules/services/network-filesystems/eris-server.nix index 104676a52c61..7ad190c62f0a 100644 --- a/nixos/modules/services/network-filesystems/eris-server.nix +++ b/nixos/modules/services/network-filesystems/eris-server.nix @@ -53,7 +53,7 @@ in { Add "get" and "put" as query elements to enable those operations. ''; example = [ - "bolt+file:///srv/eris.bolt?get&put" + "badger+file:///var/db/eris.badger?get&put" "coap+tcp://eris.example.com:5683?get" ]; }; From 361c1e5c2aa6cf3c5e2c34b245c3f7623921f461 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 26 Aug 2024 11:42:34 +0300 Subject: [PATCH 22/25] eris-go: 20240128 -> 20240826 (cherry picked from commit 780a7d3fe0162bdd6fc996844189bd6ee536f26b) --- pkgs/by-name/er/eris-go/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix index 5823756e301d..7787f345c31e 100644 --- a/pkgs/by-name/er/eris-go/package.nix +++ b/pkgs/by-name/er/eris-go/package.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitea, mandoc, tup, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }: buildGoModule rec { pname = "eris-go"; - version = "20240128"; + version = "20240826"; outputs = [ "out" "man" ]; src = fetchFromGitea { @@ -10,18 +10,11 @@ buildGoModule rec { owner = "eris"; repo = "eris-go"; rev = version; - hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc="; + hash = "sha256-qw3HdHtyMuWqwkuGzVzQ8bXnXlJJPDpiYrQZb0lIYj8="; }; - vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M="; + vendorHash = "sha256-TnB4BSO2Yb9AtcHgdEgNrFHAQJ7u4IzmhLdcSjbZ7SA="; - nativeBuildInputs = [ mandoc tup ]; - - postConfigure = '' - rm -f *.md - tupConfigure - ''; - postBuild = "tupBuild"; postInstall = '' install -D *.1.gz -t $man/share/man/man1 ''; @@ -35,7 +28,6 @@ buildGoModule rec { homepage = "https://codeberg.org/eris/eris-go"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; - broken = stdenv.isDarwin; mainProgram = "eris-go"; }; } From 1a42560e0d113dbdafac67fe36ee48aaa833809a Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 25 Aug 2024 01:13:49 +0100 Subject: [PATCH 23/25] yarn2nix: remove GPLv3 licence All contributors that have made contributions at all likely to be copyrightable have agreed to relicense this code under the same MIT licence as the rest of Nixpkgs in . Note that this applies to all previous versions of the code, including in older Nixpkgs versions where the GPLv3 text is still present and the original yarn2nix repositories before they were imported into Nixpkgs. Closes: #334267 Closes: #334374 (cherry picked from commit df1aa3543cabf8e511e4bae905a72d7f53ef0557) --- .../yarn2nix-moretea/yarn2nix/LICENSE.txt | 674 ------------------ 1 file changed, 674 deletions(-) delete mode 100644 pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt deleted file mode 100644 index 94a9ed024d38..000000000000 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. From 7e2c6684ba59d65a85cd58ecd4799949818ffb3d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:37:33 +0200 Subject: [PATCH 24/25] webtorrent_desktop: make fetchpatch url reproducible (cherry picked from commit 8e1e4c64035a440870492dc6635df6412203a603) --- pkgs/applications/video/webtorrent_desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 75a8d9f5c639..60ef7c57cdc8 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -12,12 +12,14 @@ buildNpmPackage { patches = [ # electron 27 fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388 + url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch"; hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; }) # startup fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389 + url = "https://github.com/webtorrent/webtorrent-desktop/commit/407046d150ed7ff876a5e1978f68630e9c8f0074.patch"; hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; }) ]; From 6a7538a660994c6e644f56e2418cfcc0b704277e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 24 Jun 2024 10:47:54 +0200 Subject: [PATCH 25/25] webtorrent_desktop: update and use latest electron (#320293) (cherry picked from commit 62db0a59de47a0d343bb7bedd4e65ebad135d66d) --- .../video/webtorrent_desktop/default.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 60ef7c57cdc8..9fd34a1eed1f 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -2,20 +2,14 @@ buildNpmPackage { pname = "webtorrent-desktop"; - version = "0.25-pre-1eb612"; + version = "0.25-pre-ac7f16"; src = fetchFromGitHub { owner = "webtorrent"; repo = "webtorrent-desktop"; - rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c"; - sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg="; + rev = "ac7f16e71c96c5ad670bfcb8728df5af78ae21a1"; + sha256 = "sha256-UEN5NhLVSQEO8rsiTW1hJPjNFL9KobW/Bho98FzKaf4="; }; patches = [ - # electron 27 fix - (fetchpatch { - name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388 - url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch"; - hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; - }) # startup fix (fetchpatch { name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389 @@ -23,7 +17,7 @@ buildNpmPackage { hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; }) ]; - npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE="; + npmDepsHash = "sha256-otAes6GkqoAVvfeWhWgyY4IVZIZxw3WtkrVdEWIk1Lk="; makeCacheWritable = true; npmRebuildFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6a3b6094c64..954b4a621b85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35388,9 +35388,7 @@ with pkgs; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { - electron = electron_27; - }; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };