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

Commits on Sep 11, 2020

  1. prosody: 0.11.5 -> 0.11.6 

    See https://blog.prosody.im/prosody-0.11.6-released/ for the release
notes.

(cherry picked from commit b47cabb)
    @picnoir @andir
    picnoir authored and andir committed Sep 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e9f3523 View commit details

  2. Merge pull request #97755 from andir/20.09/prosody-0-11-6 

    [20.09] prosody: 0.11.5 -> 0.11.6
    Félix Baylac-Jacqué authored Sep 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b668c6a 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
@@ -15,7 +15,7 @@ with stdenv.lib;


stdenv.mkDerivation rec {
version = "0.11.5"; # also update communityModules
version = "0.11.6"; # also update communityModules
pname = "prosody";
# The following community modules are necessary for the nixos module
# prosody module to comply with XEP-0423 and provide a working
@@ -29,16 +29,16 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m";
sha256 = "0m8p2kwiy4l87ifpygricpyixi1vpx6j1jb6ki1zi4az3iixp8fd";
};

# 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 = "2dcbc01c9931";
sha256 = "0ydhbvfp7vk5zqpsc54ihxz6y2gmzh0bcgyz0xidlxrmxzwcvvyh";
rev = "e77122025080";
sha256 = "1pjax8lzgcwcn3mq5q4kbwfyyzaifqcc3a0s4rl9gib5rhwddybh";
};

buildInputs = [
@@ -85,6 +85,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
homepage = "https://prosody.im";
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin ];
maintainers = with maintainers; [ fpletz globin ninjatrappeur ];
};
}