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: 8fa5e595594d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a01f1c71fb94
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 4, 2018

  1. fixup libarchive-c

    @FRidh
    FRidh committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7412d23 View commit details

  2. pythonPackages.cryptography: silence pytest deprecation warnings 

    Significantly reduces the log size, thus unblocking the Hydra build.
    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    a01f1c7 View commit details
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/cryptography/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
, iso8601
, pytz
, hypothesis
, fetchpatch
}:

buildPythonPackage rec {
@@ -51,6 +52,13 @@ buildPythonPackage rec {
hypothesis
];

patches = [
(fetchpatch {
url = https://github.com/pyca/cryptography/commit/0322962e143798fa5228f4505eeb606cdf773b87.patch;
sha256 = "00c42ql4k8wk924i4pccqc6nkm0c58l7j3vf2fzlawdanyz1s9sb";
})
];

# The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
# compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
# use it. This boils down to them checking compatibility with `getentropy` in two different places,
8 changes: 5 additions & 3 deletions pkgs/development/python-modules/libarchive-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,9 @@
, buildPythonPackage
, fetchPypi
, pytest
, pkgs
, glibcLocales
, libarchive
, mock
}:

buildPythonPackage rec {
@@ -14,13 +16,13 @@ buildPythonPackage rec {
sha256 = "06d44d5b9520bdac93048c72b7ed66d11a6626da16d2086f9aad079674d8e061";
};

buildInputs = [ pytest pkgs.glibcLocales ];
checkInputs = [ mock pytest glibcLocales ];

LC_ALL="en_US.UTF-8";

postPatch = ''
substituteInPlace libarchive/ffi.py --replace \
"find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
"find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';

checkPhase = ''
4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4250,7 +4250,9 @@ in {

python-libarchive = callPackage ../development/python-modules/python-libarchive { };

libarchive-c = callPackage ../development/python-modules/libarchive-c { };
libarchive-c = callPackage ../development/python-modules/libarchive-c {
inherit (pkgs) libarchive;
};

libasyncns = callPackage ../development/python-modules/libasyncns {
inherit (pkgs) libasyncns pkgconfig;