diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
commit | a510aa2672dae525c1eb152f00fd0e6f8eb10f39 (patch) | |
tree | ee9b7efb3ca8049b84de1070e3cd2704c109f0f9 /pkgs/tools/graphics | |
parent | 077b7e5880628c12fe6a9ae0b10db848deb85b50 (diff) | |
parent | e869896d00d9c7b1485b15e891d21213b4ff97f0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.upstream | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/barcode/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/dmtx-utils/default.upstream | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/fim/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/icoutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/oxipng/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/scanbd/default.nix | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/pkgs/tools/graphics/asymptote/default.upstream index 3739390fd1d35..e86d81ba4435e 100644 --- a/pkgs/tools/graphics/asymptote/default.upstream +++ b/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 diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 4fa9fff97d392..de09c2b278045 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/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; }; } diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream index 8768681642e53..2bb7fe31bf7c9 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.upstream +++ b/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 diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 066c181f53c20..7303f27fe111c 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/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 ]; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 3ab2232e26c6a..b16dbe2198534 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/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; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index c5737554b777e..10b4dd4a03181 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/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; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 0d1890bb6703f..61e21b1a33da5 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/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 ]; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 402628f0fc8f6..5dbbd20cd8272 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/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; }; |