From 4c615664650a3d41e886d82d0be05078d5acd94d Mon Sep 17 00:00:00 2001
From: stubbfel <git@stubbe.rocks>
Date: Thu, 12 Apr 2018 21:12:57 +0200
Subject: [PATCH] uptade to nixos 18.03

---
 services/gitea.nix     | 17 ++---------------
 services/nextcloud.nix |  5 ++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/services/gitea.nix b/services/gitea.nix
index 25585ee..30e33e1 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -1,29 +1,16 @@
 { config, pkgs, ... }:
 
-#let
-# pkgs = import <nixos-unstable> {};
-#in 
 {
-#  environment.systemPackages = [ (import <nixos-unstable> {}).gitea ];
   services.nginx.virtualHosts."gitea.stubbe.rocks" = {
         enableACME = true;
         forceSSL = true;
 	locations."/".proxyPass = "http://localhost:3000";
-    };
-
-nixpkgs.config.packageOverrides = pkgs: {
-     gitea = (import <nixos-unstable> {}).gitea;
   };
 
- users.users.gitea.shell = pkgs.zsh;
-  imports = [
-      <nixos-unstable/nixos/modules/services/misc/gitea.nix>
-    ];
-
+  users.users.gitea.shell = pkgs.zsh;
   services.postgresql.enable = true;
   services.gitea = {
         enable = true;
 	useWizard = true;
-   };
-
+  };
 }
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 78eff2e..5a88cb3 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -71,7 +71,7 @@
   };
 
     users.extraUsers.nextcloud.packages = [
-      pkgs.php
+      pkgs.php71
       pkgs.php71Packages.apcu
       pkgs.php71Packages.memcached
       pkgs.php71Packages.redis
@@ -108,4 +108,7 @@
       opcache.save_comments=1
       opcache.revalidate_freq=1
 '';
+
+  services.phpfpm.phpPackage = pkgs.php71;
+
 }