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

Commits on Nov 1, 2018

  1. pythonPackages.zstd: init at 1.3.5.1 (#49339)

    @eadwu @dotlambda
    eadwu authored and dotlambda committed Nov 1, 2018
    Copy the full SHA
    0111c7d View commit details
Showing with 53 additions and 0 deletions.
  1. +49 −0 pkgs/development/python-modules/zstd/default.nix
  2. +4 −0 pkgs/top-level/python-packages.nix
49 changes: 49 additions & 0 deletions pkgs/development/python-modules/zstd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ stdenv, pkgconfig, fetchpatch, fetchFromGitHub, buildPythonPackage
, zstd, pytest }:

buildPythonPackage rec {
pname = "zstd";
version = "1.3.5.1";

# Switch back to fetchPypi when tests/ is included, see https://github.com/NixOS/nixpkgs/pull/49339
src = fetchFromGitHub {
owner = "sergey-dryabzhinsky";
repo = "python-zstd";
rev = "v${version}";
sha256 = "08n1vz4zavas4cgzpdfcbpy33lnv39xxhq5mgj0zv3xi03ypc1rl";
};

postPatch = ''
substituteInPlace setup.py \
--replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config"
'';

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zstd ];

setupPyBuildFlags = [
"--external"
"--include-dirs=${zstd}/include"
"--libraries=zstd"
"--library-dirs=${zstd}/lib"
];

# Running tests via setup.py triggers an attempt to recompile with the vendored zstd
ZSTD_EXTERNAL = 1;
VERSION = zstd.version;
PKG_VERSION = version;

checkInputs = [ pytest ];
checkPhase = ''
pytest
'';

meta = with stdenv.lib; {
description = "Simple python bindings to Yann Collet ZSTD compression library";
homepage = https://github.com/sergey-dryabzhinsky/python-zstd;
license = licenses.bsd2;
maintainers = with maintainers; [
eadwu
];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10903,6 +10903,10 @@ EOF

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

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

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

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