From 3c824cd0f6a71a98ba5c6527c23f3f3560ea146c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Oct 2019 17:53:48 +0300 Subject: mariadb: remove development components --- .../sql/mariadb/cmake-libmariadb-includedir.patch | 21 ---------------- pkgs/servers/sql/mariadb/default.nix | 29 ++++++++-------------- 2 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch (limited to 'pkgs/servers/sql') diff --git a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch b/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch deleted file mode 100644 index dee77d9ab17..00000000000 --- a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 703c9466..c6d3f1bc 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,13 +5,13 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@/mysql" -+#define LIBS "-L@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" - #define CC_VERSION "@CPACK_PACKAGE_VERSION@" --#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" -+#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_PLUGINDIR@" - #define SOCKET "@MARIADB_UNIX_ADDR@" - #define PORT "@MARIADB_PORT@" - #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index bb9818cf9bb..1357e93fc7f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -44,7 +44,6 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch - ./cmake-libmariadb-includedir.patch ]; cmakeFlags = [ @@ -86,10 +85,14 @@ common = rec { # attributes common to both builds ]; postInstall = '' + # Remove Development components. Need to use libmysqlclient. rm "$out"/lib/mysql/plugin/daemon_example.ini - mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin - mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib - mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin + rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} + rm "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} + rm "$out"/bin/{mariadb_config,mysql_config} + rm -r $out/include + rm -r $out/lib/pkgconfig + rm -r $out/share/{aclocal,pkgconfig} ''; enableParallelBuilding = true; @@ -108,9 +111,7 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { pname = "mariadb-client"; - outputs = [ "out" "dev" "man" ]; - - propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + outputs = [ "out" "man" ]; patches = common.patches ++ [ ./cmake-plugin-includedir.patch @@ -123,11 +124,6 @@ client = stdenv.mkDerivation (common // { "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev" - ''; - postInstall = common.postInstall + '' rm -r "$out"/share/doc rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} @@ -141,7 +137,7 @@ client = stdenv.mkDerivation (common // { server = stdenv.mkDerivation (common // { pname = "mariadb-server"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper; @@ -176,12 +172,7 @@ server = stdenv.mkDerivation (common // { "-DWITHOUT_TOKUDB=1" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev - -DINSTALL_SHAREDIR=$dev/share/mysql - -DINSTALL_SUPPORTFILESDIR=$dev/share/mysql" - '' + optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.isDarwin) '' patchShebangs scripts/mytop.sh ''; -- cgit 1.4.1 From 7470e6e6deb3c3119b09e2ab4989beeb285a56a2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Oct 2019 21:14:01 +0300 Subject: mariadb: refactor build configuration --- pkgs/servers/sql/mariadb/default.nix | 37 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'pkgs/servers/sql') diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1357e93fc7f..d451c1dab5c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, scons, less +, fixDarwinDylibNames, cctools, CoreServices, less , withoutClient ? false }: @@ -35,8 +34,8 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc libiconv curl - ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] + ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -74,7 +73,7 @@ common = rec { # attributes common to both builds "-DWITH_SAFEMALLOC=OFF" "-DWITH_UNIT_TESTS=OFF" "-DEMBEDDED_LIBRARY=OFF" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides # to pass in java explicitly. @@ -139,18 +138,18 @@ server = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl - ++ optional stdenv.isLinux linux-pam - ++ optional (!stdenv.isDarwin) mytopEnv; + ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl + ++ optional stdenv.hostPlatform.isLinux linux-pam + ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; patches = common.patches ++ [ ./cmake-without-client.patch - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -165,39 +164,39 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" - ] ++ stdenv.lib.optionals withoutClient [ + ] ++ optionals withoutClient [ "-DWITHOUT_CLIENT=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_TOKUDB=1" ]; - preConfigure = optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' patchShebangs scripts/mytop.sh ''; postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/mysql_client_test + rm "$out"/bin/{mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString withoutClient '' ${ # We don't build with GSSAPI on Darwin - optionalString (!stdenv.isDarwin) '' + optionalString (!stdenv.hostPlatform.isDarwin) '' rm "$out"/lib/mysql/plugin/auth_gssapi_client.so '' } rm "$out"/lib/mysql/plugin/client_ed25519.so - '' + optionalString (!stdenv.isDarwin) '' + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + '' + optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; # perlPackages.DBDmysql is broken on darwin - postFixup = optionalString (!stdenv.isDarwin) '' + postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/mytop --set PATH ${less}/bin/less ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; + CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; }); in mariadb -- cgit 1.4.1 From 9367367dfd6e0373c04650e9893deed426d48aa2 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 16 Nov 2019 01:41:23 +0100 Subject: Treewide: fix URL permanent redirects Permanent redirects on homepages and/or source URLs as reported by Repology --- pkgs/applications/misc/cmatrix/default.nix | 2 +- pkgs/applications/misc/fetchmail/default.nix | 2 +- pkgs/applications/networking/browsers/luakit/default.nix | 2 +- pkgs/applications/networking/feedreaders/castget/default.nix | 2 +- pkgs/applications/science/chemistry/octopus/default.nix | 2 +- pkgs/applications/science/logic/aspino/default.nix | 2 +- pkgs/applications/science/math/glsurf/default.nix | 4 ++-- pkgs/applications/science/medicine/aliza/default.nix | 2 +- pkgs/data/fonts/babelstone-han/default.nix | 2 +- pkgs/data/fonts/gohufont/default.nix | 4 ++-- pkgs/data/fonts/input-fonts/default.nix | 2 +- pkgs/desktops/enlightenment/ephoto.nix | 2 +- pkgs/desktops/xfce/core/exo.nix | 2 +- pkgs/development/compilers/factor-lang/default.nix | 4 ++-- pkgs/development/libraries/boehm-gc/7.6.6.nix | 6 +++--- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- pkgs/development/libraries/c-blosc/default.nix | 2 +- pkgs/development/libraries/fltk/1.4.nix | 4 ++-- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/freetds/default.nix | 2 +- pkgs/development/libraries/geoip/default.nix | 2 +- pkgs/development/libraries/liburing/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 2 +- pkgs/development/libraries/mapnik/default.nix | 2 +- pkgs/development/libraries/opencolorio/default.nix | 2 +- pkgs/development/ocaml-modules/easy-format/default.nix | 2 +- pkgs/development/ocaml-modules/iso8601/default.nix | 2 +- pkgs/development/ocaml-modules/yojson/default.nix | 2 +- pkgs/development/python-modules/ansi2html/default.nix | 2 +- pkgs/development/python-modules/cssmin/default.nix | 2 +- pkgs/development/python-modules/dmenu/default.nix | 2 +- pkgs/development/python-modules/eyed3/default.nix | 2 +- pkgs/development/tools/build-managers/meson/default.nix | 2 +- pkgs/development/tools/ocaml/cppo/default.nix | 2 +- pkgs/games/arx-libertatis/default.nix | 4 ++-- pkgs/games/gcs/default.nix | 8 ++++---- pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 6 +++--- pkgs/os-specific/linux/hostapd/default.nix | 2 +- pkgs/os-specific/linux/pam_ccreds/default.nix | 6 +++--- pkgs/os-specific/linux/pam_ldap/default.nix | 4 ++-- pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/servers/irc/charybdis/default.nix | 2 +- pkgs/servers/sql/mariadb/galera/default.nix | 2 +- pkgs/tools/archivers/innoextract/default.nix | 4 ++-- pkgs/tools/backup/lvmsync/default.nix | 2 +- pkgs/tools/security/ossec/default.nix | 4 ++-- pkgs/tools/system/fio/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 2 +- pkgs/tools/text/papertrail/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 53 files changed, 73 insertions(+), 73 deletions(-) (limited to 'pkgs/servers/sql') diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index cc57e58c56a..9f86ec94f18 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. ''; - homepage = http://www.asty.org/cmatrix/; + homepage = https://github.com/abishekvashok/cmatrix; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index bbbf1a0aff9..6c4ecf6fa39 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { - homepage = http://www.fetchmail.info/; + homepage = https://www.fetchmail.info/; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index d679eb56f5b..0605eda7fc7 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = http://luakit.org; + homepage = https://luakit.github.io/; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 83132f03014..33f8d8ca238 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { castget is a simple, command-line based RSS enclosure downloader. It is primarily intended for automatic, unattended downloading of podcasts. ''; - homepage = "http://castget.johndal.com/"; + homepage = "https://castget.johndal.com/"; maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 6dec5b3b11f..d37f8d17336 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-space time dependent density-functional theory code"; - homepage = http://octopus-code.org; + homepage = https://octopus-code.org; maintainers = with maintainers; [ markuskowa ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index d6190942efa..6af7eaf3a5b 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ma27 ]; platforms = platforms.unix; license = licenses.asl20; - homepage = http://alviano.net/software/maxino/; + homepage = https://alviano.net/software/maxino/; # See pkgs/applications/science/logic/glucose/default.nix badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 1cd5e364208..609e73b327a 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glsurf-3.3.1"; src = fetchurl { - url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; + homepage = https://raffalli.eu/~christophe/glsurf/; description = "A program to draw implicit surfaces and curves"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 2633f4c8db1..53d5ad6ab4c 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = http://www.aliza-dicom-viewer.com; + homepage = https://www.aliza-dicom-viewer.com; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 113ee5b9204..3485b181d5a 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 29b4241be92..e4e9954d118 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1"; src = fetchurl { - url = "http://font.gohu.org/${pname}-${version}.tar.gz"; + url = "https://font.gohu.org/${pname}-${version}.tar.gz"; sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = http://font.gohu.org/; + homepage = https://font.gohu.org/; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid rnhmjoj ]; }; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 3bc836fa4e4..68322bd5482 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { generous spacing, large punctuation, and easily distinguishable characters — but without the limitations of a fixed width. ''; - homepage = http://input.fontbureau.com; + homepage = https://input.fontbureau.com; license = licenses.unfree; maintainers = with maintainers; [ romildo ]; platforms = platforms.all; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index 3563b9aabc1..b00b3d7a846 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; - homepage = http://smhouston.us/ephoto/; + homepage = https://smhouston.us/projects/ephoto/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 6b5ee4b3132..1a7cdd39d10 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { - homepage = "http://www.xfce.org/projects/${p_name}"; + homepage = "https://docs.xfce.org/xfce/${p_name}/start"; description = "Application library for the Xfce desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ef445faec92..314a2d0fc52 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; src = fetchurl { - url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; + url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri"; }; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://factorcode.org; + homepage = https://factorcode.org; license = licenses.bsd2; description = "A concatenative, stack-based programming language"; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index c2b5c7b6062..1cbbee469e6 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" ]; sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://hboehm.info/gc/; + homepage = https://hboehm.info/gc/; # non-copyleft, X11-style license - license = http://hboehm.info/gc/license.txt; + license = https://hboehm.info/gc/license.txt; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 5ae6200473b..f061626a897 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" - "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://hboehm.info/gc/; + homepage = https://hboehm.info/gc/; # non-copyleft, X11-style license - license = http://hboehm.info/gc/license.txt; + license = https://hboehm.info/gc/license.txt; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 196dd9ca3f9..4a9e627e544 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; - homepage = http://www.blosc.org; + homepage = https://www.blosc.org; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index eebe119d142..183f0c2bb70 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -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; }; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a22b5eef8d2..ad317b06bbb 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -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; }; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0ff9cea3d27..855ca0385df 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; + homepage = https://www.freetds.org; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 4525f923286..d55983952b8 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thoughtpolice raskin ]; license = licenses.lgpl21; platforms = platforms.unix; - homepage = "http://maxmind.com"; + homepage = "https://www.maxmind.com"; }; } diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index ad8c08b3cce..386354b48e4 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace library for the Linux io_uring API"; - homepage = http://git.kernel.dk/cgit/liburing/; + homepage = https://git.kernel.dk/cgit/liburing/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 70320ead5d1..709a237aed9 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - homepage = http://linalg.org/; + homepage = https://linalg.org/; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1feea915c02..53c4594f535 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source toolkit for developing mapping applications"; - homepage = http://mapnik.org; + homepage = https://mapnik.org; maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index cbd05848173..06eff9d17f3 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://opencolorio.org; + homepage = https://opencolorio.org; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index bbf4d82b519..5c1155a723b 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "http://mjambon.com/${pname}.html"; + homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 40db8246f4a..96f0205aa79 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://sagotch.github.io/ISO8601.ml/; + homepage = https://ocaml-community.github.io/ISO8601.ml/; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index c660ca64856..84d5e488b25 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation ({ meta = with stdenv.lib; { description = "An optimized parsing and printing library for the JSON format"; - homepage = "http://mjambon.com/${pname}.html"; + homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 2a705b53538..18a2b0dde7f 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert text with ANSI color codes to HTML"; - homepage = http://github.com/ralphbean/ansi2html; + homepage = https://github.com/ralphbean/ansi2html; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index 7cb01001fac..2d1ffaccd6f 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python port of the YUI CSS compression algorithm"; - homepage = http://github.com/zacharyvoase/cssmin; + homepage = https://github.com/zacharyvoase/cssmin; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix index d7ec8161ef5..7897138d59f 100644 --- a/pkgs/development/python-modules/dmenu/default.nix +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python wrapper for dmenu"; - homepage = http://dmenu.readthedocs.io; + homepage = https://dmenu.readthedocs.io; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index a06f276232e..5af13c488ba 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python module and command line program for processing ID3 tags"; - homepage = http://eyed3.nicfit.net/; + homepage = https://eyed3.nicfit.net/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 595d9332739..75658dcbb3e 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -111,7 +111,7 @@ python3Packages.buildPythonApplication rec { isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { - homepage = http://mesonbuild.com; + homepage = https://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; maintainers = with maintainers; [ mbe rasendubi ]; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index bde5cce6048..27c608fc719 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: let pname = "cppo"; - webpage = "http://mjambon.com/${pname}.html"; + webpage = "https://github.com/ocaml-community/${pname}"; in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index d3f18d4c218..354787e0f07 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation { '' + optionalString withCrashReporter '' wrapQtApp "$out/libexec/arxcrashreporter" ''; - + meta = { description = '' A cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = http://arx-libertatis.org/; + homepage = https://arx-libertatis.org/; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 3665467407a..f1230b739bb 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { cd ../toolkit ant - + cd ../gcs ant @@ -60,15 +60,15 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java find gcs/libraries toolkit/libraries apple_stubs/ \( -name '*.jar' -and -not -name '*-src.jar' \) -exec cp '{}' $out/share/java ';' - + makeWrapper ${jre8}/bin/java $out/bin/gcs \ --set GCS_LIBRARY ${library} \ --add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS" - ''; + ''; meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = http://gurpscharactersheet.com/; + homepage = https://gurpscharactersheet.com/; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 6ca09c9516b..4bd0a96fb3a 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = http://jackaudio.org; + homepage = https://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index cb487677881..39c0d7d50c7 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.125.0"; src = fetchurl { - url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = http://jackaudio.org; - license = "GPL"; + homepage = https://jackaudio.org; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index e90470cd589..41d7f236682 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi; + homepage = https://hostap.epitest.fi; repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 8293ac0a830..012750c22ad 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pam, openssl, db}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pam_ccreds-10"; src = fetchurl { - url = "http://www.padl.com/download/pam_ccreds.tgz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ pam openssl db ]; meta = with stdenv.lib; { - homepage = http://www.padl.com/OSS/pam_ccreds.html; + homepage = https://www.padl.com/OSS/pam_ccreds.html; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 5b34a8bc82b..2b3a300ecca 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pam_ldap-186"; src = fetchurl { - url = "http://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openldap ]; meta = { - homepage = http://www.padl.com/OSS/pam_ldap.html; + homepage = https://www.padl.com/OSS/pam_ldap.html; description = "LDAP backend for PAM"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 2156177f641..5e355ac7c9a 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; - homepage = http://kernelshark.org/; + homepage = https://kernelshark.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 99425b6799c..dc5b4289a45 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 7c6f595bfaf..d02901e0cc1 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -25,7 +25,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index c6b2af3d387..ecbedcfbec8 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = http://atheme.org/projects/charybdis.html; + homepage = https://github.com/charybdis-ircd/charybdis; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 263a21983e2..73d37ba11a2 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Galera 3 wsrep provider library"; - homepage = http://galeracluster.com/; + homepage = https://galeracluster.com/; license = licenses.lgpl2; maintainers = with maintainers; [ izorkin ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6b0ca7e1528..6a8c8c71274 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "innoextract-1.8"; src = fetchurl { - url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; + url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; sha256 = "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = http://constexpr.org/innoextract/; + homepage = https://constexpr.org/innoextract/; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 814c02267ba..8c23d804d0b 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; - homepage = http://theshed.hezmatt.org/lvmsync/; + homepage = https://theshed.hezmatt.org/lvmsync/; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ jluttine nicknovitski ]; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 7231f6821da..2b52099e70b 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -31,8 +31,8 @@ yes ''; meta = { - description = "Open soruce host-based instrusion detection system"; - homepage = http://www.ossec.net; + description = "Open source host-based instrusion detection system"; + homepage = https://www.ossec.net; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b6ad10ec645..79b2769ab0d 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible IO Tester - an IO benchmark tool"; - homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; + homepage = "https://git.kernel.dk/cgit/fio/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 0764844dbfc..5ff8ff95f8a 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://proot-me.github.io; + homepage = https://proot-me.github.io; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index be85511a92b..d20727f725a 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = http://github.com/papertrail/papertrail-cli/; + homepage = https://github.com/papertrail/papertrail-cli/; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5f37899d276..c5b6bc3f049 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -445,7 +445,7 @@ let meta = { description = "A container for functions of the ClusterSSH programs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://github.com/duncs/clusterssh/wiki"; + homepage = "https://github.com/duncs/clusterssh/wiki"; }; }; -- cgit 1.4.1 From ab692f467b977c652351bcc2770d3d462ae19b01 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Nov 2019 22:22:22 -0500 Subject: postgresqlPackages.pgroonga: 2.2.1 -> 2.2.2 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/sql') diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 15a22067000..866dd8021d0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0d913rkxx6qlkav6z9crsz3ypqkdffn4c667nsgzh5s9n4wbbpb8"; + sha256 = "0pdz2lpi7g1n9b5rg6kwhh6fr0bwf06zr642brmh53n6mp41186m"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1