summaryrefslogtreecommitdiff
path: root/pkgs/servers/corosync/default.nix
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-10-31 15:16:29 +0000
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-10-31 15:16:29 +0000
commit59b5bbeae91109007e36a269a94cccc865dc5175 (patch)
tree1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/servers/corosync/default.nix
parentDo not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff)
parentMerge pull request #19675 from edwtjo/dictd-touchup (diff)
downloadnixpkgs-origin/security-updates.tar.gz
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch. Some conflict happen in top-level/default.nix due to a reformating of the code of which is computing the fix-point. This merge fixes these issues by adding the pkgsIndex argument, needed to re-evaluate the fix-point with another set of packages, and also re-add the second fix-point made to support the dependencies.
Diffstat (limited to 'pkgs/servers/corosync/default.nix')
-rw-r--r--pkgs/servers/corosync/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index 5e8f2fd0caae..d04a1d124faa 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "corosync-2.3.4";
+ name = "corosync-2.4.1";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
- sha256 = "1m276b060fjghr93hdzfag81whi5ph65dc2ka8ln1igm3kxr7bix";
+ sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y";
};
buildInputs = [