From f31d4de37b81657b417f0ccea6f9d7c0b79d8fd9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 29 Sep 2021 00:19:10 +0000
Subject: [PATCH 1/2] xidel: add TLS support

Without this, it would try to find libcrypto in libc's prefix, and
then fail with this message:

	Error:
	Internet Error: -2 Couldn't load ssl libraries: libopenssl and libcrypto
	They must be installed separately.
	  On Debian/Ubuntu install libssl-dev.
	  On Fedora/CentOS install openssl-devel.
	  On Windows install OpenSSL from https://slproweb.com/products/Win32OpenSSL.html
	when talking to: https://archive.mozilla.org/pub/firefox/releases/

Tested with

       xidel -s https://archive.mozilla.org/pub/firefox/releases/ --extract "//a"
---
 pkgs/tools/text/xidel/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 97c74e370089..9865c302f985 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }:
+{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:
 
 let
   flreSrc = fetchFromGitHub {
@@ -36,6 +36,9 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ fpc ];
+  buildInputs = [ openssl ];
+
+  NIX_LDFLAGS = [ "-lcrypto" ];
 
   patchPhase = ''
     patchShebangs \

From 0e838b311522d7d83475a0f02558d1548fd8f170 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 5 Oct 2021 17:36:11 +0000
Subject: [PATCH 2/2] firefox-bin: HTTPS for homepage and updateScript

---
 .../networking/browsers/firefox-bin/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index c8f28b551cd7..785a7d23949a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -190,12 +190,12 @@ stdenv.mkDerivation {
     inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
     baseUrl =
       if channel == "devedition"
-        then "http://archive.mozilla.org/pub/devedition/releases/"
-        else "http://archive.mozilla.org/pub/firefox/releases/";
+        then "https://archive.mozilla.org/pub/devedition/releases/"
+        else "https://archive.mozilla.org/pub/firefox/releases/";
   };
   meta = with lib; {
     description = "Mozilla Firefox, free web browser (binary package)";
-    homepage = "http://www.mozilla.org/firefox/";
+    homepage = "https://www.mozilla.org/firefox/";
     license = licenses.mpl20;
     platforms = builtins.attrNames mozillaPlatforms;
     hydraPlatforms = [];