aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-25 23:30:18 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-26 08:53:18 +0100
commit587b9e340bb5cb14ca55e62a0498295e702b56c5 (patch)
tree10d7488dffc394905b2321726c1eda0a6f2640b9 /nixops/modules
parentcaa08508100ce2307a4c64ff047241572ff85b45 (diff)
downloadNix-587b9e340bb5cb14ca55e62a0498295e702b56c5.tar.gz
Nix-587b9e340bb5cb14ca55e62a0498295e702b56c5.tar.zst
Nix-587b9e340bb5cb14ca55e62a0498295e702b56c5.zip
Upgrade to latest nixpkgs
Diffstat (limited to 'nixops/modules')
-rw-r--r--nixops/modules/buildbot/default.nix4
-rw-r--r--nixops/modules/databases/mysql.nix3
-rw-r--r--nixops/modules/databases/postgresql.nix33
-rw-r--r--nixops/modules/gitolite/default.nix13
-rw-r--r--nixops/modules/task/default.nix4
-rw-r--r--nixops/modules/websites/aten/aten.nix2
-rw-r--r--nixops/modules/websites/commons/stats.nix6
-rw-r--r--nixops/modules/websites/tools/diaspora/default.nix4
-rw-r--r--nixops/modules/websites/tools/mastodon/default.nix4
-rw-r--r--nixops/modules/websites/tools/mediagoblin/mediagoblin.nix8
10 files changed, 22 insertions, 59 deletions
diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 3962e65..3768bde 100644
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -1,7 +1,5 @@
1{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
4
5 varDir = "/var/lib/buildbot"; 3 varDir = "/var/lib/buildbot";
6 buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json; 4 buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
7 buildslist_yarn = pkgs.yarn2nix.mkYarnModules { 5 buildslist_yarn = pkgs.yarn2nix.mkYarnModules {
diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index 39d25d3..635f212 100644
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -1,6 +1,5 @@
1{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
4 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
5in { 4in {
6 options.services.myDatabases = { 5 options.services.myDatabases = {
diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index 7046b45..673ced8 100644
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -1,6 +1,5 @@
1{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
4 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
5in { 4in {
6 options.services.myDatabases = { 5 options.services.myDatabases = {
@@ -17,28 +16,14 @@ in {
17 config = lib.mkIf cfg.enable { 16 config = lib.mkIf cfg.enable {
18 nixpkgs.overlays = [ (self: super: rec { 17 nixpkgs.overlays = [ (self: super: rec {
19 postgresql = postgresql_11; 18 postgresql = postgresql_11;
20 postgresql_11 = if builtins.hasAttr "postgresql_11" super 19 postgresql_11 = super.postgresql_11.overrideAttrs(old: rec {
21 then super.postgresql_11.overrideAttrs(old: rec { 20 passthru = old.passthru // { psqlSchema = "11.0"; };
22 passthru = old.passthru // { psqlSchema = "11.0"; }; 21 configureFlags = old.configureFlags ++ [ "--with-pam" ];
23 configureFlags = old.configureFlags ++ [ "--with-pam" ]; 22 buildInputs = (old.buildInputs or []) ++ [ self.pam ];
24 buildInputs = (old.buildInputs or []) ++ [ self.pam ]; 23 patches = old.patches ++ [
25 patches = old.patches ++ [ 24 ./postgresql_run_socket_path.patch
26 ./postgresql_run_socket_path.patch 25 ];
27 ]; 26 });
28 })
29 else super.postgresql100.overrideAttrs(old: rec {
30 passthru = old.passthru // { psqlSchema = "11.0"; };
31 name = "postgresql-11.1";
32 src = self.fetchurl {
33 url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
34 sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
35 };
36 configureFlags = old.configureFlags ++ [ "--with-pam" ];
37 buildInputs = (old.buildInputs or []) ++ [ self.pam ];
38 patches = old.patches ++ [
39 ./postgresql_run_socket_path.patch
40 ];
41 });
42 }) ]; 27 }) ];
43 28
44 networking.firewall.allowedTCPPorts = [ 5432 ]; 29 networking.firewall.allowedTCPPorts = [ 5432 ];
diff --git a/nixops/modules/gitolite/default.nix b/nixops/modules/gitolite/default.nix
index 44442ea..844bd0f 100644
--- a/nixops/modules/gitolite/default.nix
+++ b/nixops/modules/gitolite/default.nix
@@ -11,19 +11,6 @@ in {
11 }; 11 };
12 12
13 config = lib.mkIf cfg.enable { 13 config = lib.mkIf cfg.enable {
14 nixpkgs.overlays = [ (self: super: rec {
15 gitolite = super.gitolite.overrideAttrs(old: rec {
16 name = "gitolite-${version}";
17 version = "3.6.10";
18 src = self.fetchFromGitHub {
19 owner = "sitaramc";
20 repo = "gitolite";
21 rev = "v${version}";
22 sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h";
23 };
24 });
25 }) ];
26
27 networking.firewall.allowedTCPPorts = [ 9418 ]; 14 networking.firewall.allowedTCPPorts = [ 9418 ];
28 15
29 services.gitDaemon = { 16 services.gitDaemon = {
diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix
index ac16c62..0b8d2d7 100644
--- a/nixops/modules/task/default.nix
+++ b/nixops/modules/task/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
2let 2let
3 cfg = config.services.myTasks; 3 cfg = config.services.myTasks;
4 vardir = config.services.taskserver.dataDir; 4 vardir = config.services.taskserver.dataDir;
@@ -40,7 +40,7 @@ let
40 chmod a+x $out/bin/taskserver-user-certs 40 chmod a+x $out/bin/taskserver-user-certs
41 patchShebangs $out/bin/taskserver-user-certs 41 patchShebangs $out/bin/taskserver-user-certs
42 ''; 42 '';
43 taskwarrior-web = pkgs.callPackage ./taskwarrior-web.nix { 43 taskwarrior-web = pkgsPrevious.callPackage ./taskwarrior-web.nix {
44 inherit (mylibs) fetchedGithub; 44 inherit (mylibs) fetchedGithub;
45 inherit env; 45 inherit env;
46 }; 46 };
diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index dc8d25f..b60b00a 100644
--- a/nixops/modules/websites/aten/aten.nix
+++ b/nixops/modules/websites/aten/aten.nix
@@ -102,7 +102,7 @@ let
102 postInstall = let 102 postInstall = let
103 nodeHeaders = fetchurl { 103 nodeHeaders = fetchurl {
104 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 104 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
105 sha256 = "12zzsf8my43b8qnlacp871ih5vqafl2vlpqp51xp6h3gckn2frwy"; 105 sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
106 }; 106 };
107 in 107 in
108 '' 108 ''
diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix
index 921cde2..8d618c5 100644
--- a/nixops/modules/websites/commons/stats.nix
+++ b/nixops/modules/websites/commons/stats.nix
@@ -25,12 +25,6 @@ in {
25 25
26 nixpkgs.overlays = [ (self: super: rec { 26 nixpkgs.overlays = [ (self: super: rec {
27 goaccess = super.goaccess.overrideAttrs(old: rec { 27 goaccess = super.goaccess.overrideAttrs(old: rec {
28 name = "goaccess-${version}";
29 version = "1.3";
30 src = self.fetchurl {
31 url = "https://tar.goaccess.io/${name}.tar.gz";
32 sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
33 };
34 configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; 28 configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
35 buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; 29 buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ];
36 }); 30 });
diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index b1cb6f2..7a2af97 100644
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -1,6 +1,6 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
2let 2let
3 diaspora = pkgs.callPackage ./diaspora.nix { 3 diaspora = pkgsPrevious.callPackage ./diaspora.nix {
4 inherit (mylibs) fetchedGithub; 4 inherit (mylibs) fetchedGithub;
5 env = myconfig.env.tools.diaspora; 5 env = myconfig.env.tools.diaspora;
6 }; 6 };
diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon/default.nix
index b64474c..b0ace56 100644
--- a/nixops/modules/websites/tools/mastodon/default.nix
+++ b/nixops/modules/websites/tools/mastodon/default.nix
@@ -1,6 +1,6 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
2let 2let
3 mastodon = pkgs.callPackage ./mastodon.nix { 3 mastodon = pkgsPrevious.callPackage ./mastodon.nix {
4 inherit (mylibs) fetchedGithub; 4 inherit (mylibs) fetchedGithub;
5 env = myconfig.env.tools.mastodon; 5 env = myconfig.env.tools.mastodon;
6 }; 6 };
diff --git a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
index 45bc432..53796d5 100644
--- a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
+++ b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
@@ -1,4 +1,4 @@
1{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: 1{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python36, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
2let 2let
3 plugins = { 3 plugins = {
4 basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec { 4 basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec {
@@ -68,11 +68,11 @@ let
68 url = "mirror://pypi/P/PasteScript/${name}.tar.gz"; 68 url = "mirror://pypi/P/PasteScript/${name}.tar.gz";
69 sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0"; 69 sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0";
70 }; 70 };
71 propagatedBuildInputs = with self; [ six paste PasteDeploy argparse ]; 71 propagatedBuildInputs = with self; [ six paste PasteDeploy ];
72 }); 72 });
73 }; 73 };
74 in 74 in
75 python3.override { inherit packageOverrides; }; 75 python36.override { inherit packageOverrides; };
76 pythonEnv = python-pkgs: with python-pkgs; [ 76 pythonEnv = python-pkgs: with python-pkgs; [
77 waitress alembic dateutil wtforms pybcrypt 77 waitress alembic dateutil wtforms pybcrypt
78 pytest pytest_xdist werkzeug celery 78 pytest pytest_xdist werkzeug celery
@@ -80,7 +80,7 @@ let
80 sqlalchemy itsdangerous pytz sphinx six 80 sqlalchemy itsdangerous pytz sphinx six
81 oauthlib unidecode jsonschema PasteDeploy 81 oauthlib unidecode jsonschema PasteDeploy
82 requests PyLD exifread 82 requests PyLD exifread
83 typing pasteScript 83 typing pasteScript lxml
84 # For images plugin 84 # For images plugin
85 pillow 85 pillow
86 # For video plugin 86 # For video plugin