Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52e9f62f5212
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 240f670043a1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 31, 2020

  1. memcached: 1.5.22 -> 1.6.2 

    fixes remote DoS/possibly code execution, as described in
memcached/memcached#629

(cherry picked from commit 58a491a)
    @ajs124
    ajs124 committed Mar 31, 2020
    Copy the full SHA
    07dc1c7 View commit details

Commits on May 7, 2020

  1. Merge pull request #83331 from helsinki-systems/backport/20.03/memcached 

    [20.03] memcached: 1.5.22 -> 1.6.2
    @flokli
    flokli authored May 7, 2020
    Copy the full SHA
    240f670 View commit details
Showing with 4 additions and 14 deletions.
  1. +4 −14 pkgs/servers/memcached/default.nix
18 changes: 4 additions & 14 deletions pkgs/servers/memcached/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"}"
];
@@ -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;