From a02ad5557fe1e528eacc2c2d77c8c70aa65e8e8b Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Sun, 14 Jul 2024 04:12:56 +0200 Subject: [PATCH 01/23] vscode: 1.91.0 -> 1.91.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 78a063e6ee367..b67bd950dee45 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv"; - x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0"; - aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz"; - aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2"; - armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr"; + x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0"; + x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy"; + aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9"; + aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c"; + armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.91.0"; + version = "1.91.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286"; + rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v"; + sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg"; }; }; From bc45d784dbf5763c940701a838b41eb31490a020 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 1 Aug 2024 23:18:08 +0200 Subject: [PATCH 02/23] vscode: 1.91.1 -> 1.92.0 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b67bd950dee45..d9d90ab0b8582 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0"; - x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy"; - aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9"; - aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c"; - armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr"; + x86_64-linux = "1q8krqhwlqj3a76hp830nhz27sqwz9i0klh2q2b3n5l29x9cvd34"; + x86_64-darwin = "1d0sp42g582ykzdpzmr1wqkc0ivg09l9zxm201fxd6irr6i6lvqz"; + aarch64-linux = "0z48qlz8b7mvznr4d4vi47mibkffbsmbr2bp712h1z9s4jhx40h4"; + aarch64-darwin = "01hmcnhpfdckaslz7133692n1haiq4ifbv72vbsdnzsrdxs7wd3m"; + armv7l-linux = "1ifd7z1mvimckb26l1nzv6qd3vjamfrzm0h655367d93fqz4iph4"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.91.1"; + version = "1.92.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729"; + rev = "b1c0a14de1414fcdaa400695b4db1c0799bc3124"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg"; + sha256 = "03skx6cla4k5clncxx8wlp0j40gkqggqcs9wl0dqkrv18cljy5zz"; }; }; From e3d45c647f16704413d2720a6e73d755dedb7053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 1 Aug 2024 19:51:22 +0200 Subject: [PATCH 03/23] yt-dlp: 2024.7.25 -> 2024.8.1 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.8.1 (cherry picked from commit 4da61526d9e45866701c97ef2656494f5d3a746a) --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 8ce204f6496f2..c38fed8d5f892 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.7.25"; + version = "2024.8.1"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw="; + hash = "sha256-QxiqUjaUYRVi8BQZyNUmtmKnLfNO+LpFQBazTINmwVg="; }; build-system = [ From d354c6dccf5da37933c7d03f115f4dd37c60ca07 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 29 Jul 2024 22:51:34 +0200 Subject: [PATCH 04/23] linux_xanmod: 6.6.42 -> 6.6.43 (cherry picked from commit 5af67404149106f33d1c8486f091c909e5098cca) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5acf8c5b25601..c1a2ca16166e5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.42"; - hash = "sha256-0YqvOObUHP2S8Jf1H+fzAZ+wOMoFt1BLxWilqt6ohVg="; + version = "6.6.43"; + hash = "sha256-4o8qdAkqFjlRFS2k2zW9weSB1JQ5BFuDdcv26v9qYoA="; variant = "lts"; }; From 9a0987f50b649372eddab6b167453e72d5601ed2 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 29 Jul 2024 22:48:54 +0200 Subject: [PATCH 05/23] linux_xanmod_latest: 6.9.11 -> 6.9.12 (cherry picked from commit f8766a076245f8af0a1297468900f9a5979eb29f) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c1a2ca16166e5..06f909c59cdab 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.9.11"; - hash = "sha256-c6Mkk37SFoC9hJfh/iQqyNzGJJjN0W28VLta/nayCgc="; + version = "6.9.12"; + hash = "sha256-ysnu/6q2Zc0b+MNRdjQDLNmmjU+nWKpb/CcPOSSmotM="; variant = "main"; }; From 90153e72171c3206c6ced3786eeef928eb7560fe Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 2 Aug 2024 10:41:42 +0000 Subject: [PATCH 06/23] spotify: 1.2.40.599.g606b7f29 -> 1.2.42.290.g242057a2 (cherry picked from commit 7d1134ba7d46a730ad995b467804a8b310aeafaa) --- pkgs/applications/audio/spotify/linux.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index f06b5f9367fd6..e997a9a33fcc1 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.40.599.g606b7f29"; + version = "1.2.42.290.g242057a2"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "77"; + rev = "78"; deps = [ alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation { src = fetchurl { name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-XQyZbU6dJh87jEdEvks2D0EpMkjPSKROl8kurSaiPs2z4FZ2SxM2DUvHwtKemKKScdTISm3jh6wyHXwPhB8eNQ=="; + hash = "sha512-3kT7SA2Q1OxgDa5duivIiHaxcROBAFjDnTx6rw2ya6o5yOVygseS02zBgWg2Qd8jq0721KbYC83u9M+MWtWhhA=="; }; nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; From 2dde124486328d93f3df0a6202a71a2cc77ec632 Mon Sep 17 00:00:00 2001 From: Martin Wimpress <304639+flexiondotorg@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:27:28 +0100 Subject: [PATCH 07/23] wavebox: 10.124.17-2 -> 10.127.10-2 (#324822) * wavebox: 10.124.17-2 -> 10.126.14-2 * wavebox: apply suggestions from code review Co-authored-by: Sandro * wavebox: bump version to 10.127.10-2 * wavebox: complete the removal of $appname variable * wavebox: use callPackage from all-packages.nix; wavebox is not a Qt5 app * wavebox: replace addOpenGLRunpath with addDriverRunpath * wavebox: update comment about libvaSupport * wavebox: format with nixfmt-rfc-style --------- Co-authored-by: Sandro (cherry picked from commit a18c10b8c1dd6eeea5eaf413625de34044eb2356) --- .../instant-messengers/wavebox/default.nix | 293 +++++++++++++----- .../instant-messengers/wavebox/update.sh | 5 - pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 224 insertions(+), 76 deletions(-) delete mode 100755 pkgs/applications/networking/instant-messengers/wavebox/update.sh diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index d1df9c108143e..eb4a9de8425dd 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,94 +1,247 @@ -{ alsa-lib -, autoPatchelfHook -, fetchurl -, gtk3 -, gtk4 -, libnotify -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, mesa -, nss -, lib -, libdrm -, qt5 -, stdenv -, udev -, xdg-utils -, xorg +{ + lib, + stdenv, + patchelf, + makeWrapper, + fetchurl, + writeScript, + + # Libraries + glib, + fontconfig, + freetype, + pango, + cairo, + libX11, + libXi, + atk, + nss, + nspr, + libXcursor, + libXext, + libXfixes, + libXrender, + libXScrnSaver, + libXcomposite, + libxcb, + alsa-lib, + libXdamage, + libXtst, + libXrandr, + libxshmfence, + expat, + cups, + dbus, + gtk3, + gtk4, + gdk-pixbuf, + gcc-unwrapped, + at-spi2-atk, + at-spi2-core, + libkrb5, + libdrm, + libglvnd, + mesa, + libxkbcommon, + pipewire, + wayland, + + coreutils, + + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", + + systemd, + + # Loaded at runtime. + libexif, + pciutils, + + liberation_ttf, + curl, + util-linux, + xdg-utils, + wget, + flac, + harfbuzz, + icu, + libpng, + libopus, + snappy, + speechd, + bzip2, + libcap, + + # Necessary for USB audio devices. + pulseSupport ? true, + libpulseaudio, + + gsettings-desktop-schemas, + + # Allow video acceleration via VA-API to be disabled on systems where is doesn't + # work reliably (--enable-features=VaapiVideoDecoder) + libvaSupport ? true, + libva, + + # For Vulkan support (--enable-features=Vulkan) + addDriverRunpath, }: -stdenv.mkDerivation rec { +let + opusWithCustomModes = libopus.override { withCustomModes = true; }; + + deps = + [ + glib + fontconfig + freetype + pango + cairo + libX11 + libXi + atk + nss + nspr + libXcursor + libXext + libXfixes + libXrender + libXScrnSaver + libXcomposite + libxcb + alsa-lib + libXdamage + libXtst + libXrandr + libxshmfence + expat + cups + dbus + gdk-pixbuf + gcc-unwrapped.lib + systemd + libexif + pciutils + liberation_ttf + curl + util-linux + wget + flac + harfbuzz + icu + libpng + opusWithCustomModes + snappy + speechd + bzip2 + libcap + at-spi2-atk + at-spi2-core + libkrb5 + libdrm + libglvnd + mesa + coreutils + libxkbcommon + pipewire + wayland + ] + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva + ++ [ + gtk3 + gtk4 + ]; + +in +stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.124.17-2"; + version = "10.127.10-2"; src = fetchurl { - url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; - sha256 = "sha256-RS1/zs/rFWsj29BrT8Mb2IXgy9brBsQypxfvnd7pKl0="; + url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; + hash = "sha256-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew="; }; - # don't remove runtime deps - dontPatchELF = true; - # ignore optional Qt 6 shim - autoPatchelfIgnoreMissingDeps = [ "libQt6Widgets.so.6" "libQt6Gui.so.6" "libQt6Core.so.6" ]; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook copyDesktopItems ]; - - buildInputs = with xorg; [ - libXdmcp - libXScrnSaver - libXtst - libxshmfence - libXdamage - ] ++ [ - alsa-lib + nativeBuildInputs = [ + patchelf + makeWrapper + ]; + buildInputs = [ + gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH + glib gtk3 - nss - libdrm - mesa - gtk4 - qt5.qtbase ]; - runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ]; - - desktopItems = [ - (makeDesktopItem rec { - name = "Wavebox"; - exec = "wavebox"; - icon = "wavebox"; - desktopName = name; - genericName = name; - categories = [ "Network" "WebBrowser" ]; - }) - ]; + unpackPhase = '' + ar x $src + tar xf data.tar.xz + ''; + + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; installPhase = '' runHook preInstall - mkdir -p $out/bin $out/opt/wavebox - cp -r * $out/opt/wavebox + exe=$out/bin/wavebox + + mkdir -p $out/bin $out/share + + cp -a opt/* $out/share + cp -a usr/share/* $out/share - # provide icon for desktop item - mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png + + substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \ + --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/wavebox.desktop \ + --replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe + substituteInPlace $out/share/menu/wavebox.menu \ + --replace-fail /opt $out/share \ + --replace-fail $out/share/wavebox.io/wavebox/wavebox $exe + + for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -p "$logo_output_path" + mv "$icon_file" "$logo_output_path/wavebox.png" + done + + makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "${lib.makeBinPath deps}" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "wavebox" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do + patchelf --set-rpath $rpath $elf + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf + done runHook postInstall ''; - postFixup = '' - makeWrapper $out/opt/wavebox/wavebox-launcher $out/bin/wavebox \ - --prefix PATH : ${xdg-utils}/bin - ''; + passthru = { + updateScript = writeScript "update-wavebox.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update curl jq - passthru.updateScript = ./update.sh; + version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]') + nix-update wavebox --version "$version" + ''; + }; - meta = with lib; { - description = "Wavebox messaging application"; + meta = { + description = "Wavebox Productivity Browser"; homepage = "https://wavebox.io"; - license = licenses.mpl20; - maintainers = with maintainers; [ rawkode ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ flexiondotorg ]; platforms = [ "x86_64-linux" ]; - hydraPlatforms = [ ]; + mainProgram = "wavebox"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/wavebox/update.sh b/pkgs/applications/networking/instant-messengers/wavebox/update.sh deleted file mode 100755 index 316f8bfbb7ecc..0000000000000 --- a/pkgs/applications/networking/instant-messengers/wavebox/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update curl jq - -version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["tar"] | match("https://download.wavebox.app/stable/linux/tar/Wavebox_(.+).tar.gz").captures[0]["string"]') -nix-update wavebox --version "$version" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d516ea19bcecd..7dd71e548a111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34295,7 +34295,7 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; - wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; + wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; From c51998a29b13ca855dde13ada9d1fab0f88519c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 10:27:32 +0000 Subject: [PATCH 08/23] asterisk: 20.8.1 -> 20.9.0 (cherry picked from commit 65949484a264817c454ac9996bd7b93364ae072f) --- pkgs/servers/asterisk/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index e11a27cf55442..43087f71406ed 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,14 +1,14 @@ { "asterisk_18": { - "sha256": "a46a85f676ea820f9c3c550c7caa8d9515e7754512740768a1336a82e8cf6162", - "version": "18.23.1" + "sha256": "ddbaf55c222503fa393f3ff3e3d3d193c644e8eddcfba3e6d1d3c597869d9fed", + "version": "18.24.0" }, "asterisk_20": { - "sha256": "fa498b6224e8c262de6840a67e00e3747e178fcefd9fb2595885d402ca3248f5", - "version": "20.8.1" + "sha256": "1a783adbd7c3d96439ee1ca0ca5b1421ee809be5948ac6960021c0ad8c19679c", + "version": "20.9.0" }, "asterisk_21": { - "sha256": "cf59196b94851fbfdbcc63d1d6a8d2b83a4ae093c89c3d37b5d460b3a3d20f15", - "version": "21.3.1" + "sha256": "dfa4f8262461d40480cbd6cc4f7abf5f61fcfdf358f360fed18bcd1f61a16880", + "version": "21.4.0" } } From 704b2f6673ab7e8b4bfa001b665b69cbb26dc9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 May 2024 03:11:33 +0000 Subject: [PATCH 09/23] yggdrasil: 0.5.5 -> 0.5.6 (cherry picked from commit 9188748d07d5ceb68592ca326d2d45a91309f722) --- pkgs/by-name/yg/yggdrasil/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 70e352e730920..7473281706222 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-ZInSgHjur2C+G6h/VcYtlCt0YLWwMIrz84UkDBbR73s="; + sha256 = "sha256-LiQKAkFN9JRdl7P3TMIzEeRxKBysidFWMWGGW8jEm/E="; }; - vendorHash = "sha256-Ar0mWVFgLP1eYeKalaazZLKaLMXoe2bOGYkruzaKW88="; + vendorHash = "sha256-Bfq8AjOljSg/mWHUwTSKwslukW3aZXOFi4KigUsIogc="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; From 03b63017ed9d0d7b3dd5b29bb61a0b561bef5849 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 3 Aug 2024 15:49:33 +0200 Subject: [PATCH 10/23] nixos/flatpak: add package option this patch adds the `services.flatpak.package` option to allow overriding the package added by this module to `environment.systemPackages` and the likes. This is useful in scenarios where applications call the flatpak binary to query information like writable directories and there is a custom package returning different results from the vanilla binary. See https://github.com/crabdancing/nixpak-flatpak-wrapper (cherry picked from commit af69223f4666c1f9dd4f68c375727415838f1376) --- nixos/modules/services/desktops/flatpak.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index cda0a17d04758..b386bafcfe6f5 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -15,6 +15,8 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; + + package = mkPackageOption pkgs "flatpak" { }; }; }; @@ -28,16 +30,16 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ]; + environment.systemPackages = [ cfg.package ]; security.polkit.enable = true; fonts.fontDir.enable = true; - services.dbus.packages = [ pkgs.flatpak ]; + services.dbus.packages = [ cfg.package ]; - systemd.packages = [ pkgs.flatpak ]; - systemd.tmpfiles.packages = [ pkgs.flatpak ]; + systemd.packages = [ cfg.package ]; + systemd.tmpfiles.packages = [ cfg.package ]; environment.profiles = [ "$HOME/.local/share/flatpak/exports" From a505ebc824f38815c047aa00d079ea2febeef307 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Jun 2024 04:35:39 +0000 Subject: [PATCH 11/23] freetube: 0.20.0 -> 0.21.0 (cherry picked from commit 5e74178a2fb7be86e5c22a0c1c35b4ae538ad180) --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 9c5d7f2067fee..d1d91f396cd05 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-7k5hyiK3m+117AxmsoecGsgXSxs8xhyTf8+rl4oBbB8="; + sha256 = "sha256-jTDJ0oyDrgOM6T+nwiOakm3QUqKfK2UNY6AfpoaJzd0="; }; passthru.tests = nixosTests.freetube; From 116cd8da9cd0c3a995423e2ec56c0c6a1189fd2b Mon Sep 17 00:00:00 2001 From: Airradda Date: Wed, 10 Jul 2024 20:39:53 -0500 Subject: [PATCH 12/23] freetube: 0.21.0 -> 0.21.1 (cherry picked from commit 7f6900dfefc560e8c5511be99d6c19a91625063e) --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index d1d91f396cd05..34b04d3c680c9 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.0"; + version = "0.21.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-jTDJ0oyDrgOM6T+nwiOakm3QUqKfK2UNY6AfpoaJzd0="; + sha256 = "sha256-HAtOWa/2j8xIICz8BQcG9X4t5Wu+VjlpWUGcTVteeME="; }; passthru.tests = nixosTests.freetube; From 2bfb8721a32366b66c5371b41d1eb4b549fd0ee0 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 26 Jul 2024 03:02:00 -0600 Subject: [PATCH 13/23] freetube: 0.21.1 -> 0.21.2 (cherry picked from commit 8f509ee7483fb84985e5e26f2286650ca372872e) (Resolved conflict in default.nix.) --- pkgs/applications/video/freetube/default.nix | 25 ++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 34b04d3c680c9..7b55601f40ddf 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,12 +1,20 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: +{ + stdenv, + lib, + fetchurl, + appimageTools, + makeWrapper, + electron, + nixosTests, +}: stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-HAtOWa/2j8xIICz8BQcG9X4t5Wu+VjlpWUGcTVteeME="; + hash = "sha256-Mk8qHDiUs2Nd8APMR8q1wZhTtxyzRhBAeXew9ogC3nk="; }; passthru.tests = nixosTests.freetube; @@ -43,11 +51,14 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; - meta = with lib; { - description = "An Open Source YouTube app for privacy"; + meta = { + description = "Open Source YouTube app for privacy"; homepage = "https://freetubeapp.io/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ryneeverett alyaeanyx ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ryneeverett + alyaeanyx + ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; From 80ef8454d5f117c9de83560153835218d1ba8871 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 2 Aug 2024 13:01:11 -0600 Subject: [PATCH 14/23] freetube: 0.21.2 -> 0.21.3 (cherry picked from commit 8a5184b51f449368db552406a762eccd5079a959) --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 7b55601f40ddf..4e5be53dda573 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.2"; + version = "0.21.3"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - hash = "sha256-Mk8qHDiUs2Nd8APMR8q1wZhTtxyzRhBAeXew9ogC3nk="; + hash = "sha256-sg/ycFo4roOJ2sW4naRCE6dwGXVQFzF8uwAZQkS2EY4="; }; passthru.tests = nixosTests.freetube; From 3b831e65232b20a7a324b97e7e6e5a89da90671a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:18:58 +0200 Subject: [PATCH 15/23] linux_6_10: 6.10.2 -> 6.10.3 (cherry picked from commit 4fc54045c8b41d093dd815a7bbc0809f55a98098) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3506d0937af80..c6d2c5f91d132 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.2", - "hash": "sha256:0w4vsb0c8bp34j90l89qms50nx6r6mmyf23jbvyar9fbv46m5n3k" + "version": "6.10.3", + "hash": "sha256:1666dypfg193l5460maadki4hc291hr7k9fw74nq21fxczyj4pzs" } } From ae9f70329e15533c92f558b559b155425533820e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:11 +0200 Subject: [PATCH 16/23] linux_6_6: 6.6.43 -> 6.6.44 (cherry picked from commit 1b6d60d0901284433ded00f3667ee8262f37c505) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c6d2c5f91d132..07405bbe1a34d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal" }, "6.6": { - "version": "6.6.43", - "hash": "sha256:0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a" + "version": "6.6.44", + "hash": "sha256:1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck" }, "6.8": { "version": "6.8.12", From e2fbe78c529cdeb1e6a99aaa23b30b3ebeea9a3b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:19 +0200 Subject: [PATCH 17/23] linux_6_1: 6.1.102 -> 6.1.103 (cherry picked from commit cb36f982f4858f1d24f64d615cd4227b67c9f411) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 07405bbe1a34d..4ff1bd6a23db6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19" }, "6.1": { - "version": "6.1.102", - "hash": "sha256:1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v" + "version": "6.1.103", + "hash": "sha256:0ws59jjd71vhwbzkn0wqaby3yb8kjbc4clgza8aqhl4gi5pp1d2y" }, "5.15": { "version": "5.15.164", From 71bc87260cff4aad71e402f996a768f94faf0587 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:30 +0200 Subject: [PATCH 18/23] linux-rt_5_10: 5.10.221-rt113 -> 5.10.222-rt114 (cherry picked from commit ac1932a7b1251ec7c8ca2b61196b79bd721011d1) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 4168442456cd2..9d6b464a5b299 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.221-rt113"; # updated by ./update-rt.sh + version = "5.10.222-rt114"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs"; + sha256 = "1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1aaamfnlhzhi4lj1sk2m082fpgr3qxs3b3a1ikh8zwmy89kw9i9x"; + sha256 = "0ylq8ffl9ivd1rh1fidmviyhzvknfh46my8iiqyfyg7y5z0cl1pg"; }; }; in [ rt-patch ] ++ kernelPatches; From e9d5b706fd14fb0250eaee8bc17453eb8af94c6a Mon Sep 17 00:00:00 2001 From: e1mo Date: Wed, 3 Jul 2024 13:29:35 +0200 Subject: [PATCH 19/23] borgbackup: 1.2.8 -> 1.4.0 Various fixes, new `BORG_EXIT_CODES=modern` and `borg version`, documentation improvements. Changelog: > If you currently use borg 1.2.5+: no upgrade steps needed > (if you already did them when upgrading to that version, otherwise see below). Upgrade notes: https://github.com/borgbackup/borg/blob/1.4.0/docs/changes.rst#upgrade-notes (cherry picked from commit bf3af291600ea04bd5ce1da15cec4b50165542e1) --- pkgs/tools/backup/borgbackup/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 778f5a5aad9f5..ab43dfbef0ce6 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.8"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "borgbackup"; repo = "borg"; rev = "refs/tags/${version}"; - hash = "sha256-+FHqOVuHlY9QUjCrYVnrMBZPMFH9Z2U7eZ6eUSINSrw="; + hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140="; }; postPatch = '' @@ -82,7 +82,6 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ e2fsprogs py - python-dateutil pytest-benchmark pytest-xdist pytestCheckHook @@ -121,6 +120,8 @@ python.pkgs.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; + disabled = python.pythonOlder "3.9"; + meta = with lib; { changelog = "https://github.com/borgbackup/borg/blob/${src.rev}/docs/changes.rst"; description = "Deduplicating archiver with compression and encryption"; From 4cccbb8fdb3e69634715fb8f54485618f0acc709 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:27:01 +0200 Subject: [PATCH 20/23] signal-desktop: 7.17.0 -> 7.18.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v7.18.0 (cherry picked from commit a57d965604c291fdf4c1b8d493bf65877c193092) --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ebe2cbc9d9a2d..58250efb2b12c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.17.0"; + version = "7.18.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-4Yp81aBY01cVZ/KDSqPO3R3HglLup/+sczQ5XNtQn84="; + hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M="; } From 2ae80141911b469a4e9b4abcf778ed7157638c9a Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 2 Aug 2024 01:32:51 -0400 Subject: [PATCH 21/23] brave: 1.67.134 -> 1.68.134 https://community.brave.com/t/release-channel-1-68-134/560701 (cherry picked from commit dc696e8084dbd13b915357ff51920253927cfc3c) --- .../networking/browsers/brave/default.nix | 16 ++++++++-------- .../networking/browsers/brave/update.sh | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index abb49edcc0dc8..923a23c489b95 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -4,19 +4,19 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.isAarch64 then - { + rec { pname = "brave"; - version = "1.67.134"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_arm64.deb"; - hash = "sha256-5wa4y+3PlcrT+U7xiPjkXqhpFz1rC+wyH6q9blmjaCI="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-FP+Afk62/aiKd6ZPX0zy76bzO3pJjm4pqauxluFYEl8="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then - { + rec { pname = "brave"; - version = "1.67.134"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_amd64.deb"; - hash = "sha256-OJYPV3yJkqGh4OdX4lFZNrOxv33ysFQSTwYmlToXOq8="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-l07sbkM5gDMcXeMoWiWH/8nU+Y0ShyB2jIHsqEFaoew="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index c0b8d7cff415b..04fbbc349419e 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -24,18 +24,18 @@ cat > $SCRIPT_DIR/default.nix << EOF callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.isAarch64 then - { + rec { pname = "brave"; version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; hash = "${hashAarch64}"; platform = "aarch64-linux"; } else if stdenv.isx86_64 then - { + rec { pname = "brave"; version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; hash = "${hashAmd64}"; platform = "x86_64-linux"; } From af302448820f0f9ade5f4e581d886b42bb67a895 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:27:36 +0200 Subject: [PATCH 22/23] signal-desktop-beta: 7.18.0-beta1 -> 7.19.0-beta1 https://github.com/signalapp/Signal-Desktop/releases/tag/v7.19.0-beta.1 (cherry picked from commit 4ce55aef1cbce8e8af7d412924354ce2b27bc3e8) --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 79c501a2e6ce6..ffb73d9e9150a 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 @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.18.0-beta.1"; + 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-ZNFssB0SiNAAW7SupxNqdbEtEpemrv+IoyfdWVKu8CI="; + hash = "sha256-kD08xke+HYhwAZG7jmU1ILo013556vNcvAFc/+9BTjg="; } From 9261de0d4e5d2526e1d0710c81f5b01672ea1f37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 08:58:40 +0000 Subject: [PATCH 23/23] goxel: 0.15.0 -> 0.15.1 (cherry picked from commit 22a6c4f19ddb00ae87aef53479b7fc09ae25960a) --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 6b6a182542c1d..404a42959038f 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goxel"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${finalAttrs.version}"; - hash = "sha256-bJnIZwTmvHNHXYq3zsMwu0EORtX2o9lLi6LFNrolwe4="; + hash = "sha256-mNSkQisWL3wXb+IsClWFTMbpeiRC4xteePXNP+GkUnU="; }; nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ];