From 882cc8dc9ae165bb9ddc2d0e70ee9ecc7690444d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 1 Sep 2016 20:15:58 +0200 Subject: postfix: 3.1.1 -> 3.1.2 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 176fd22162bc..6303946de3a2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "10lrp8fyn38digih1sy7y4dm74szj1cvbyxmn68095ri8v1s9v9x"; + sha256 = "0sqgsfq3dqilfcr2z9wi7g12mcma690j8qvs8v93gszrdgpb9f8s"; }; buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] -- cgit 1.4.1 From 2db487e6bf56cbcc2887e0611a083db8afd9a132 Mon Sep 17 00:00:00 2001 From: Joachim F Date: Thu, 15 Sep 2016 17:19:51 +0200 Subject: opensmtpd: 5.9.2p1 -> 6.0.0p1 (#18629) Also change to https src.url. Changelog at https://www.opensmtpd.org/announces/release-6.0.0.txt In particular, note that - logging format has been reworked so scripts that consume opensmtpd logs may need updating - dhparams option has been removed --- pkgs/servers/mail/opensmtpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 46fc9bc00f2b..b5ea7acb9d2c 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.9.2p1"; + version = "6.0.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { - url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9"; }; patches = [ ./proc_path.diff ]; -- cgit 1.4.1 From f7f4930912ac2b4a60f314e495dcc6cb876d7bcb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 23 Sep 2016 18:43:21 -0400 Subject: mailman: 2.1.18 -> 2.1.23 --- pkgs/servers/mail/mailman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 933b0fabc4b7..b18ab016c441 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pythonPackages }: stdenv.mkDerivation rec { - name = "mailman-2.1.18"; + name = "mailman-2.1.23"; src = fetchurl { url = "mirror://gnu/mailman/${name}.tgz"; - sha256 = "0jc360crakvpz71msl0h11zv3849fqzlj9jfh1g7x3j4459n07fw"; + sha256 = "0s9ywix4m3n7qa0baws744ildg48hsa87jahpsfiqqilhmpwl8mh"; }; buildInputs = [ python pythonPackages.dns ]; -- cgit 1.4.1 From 9cab11980b3854a27deb3700b1988166f78a1735 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 21 Sep 2016 18:03:14 +0200 Subject: maintainers: add schneefux --- lib/maintainers.nix | 1 + pkgs/servers/mail/postfix/pflogsumm.nix | 1 + pkgs/servers/nextcloud/default.nix | 1 + 3 files changed, 3 insertions(+) (limited to 'pkgs/servers/mail') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 24b87a5f36a0..78dd79bb308e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -367,6 +367,7 @@ samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; schmitthenner = "Fabian Schmitthenner "; + schneefux = "schneefux "; schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sepi = "Raffael Mancini "; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index f73a22e130ab..978ccec503d2 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -28,6 +28,7 @@ buildPerlPackage rec { meta = { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1d56c30fdf66..bb2735461e00 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Sharing solution for files, calendars, contacts and more"; homepage = https://nextcloud.com; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; license = stdenv.lib.licenses.agpl3Plus; platforms = with stdenv.lib.platforms; unix; }; -- cgit 1.4.1 From 5609fe521daf42af3a8d7d8d15dd68db87efefb0 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 17 Nov 2015 18:30:10 +0100 Subject: postgrey: init at 1.36 (includes service) --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/postgrey.nix | 75 ++++++++++++++++++++++++++++++++ pkgs/servers/mail/postgrey/default.nix | 34 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/mail/postgrey.nix create mode 100644 pkgs/servers/mail/postgrey/default.nix (limited to 'pkgs/servers/mail') diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e005c0465042..2881d843760d 100755 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -275,6 +275,7 @@ prometheus = 255; telegraf = 256; gitlab-runner = 257; + postgrey = 258; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -520,6 +521,7 @@ prometheus = 255; #telegraf = 256; # unused gitlab-runner = 257; + postgrey = 258; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ad3edd6fbd5b..2978eaefb46b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -216,6 +216,7 @@ ./services/mail/opensmtpd.nix ./services/mail/postfix.nix ./services/mail/postsrsd.nix + ./services/mail/postgrey.nix ./services/mail/spamassassin.nix ./services/mail/rspamd.nix ./services/mail/rmilter.nix diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix new file mode 100644 index 000000000000..5332939a859d --- /dev/null +++ b/nixos/modules/services/mail/postgrey.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: + +with lib; let + + cfg = config.services.postgrey; + +in { + + options = { + services.postgrey = { + enable = mkOption { + default = false; + description = "Whether to run the Postgrey daemon"; + }; + inetAddr = mkOption { + default = null; + example = "127.0.0.1"; + description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock"; + }; + inetPort = mkOption { + default = 10030; + description = "The tcp port to bind to"; + }; + greylistText = mkOption { + default = "Greylisted for %%s seconds"; + description = "Response status text for greylisted messages"; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.postgrey ]; + + users = { + extraUsers = { + postgrey = { + description = "Postgrey Daemon"; + uid = config.ids.uids.postgrey; + group = "postgrey"; + }; + }; + extraGroups = { + postgrey = { + gid = config.ids.gids.postgrey; + }; + }; + }; + + systemd.services.postgrey = let + bind-flag = if isNull cfg.inetAddr then + "--unix=/var/run/postgrey.sock" + else + "--inet=${cfg.inetAddr}:${cfg.inetPort}"; + in { + description = "Postfix Greylisting Service"; + wantedBy = [ "multi-user.target" ]; + before = [ "postfix.service" ]; + preStart = '' + mkdir -p /var/postgrey + chown postgrey:postgrey /var/postgrey + chmod 0770 /var/postgrey + ''; + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"''; + Restart = "always"; + RestartSec = 5; + TimeoutSec = 10; + }; + }; + + }; + +} diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix new file mode 100644 index 000000000000..7fdf0edb096d --- /dev/null +++ b/pkgs/servers/mail/postgrey/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl, perlPackages, lib, runCommand, postfix }: + +let + mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/lib/perl5/site_perl") inputs); + postgrey-flags = mk-perl-flags (with perlPackages; [ + NetServer BerkeleyDB DigestSHA1 NetAddrIP IOMultiplex + ]); + policy-test-flags = mk-perl-flags (with perlPackages; [ + ParseSyslog + ]); + version = "1.36"; + name = "postgrey-${version}"; +in runCommand name { + src = fetchurl { + url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; + sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2"; + }; + meta = with stdenv.lib; { + description = "A postfix policy server to provide greylisting"; + homepage = "https://postgrey.schweikert.ch/"; + platforms = postfix.meta.platforms; + licenses = licenses.gpl2; + }; +} '' + mkdir -p $out/bin + cd $out + tar -xzf $src --strip-components=1 + mv postgrey policy-test bin + sed -i -e "s,#!/usr/bin/perl -T,#!${perl}/bin/perl -T ${postgrey-flags}," \ + -e "s#/etc/postfix#$out#" \ + bin/postgrey + sed -i -e "s,#!/usr/bin/perl,#!${perl}/bin/perl ${policy-test-flags}," \ + bin/policy-test +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53ad8e5f5865..394c0c7a27af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9963,6 +9963,8 @@ in pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; + postgrey = callPackage ../servers/mail/postgrey { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; -- cgit 1.4.1 From 9772f0f9a145478e756aaaed088d6c650bb03268 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 29 Sep 2016 13:32:28 +0200 Subject: dovecot: enable darwin build --- pkgs/servers/mail/dovecot/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d55425779e65..2be20323f259 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { "--with-lucene" "--with-icu" ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ++ lib.optional (stdenv.isDarwin) "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } -- cgit 1.4.1 From a7a34745b630ed90d6b95f95e6d72ecdb16483db Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 15:29:30 +0200 Subject: postfix: 3.1.2 -> 3.1.3 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6303946de3a2..9c72aa018989 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0sqgsfq3dqilfcr2z9wi7g12mcma690j8qvs8v93gszrdgpb9f8s"; + sha256 = "0ya9h7ynhq8h7zgq0qkvfwx5rsam7i3vkbyh6rx63qlpcxz15y2j"; }; buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] -- cgit 1.4.1 From b085f4a216bda0ed6516c54056ba4062728af52e Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 18 Oct 2016 15:59:59 -0200 Subject: opensmtpd: 6.0.0p1 -> 6.0.2p1 (#19660) Changelogs at https://www.opensmtpd.org/announces/release-6.0.1.txt https://www.opensmtpd.org/announces/release-6.0.2.txt --- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index b5ea7acb9d2c..7ad5f6e9ad59 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.0.0p1"; + version = "6.0.2p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9"; + sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a"; }; patches = [ ./proc_path.diff ]; -- cgit 1.4.1 From be95ceaff2b73ff836171f9822b81767d9a8cee6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:49:18 +0300 Subject: treewide: quote URLs in my packages --- pkgs/applications/audio/deadbeef/plugins/mpris2.nix | 2 +- pkgs/applications/display-managers/sddm/default.nix | 2 +- pkgs/applications/graphics/yed/default.nix | 2 +- pkgs/applications/misc/octoprint/default.nix | 2 +- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- pkgs/applications/video/avidemux/default.nix | 2 +- .../window-managers/xmonad-log-applet/default.nix | 2 +- pkgs/data/fonts/xits-math/default.nix | 2 +- pkgs/development/libraries/SDL_ttf/default.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- .../libraries/double-conversion/default.nix | 4 ++-- pkgs/development/libraries/folly/default.nix | 2 +- pkgs/development/libraries/libaacs/default.nix | 13 +++++-------- pkgs/development/libraries/libbdplus/default.nix | 14 +++++--------- pkgs/development/libraries/libbluray/default.nix | 7 +++---- pkgs/development/libraries/libburn/default.nix | 2 +- pkgs/development/libraries/libisofs/default.nix | 2 +- pkgs/development/libraries/libvdpau-va-gl/default.nix | 2 +- pkgs/development/libraries/libxls/default.nix | 2 +- pkgs/development/libraries/opendkim/default.nix | 6 ++++-- pkgs/development/libraries/qpdf/default.nix | 2 +- .../libraries/science/math/ipopt/default.nix | 4 ++-- pkgs/development/libraries/vc/0.7.nix | 2 +- pkgs/development/libraries/vcg/default.nix | 2 +- pkgs/development/libraries/xlslib/default.nix | 4 ++-- pkgs/development/tools/analysis/swarm/default.nix | 2 +- pkgs/games/crawl/default.nix | 2 +- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 8 ++++---- pkgs/games/dwarf-fortress/unfuck.nix | 2 +- pkgs/games/quake3/ioquake/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/the-powder-toy/default.nix | 2 +- pkgs/games/wesnoth/default.nix | 2 +- pkgs/games/wesnoth/dev.nix | 2 +- pkgs/misc/drivers/m33-linux/default.nix | 2 +- .../os-specific/linux/mkinitcpio-nfs-utils/default.nix | 2 +- pkgs/os-specific/linux/pam_pgsql/default.nix | 2 +- pkgs/servers/mail/dovecot/plugins/antispam/default.nix | 2 +- pkgs/tools/compression/lbzip2/default.nix | 2 +- pkgs/tools/misc/ltunify/default.nix | 2 +- pkgs/tools/networking/network-manager/l2tp.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 18 +++++++++--------- 43 files changed, 70 insertions(+), 76 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 1504cce1d582..12e8b3cccaed 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; + homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3f8d5aec4aa1..9fd56a49b5f5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -57,7 +57,7 @@ let meta = with stdenv.lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; + homepage = "https://github.com/sddm/sddm"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ttuegel ]; }; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index afb48c697b5c..4221b75374cc 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - homepage = http://www.yworks.com/en/products/yfiles/yed/; + homepage = "http://www.yworks.com/en/products/yfiles/yed/"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index fa0097272ffb..986c8b5130ce 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { description = "SockJS python server implementation on top of Tornado framework"; - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = "http://github.com/mrjoes/sockjs-tornado/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a53513061ae..d4dba663e6da 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/pidgin-latex/; + homepage = "http://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 96017a7ba19c..6b20ce8870d7 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -43,7 +43,7 @@ let ; meta = { - homepage = http://fixounet.free.fr/avidemux/; + homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index f27e7a953dd2..b09dfebfd127 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch ]; meta = with stdenv.lib; { - homepage = http://github.com/alexkay/xmonad-log-applet; + homepage = "http://github.com/alexkay/xmonad-log-applet"; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 773aa74ce390..8e834d79061f 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/khaledhosny/xits-math; + homepage = "https://github.com/khaledhosny/xits-math"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 1f290bf7044f..4875d9ab5a1a 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9da83ca913e7..22c8633f0da5 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/zeromq/cppzmq; + homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 049a799c44fa..c6f7684ecf39 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.0.1"; name = "double-conversion-${version}"; + version = "2.0.1"; src = fetchFromGitHub { owner = "google"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/google/double-conversion; + homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index af8b1cb87373..67a47eeaab0f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = https://github.com/facebook/folly; + homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 229eca5e5972..fc27f3a2c6b5 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -7,15 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay -let baseName = "libaacs"; - version = "0.8.1"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libaacs-${version}"; + version = "0.8.1"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; }; @@ -24,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 1f47e5f8dcd4..4531546f33fd 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -7,16 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay - -let baseName = "libbdplus"; - version = "0.1.2"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libbdplus-${version}"; + version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; @@ -25,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbdplus.html; + homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 729fc27a0d37..c5bf7fd7f982 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -18,12 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - baseName = "libbluray"; + name = "libbluray-${version}"; version = "0.9.2"; - name = "${baseName}-${version}"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index cedc376972b6..3b5b8156942d 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 85e32cc1af1f..71b9d2d5c336 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 8065df5c5b52..4efecf30fd5e 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; meta = with stdenv.lib; { - homepage = https://github.com/i-rinat/libvdpau-va-gl; + homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 0d7115144449..96e2ca872850 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = http://sourceforge.net/projects/libxls/; + homepage = "http://sourceforge.net/projects/libxls/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7f4b5ba2e328..f412346456c6 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -2,7 +2,9 @@ , perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-2.10.3"; + name = "opendkim-${version}"; + version = "2.10.3"; + src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://www.opendkim.org/; + homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 8f886421d55b..5aa1d0350fc7 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://qpdf.sourceforge.net/; + homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9ea3a54f2b0b..5e16fcb1b547 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.6"; name = "ipopt-${version}"; + version = "3.12.6"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = https://projects.coin-or.org/Ipopt; + homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index d6dd61db83c0..2beaa616f2d8 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.7.5"; name = "Vc-${version}"; + version = "0.7.5"; src = fetchFromGitHub { owner = "VcDevel"; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 59fadbbbc1f8..9e85ad7413d0 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vcg.isti.cnr.it/vcglib/install.html; + homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 3a45447119ca..44f57cae7e11 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - version = "2.5.0"; name = "xlslib-${version}"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://sourceforge.net/projects/xlslib/; + homepage = "http://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index a67d9b8d42e8..91d4155d093d 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 2a1e9232c230..23a9253b6bd4 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source, single-player, role-playing roguelike game"; - homepage = http://crawl.develz.org/; + homepage = "http://crawl.develz.org/"; longDescription = '' Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting in dungeons filled with dangerous and unfriendly monsters diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index c13bfd4d3f2d..57610fb1c1c8 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { rm $out/bin/dwarftherapist ''; - meta = { + meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ the-kenny abbradar ]; + license = licenses.mit; + platforms = platforms.linux; homepage = "https://github.com/splintermind/Dwarf-Therapist"; }; } diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 89000115f4ab..d5055b40728c 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; + homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index f03b8dde13e8..a73093ad2fc0 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ioquake3.org/; + homepage = "http://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index be921bf11892..dd4069e1c11c 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lopenal" ]; meta = with stdenv.lib; { - homepage = http://scorched3d.co.uk/; + homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index e07117172ce6..f72307e0172f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = http://powdertoy.co.uk/; + homepage = "http://powdertoy.co.uk/"; platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 46dd24acbb7b..a7352f0a75c4 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index a7e621460b66..ccd5a4778ab4 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f2..cb78bd3498a9 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index f4e7ad1f2344..8887237b3046 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://archlinux.org/; + homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 42949a3557a6..10383a13e7e3 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - version = "0.7.3.2"; name = "pam_pgsql-${version}"; + version = "0.7.3.2"; src = fetchFromGitHub { owner = "pam-pgsql"; diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix index 1a1ba1ad4486..b972192da7a7 100644 --- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://wiki2.dovecot.org/Plugins/Antispam; + homepage = "http://wiki2.dovecot.org/Plugins/Antispam"; description = "An antispam plugin for the Dovecot IMAP server"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index cf616a21e0aa..cc6453e801e6 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://lbzip2.org/; + homepage = "http://lbzip2.org/"; description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cf28fa051326..8066cdd9bc5a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 5e09bb7229f8..591994ddccf6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = "https://github.com/seriyps/NetworkManager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92eba09281ce..dd5278ce4d8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10077,7 +10077,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efdd8e67f965..26bbf15fe515 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1456,7 +1456,7 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; meta = with stdenv.lib; { - homepage = https://github.com/dimka665/awesome-slugify; + homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; license = licenses.gpl3; platforms = platforms.all; @@ -8698,7 +8698,7 @@ in { }; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8723,7 +8723,7 @@ in { ''; meta = { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; @@ -8926,7 +8926,7 @@ in { }; meta = { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; @@ -9081,7 +9081,7 @@ in { }; meta = { - homepage = http://sarge.readthedocs.org/; + homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; platform = platforms.all; @@ -11047,7 +11047,7 @@ in { doCheck = false; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; @@ -11092,7 +11092,7 @@ in { propagatedBuildInputs = with self; [ flask blinker nose ]; meta = { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; platforms = platforms.all; @@ -11131,7 +11131,7 @@ in { propagatedBuildInputs = with self; [ flask ]; meta = { - homepage = http://github.com/smurfix/flask-script; + homepage = "http://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; platforms = platforms.all; @@ -13369,7 +13369,7 @@ in { }; meta = { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; platforms = platforms.all; -- cgit 1.4.1 From 60d29f526d2b18f415803c69f7a8619048cfebb7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Dec 2016 15:51:31 +0100 Subject: rmilter: 1.8.5 -> 1.10.0 --- pkgs/servers/mail/rmilter/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 5c41f84c6836..e0e5fd45b7f2 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim, - libmemcached }: +{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre +, libmilter, opendkim, libmemcached, glib }: let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; @@ -8,17 +8,17 @@ in stdenv.mkDerivation rec { name = "rmilter-${version}"; - version = "1.8.5"; + version = "1.10.0"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rmilter"; rev = version; - sha256 = "1bfql9v243iw3v87kjgwcx4xxw7g5nv1rsi9gk8p7xg5mzrhi3bn"; + sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; }; - nativeBuildInputs = [ bison cmake flex ]; - buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim]; + nativeBuildInputs = [ bison cmake flex pkgconfig ]; + buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; meta = with stdenv.lib; { homepage = "https://github.com/vstakhov/rmilter"; -- cgit 1.4.1 From f97bfcec9991d45a95398c29c038b416f54da9f2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Dec 2016 15:51:59 +0100 Subject: rspamd: 1.2.7 -> 1.4.1 --- pkgs/servers/mail/rspamd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index c978c9566a35..692227b5094c 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, perl -, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }: +, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel }: let libmagic = file; # libmagic provided by file package ATM in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.2.7"; + version = "1.4.1"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "0wr9lndg5fpsrjknm828zj0zy7zvdqrak9bdr6pga3bnq6xabbik"; + sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel ]; postPatch = '' substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" -- cgit 1.4.1 From 352e167c224e5d98076ca9653d2124c351d969d1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 25 Dec 2016 10:11:06 +0000 Subject: exim: 4.87 -> 4.88 for CVE-2016-9963 --- pkgs/servers/mail/exim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 0918e308d263..68e3ad4ca426 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,11 +1,11 @@ { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "exim-4.87"; + name = "exim-4.88"; src = fetchurl { - url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2"; - sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl"; + url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2"; + sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i"; }; buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; -- cgit 1.4.1 From 35e3ea0966bcdf3483fc25e78a5e9e1887befe9b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 Dec 2016 15:04:41 +0100 Subject: dovecot: 2.2.25 -> 2.2.27 --- pkgs/servers/mail/dovecot/2.2.x-module_dir.patch | 10 +++++----- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch index 66059cff6f76..1914933c558c 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream index a0659ab..dba3729 100644 --- a/src/lib-ssl-iostream/iostream-ssl.c +++ b/src/lib-ssl-iostream/iostream-ssl.c -@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r) - memset(&mod_set, 0, sizeof(mod_set)); +@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r) mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.setting_name = ""; + mod_set.require_init_funcs = TRUE; - ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set); + ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set); - - ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); - if (ssl_vfuncs == NULL) { + if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name, + &mod_set, error_r) < 0) + return -1; diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index e2233bf..bbf981e 100644 --- a/src/lib-storage/mail-storage-settings.c diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2be20323f259..36d45672150e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.25"; + name = "dovecot-2.2.27"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq"; + sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; }; preConfigure = '' -- cgit 1.4.1