diff options
| author | stuebinm | 2021-06-23 23:14:56 +0200 |
|---|---|---|
| committer | stuebinm | 2021-06-24 02:15:41 +0200 |
| commit | e5f476b8088aeb399f9a89ec63882dd92754ee9a (patch) | |
| tree | 26e0e995f3583090ef61cf63b8b6b7cbc81fe896 /pkgs | |
| parent | 3c2f588cd95593bdbf7743a3f58321ddbac17038 (diff) | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
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; |