nixpkgs 20.09 → nixpkgs 21.05

Since pleroma is in nixpkgs 21.05, this requires some reshuffling to
keep the unstable version of pleroma (otherwise the database versions
are not compatible, and pleroma does not like database downgrades).

Additionally, hedgedoc's database has been moved to a postgres user who
is actually called hedgedoc.

4 files changed, 12 insertions, 12 deletions

diff --git a/hosts/flora/services/hedgedoc.nix b/hosts/flora/services/hedgedoc.nix
index 84721ce..038f99f 100644
--- a/hosts/flora/services/hedgedoc.nix
+++ b/hosts/flora/services/hedgedoc.nix
@@ -20,7 +20,7 @@ in
     
     config = {config, pkgs, ... }: {
       # open CodiMD port
-      networking.firewall.allowedTCPPorts = [ config.services.codimd.configuration.port ];
+      networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.configuration.port ];
 
       # database (postgres 11), with default database reachable for CodiMD; no imperative config needed!
       services.postgresql = {
@@ -28,7 +28,7 @@ in
         package = pkgs.postgresql_11;
         ensureDatabases = [ "codimd" ];
         ensureUsers = [ {
-          name = "codimd";
+          name = "hedgedoc";
           ensurePermissions = { "DATABASE codimd" = "ALL PRIVILEGES";};
         } ];
         # ugly workaround to allow CodiMD to login without password — this service has lots of options,
@@ -36,6 +36,7 @@ in
         authentication = pkgs.lib.mkForce ''
           # Generated file; do not edit!
           local all all              trust
+          host  codimd hedgedoc  ::1/18       trust
           host  codimd codimd ::1/128      trust
         '';
       };
diff --git a/hosts/flora/services/pleroma.nix b/hosts/flora/services/pleroma.nix
index a76a9eb..fca9d65 100644
--- a/hosts/flora/services/pleroma.nix
+++ b/hosts/flora/services/pleroma.nix
@@ -19,17 +19,18 @@ in
     
     config = {pkgs, config, ...}: {
       
-      # pleroma is only on unstable for now, so import it here
-      imports = [ "${sources.nixpkgs-unstable}/nixos/modules/services/networking/pleroma.nix" ];
       # generating the manual will fail when mixing nixos channels,
       # so disable it here or this won't build at all.
       documentation.enable = false;
       
       # pleroma has a cli tool for configuration
-      environment.systemPackages = [ pkgs.pleroma pkgs.dnsutils ];
+      environment.systemPackages = [ pkgs.dnsutils ];
     
       services.pleroma = {
         enable = true;
+
+
+        package = (import sources.nixpkgs-unstable {}).pleroma;
         
         # this is barely necessary at this point — all that's
         # set in here is the default_signer for joken, and the
diff --git a/nix/sources.json b/nix/sources.json
index b61f355..3fa638d 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -12,15 +12,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-20.09",
+        "branch": "release-21.05",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6a5be86b6adf99d0c853331460c6736785bfaaf",
-        "sha256": "0lsfrid5g880yqq5vqcbp0n61pgc9z25fbvzb0a8akrbn87jzjjl",
+        "rev": "e4fe40fc56e5b4622c375a9aaac19b4b8138563b",
+        "sha256": "0n95mn4azq11y6gkn7sicayklmjh4my21fl11z7lmm5dw4psnm9z",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/d6a5be86b6adf99d0c853331460c6736785bfaaf.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e4fe40fc56e5b4622c375a9aaac19b4b8138563b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5195e04..0017eda 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,9 +6,7 @@ let
 
   callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
 
-  newpkgs = { 
-    #pleroma-otp = callPackage "${sources.nixpkgs-unstable}/pkgs/servers/pleroma-otp" {};
-    pleroma = (import sources.nixpkgs-unstable {}).pleroma;
+  newpkgs = {
 #    dendrite = callPackage "${sources.nixchen}/pkgs/dendrite" {};
 
     inherit callPackage;