From 73e5ea35a006eba97b51714f9b600a3fcda5a797 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 30 May 2023 13:13:43 -0700 Subject: [PATCH 1/4] =?UTF-8?q?mozillavpn:=202.14.1=20=E2=86=92=202.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg (cherry picked from commit dd5bc12f6bdf2864a2c300e79bbe855ca59f0db8) --- pkgs/tools/networking/mozillavpn/default.nix | 50 +++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index dd8ce048af07..92cb1e553f84 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -2,6 +2,7 @@ , cargo , cmake , fetchFromGitHub +, fetchpatch , go , lib , libsecret @@ -23,43 +24,56 @@ let pname = "mozillavpn"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-xWm21guI+h0bKd/rEyxVMyxypCitLWEbVy7TaVBKh4o="; + hash = "sha256-eyYrA8ysfmXxlHNUBkGU9ioYrnbx3L1wP9byNz9L/MA="; }; + patches = [ + # Force version downgrade for openssl and openssl-sys crates + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5911071ea37d12401af32dcdf2a542ca5049bf2f.patch"; + hash = "sha256-b3yOgn3Et0sYpqzUUdmlGIbzZSz13Q9HW56hyQqRnHc="; + revert = true; + }) + # [2.15] Restore qtglean/Cargo.lock + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/7026/commits/13c1b77ee4249883a33b6ac240b3ca143b485ba1.patch"; + hash = "sha256-L4D71zreDMLAIbP4x1as9QdNmMC1snUZSwlkKehg5yM="; + }) + ]; netfilter-go-modules = (buildGoModule { - inherit pname version src; + inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; }).go-modules; extensionBridgeDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-XW47EnNHm5JUWCqDU/iHB6ZRGny4v5x7Fs/1dv5TfzM="; + hash = "sha256-R/9ePEhc4qVgg3WC5ng+cD88K/N3PTnx4QWyaZZfRds="; }; signatureDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-CNPL1Orn+ZbX0HL+CHMaoXPI9G8MoC+hY8pJTJlWH1U="; + hash = "sha256-27g2qnnUrxbThM1cHZquQgWQLWDtZaBnlf8PjvQtBJU="; }; - vpngleanDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}-vpnglean"; - preBuild = "cd vpnglean"; - hash = "sha256-5vazbCqzJG6iA0MFaTNha42jb1pgLhr0P9I8rQxSKtw="; + qtgleanDeps = rustPlatform.fetchCargoTarball { + inherit src patches; + name = "${pname}-${version}-qtglean"; + preBuild = "cd qtglean"; + hash = "sha256-cW+nf+Dho+eSzOBo3xhxki7NXpg0wd5ZM9OMA6iOUl4="; }; in stdenv.mkDerivation { - inherit pname version src; + inherit pname version src patches; buildInputs = [ libsecret @@ -95,9 +109,9 @@ stdenv.mkDerivation { signatureDepsCopy="$cargoDepsCopy" popd - pushd source/vpnglean - cargoDeps='${vpngleanDeps}' cargoSetupPostUnpackHook - vpngleanDepsCopy="$cargoDepsCopy" + pushd source/qtglean + cargoDeps='${qtgleanDeps}' cargoSetupPostUnpackHook + qtgleanDepsCopy="$cargoDepsCopy" popd ''; dontCargoSetupPostUnpack = true; @@ -128,8 +142,8 @@ stdenv.mkDerivation { cargoDepsCopy="$signatureDepsCopy" cargoSetupPostPatchHook popd - pushd vpnglean - cargoDepsCopy="$vpngleanDepsCopy" cargoSetupPostPatchHook + pushd qtglean + cargoDepsCopy="$qtgleanDepsCopy" cargoSetupPostPatchHook popd cargoSetupPostPatchHook() { true; } From 6fc8b2bc5e6b64dbc5480793d2ffbd5b75fca3d3 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 7 Aug 2023 10:39:30 -0700 Subject: [PATCH 2/4] =?UTF-8?q?mozillavpn:=202.15.0=20=E2=86=92=202.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg (cherry picked from commit 37fd72b652a90662cf58e61491c99733203a29cd) --- pkgs/tools/networking/mozillavpn/default.nix | 44 +++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 92cb1e553f84..abbaa00dcbe5 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -2,9 +2,10 @@ , cargo , cmake , fetchFromGitHub -, fetchpatch , go , lib +, libgcrypt +, libgpg-error , libsecret , pkg-config , polkit @@ -24,29 +25,17 @@ let pname = "mozillavpn"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-eyYrA8ysfmXxlHNUBkGU9ioYrnbx3L1wP9byNz9L/MA="; + hash = "sha256-Yd53QUnoZ+5imt8kWpfGL6mkWeEFvqRrTpSu6efGgOA="; }; - patches = [ - # Force version downgrade for openssl and openssl-sys crates - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5911071ea37d12401af32dcdf2a542ca5049bf2f.patch"; - hash = "sha256-b3yOgn3Et0sYpqzUUdmlGIbzZSz13Q9HW56hyQqRnHc="; - revert = true; - }) - # [2.15] Restore qtglean/Cargo.lock - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/7026/commits/13c1b77ee4249883a33b6ac240b3ca143b485ba1.patch"; - hash = "sha256-L4D71zreDMLAIbP4x1as9QdNmMC1snUZSwlkKehg5yM="; - }) - ]; + patches = [ ]; - netfilter-go-modules = (buildGoModule { + netfilterGoModules = (buildGoModule { inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; @@ -56,19 +45,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-R/9ePEhc4qVgg3WC5ng+cD88K/N3PTnx4QWyaZZfRds="; + hash = "sha256-WKnc2nGXJVhzNluh0RFSdmPtGdo2QnNuEJ7r5xJCGi0="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-27g2qnnUrxbThM1cHZquQgWQLWDtZaBnlf8PjvQtBJU="; + hash = "sha256-XlOnUB0TO6rrLkWU9eT1sTOcDtJdz4yi/ejKcEfFcFc="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-cW+nf+Dho+eSzOBo3xhxki7NXpg0wd5ZM9OMA6iOUl4="; + hash = "sha256-BU++ZWb4Fp8LS2woohuDSD2iYo/3rBO6xgeLzyrdLkU="; }; in @@ -76,8 +65,9 @@ stdenv.mkDerivation { inherit pname version src patches; buildInputs = [ + libgcrypt + libgpg-error libsecret - polkit qt5compat qtbase qtnetworkauth @@ -85,6 +75,7 @@ stdenv.mkDerivation { qtwebsockets ]; nativeBuildInputs = [ + cargo cmake go pkg-config @@ -92,8 +83,8 @@ stdenv.mkDerivation { python3.pkgs.glean-parser python3.pkgs.pyyaml python3.pkgs.setuptools + qttools rustPlatform.cargoSetupHook - cargo rustc wrapQtAppsHook ]; @@ -117,22 +108,15 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" - - substituteInPlace scripts/addon/build.py \ - --replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \ - --replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"' - substituteInPlace src/apps/vpn/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ - --replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - ln -s '${netfilter-go-modules}' linux/netfilter/vendor + ln -s '${netfilterGoModules}' linux/netfilter/vendor pushd extension/bridge cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook From 4ca0d42df63642da681c3e13810dfc91d99447a4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 11 Aug 2023 17:08:16 +0200 Subject: [PATCH 3/4] lib/path/tests: Fix test setup on darwin These statements are taken from the `lib/test/release.nix` tests, which previously also worked on darwin. Unblocks https://github.com/NixOS/nix/pull/8569 when backported (cherry picked from commit b8435108e1a4f3292e6631dbd8134810db1bec76) --- lib/path/tests/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/path/tests/default.nix b/lib/path/tests/default.nix index 6b8e515f4330..50d40cdfa476 100644 --- a/lib/path/tests/default.nix +++ b/lib/path/tests/default.nix @@ -18,7 +18,14 @@ pkgs.runCommand "lib-path-tests" { ]; } '' # Needed to make Nix evaluation work - export NIX_STATE_DIR=$(mktemp -d) + export TEST_ROOT=$(pwd)/test-tmp + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat cp -r ${libpath} lib export TEST_LIB=$PWD/lib From 8a5067c7281d4bfd86c9800fb722b0859bbb5428 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Aug 2023 12:04:48 +0000 Subject: [PATCH 4/4] librewolf-unwrapped: 116.0-1 -> 116.0.2-1 (cherry picked from commit 0823eb2b02b7ef84d5302850764a1b2881a879de) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 2e364b5c7f74..a22978098c01 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "116.0-1", + "packageVersion": "116.0.2-1", "source": { - "rev": "116.0-1", - "sha256": "1nah5a5l5ajyvy8aw4xdpdfs2s3ybfs5jw9c4qj9qczxdp541a66" + "rev": "116.0.2-1", + "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp" }, "firefox": { - "version": "116.0", - "sha512": "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d" + "version": "116.0.2", + "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d" } }