diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-25 23:30:18 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-26 08:53:18 +0100 |
commit | 587b9e340bb5cb14ca55e62a0498295e702b56c5 (patch) | |
tree | 10d7488dffc394905b2321726c1eda0a6f2640b9 /nixops/modules/websites/tools | |
parent | caa08508100ce2307a4c64ff047241572ff85b45 (diff) | |
download | Nix-587b9e340bb5cb14ca55e62a0498295e702b56c5.tar.gz Nix-587b9e340bb5cb14ca55e62a0498295e702b56c5.tar.zst Nix-587b9e340bb5cb14ca55e62a0498295e702b56c5.zip |
Upgrade to latest nixpkgs
Diffstat (limited to 'nixops/modules/websites/tools')
-rw-r--r-- | nixops/modules/websites/tools/diaspora/default.nix | 4 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mastodon/default.nix | 4 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | 8 |
3 files changed, 8 insertions, 8 deletions
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, ... }: |
2 | let | 2 | let |
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, ... }: |
2 | let | 2 | let |
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 }: |
2 | let | 2 | let |
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 |