Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] memcached: 1.5.22 -> 1.6.2 #83331

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 4 additions & 14 deletions pkgs/servers/memcached/default.nix
@@ -1,24 +1,14 @@
{stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}:
{stdenv, fetchurl, cyrus_sasl, libevent}:

stdenv.mkDerivation rec {
version = "1.5.22";
version = "1.6.2";
pname = "memcached";

src = fetchurl {
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
sha256 = "14qzbxgz40j4yhi3lzrsdjd6kyy3zwv9c8kw11kj6njp42fpxd62";
sha256 = "12qn8m0jdvdckz53m2akrvixbrn64g5kv6r4hl5vx286qhc02wh6";
};

patches = [
# Fixes compilation error on Darwin due to redeclaration of
# htonll. The fix should appear in 1.5.23.
# https://github.com/memcached/memcached/issues/598
(fetchpatch {
url = "https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604.diff";
sha256 = "0ab5l24p4n4fpx78ilmg7jvs9nl84pdza90jbpbx3ns5n23pqbfs";
})
];

configureFlags = [
"ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}"
];
Expand All @@ -32,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A distributed memory object caching system";
repositories.git = https://github.com/memcached/memcached.git;
homepage = http://memcached.org/;
homepage = "http://memcached.org/";
license = licenses.bsd3;
maintainers = [ maintainers.coconnor ];
platforms = platforms.linux ++ platforms.darwin;
Expand Down