cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #140658 from alyssais/firefox-bin-https

Browse source 
firefox-bin: HTTPS for homepage and updateScript
This commit is contained in:
Sandro 2022-07-11 13:47:27 +02:00 committed by GitHub
commit 006ffd8252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -199,12 +199,12 @@ stdenv.mkDerivation {
inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl = baseUrl =
if channel == "devedition" if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/" then "https://archive.mozilla.org/pub/devedition/releases/"
else "http://archive.mozilla.org/pub/firefox/releases/"; else "https://archive.mozilla.org/pub/firefox/releases/";
}; };
meta = with lib; { meta = with lib; {
description = "Mozilla Firefox, free web browser (binary package)"; description = "Mozilla Firefox, free web browser (binary package)";
homepage = "http://www.mozilla.org/firefox/"; homepage = "https://www.mozilla.org/firefox/";
license = licenses.mpl20; license = licenses.mpl20;
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = builtins.attrNames mozillaPlatforms; platforms = builtins.attrNames mozillaPlatforms;

5
pkgs/tools/text/xidel/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }: { lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:
let let
flreSrc = fetchFromGitHub { flreSrc = fetchFromGitHub {
@ -36,6 +36,9 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ fpc ]; nativeBuildInputs = [ fpc ];
buildInputs = [ openssl ];
NIX_LDFLAGS = [ "-lcrypto" ];
patchPhase = '' patchPhase = ''
patchShebangs \ patchShebangs \