From 2053ddac783c931053676ebc2b02bc8b82d89399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 8 Aug 2020 21:40:31 +0200 Subject: Upgrade nixos-unstable --- modules/private/mail/dovecot.nix | 12 ++++++------ modules/private/system.nix | 2 +- modules/private/system/dilion.nix | 2 +- modules/private/websites/isabelle/aten_app/default.nix | 14 +++++++++----- modules/private/websites/leila/production.nix | 2 +- modules/private/websites/tools/cloud/default.nix | 2 +- modules/private/websites/tools/mail/default.nix | 2 +- modules/private/websites/tools/tools/adminer.nix | 4 ++-- modules/private/websites/tools/tools/default.nix | 6 +++--- 9 files changed, 25 insertions(+), 21 deletions(-) (limited to 'modules') diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix index 0304b89..aa25d1f 100644 --- a/modules/private/mail/dovecot.nix +++ b/modules/private/mail/dovecot.nix @@ -69,12 +69,12 @@ in mailUser = "vhost"; mailGroup = "vhost"; createMailUser = false; - mailboxes = [ - { name = "Trash"; auto = "subscribe"; specialUse = "Trash"; } - { name = "Junk"; auto = "subscribe"; specialUse = "Junk"; } - { name = "Sent"; auto = "subscribe"; specialUse = "Sent"; } - { name = "Drafts"; auto = "subscribe"; specialUse = "Drafts"; } - ]; + mailboxes = { + Trash = { auto = "subscribe"; specialUse = "Trash"; }; + Junk = { auto = "subscribe"; specialUse = "Junk"; }; + Sent = { auto = "subscribe"; specialUse = "Sent"; }; + Drafts = { auto = "subscribe"; specialUse = "Drafts"; }; + }; mailLocation = "mbox:~/Mail:INBOX=~/Mail/Inbox:INDEX=~/.imap"; sslServerCert = "/var/lib/acme/mail/fullchain.pem"; sslServerKey = "/var/lib/acme/mail/key.pem"; diff --git a/modules/private/system.nix b/modules/private/system.nix index 0ab4a81..bca6e19 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix @@ -54,7 +54,7 @@ pkgs.tcpdump pkgs.tshark pkgs.tcpflow - pkgs.mitmproxy + # pkgs.mitmproxy # failing pkgs.nmap pkgs.p0f pkgs.socat diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix index a0d56cc..ca9a052 100644 --- a/modules/private/system/dilion.nix +++ b/modules/private/system/dilion.nix @@ -42,7 +42,7 @@ }; system.nssModules = [ pkgs.libvirt ]; - system.nssHosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ]; + system.nssDatabases.hosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ]; programs.zsh.enable = true; users.users.backup = { diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix index 30d10ba..f967b9a 100644 --- a/modules/private/websites/isabelle/aten_app/default.nix +++ b/modules/private/websites/isabelle/aten_app/default.nix @@ -1,12 +1,16 @@ { environment ? "prod" , varDir ? "/var/lib/aten_${environment}" -, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: +, composerEnv, fetchgit, runCommand, nodejs-10_x, jq, libsass, python, fetchurl, yarn2nix-moretea, yarn, sources }: let + yarn2nix-moretea' = yarn2nix-moretea.override({ + yarn = yarn.override({ nodejs = nodejs-10_x; }); + nodejs = nodejs-10_x; + }); packagesource = sources.websites-isabelle-aten; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out ''; - yarnModules = yarn2nix-moretea.mkYarnModules rec { + yarnModules = yarn2nix-moretea'.mkYarnModules rec { name = "aten-yarn"; pname = name; version = "v1.0.0"; @@ -18,8 +22,8 @@ let buildInputs = [ libsass python ]; postInstall = let nodeHeaders = fetchurl { - url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; + url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz"; + sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c"; }; in '' @@ -46,7 +50,7 @@ let rm -rf var/{log,cache} ln -sf ${varDir}/{log,cache} var/ ''; - buildInputs = [ yarnModules yarn2nix-moretea.yarn ]; + buildInputs = [ yarnModules yarn2nix-moretea'.yarn ]; passthru = { inherit varDir; inherit environment; diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix index 0ae7893..8385bc7 100644 --- a/modules/private/websites/leila/production.nix +++ b/modules/private/websites/leila/production.nix @@ -25,7 +25,7 @@ in { phpOptions = config.services.phpfpm.phpOptions + '' disable_functions = "mail" ''; - phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]); + phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick ]); phpEnv = { PATH = lib.makeBinPath [ pkgs.imagemagick ]; }; diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index e6f8ecb..50ed528 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix @@ -171,7 +171,7 @@ in { user = "wwwrun"; group = "wwwrun"; settings = phpFpm.pool; - phpPackage = pkgs.php74.withExtensions(e: pkgs.php74.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); + phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]); }; services.cron = { diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index 7c60ae4..4636a6c 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix @@ -65,7 +65,7 @@ in phpOptions = config.services.phpfpm.phpOptions + '' date.timezone = 'CET' ''; - phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]); + phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick ]); }; services.phpfpm.pools.rainloop = { user = "wwwrun"; diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix index af03550..a4ba344 100644 --- a/modules/private/websites/tools/tools/adminer.nix +++ b/modules/private/websites/tools/tools/adminer.nix @@ -1,4 +1,4 @@ -{ adminer, php74, php74base, myPhpPackages, lib, forcePhpSocket ? null }: +{ adminer, php74, myPhpPackages, lib, forcePhpSocket ? null }: rec { activationScript = { deps = [ "httpd" ]; @@ -10,7 +10,7 @@ rec { phpFpm = rec { user = apache.user; group = apache.group; - phpPackage = php74base.withExtensions (e: (lib.remove e.mysqli php74.enabledExtensions) ++ [myPhpPackages.mysqli_pam]); + phpPackage = php74.withExtensions ({ enabled, all }: (lib.remove all.mysqli enabled) ++ [myPhpPackages.mysqli_pam]); settings = { "listen.owner" = apache.user; "listen.group" = apache.group; diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 93d1122..1e30eed 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -17,7 +17,7 @@ let wallabag = pkgs.callPackage ./wallabag.nix { wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { - php = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); + php = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]); }; }; env = config.myEnv.tools.wallabag; @@ -324,7 +324,7 @@ in { "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; }; - phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]); + phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [all.mysqli all.redis all.apcu all.opcache ]); }; adminer = adminer.phpFpm; ttrss = { @@ -337,7 +337,7 @@ in { user = "wwwrun"; group = "wwwrun"; settings = wallabag.phpFpm.pool; - phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); + phpPackage = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]); }; yourls = { user = "wwwrun"; -- cgit v1.2.3