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: 158525da9f50
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: 08d245eb31a3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 9, 2018

  1. pythonPackages.pylibmc: fix runtime dependency on libsasl2.so, by way… 

    … of cyrus_sasl

Without explicitly specifying that libsasl2 is part of the build, and
without explicitly making it part of pylibmc's linker flags for its
CPython extension, the cpython code enters a build state error where it
instead attempts to blindly `dlopen("libsasl2.so")` out of
$LD_LIBRARY_PATH; this fails as it can't be found in the store,
obviously.

The bigger problem with this is that it otherwise makes pylibmc
unusable, as it will try to immediately load libsasl2 at startup. This
means even using 'import pylibmc' at all will cause a failure.

Instead, add cyrus_sasl into the build closure of the library, and pass
an argument to the setup.py script to properly pass -lsasl2 to the C
extension. This causes a link to properly be formed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 350f497)
    @thoughtpolice
    thoughtpolice committed Jun 9, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43c77db View commit details

Commits on Jun 10, 2018

  1. p7zip: fix src URL for debian gitlab move (#41769) 

    Another broken URL related to: NixOS/nixpkgs#39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f

(cherry picked from commit e20abf8)
    @bhipple @vcunat
    bhipple authored and vcunat committed Jun 10, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08d245e View commit details
Showing with 7 additions and 5 deletions.
  1. +4 −2 pkgs/development/python-modules/pylibmc/default.nix
  2. +3 −3 pkgs/tools/archivers/p7zip/default.nix
6 changes: 4 additions & 2 deletions pkgs/development/python-modules/pylibmc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:

buildPythonPackage rec {
version = "1.5.2";
pname = "pylibmc";
@@ -9,7 +10,8 @@ buildPythonPackage rec {
sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
};

buildInputs = [ libmemcached zlib ];
buildInputs = [ libmemcached zlib cyrus_sasl ];
setupPyBuildFlags = [ "--with-sasl2" ];

# requires an external memcached server running
doCheck = false;
6 changes: 3 additions & 3 deletions pkgs/tools/archivers/p7zip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch rec {
name = "CVE-2016-9296.patch";
url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}";
sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
})
(fetchpatch rec {
name = "CVE-2017-17969.patch";
url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5";
sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7";
url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}";
sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn";
})
];