From 4cce7f46f524efcf5459034334c34b1aa747f66a Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 27 Jul 2021 10:21:17 -0700
Subject: firecracker: 0.24.4 -> 0.24.5

---
 pkgs/applications/virtualization/firecracker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index 3d2f4606e49..78720034ea1 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv }:
 
 let
-  version = "0.24.4";
+  version = "0.24.5";
 
   suffix = {
     x86_64-linux = "x86_64";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
   src = dlbin {
-    x86_64-linux = "sha256-EKndfLdkxn+S+2ElAyQ+mKEo5XN6kqZLuLCsQf+fKuk=";
-    aarch64-linux = "0zzr8x776aya6f6pw0dc0a6jxgbqv3f37p1vd8mmlsdv66c4kmfb";
+    x86_64-linux = "sha256-drcm2kz2csuJqr8Oqs0r1BrxgPHOyuwC2S+99MhbMjA=";
+    aarch64-linux = "sha256-x8RoBmgY3HRUOLw8YzEwQfQuT83zGfBHHWu88b4i05o=";
   };
 
   dontConfigure = true;
-- 
cgit 1.4.1


From 48d060a81c025ca7d9f7ed135a66a03db8589f25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Jul 2021 16:52:47 +0200
Subject: lkl: use python3

---
 pkgs/applications/virtualization/lkl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index aee2d493a70..f2481e25a8f 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
+{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive
 , buildPackages }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "lib" "out" ];
 
-  nativeBuildInputs = [ bc bison flex python ];
+  nativeBuildInputs = [ bc bison flex python3 ];
 
   buildInputs = [ fuse libarchive ];
 
-- 
cgit 1.4.1


From 8e122bcae86ad8727a7eed249d18c36edf6fd2e1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 28 Jul 2021 09:29:41 +1000
Subject: crun: 0.20.1 -> 0.21

https://github.com/containers/crun/releases/tag/0.21
---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index e172248c8dd..a0d8c16d557 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.20.1";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Fo8UCUwZ5RiJTXs1jWn1Mwq2qvK8p++ETxW9Tseokjw=";
+    sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw=";
     fetchSubmodules = true;
   };
 
-- 
cgit 1.4.1


From 250ccd425a4f6f8b2d4c54960d194f60b22cd090 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Jul 2021 21:13:02 +0200
Subject: virt-what: 1.20 -> 1.21

---
 pkgs/applications/virtualization/virt-what/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index f3004267ed7..ead44c40f9c 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "virt-what";
-  version = "1.20";
+  version = "1.21";
 
   src = fetchurl {
     url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
-    sha256 = "1s0hg5w47gmnllbs935bx21k3zqrgvqx1wn0zzij2lfxkb9dq4zr";
+    sha256 = "0yqz1l4di57d4y1z94yhdmkiykg9a8i7xwkqmd9zsk5a6i9lbjqj";
   };
 
   meta = with lib; {
-- 
cgit 1.4.1


From 4e992dcdfc0cb123d52a3a274f84c7163df0de59 Mon Sep 17 00:00:00 2001
From: Elias N Vasylenko <elias@vasylenko.uk>
Date: Wed, 28 Jul 2021 11:28:08 +0100
Subject: win-spice: 0.11 -> 0.21

This includes updates for three components; usbdk, qxlwddm, and vdagent.

The result is updated support from Windows 8.1 to Windows 10.
---
 .../virtualization/driver/win-spice/default.nix    | 50 +++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix
index 67ba9b74fbb..2c2cd90f1c2 100644
--- a/pkgs/applications/virtualization/driver/win-spice/default.nix
+++ b/pkgs/applications/virtualization/driver/win-spice/default.nix
@@ -1,51 +1,56 @@
 { lib, stdenv, fetchurl, p7zip, win-virtio }:
 
 let
+  version_usbdk = "1.0.22";
   src_usbdk_x86 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x86.msi";
-    sha256 = "17hv8034wk1xqnanm5jxs4741nl7asps1fdz6lhnrpp6gvj6yg9y";
+    url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x86.msi";
+    sha256 = "1vr8kv37wz6p3xhawyhwxv0g7y89igkvx30zwmyvlgnkv3h5i317";
   };
-
   src_usbdk_amd64 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x64.msi";
-    sha256 = "0alcqsivp33pm8sy0lmkvq7m5yh6mmcmxdl39zjxjra67kw8r2sd";
+    url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x64.msi";
+    sha256 = "19b64jv6pfimd54y0pphbs1xh25z41bbblz64ih6ag71w6azdxli";
   };
 
+  version_qxlwddm = "0.21";
   src_qxlwddm = fetchurl {
-    url = "https://people.redhat.com/~vrozenfe/qxlwddm/qxlwddm-0.11.zip";
-    sha256 = "082zdpbh9i3bq2ds8g33rcbcw390jsm7cqf46rrlx02x8r03dm98";
+    url = "https://www.spice-space.org/download/windows/qxl-wddm-dod/qxl-wddm-dod-${version_qxlwddm}/spice-qxl-wddm-dod-${version_qxlwddm}.zip";
+    sha256 = "0yjq54gxw3lcfghsfs4fzwipa9sgx5b1sn3fss6r5dm7pdvjp20q";
   };
 
+  version_vdagent = "0.10.0";
   src_vdagent_x86 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x86.zip";
-    sha256 = "0d928g49rf4dl79jmvnqh6g864hp1flw1f0384sfp82himm3bxjs";
+    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x86.zip";
+    sha256 = "142c0lqsqry9dclji2225ppclkn13gbjl1j0pzx8fp6hgy4i02c1";
   };
-
   src_vdagent_amd64 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x64.zip";
-    sha256 = "0djmvm66jcmcyhhbjppccbai45nqpva7vyvry6w8nyc0fwi1vm9l";
+    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x64.zip";
+    sha256 = "1x2wcvld531kv17a4ks7sh67nhzxzv7nkhpx391n5vj6d12i8g3i";
   };
 in
 
 stdenv.mkDerivation  {
   # use version number of qxlwddm as qxlwddm is the most important component
-  name = "win-spice-0.11";
-  version = "0.11";
+  pname = "win-spice";
+  version = version_qxlwddm;
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   buildPhase = ''
+    runHook preBuild
+
     mkdir -p usbdk/x86 usbdk/amd64
     (cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86})
     (cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64})
 
     mkdir -p vdagent/x86 vdagent/amd64
-    (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86)
-    (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
+    (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent-win-${version_vdagent}-x86/* .; rm -r vdagent-win-${version_vdagent}-x86)
+    (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent-win-${version_vdagent}-x64/* .; rm -r vdagent-win-${version_vdagent}-x64)
 
     mkdir -p qxlwddm
-    (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64)
-    '';
+    (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; cd w10)
+
+    runHook postBuild
+  '';
 
   installPhase =
     let
@@ -57,8 +62,11 @@ stdenv.mkDerivation  {
       #       That way it would never matter whether vioserial is installed from win-virtio or win-spice.
       copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n";
       copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch);
-    in
-      (copy "amd64" "w8.1") + (copy "x86" "w8.1");
+    in ''
+      runHook preInstall
+      ${(copy "amd64" "w10") + (copy "x86" "w10")}
+      runHook postInstall
+    '';
 
   meta = with lib; {
     description = "Windows SPICE Drivers";
-- 
cgit 1.4.1


From a68cec5ef28efe2ae7aec658b3fd37675d672ffb Mon Sep 17 00:00:00 2001
From: Elias N Vasylenko <elias@vasylenko.uk>
Date: Wed, 28 Jul 2021 11:34:19 +0100
Subject: win-virtio: 0.1.141-1 -> 0.1.196-1

this results in Windows version support bumped from 8.1 to 10
---
 .../virtualization/driver/win-virtio/default.nix         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 1f9e21845ce..7de6498ab5b 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,18 +1,20 @@
 { lib, stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
   pname = "win-virtio";
-  version = "0.1.141-1";
+  version = "0.1.196-1";
 
   phases = [ "buildPhase" "installPhase" ];
 
   src = fetchurl {
     url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
-    sha256 = "0mn5gcgb9dk59nrw9scdza628yiji4vdkxmixikn9v02kgwnkja3";
+    sha256 = "1zj53xybygps66m3v5kzi61vqy987zp6bfgk0qin9pja68qq75vx";
   };
 
   buildPhase = ''
+    runHook preBuild
     ${p7zip}/bin/7z x $src
-    '';
+    runHook postBuild
+  '';
 
   installPhase =
     let
@@ -24,12 +26,16 @@ stdenv.mkDerivation rec {
                 {input="viostor"; output="viostor";}
                 {input="viorng"; output="viorng";}
                ];
-    in
-      lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
+    in ''
+      runHook preInstall
+      ${lib.concatStringsSep "\n" ((map (copy "amd64" "w10") virtio) ++ (map (copy "x86" "w10") virtio))}
+      runHook postInstall
+    '';
 
   meta = with lib; {
     description = "Windows VirtIO Drivers";
     homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    license = [ licenses.bsd3 ];
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
   };
-- 
cgit 1.4.1


From b58b4a85c418a6821f8557d6a2c19f7a2262fc0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jul 2021 06:52:49 +0000
Subject: containerd: 1.5.4 -> 1.5.5

---
 pkgs/applications/virtualization/containerd/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 0c44805bedd..c86f4280e82 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.5.4";
+  version = "1.5.5";
 
   outputs = [ "out" "man" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
+    sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk=";
   };
 
   vendorSha256 = null;
@@ -32,15 +32,19 @@ buildGoModule rec {
   BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
 
   buildPhase = ''
+    runHook preBuild
     patchShebangs .
     make binaries man $buildFlags
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     install -Dm555 bin/* -t $out/bin
     installManPage man/*.[1-9]
     installShellCompletion --bash contrib/autocomplete/ctr
     installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
+    runHook postInstall
   '';
 
   passthru.tests = { inherit (nixosTests) docker; };
-- 
cgit 1.4.1


From a2e6029290a87bdfdca4c1f0af6a267263e09c5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jul 2021 11:03:16 +0000
Subject: docker-buildx: 0.6.0 -> 0.6.1

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 020e22db601..4cdb253505b 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU=";
+    sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE=";
   };
 
   vendorSha256 = null;
-- 
cgit 1.4.1


From 2f94991628ea21ff82227c79aac8a57582c9576d Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 1 Aug 2021 00:01:50 +0700
Subject: treewide: fix redirected URLs

Using the script in maintainers/scripts/update-redirected-urls.sh
---
 pkgs/applications/audio/friture/default.nix                         | 2 +-
 pkgs/applications/audio/spectmorph/default.nix                      | 2 +-
 pkgs/applications/editors/ne/default.nix                            | 2 +-
 pkgs/applications/graphics/scantailor/default.nix                   | 2 +-
 pkgs/applications/misc/audio/wavesurfer/default.nix                 | 2 +-
 pkgs/applications/misc/mkgmap/default.nix                           | 4 ++--
 pkgs/applications/misc/mkgmap/splitter/default.nix                  | 4 ++--
 pkgs/applications/misc/mkgmap/splitter/testinputs.nix               | 2 +-
 pkgs/applications/misc/mkgmap/testinputs.nix                        | 2 +-
 pkgs/applications/networking/cluster/hadoop/default.nix             | 2 +-
 pkgs/applications/office/osmo/default.nix                           | 2 +-
 pkgs/applications/science/logic/verifast/default.nix                | 2 +-
 pkgs/applications/science/math/nauty/default.nix                    | 6 +++---
 pkgs/applications/virtualization/bochs/default.nix                  | 2 +-
 pkgs/data/fonts/terminus-font-ttf/default.nix                       | 4 ++--
 pkgs/development/compilers/terra/default.nix                        | 2 +-
 pkgs/development/interpreters/io/default.nix                        | 2 +-
 pkgs/development/libraries/libnetfilter_acct/default.nix            | 2 +-
 pkgs/development/libraries/libnetfilter_cthelper/default.nix        | 2 +-
 pkgs/development/libraries/libnetfilter_queue/default.nix           | 2 +-
 pkgs/development/libraries/libnfnetlink/default.nix                 | 2 +-
 pkgs/development/libraries/librdf/raptor.nix                        | 2 +-
 pkgs/development/libraries/librdf/raptor2.nix                       | 2 +-
 pkgs/development/libraries/librdf/rasqal.nix                        | 2 +-
 pkgs/development/libraries/librdf/redland.nix                       | 2 +-
 pkgs/development/libraries/libroxml/default.nix                     | 2 +-
 pkgs/development/libraries/libvmi/default.nix                       | 2 +-
 pkgs/development/libraries/qt-4.x/4.8/default.nix                   | 2 +-
 pkgs/development/libraries/raylib/default.nix                       | 2 +-
 pkgs/development/libraries/snack/default.nix                        | 2 +-
 pkgs/development/node-packages/node-packages.nix                    | 6 +++---
 pkgs/development/ocaml-modules/cudf/default.nix                     | 2 +-
 pkgs/development/ocaml-modules/dose3/default.nix                    | 2 +-
 pkgs/development/python-modules/autologging/default.nix             | 2 +-
 pkgs/development/python-modules/pweave/default.nix                  | 2 +-
 pkgs/development/python-modules/pyfantom/default.nix                | 2 +-
 pkgs/development/python-modules/pyqtgraph/default.nix               | 2 +-
 pkgs/development/python-modules/python-uinput/default.nix           | 2 +-
 pkgs/development/python-modules/vispy/default.nix                   | 2 +-
 .../python-modules/xstatic-jquery-file-upload/default.nix           | 2 +-
 pkgs/development/tools/ammonite/default.nix                         | 2 +-
 pkgs/development/tools/lattice-diamond/default.nix                  | 2 +-
 pkgs/development/tools/ocaml/camlidl/default.nix                    | 2 +-
 pkgs/development/web/remarkjs/node-packages.nix                     | 2 +-
 pkgs/games/freedroidrpg/default.nix                                 | 2 +-
 pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix    | 2 +-
 pkgs/os-specific/linux/ipset/default.nix                            | 4 ++--
 pkgs/os-specific/windows/jom/default.nix                            | 2 +-
 pkgs/servers/monitoring/munin/default.nix                           | 4 ++--
 pkgs/servers/nosql/aerospike/default.nix                            | 2 +-
 pkgs/tools/misc/kermit/default.nix                                  | 2 +-
 pkgs/tools/package-management/holo-build/default.nix                | 2 +-
 pkgs/tools/text/jumanpp/default.nix                                 | 2 +-
 pkgs/tools/text/popfile/default.nix                                 | 6 +++---
 pkgs/tools/video/vnc2flv/default.nix                                | 2 +-
 55 files changed, 66 insertions(+), 66 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix
index e4bd79a08e3..99ce726ca17 100644
--- a/pkgs/applications/audio/friture/default.nix
+++ b/pkgs/applications/audio/friture/default.nix
@@ -38,7 +38,7 @@ in py.buildPythonApplication rec {
 
   meta = with lib; {
     description = "A real-time audio analyzer";
-    homepage = "http://friture.org/";
+    homepage = "https://friture.org/";
     license = licenses.gpl3;
     platforms = platforms.linux; # fails on Darwin
     maintainers = [ maintainers.laikq ];
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 6292d771a51..9b549e02f77 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "spectmorph";
   version = "0.5.2";
   src = fetchurl {
-    url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
+    url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
     sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f";
   };
 
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index fde6542f160..172b30dbb0f 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "The nice editor";
-    homepage = "http://ne.di.unimi.it/";
+    homepage = "https://ne.di.unimi.it/";
     longDescription = ''
       ne is a free (GPL'd) text editor based on the POSIX standard that runs
       (we hope) on almost any UN*X machine.  ne is easy to use for the beginner,
diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix
index 291825770ac..898cc3336a5 100644
--- a/pkgs/applications/graphics/scantailor/default.nix
+++ b/pkgs/applications/graphics/scantailor/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ qt4 libjpeg libtiff boost ];
 
   meta = {
-    homepage = "http://scantailor.org/";
+    homepage = "https://scantailor.org/";
     description = "Interactive post-processing tool for scanned pages";
 
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix
index b7e738cfc12..9c8a99a5934 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Tool for recording, playing, editing, viewing and labeling of audio";
-    homepage = "http://www.speech.kth.se/wavesurfer/";
+    homepage = "https://www.speech.kth.se/wavesurfer/";
     license = lib.licenses.bsd0;
   };
 }
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix
index f82881eb5bd..d6fa24c19ba 100644
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/pkgs/applications/misc/mkgmap/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "4608";
 
   src = fetchurl {
-    url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
+    url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
     sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0=";
   };
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
     homepage = "http://www.mkgmap.org.uk";
-    downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html";
+    downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix
index c78d81771ca..9e034b58110 100644
--- a/pkgs/applications/misc/mkgmap/splitter/default.nix
+++ b/pkgs/applications/misc/mkgmap/splitter/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   version = "598";
 
   src = fetchurl {
-    url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
+    url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
     sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M=";
   };
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Utility for splitting OpenStreetMap maps into tiles";
     homepage = "http://www.mkgmap.org.uk";
-    downloadPage = "http://www.mkgmap.org.uk/download/splitter.html";
+    downloadPage = "https://www.mkgmap.org.uk/download/splitter.html";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix
index ab81b07ed8d..0d73f971029 100644
--- a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix
+++ b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix
@@ -2,7 +2,7 @@
 let
   fetchTestInput = { res, sha256 }: fetchurl {
     inherit sha256;
-    url = "http://www.mkgmap.org.uk/testinput/${res}";
+    url = "https://www.mkgmap.org.uk/testinput/${res}";
     name = builtins.replaceStrings [ "/" ] [ "__" ] res;
   };
 in
diff --git a/pkgs/applications/misc/mkgmap/testinputs.nix b/pkgs/applications/misc/mkgmap/testinputs.nix
index 0c4516190e0..93c858a3889 100644
--- a/pkgs/applications/misc/mkgmap/testinputs.nix
+++ b/pkgs/applications/misc/mkgmap/testinputs.nix
@@ -2,7 +2,7 @@
 let
   fetchTestInput = { res, sha256 }: fetchurl {
     inherit sha256;
-    url = "http://www.mkgmap.org.uk/testinput/${res}";
+    url = "https://www.mkgmap.org.uk/testinput/${res}";
     name = builtins.replaceStrings [ "/" ] [ "__" ] res;
   };
 in
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index ef93b5cbdb0..589ce21fe87 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -109,7 +109,7 @@ let
         '';
 
         meta = with lib; {
-          homepage = "http://hadoop.apache.org/";
+          homepage = "https://hadoop.apache.org/";
           description = "Framework for distributed processing of large data sets across clusters of computers";
           license = licenses.asl20;
 
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 77cc087c66b..975305a7217 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A handy personal organizer";
-    homepage = "http://clayo.org/osmo/";
+    homepage = "https://clayo.org/osmo/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index e426f7b8098..a33c4941ac4 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Verification for C and Java programs via separation logic";
-    homepage    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/";
+    homepage    = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/";
     license     = lib.licenses.mit;
     platforms   = [ "x86_64-linux" ];
     maintainers = [ lib.maintainers.thoughtpolice ];
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index a941a633450..c435c63ab2e 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "nauty";
   version = "27r1";
   src = fetchurl {
-    url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
+    url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz";
     sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn";
   };
   outputs = [ "out" "dev" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     # I'm not sure if the filename will remain the same for future changelog or
     # if it will track changes to minor releases. Lets see. Better than nothing
     # in any case.
-    changelog = "http://pallini.di.uniroma1.it/changes24-27.txt";
-    homepage = "http://pallini.di.uniroma1.it/";
+    changelog = "https://pallini.di.uniroma1.it/changes24-27.txt";
+    homepage = "https://pallini.di.uniroma1.it/";
   };
 }
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index e614b3da2b0..002848380c2 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://bochs.sourceforge.io/";
+    homepage = "https://bochs.sourceforge.io/";
     description = "An open-source IA-32 (x86) PC emulator";
     longDescription = ''
       Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index 1a65798891f..1ebf987fcd5 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -5,7 +5,7 @@ let
 in fetchzip {
   name = "terminus-font-ttf-${version}";
 
-  url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
+  url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
 
   postFetch = ''
     unzip -j $downloadedFile
@@ -26,7 +26,7 @@ in fetchzip {
       Monospaced bitmap font designed for long work with computers
       (TTF version, mainly for Java applications)
     '';
-    homepage = "http://files.ax86.net/terminus-ttf";
+    homepage = "https://files.ax86.net/terminus-ttf";
     license = licenses.ofl;
     maintainers = with maintainers; [ okasu ];
   };
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 3174744fdde..9919973de24 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A low-level counterpart to Lua";
-    homepage = "http://terralang.org/";
+    homepage = "https://terralang.org/";
     platforms = platforms.x86_64;
     maintainers = with maintainers; [ jb55 seylerius thoughtpolice ];
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index 48462a333bc..9f6ecb2516e 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Io programming language";
-    homepage = "http://iolanguage.org/";
+    homepage = "https://iolanguage.org/";
     license = licenses.bsd3;
 
     maintainers = with maintainers; [
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
index 72766471d2f..6c52d7f7b56 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmnl ];
 
   meta = with lib; {
-    homepage = "http://www.netfilter.org/projects/libnetfilter_acct/";
+    homepage = "https://www.netfilter.org/projects/libnetfilter_acct/";
     description = "Userspace library providing interface to extended accounting infrastructure";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index b8b05e57dad..294f776192d 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       library, you register, configure, enable and disable user-space helpers. This library
       is used by conntrack-tools.
     '';
-    homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/";
+    homepage = "https://www.netfilter.org/projects/libnetfilter_cthelper/";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 7dafcd42223..d1783289965 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmnl libnfnetlink ];
 
   meta = with lib; {
-    homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
+    homepage = "https://www.netfilter.org/projects/libnetfilter_queue/";
     description = "Userspace API to packets queued by the kernel packet filter";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix
index 4c7b4a5cc2d..a070d2e3af2 100644
--- a/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/pkgs/development/libraries/libnfnetlink/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       This library is not meant as a public API for application developers.
       It is only used by other netfilter.org projects, like the aforementioned ones.
     '';
-    homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html";
+    homepage = "https://www.netfilter.org/projects/libnfnetlink/index.html";
     license = lib.licenses.gpl2;
 
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index 8d1b1f2a0ea..ef755b82155 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The RDF Parser Toolkit";
-    homepage = "http://librdf.org/raptor";
+    homepage = "https://librdf.org/raptor";
     license = with lib.licenses; [ lgpl21 asl20 ];
     maintainers = [ lib.maintainers.marcweber ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index bb8aeefa102..65655814685 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The RDF Parser Toolkit";
-    homepage = "http://librdf.org/raptor";
+    homepage = "https://librdf.org/raptor";
     license = with lib.licenses; [ lgpl21 asl20 ];
     maintainers = with lib.maintainers; [ marcweber ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 88acc372f7f..0dd5b87377f 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
-    homepage = "http://librdf.org/rasqal";
+    homepage = "https://librdf.org/rasqal";
     license = with lib.licenses; [ lgpl21 asl20 ];
     maintainers = with lib.maintainers; [ marcweber ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 731d1cf1868..5ac2c711104 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "C libraries that provide support for the Resource Description Framework (RDF)";
-    homepage = "http://librdf.org/";
+    homepage = "https://librdf.org/";
     platforms = platforms.unix;
     license = licenses.asl20;
   };
diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix
index de1877f2ab4..39c8eab5a65 100644
--- a/pkgs/development/libraries/libroxml/default.nix
+++ b/pkgs/development/libraries/libroxml/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256  = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x";
   };
   meta = with lib; {
-    homepage = "http://www.libroxml.net/";
+    homepage = "https://www.libroxml.net/";
     description = "This library is minimum, easy-to-use, C implementation for xml file parsing";
     license = licenses.lgpl3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 9d9e47407b6..36fd026eeed 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://libvmi.com/";
+    homepage = "https://libvmi.com/";
     description = "A C library for virtual machine introspection";
     longDescription = ''
       LibVMI is a C library with Python bindings that makes it easy to monitor the low-level
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index ed93d86a197..5856e0b84b5 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = {
-    homepage    = "http://qt-project.org/";
+    homepage    = "https://qt-project.org/";
     description = "A cross-platform application framework for C++";
     license     = lib.licenses.lgpl21Plus; # or gpl3
     maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 836bafd4280..9843141fc00 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A simple and easy-to-use library to enjoy videogames programming";
-    homepage = "http://www.raylib.com/";
+    homepage = "https://www.raylib.com/";
     license = licenses.zlib;
     maintainers = with maintainers; [ adamlwgriffiths ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 8750bdf2ac6..8c97d0224c6 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The Snack Sound Toolkit (Tcl)";
-    homepage = "http://www.speech.kth.se/snack/";
+    homepage = "https://www.speech.kth.se/snack/";
     license = lib.licenses.gpl2;
     broken = true;
   };
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 45cc5cdeac6..3acc583f8a0 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -89128,7 +89128,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
-      homepage = "http://github.com/remy/inliner";
+      homepage = "https://github.com/remy/inliner";
       license = "MIT";
     };
     production = true;
@@ -90816,7 +90816,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
+      homepage = "https://jshint.com/";
       license = "MIT";
     };
     production = true;
@@ -103950,7 +103950,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = "http://pm2.keymetrics.io/";
+      homepage = "https://pm2.keymetrics.io/";
       license = "AGPL-3.0";
     };
     production = true;
diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix
index d2090cda676..22de0e690c8 100644
--- a/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/pkgs/development/ocaml-modules/cudf/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "A library for CUDF format";
-    homepage = "http://www.mancoosi.org/cudf/";
+    homepage = "https://www.mancoosi.org/cudf/";
     downloadPage = "https://gforge.inria.fr/projects/cudf/";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ superherointj ];
diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix
index 3397527fd63..733427cdb91 100644
--- a/pkgs/development/ocaml-modules/dose3/default.nix
+++ b/pkgs/development/ocaml-modules/dose3/default.nix
@@ -46,7 +46,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Dose library (part of Mancoosi tools)";
     downloadPage = "https://gitlab.com/irill/dose3/";
-    homepage = "http://www.mancoosi.org/software/";
+    homepage = "https://www.mancoosi.org/software/";
     license = licenses.lgpl3Plus;
     longDescription = ''
       The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository.
diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix
index fdd935303d0..1b3a7d65218 100644
--- a/pkgs/development/python-modules/autologging/default.nix
+++ b/pkgs/development/python-modules/autologging/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   meta = with lib; {
-    homepage = "http://ninthtest.info/python-autologging/";
+    homepage = "https://ninthtest.info/python-autologging/";
     description = "Easier logging and tracing for Python classes";
     license = licenses.mit;
     maintainers = with maintainers; [ twey ];
diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix
index 1b8e1a3cc6f..b97d5149652 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/pkgs/development/python-modules/pweave/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Scientific reports with embedded python computations with reST, LaTeX or markdown";
-    homepage = "http://mpastell.com/pweave/";
+    homepage = "https://mpastell.com/pweave/";
     license = licenses.bsd3;
   };
 
diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix
index d7c77e763e7..d27cccfbd8c 100644
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/pkgs/development/python-modules/pyfantom/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
   doCheck = false;
 
   meta = with lib; {
-    homepage = "http://pyfantom.ni.fr.eu.org/";
+    homepage = "https://pyfantom.ni.fr.eu.org/";
     description = "Wrapper for the LEGO Mindstorms Fantom Driver";
     license = licenses.gpl2;
   };
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 54a136d5dcd..49401bf1f84 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Scientific Graphics and GUI Library for Python";
-    homepage = "http://www.pyqtgraph.org/";
+    homepage = "https://www.pyqtgraph.org/";
     changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
index 8d82ffb6b3b..efb1288943a 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Pythonic API to Linux uinput kernel module";
-    homepage = "http://tjjr.fi/sw/python-uinput/";
+    homepage = "https://tjjr.fi/sw/python-uinput/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index 5524258a7e8..849f25ef0df 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "vispy" ];
 
   meta = with lib; {
-    homepage = "http://vispy.org/index.html";
+    homepage = "https://vispy.org/index.html";
     description = "Interactive scientific visualization in Python";
     license = licenses.bsd3;
     maintainers = with maintainers; [ goertzenator ];
diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
index 0316a849376..ce3f8c76dfa 100644
--- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ xstatic-jquery ];
 
   meta = with lib;{
-    homepage =  "http://plugins.jquery.com/project/jQuery-File-Upload";
+    homepage =  "https://plugins.jquery.com/project/jQuery-File-Upload";
     description = "jquery-file-upload packaged static files for python";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index ffd3b78cedd..ab1ea2a82a3 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -66,7 +66,7 @@ let
           with a lot of ergonomic improvements and configurability
           that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
         '';
-        homepage = "http://www.lihaoyi.com/Ammonite/";
+        homepage = "https://www.lihaoyi.com/Ammonite/";
         license = licenses.mit;
         platforms = platforms.all;
         maintainers = [ maintainers.nequissimus ];
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
index ce352542061..e8bc4c1b1be 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation {
       for cost- sensitive, low-power Lattice FPGA architectures. It is the
       next-generation replacement for ispLEVER.
     '';
-    homepage = "http://www.latticesemi.com/latticediamond";
+    homepage = "https://www.latticesemi.com/latticediamond";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ q3k ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index a464996ff38..36a1c7f755e 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "camlidl";
-  webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";
+  webpage = "https://caml.inria.fr/pub/old_caml_site/camlidl/";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 5f5d3576b76..9add677c248 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -3674,7 +3674,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
+      homepage = "https://jshint.com/";
       license = "MIT";
     };
     production = true;
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 53b008d11dd..e0582c524ec 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
       </para>
     '';
 
-    homepage = "http://www.freedroid.org/";
+    homepage = "https://www.freedroid.org/";
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index 5118d0a0b9b..a0985cad0db 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
-    homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth";
+    homepage = "https://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ zraexy ];
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index dd9fadfd02f..7b4322657e5 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "7.14";
 
   src = fetchurl {
-    url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
+    url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
     sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA=";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-kmod=no" ];
 
   meta = with lib; {
-    homepage = "http://ipset.netfilter.org/";
+    homepage = "https://ipset.netfilter.org/";
     description = "Administration tool for IP sets";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index a2fbdde95aa..f3a953576ec 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://qt-project.org/wiki/jom";
+    homepage = "https://qt-project.org/wiki/jom";
     description = "Clone of nmake supporting multiple independent commands in parallel";
     license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later.
   };
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index a86dd8471ce..ac9b015480e 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   # needs to find a local perl module during build
   PERL_USE_UNSAFE_INC = "1";
 
-  # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1
+  # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1
   # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass
   doCheck = false;
 
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
       interface. Munin can help analyze resource trends and 'what just happened
       to kill our performance?' problems.
     '';
-    homepage = "http://munin-monitoring.org/";
+    homepage = "https://munin-monitoring.org/";
     license = licenses.gpl2;
     maintainers = [ maintainers.bjornfor ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index 33347a73a20..db7b39ac5c7 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Flash-optimized, in-memory, NoSQL database";
-    homepage = "http://aerospike.com/";
+    homepage = "https://aerospike.com/";
     license = licenses.agpl3;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kalbasit ];
diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix
index 1a561f0bef4..8af0674f54b 100644
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/pkgs/tools/misc/kermit/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    homepage = "http://www.kermitproject.org/ck90.html";
+    homepage = "https://www.kermitproject.org/ck90.html";
     description = "Portable Scriptable Network and Serial Communication Software";
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix
index 8f88ae08762..20e3b555fd2 100644
--- a/pkgs/tools/package-management/holo-build/default.nix
+++ b/pkgs/tools/package-management/holo-build/default.nix
@@ -52,7 +52,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Cross-distribution system package compiler";
-    homepage = "http://holocm.org/";
+    homepage = "https://holocm.org/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index 5578ed417a2..5fb5ec88d67 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       plausibility of word sequences by using a recurrent neural network
       language model (RNNLM).
     '';
-    homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++";
+    homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++";
     license = licenses.asl20;
     maintainers = with maintainers; [ mt-caret ];
     platforms = platforms.all;
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
index e2f5952077f..7cfb2d2d6a4 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/pkgs/tools/text/popfile/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${appname}-${version}";
 
   src = fetchzip {
-    url = "http://getpopfile.org/downloads/${appname}-${version}.zip";
+    url = "https://getpopfile.org/downloads/${appname}-${version}.zip";
     sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63";
     stripRoot = false;
   };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = (with perlPackages; [
     ## These are all taken from the popfile documentation as applicable to Linux
-    ## http://getpopfile.org/docs/howtos:allplatformsrequireperl
+    ## https://getpopfile.org/docs/howtos:allplatformsrequireperl
     perl
     DBI
     DBDSQLite
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
     # Should work on macOS, but havent tested it.
     # Windows support is more complicated.
-    # http://getpopfile.org/docs/faq:systemrequirements
+    # https://getpopfile.org/docs/faq:systemrequirements
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index 88ec2f22b89..fdaf2ee2746 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Tool to record VNC sessions to Flash Video";
-    homepage = "http://www.unixuser.org/~euske/python/vnc2flv/";
+    homepage = "https://www.unixuser.org/~euske/python/vnc2flv/";
     license = lib.licenses.mit;
   };
 }
-- 
cgit 1.4.1


From 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 Mon Sep 17 00:00:00 2001
From: Markus Partheymueller <markus.partheymueller@cyberus-technology.de>
Date: Mon, 2 Aug 2021 16:40:32 +0200
Subject: virtualbox: 6.1.22 -> 6.1.26 (#132223)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/virtualization/virtualbox/default.nix       |  7 +++++--
 pkgs/applications/virtualization/virtualbox/extpack.nix       |  2 +-
 .../virtualbox/fix-configure-pkgconfig-qt.patch               | 11 +++++++++++
 .../virtualization/virtualbox/guest-additions/default.nix     |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 0bc3af364e6..31f48576803 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,7 +23,7 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  version = "6.1.22";
+  version = "6.1.26";
 
   iasl' = iasl.overrideAttrs (old: rec {
     inherit (old) pname;
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49";
+    sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195";
   };
 
   outputs = [ "out" "modsrc" ];
@@ -104,6 +104,9 @@ in stdenv.mkDerivation {
     })
   ++ [
     ./qtx11extras.patch
+    # Temporary workaround for broken build
+    # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html
+    ./fix-configure-pkgconfig-qt.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 8c64337c6cb..5ed763fa2e7 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -12,7 +12,7 @@ fetchurl rec {
     # Manually sha256sum the extensionPack file, must be hex!
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
-    let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87";
+    let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee";
     in assert (builtins.stringLength value) == 64; value;
 
   meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
new file mode 100644
index 00000000000..0594a2f19d4
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
@@ -0,0 +1,11 @@
+Index: /trunk/configure
+===================================================================
+--- a/configure	(revision 90360)
++++ b/configure	(revision 90377)
+@@ -1588,5 +1588,5 @@
+         if [ $? -eq 0 ]; then
+           echo "(Qt5 from pkg-config)" >> $LOG
+-          FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
++          FLGQT5=`pkg-config Qt5Core --cflags`
+           # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
+           [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 218d4983ca5..66bd2966f5d 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9";
+    sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-- 
cgit 1.4.1