From 587b9e340bb5cb14ca55e62a0498295e702b56c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 25 Mar 2019 23:30:18 +0100
Subject: Upgrade to latest nixpkgs

---
 nixops/modules/websites/aten/aten.nix                     | 2 +-
 nixops/modules/websites/commons/stats.nix                 | 6 ------
 nixops/modules/websites/tools/diaspora/default.nix        | 4 ++--
 nixops/modules/websites/tools/mastodon/default.nix        | 4 ++--
 nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | 8 ++++----
 5 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'nixops/modules/websites')

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
               postInstall = let
                 nodeHeaders = fetchurl {
                   url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-                  sha256 = "12zzsf8my43b8qnlacp871ih5vqafl2vlpqp51xp6h3gckn2frwy";
+                  sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
                 };
               in
                 ''
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 {
 
     nixpkgs.overlays = [ (self: super: rec {
       goaccess = super.goaccess.overrideAttrs(old: rec {
-        name = "goaccess-${version}";
-        version = "1.3";
-        src = self.fetchurl {
-          url = "https://tar.goaccess.io/${name}.tar.gz";
-          sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
-        };
         configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
         buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ];
       });
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
 let
-  diaspora = pkgs.callPackage ./diaspora.nix {
+  diaspora = pkgsPrevious.callPackage ./diaspora.nix {
     inherit (mylibs) fetchedGithub;
     env = myconfig.env.tools.diaspora;
   };
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
 let
-  mastodon = pkgs.callPackage ./mastodon.nix {
+  mastodon = pkgsPrevious.callPackage ./mastodon.nix {
     inherit (mylibs) fetchedGithub;
     env = myconfig.env.tools.mastodon;
   };
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 @@
-{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
+{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python36, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
 let
   plugins = {
     basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec {
@@ -68,11 +68,11 @@ let
           url = "mirror://pypi/P/PasteScript/${name}.tar.gz";
           sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0";
         };
-        propagatedBuildInputs = with self; [ six paste PasteDeploy argparse ];
+        propagatedBuildInputs = with self; [ six paste PasteDeploy ];
       });
     };
     in
-      python3.override { inherit packageOverrides; };
+      python36.override { inherit packageOverrides; };
   pythonEnv = python-pkgs: with python-pkgs; [
     waitress alembic dateutil wtforms pybcrypt
     pytest pytest_xdist werkzeug celery
@@ -80,7 +80,7 @@ let
     sqlalchemy itsdangerous pytz sphinx six
     oauthlib unidecode jsonschema PasteDeploy
     requests PyLD exifread
-    typing pasteScript
+    typing pasteScript lxml
     # For images plugin
     pillow
     # For video plugin
-- 
cgit v1.2.3