From 8c24ed04a95a7c223f285aa383609254ca007ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Sep 2023 21:20:19 +0200 Subject: [PATCH 01/17] wallabag: rebase data env patch (cherry picked from commit 859399954214fc68831a1827a58d5ad6be910363) --- pkgs/servers/web-apps/wallabag/wallabag-data.patch | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch index f70ffce29052..4276af58c584 100644 --- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch +++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch @@ -1,9 +1,9 @@ diff --git a/app/AppKernel.php b/app/AppKernel.php -index 347197e..902b558 100644 +index 61b734e06..d25d1aaa3 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php -@@ -69,19 +69,24 @@ class AppKernel extends Kernel - return __DIR__; +@@ -62,14 +62,19 @@ class AppKernel extends Kernel + return $bundles; } + public function getProjectDir() @@ -24,9 +24,3 @@ index 347197e..902b558 100644 } public function registerContainerConfiguration(LoaderInterface $loader) - { -- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); -+ $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); - - $loader->load(function ($container) { - if ($container->getParameter('use_webpack_dev_server')) { From 2390dbd6070132132d3a94ee124f2d2f273ff450 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jun 2023 23:11:17 +0200 Subject: [PATCH 02/17] wallabag: 2.5.4 -> 2.6.6 https://github.com/wallabag/wallabag/releases/tag/2.6.0 https://github.com/wallabag/wallabag/releases/tag/2.6.1 https://github.com/wallabag/wallabag/releases/tag/2.6.2 https://github.com/wallabag/wallabag/releases/tag/2.6.3 https://github.com/wallabag/wallabag/releases/tag/2.6.4 https://github.com/wallabag/wallabag/releases/tag/2.6.5 https://github.com/wallabag/wallabag/releases/tag/2.6.6 Dropped the swiftmailer patch, because wallabag migrated to symfony mailer. https://github.com/advisories/GHSA-p8gp-899c-jvq9 https://github.com/advisories/GHSA-gjvc-55fw-v6vq https://github.com/wallabag/wallabag/pull/6924 Fixes: CVE-2023-4454, CVE-2023-4455 (cherry picked from commit 0f9a86c000df68e6a36e511283f1def4dd5cc360) --- pkgs/servers/web-apps/wallabag/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 1e6763c39c3e..251735e0f78e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch }: # Point the environment variable $WALLABAG_DATA to a data directory @@ -16,30 +15,19 @@ let pname = "wallabag"; - version = "2.5.4"; + version = "2.6.6"; in stdenv.mkDerivation { inherit pname version; # Release tarball includes vendored files src = fetchurl { - urls = [ - "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz" - "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz" - ]; - hash = "sha256-yVMQXjGB8Yv1klQaHEbDGMZmOtANRocFJnawKn10xhg="; + url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; + hash = "sha256-0CkJFSHPnOz333+7uMUqXI3A9dsA9FchZXXmwq7F09o="; }; patches = [ ./wallabag-data.patch # exposes $WALLABAG_DATA - - # Use sendmail from php.ini instead of FHS path. - (fetchpatch { - url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch"; - stripLen = 1; - extraPrefix = "vendor/symfony/swiftmailer-bundle/"; - sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho="; - }) ]; dontBuild = true; From 6e4895150c7c6158723e144da4c7553529d47264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Sep 2023 23:33:32 -0700 Subject: [PATCH 03/17] imagemagick: add perlPackages.ImageMagick to passthru.tests (cherry picked from commit 840a10e87e211e1ba4290fc1d57862763525ae17) --- pkgs/applications/graphics/ImageMagick/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index fa90b95bd733..dd252a2b5848 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, perlPackages , python3 }: @@ -125,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; From d4e87833ae995e46a3d77c15277519cea72e1d17 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Sep 2023 10:29:00 +0000 Subject: [PATCH 04/17] imagemagick: add changelog to meta (cherry picked from commit 58c5f021cc670b7f1765b796761d4ab3de1ef75c) --- pkgs/applications/graphics/ImageMagick/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index dd252a2b5848..6cc426778b9b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -133,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.imagemagick.org/"; + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "A software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; From a9963085a0cc76c5fef92b6af044b3ecf4948420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Sep 2023 23:22:33 -0700 Subject: [PATCH 05/17] imagemagick: 7.1.1-15 -> 7.1.1-18 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-15...7.1.1-18 (cherry picked from commit e912f12890fa716c9d74d92e935bcbe198bc1bd9) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 6cc426778b9b..7ce2f4c5a27e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -48,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-15"; + version = "7.1.1-18"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; + hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From d0d85e83debd1e57615e85ed3d223b8b9e4c5348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Sep 2023 09:20:23 -0700 Subject: [PATCH 06/17] perlPackages.ImageMagick: 7.1.0-0 -> 7.1.1-18 (cherry picked from commit 30750a3fa42d6e76490d4a8db6a95fd119c3cf99) --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4555f6db69ec..66c865eddb72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19603,10 +19603,10 @@ with self; { PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.1.0-0"; + version = "7.1.1-18"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; + hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = From d2da776c922fdbc3aba3932e25730108b708a3f5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 24 Sep 2023 19:53:26 +0100 Subject: [PATCH 07/17] zola: add patch for CVE-2023-40274 (cherry picked from commit f54c698a92b14401bd1a00189d2b00fd593fac81) --- pkgs/applications/misc/zola/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index ca5a4684a48c..9a76eed6dff6 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rustPlatform , cmake , pkg-config @@ -26,6 +27,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; + patches = [ + (fetchpatch { + name = "CVE-2023-40274.patch"; + url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch"; + hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 86b52261d9de7abc9920961588f3c1a283bdb09a Mon Sep 17 00:00:00 2001 From: n3oney Date: Fri, 4 Aug 2023 14:33:31 +0200 Subject: [PATCH 08/17] caprine-bin: 2.55.5 -> 2.58.0 (cherry picked from commit b9599a594424b141243745acfda7db971d92f2e2) --- .../networking/instant-messengers/caprine-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index c6e020cdc252..5e49faf61c7a 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.55.5"; + version = "2.58.0"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo="; + sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk="; + sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { From 385e294390b9939b9fcee67b4bf817c06a72203c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 25 Sep 2023 05:58:09 +0000 Subject: [PATCH 09/17] caprine-bin: 2.58.0 -> 2.58.3 Bump to patch for CVE-2023-4863 Vulnerability details: https://github.com/advisories/GHSA-j7hp-h8jx-5pp Upstream release notes: https://github.com/sindresorhus/caprine/releases/tag/v2.58.2 https://github.com/sindresorhus/caprine/releases/tag/v2.58.3 (cherry picked from commit 07107cfb1fbcc2c28952b35bd7d0cb3360c6e8e2) --- .../networking/instant-messengers/caprine-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 5e49faf61c7a..02d606ce696d 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.58.0"; + version = "2.58.3"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; + sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; + sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { From a84079826f8df69914f2bc6080034cb894450e0b Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 26 Sep 2023 12:24:46 -0700 Subject: [PATCH 10/17] librewolf-unwrapped: 116.0.2-1 -> 117.0.1-1 - Backport of #257348 (cherry picked from commit b73f61061c77481ad5ee84eded5551b4d00961f0) --- .../networking/browsers/librewolf/librewolf.nix | 4 ++-- .../networking/browsers/librewolf/src.json | 14 +++++++++----- .../networking/browsers/librewolf/src.nix | 8 +++++++- .../networking/browsers/librewolf/update.nix | 9 +++++++++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index baa76488f661..f6689f6ae87d 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -29,9 +29,9 @@ rec { sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure ''; - extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ]; - extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ]; extraPassthru = { librewolf = { inherit src extraPatches; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index a22978098c01..c5c2be0dc8ef 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,15 @@ { - "packageVersion": "116.0.2-1", + "packageVersion": "117.0.1-1", "source": { - "rev": "116.0.2-1", - "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp" + "rev": "117.0.1-1", + "sha256": "06j85b6v54vxj99hgrlibpsg6f8w8cqj912vz7gwyfa17pawax9z" + }, + "settings": { + "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", + "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" }, "firefox": { - "version": "116.0.2", - "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d" + "version": "117.0.1", + "sha512": "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index a2100ac2ab8b..25a6e46d2277 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab }: +{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }: let src = lib.importJSON ./src.json; in { @@ -9,6 +9,12 @@ in fetchSubmodules = true; inherit (src.source) rev sha256; }; + settings = fetchFromGitea { + domain = "codeberg.org"; + owner = "librewolf"; + repo = "settings"; + inherit (src.settings) rev sha256; + }; firefox = fetchurl { url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index b8bc64afafe0..2cd36786c755 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -57,9 +57,18 @@ writeScript "update-librewolf" '' ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) echo "ffHash=$ffHash" + # upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276 + settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha) + echo "settingsRev=$settingsRev" + repoUrl=https://codeberg.org/librewolf/settings + nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut + settingsSha256=$(jq -r .sha256 < $prefetchOut) + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson + jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson + jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson '' From 20995faa28427e37a2d2eb8a6fa6d8fe0c9fee39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 26 Sep 2023 23:38:57 +0200 Subject: [PATCH 11/17] tor-browser-bundle-bin: 12.5.4 -> 12.5.5 (cherry picked from commit 98e5fbc98866caaacec4a0d4a67f6f0bb0b52f9c) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 64f0a431ea24..e2d89b8f6955 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null) fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.4"; + version = "12.5.5"; lang = "ALL"; @@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-AIwqIz8QG7Fq3Vvd22QTNFH1fnZgtH25qUaECX50QCQ="; + hash = "sha256-FS1ywm/UJDZiSYPf0WHikoX/o6WGIP+lQQGFeD0g2dc="; }; i686-linux = fetchurl { @@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-s8UReyurIKlxG0bT0ecGUcXMTTHyYKy/AcygTE6ujqo="; + hash = "sha256-6ozGIQPC8QnZxS1oJ0ZEdZDMY2JkwRHs+7ZHUkqrL6U="; }; }; From d46af07c9653a0d39d32e887e234cad353d763ee Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 24 Sep 2023 21:37:51 +0200 Subject: [PATCH 12/17] palemoon-bin: 32.3.1 -> 32.4.0.1 (cherry picked from commit 2b1dc1595822bab15f12c0ba61cdea6ccc393534) --- .../networking/browsers/palemoon/bin.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index ece75ad87257..a97d2b6ee81a 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -17,19 +17,19 @@ , palemoon-bin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.3.1"; + version = "32.4.0.1"; src = fetchzip { urls = [ - "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" + "sha256-kGt3pIgCjVeSD6UXRvj5w9opWrMx3q3B/Y0S55kKS08=" else - "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; + "sha256-kNvUC/ir7TKjvKXYFoEDOPAY75CEgeixmEV1tuB/WIM="; }; preferLocalBuild = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; desktopItems = [(makeDesktopItem rec { - name = pname; + name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; keywords = [ @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected @@ -186,4 +187,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; hydraPlatforms = []; }; -} +}) From 19d9d9f673e4adaff8c8d2e55ada53a2d4c26d4f Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Wed, 27 Sep 2023 13:11:26 +0300 Subject: [PATCH 13/17] doc: fix wrong flag in description of `bindnow` `-z bindnow` doesn't exist. The actual flag added is `-z now`. (cherry picked from commit f22a929fed497e09a626c483840aa0c2547c8d39) --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a923da935ced..66f36a8b9702 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1445,7 +1445,7 @@ This flag can break dynamic shared object loading. For instance, the module syst #### `bindnow` {#bindnow} -Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. +Adds the `-z now` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: From 0c3ff5673a3e9c711fb5d6fe0cfacd0e7503ecda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 27 Sep 2023 10:13:09 +0200 Subject: [PATCH 14/17] mullvad-browser: 12.5.4 -> 12.5.5 (cherry picked from commit 733b52c63c6b7050e94016d218e29697019907a4) --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 5b619bd6452c..77f948b2d755 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,7 +78,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.4"; + version = "12.5.5"; sources = { x86_64-linux = fetchurl { @@ -86,7 +86,7 @@ let "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" ]; - hash = "sha256-xjCsCg6XsnXAiNw6frgJVZRV9UBZA2EAcuHa2Bjq/ro="; + hash = "sha256-ISmhKitFReHSADGygzpoKwlBOJH2HfPDEtMjTB6fMhs="; }; }; From 9c0e7d63026b44a3848e9265908c96dd2dbd0b76 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 27 Sep 2023 18:35:30 +0200 Subject: [PATCH 15/17] dysnomia: 0.10.1 -> 0.10.2 --- nixos/modules/services/misc/dysnomia.nix | 2 +- pkgs/tools/package-management/disnix/dysnomia/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 0f92265ccbea..129345e38106 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -223,7 +223,7 @@ in ejabberdUser = config.services.ejabberd.user; }; } // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { - mysqlPort = config.services.mysql.port; + mysqlPort = config.services.mysql.settings.mysqld.port; mysqlSocket = "/run/mysqld/mysqld.sock"; } // lib.optionalAttrs cfg.enableAuthentication { mysqlUsername = "root"; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index f07aade89ca1..48d1b7965112 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -40,10 +40,10 @@ assert enableXinetdService -> xinetd != null; stdenv.mkDerivation rec { pname = "dysnomia"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-${version}/dysnomia-${version}.tar.gz"; - sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; + sha256 = "08ijqbijs2h584dvsb3z858ha385fqd5jfxc51lks9lxxv0sfkr4"; }; configureFlags = [ From 50d73da6b833a87411434a5c62d73391681c37ff Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 27 Sep 2023 18:35:50 +0200 Subject: [PATCH 16/17] disnixos: 0.9.3 -> 0.9.4 --- pkgs/tools/package-management/disnix/disnixos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 05a9e45c9562..15e5f3e0e947 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnixos"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0nm7g184xh6xzjz4a40a7kgfnpmq043x6v0cynpffa6wd9jv89s9"; + sha256 = "0adv6dm6hszjhzkfkw48pmi37zj32plcibk80r6bm907mm7n50lj"; }; nativeBuildInputs = [ pkg-config ]; From ea0ebfbde2497595018f3e7ca7ca7b89154846ef Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 27 Sep 2023 21:55:31 +0200 Subject: [PATCH 17/17] dysnomia: switch to the supervisor of the python3Packages set --- 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 eb3eb2ec97ea..dbb77444b239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39427,7 +39427,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (python2Packages) supervisor; + inherit (python3Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };