From c1b6f97a72e0b4897ce11414df28259d4ea3c5ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 2 May 2019 02:17:28 +0200 Subject: [PATCH] Move some overlays to parent directory --- nixops/eldiron.nix | 1 + nixops/modules/buildbot/default.nix | 27 ------------------ nixops/modules/databases/mysql.nix | 8 ------ nixops/modules/databases/postgresql.nix | 12 -------- nixops/modules/irc/default.nix | 6 ---- nixops/modules/websites/commons/stats.nix | 7 ----- nixops/modules/websites/tools/git/default.nix | 8 ------ .../modules/websites/tools/tools/default.nix | 6 ---- .../bitlbee}/bitlbee_long_nicks.patch | 0 overlays/bitlbee/default.nix | 5 ++++ overlays/databases/mysql/default.nix | 7 +++++ overlays/databases/postgresql/default.nix | 12 ++++++++ .../postgresql_run_socket_path.patch | 0 overlays/default.nix | 6 ++++ overlays/gitweb/default.nix | 7 +++++ .../gitweb/theme/git-favicon.png | Bin .../gitweb/theme/git-logo.png | Bin .../git => overlays}/gitweb/theme/gitweb.css | 0 .../git => overlays}/gitweb/theme/gitweb.js | 0 .../python-packages/apprise}/apprise.json | 0 overlays/python-packages/apprise/default.nix | 16 +++++++++++ overlays/python-packages/default.nix | 4 +++ overlays/python-packages/wokkel/default.nix | 16 +++++++++++ overlays/ympd/default.nix | 5 ++++ .../ympd}/ympd-password-env.patch | 0 .../tools/tools => overlays/ympd}/ympd.json | 0 26 files changed, 79 insertions(+), 74 deletions(-) rename {nixops/modules/irc => overlays/bitlbee}/bitlbee_long_nicks.patch (100%) create mode 100644 overlays/bitlbee/default.nix create mode 100644 overlays/databases/mysql/default.nix create mode 100644 overlays/databases/postgresql/default.nix rename {nixops/modules/databases => overlays/databases/postgresql}/postgresql_run_socket_path.patch (100%) create mode 100644 overlays/gitweb/default.nix rename {nixops/modules/websites/tools/git => overlays}/gitweb/theme/git-favicon.png (100%) rename {nixops/modules/websites/tools/git => overlays}/gitweb/theme/git-logo.png (100%) rename {nixops/modules/websites/tools/git => overlays}/gitweb/theme/gitweb.css (100%) rename {nixops/modules/websites/tools/git => overlays}/gitweb/theme/gitweb.js (100%) rename {nixops/modules/buildbot => overlays/python-packages/apprise}/apprise.json (100%) create mode 100644 overlays/python-packages/apprise/default.nix create mode 100644 overlays/python-packages/default.nix create mode 100644 overlays/python-packages/wokkel/default.nix create mode 100644 overlays/ympd/default.nix rename {nixops/modules/websites/tools/tools => overlays/ympd}/ympd-password-env.patch (100%) rename {nixops/modules/websites/tools/tools => overlays/ympd}/ympd.json (100%) diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index c1ccc42..4994041 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix @@ -7,6 +7,7 @@ eldiron = { config, pkgs, mylibs, myconfig, ... }: { + nixpkgs.overlays = builtins.attrValues (import ../overlays); _module.args = { pkgsNext = import {}; pkgsPrevious = import {}; diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 1c37e05..7632602 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix @@ -62,33 +62,6 @@ in }; config = lib.mkIf config.services.buildbot.enable { - nixpkgs.overlays = [ (self: super: rec { - python3 = super.python3.override { - packageOverrides = python-self: python-super: { - wokkel = python-self.buildPythonPackage rec { - pname = "wokkel"; - version = "18.0.0"; - src = python-self.fetchPypi { - inherit pname version; - sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016"; - }; - propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ]; - doChecks = false; - }; - apprise = python-self.buildPythonPackage rec { - pname = "apprise"; - version = "0.7.4"; - src = (mylibs.fetchedGithub ./apprise.json).src; - propagatedBuildInputs = with python-self; [ decorator - requests requests_oauthlib oauthlib urllib3 six click - markdown pyyaml sleekxmpp - ]; - doChecks = false; - }; - }; - }; - }) ]; - ids.uids.buildbot = myconfig.env.buildbot.user.uid; ids.gids.buildbot = myconfig.env.buildbot.user.gid; diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix index a9ca8d3..2d56155 100644 --- a/nixops/modules/databases/mysql.nix +++ b/nixops/modules/databases/mysql.nix @@ -14,14 +14,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ (self: super: rec { - mariadb = mariadbPAM; - mariadbPAM = super.mariadb.overrideAttrs(old: rec { - cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; - buildInputs = old.buildInputs ++ [ self.pam ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 3306 ]; # for adminer, ssl is implemented with mysqli only, which is diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix index 62e9e34..0afce70 100644 --- a/nixops/modules/databases/postgresql.nix +++ b/nixops/modules/databases/postgresql.nix @@ -14,18 +14,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ (self: super: rec { - postgresql = postgresql_11; - postgresql_11 = super.postgresql_11.overrideAttrs(old: rec { - passthru = old.passthru // { psqlSchema = "11.0"; }; - configureFlags = old.configureFlags ++ [ "--with-pam" ]; - buildInputs = (old.buildInputs or []) ++ [ self.pam ]; - patches = old.patches ++ [ - ./postgresql_run_socket_path.patch - ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 5432 ]; security.acme.certs."postgresql" = config.services.myCertificates.certConfig // { diff --git a/nixops/modules/irc/default.nix b/nixops/modules/irc/default.nix index 37cb53b..4cf27e5 100644 --- a/nixops/modules/irc/default.nix +++ b/nixops/modules/irc/default.nix @@ -69,12 +69,6 @@ in ''; }; - nixpkgs.overlays = [ (self: super: rec { - bitlbee = super.bitlbee.overrideAttrs(old: { - patches = (old.patches or []) ++ [ ./bitlbee_long_nicks.patch ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 6697 ]; services.bitlbee = { enable = true; diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix index 8d618c5..c707303 100644 --- a/nixops/modules/websites/commons/stats.nix +++ b/nixops/modules/websites/commons/stats.nix @@ -23,13 +23,6 @@ in { pkgs.goaccess ]; - nixpkgs.overlays = [ (self: super: rec { - goaccess = super.goaccess.overrideAttrs(old: rec { - configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; - buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; - }); - }) ]; - services.cron = { enable = true; systemCronJobs = let diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index 4a1457f..dc44049 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix @@ -15,14 +15,6 @@ in { config = lib.mkIf cfg.enable { security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; - nixpkgs.overlays = [ (self: super: rec { - gitweb = super.gitweb.overrideAttrs(old: { - installPhase = old.installPhase + '' - cp -r ${./gitweb/theme} $out/gitweb-theme; - ''; - }); - }) ]; - mySecrets.keys = mantisbt.keys; services.myWebsites.tools.modules = gitweb.apache.modules ++ diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 9be9d5d..827c563 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix @@ -248,12 +248,6 @@ in { ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName} ''; - nixpkgs.overlays = [ (self: super: rec { - ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json // { - patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; - }); - }) ]; - systemd.services.tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; serviceConfig = { diff --git a/nixops/modules/irc/bitlbee_long_nicks.patch b/overlays/bitlbee/bitlbee_long_nicks.patch similarity index 100% rename from nixops/modules/irc/bitlbee_long_nicks.patch rename to overlays/bitlbee/bitlbee_long_nicks.patch diff --git a/overlays/bitlbee/default.nix b/overlays/bitlbee/default.nix new file mode 100644 index 0000000..5183d01 --- /dev/null +++ b/overlays/bitlbee/default.nix @@ -0,0 +1,5 @@ +self: super: { + bitlbee = super.bitlbee.overrideAttrs(old: { + patches = (old.patches or []) ++ [ ./bitlbee_long_nicks.patch ]; + }); +} diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix new file mode 100644 index 0000000..24bad1b --- /dev/null +++ b/overlays/databases/mysql/default.nix @@ -0,0 +1,7 @@ +self: super: rec { + mariadb = mariadbPAM; + mariadbPAM = super.mariadb.overrideAttrs(old: { + cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; + buildInputs = old.buildInputs ++ [ self.pam ]; + }); +} diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix new file mode 100644 index 0000000..8dec7ff --- /dev/null +++ b/overlays/databases/postgresql/default.nix @@ -0,0 +1,12 @@ +self: super: rec { + postgresql = postgresql_11; + postgresql_11 = super.postgresql_11.overrideAttrs(old: { + # datadir in /var/lib/postgresql is named after psqlSchema + passthru = old.passthru // { psqlSchema = "11.0"; }; + configureFlags = old.configureFlags ++ [ "--with-pam" ]; + buildInputs = (old.buildInputs or []) ++ [ self.pam ]; + patches = old.patches ++ [ + ./postgresql_run_socket_path.patch + ]; + }); +} diff --git a/nixops/modules/databases/postgresql_run_socket_path.patch b/overlays/databases/postgresql/postgresql_run_socket_path.patch similarity index 100% rename from nixops/modules/databases/postgresql_run_socket_path.patch rename to overlays/databases/postgresql/postgresql_run_socket_path.patch diff --git a/overlays/default.nix b/overlays/default.nix index a2d9927..2e2cdd3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,15 +1,19 @@ { mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; }; + bitlbee = import ./bitlbee; dwm = import ./dwm; elinks = import ./elinks; + gitweb = import ./gitweb; goaccess = import ./goaccess; ldapvi = import ./ldapvi; lesspipe = import ./lesspipe; + mysql = import ./databases/mysql; neomutt = import ./neomutt; nixops = import ./nixops; pass = import ./pass; pelican = import ./pelican; + postgresql = import ./databases/postgresql; profanity = import ./profanity; sc-im = import ./sc-im; slrn = import ./slrn; @@ -17,4 +21,6 @@ vit = import ./vit; weboob = import ./weboob; weechat = import ./weechat; + ympd = import ./ympd; } +// import ./python-packages diff --git a/overlays/gitweb/default.nix b/overlays/gitweb/default.nix new file mode 100644 index 0000000..aa17d22 --- /dev/null +++ b/overlays/gitweb/default.nix @@ -0,0 +1,7 @@ +self: super: { + gitweb = super.gitweb.overrideAttrs(old: { + installPhase = old.installPhase + '' + cp -r ${./theme} $out/gitweb-theme; + ''; + }); +} diff --git a/nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png b/overlays/gitweb/theme/git-favicon.png similarity index 100% rename from nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png rename to overlays/gitweb/theme/git-favicon.png diff --git a/nixops/modules/websites/tools/git/gitweb/theme/git-logo.png b/overlays/gitweb/theme/git-logo.png similarity index 100% rename from nixops/modules/websites/tools/git/gitweb/theme/git-logo.png rename to overlays/gitweb/theme/git-logo.png diff --git a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.css b/overlays/gitweb/theme/gitweb.css similarity index 100% rename from nixops/modules/websites/tools/git/gitweb/theme/gitweb.css rename to overlays/gitweb/theme/gitweb.css diff --git a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.js b/overlays/gitweb/theme/gitweb.js similarity index 100% rename from nixops/modules/websites/tools/git/gitweb/theme/gitweb.js rename to overlays/gitweb/theme/gitweb.js diff --git a/nixops/modules/buildbot/apprise.json b/overlays/python-packages/apprise/apprise.json similarity index 100% rename from nixops/modules/buildbot/apprise.json rename to overlays/python-packages/apprise/apprise.json diff --git a/overlays/python-packages/apprise/default.nix b/overlays/python-packages/apprise/default.nix new file mode 100644 index 0000000..99e04ad --- /dev/null +++ b/overlays/python-packages/apprise/default.nix @@ -0,0 +1,16 @@ +self: super: { + python3 = super.python3.override { + packageOverrides = python-self: python-super: { + apprise = python-self.buildPythonPackage rec { + pname = "apprise"; + version = "0.7.4"; + src = (self.mylibs.fetchedGithub ./apprise.json).src; + propagatedBuildInputs = with python-self; [ decorator + requests requests_oauthlib oauthlib urllib3 six click + markdown pyyaml sleekxmpp + ]; + doChecks = false; + }; + }; + }; +} diff --git a/overlays/python-packages/default.nix b/overlays/python-packages/default.nix new file mode 100644 index 0000000..7313f9e --- /dev/null +++ b/overlays/python-packages/default.nix @@ -0,0 +1,4 @@ +{ + wokkel = import ./wokkel; + apprise = import ./apprise; +} diff --git a/overlays/python-packages/wokkel/default.nix b/overlays/python-packages/wokkel/default.nix new file mode 100644 index 0000000..5d0ab4a --- /dev/null +++ b/overlays/python-packages/wokkel/default.nix @@ -0,0 +1,16 @@ +self: super: { + python3 = super.python3.override { + packageOverrides = python-self: python-super: { + wokkel = python-self.buildPythonPackage rec { + pname = "wokkel"; + version = "18.0.0"; + src = python-self.fetchPypi { + inherit pname version; + sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016"; + }; + propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ]; + doChecks = false; + }; + }; + }; +} diff --git a/overlays/ympd/default.nix b/overlays/ympd/default.nix new file mode 100644 index 0000000..dda17aa --- /dev/null +++ b/overlays/ympd/default.nix @@ -0,0 +1,5 @@ +self: super: { + ympd = super.ympd.overrideAttrs(old: self.mylibs.fetchedGithub ./ympd.json // { + patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; + }); +} diff --git a/nixops/modules/websites/tools/tools/ympd-password-env.patch b/overlays/ympd/ympd-password-env.patch similarity index 100% rename from nixops/modules/websites/tools/tools/ympd-password-env.patch rename to overlays/ympd/ympd-password-env.patch diff --git a/nixops/modules/websites/tools/tools/ympd.json b/overlays/ympd/ympd.json similarity index 100% rename from nixops/modules/websites/tools/tools/ympd.json rename to overlays/ympd/ympd.json -- 2.41.0