Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 334f98c013b6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 553301324cc7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 1, 2020

  1. prosody: install prosody-migrator tool

    @arcnmx
    arcnmx committed Nov 1, 2020
    Copy the full SHA
    e2ade56 View commit details

  2. Merge pull request #102300 from arcnmx/prosody-migrator

    Ninjatrappeur authored Nov 1, 2020
    Copy the full SHA
    5533013 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/servers/xmpp/prosody/default.nix
9 changes: 9 additions & 0 deletions pkgs/servers/xmpp/prosody/default.nix
View file
Original file line number Diff line number Diff line change
@@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
"--with-lua=${lua5}"
];

postBuild = ''
make -C tools/migration
'';

postInstall = ''
${concatMapStringsSep "\n" (module: ''
cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
@@ -70,6 +74,11 @@ stdenv.mkDerivation rec {
--add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
make -C tools/migration install
wrapProgram $out/bin/prosody-migrator \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
'';

passthru = {