Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-11-16 11:45:07 +01:00
133 changed files with 1826 additions and 2024 deletions

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
};
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};