From e5f476b8088aeb399f9a89ec63882dd92754ee9a Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Wed, 23 Jun 2021 23:14:56 +0200
Subject: 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.
---
 pkgs/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pkgs')

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;
-- 
cgit v1.2.3