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: 93b68c7cc5a4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64a59a5b300b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 24, 2020

  1. prosody: 0.11.3 -> 0.11.5 

    - https://prosody.im/doc/release/0.11.4
- https://prosody.im/doc/release/0.11.5

(cherry picked from commit ce2a2af)
    @mmilata @picnoir
    mmilata authored and picnoir committed May 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    178be92 View commit details

Commits on May 28, 2020

  1. Merge pull request #88798 from NinjaTrappeur/nin-backport-prosody-bump 

    [20.03] prosody: 0.11.3 -> 0.11.5
    @marsam
    marsam authored May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    64a59a5 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/servers/xmpp/prosody/default.nix
10 changes: 5 additions & 5 deletions pkgs/servers/xmpp/prosody/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,21 +14,21 @@ with stdenv.lib;


stdenv.mkDerivation rec {
version = "0.11.3"; # also update communityModules
version = "0.11.5"; # also update communityModules
pname = "prosody";

src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m";
};

# A note to all those merging automated updates: Please also update this
# attribute as some modules might not be compatible with a newer prosody
# version.
communityModules = fetchhg {
url = "https://hg.prosody.im/prosody-modules";
rev = "b54e98d5c4a1";
sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg";
rev = "acd231e2b46f";
sha256 = "1b33lsxrrrvarknqz9xs7j7f19bzxxymmfdhch7k70x3yyiwmfsy";
};

buildInputs = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Open-source XMPP application server written in Lua";
license = licenses.mit;
homepage = https://prosody.im;
homepage = "https://prosody.im";
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin ];
};