Merge master into staging-next

pkgs/tools/graphics/asymptote/default.upstream

@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/asymptote/files/
+url https://sourceforge.net/projects/asymptote/files/
 SF_version_dir
 version_link 'src[.]tgz/download$'
 SF_redirect

pkgs/tools/graphics/barcode/default.nix

@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     description = "GNU barcode generator";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux; # Maybe other non-darwin Unix
-    downloadPage = "http://ftp.gnu.org/gnu/barcode/";
+    downloadPage = "https://ftp.gnu.org/gnu/barcode/";
     updateWalker = true;
-    homepage = http://ftp.gnu.org/gnu/barcode/;
+    homepage = https://www.gnu.org/software/barcode/;
     license = licenses.gpl3;
   };
 }

pkgs/tools/graphics/dmtx-utils/default.upstream

@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libdmtx/files/libdmtx/
+url https://sourceforge.net/projects/libdmtx/files/libdmtx/
 SF_version_dir
 version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$'
 SF_redirect

pkgs/tools/graphics/fim/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       to be a highly customizable and scriptable for users who are comfortable
       with software like the VIM text editor or the Mutt mail user agent.
     '';
-    homepage = http://www.nongnu.org/fbi-improved/;
+    homepage = https://www.nongnu.org/fbi-improved/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];

pkgs/tools/graphics/icoutils/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.nongnu.org/icoutils/;
+    homepage = https://www.nongnu.org/icoutils/;
     description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux ++ darwin;

pkgs/tools/graphics/oxipng/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "2.1.6";
+  version = "2.1.8";
   name = "oxipng-${version}";
 
   src = fetchFromGitHub {
     owner = "shssoichiro";
     repo = "oxipng";
     rev = "v${version}";
-    sha256 = "0n3v2dxybfkf07hb4p2hbhhkwx907b85wzj8wa4whwil89igyrdm";
+    sha256 = "18ld65vm58s6x918g6bhfkrg7lw2lca8daidv88ff14wm5khjvik";
   };
 
-  cargoSha256 = "1ycacwhwbn27i81jpp55m1446b9a50knlqv0kzkjcv8yf27213y9";
+  cargoSha256 = "034i8hgi0zgv085bimlja1hl3nd096rqpi167pw6rda5aj18c625";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/shssoichiro/oxipng;

pkgs/tools/graphics/plotutils/default.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
          graphics.
       '';
 
-    homepage = http://www.gnu.org/software/plotutils/;
+    homepage = https://www.gnu.org/software/plotutils/;
 
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.marcweber ];

pkgs/tools/graphics/scanbd/default.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       scanbuttond project. 
     '';
     homepage = http://scanbd.sourceforge.net/;
-    downloadPage = http://sourceforge.net/projects/scanbd/;
+    downloadPage = https://sourceforge.net/projects/scanbd/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };