From 2ff9969a9725f9f42983baa2d3ced742f5c01124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:04:29 +0100 Subject: [PATCH] pythonPackages.google_crc32c: 1.0.0 -> 1.1.0, rename to fit other google packages --- .../{google-crc32c => google_crc32c}/default.nix | 14 +++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{google-crc32c => google_crc32c}/default.nix (68%) diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google_crc32c/default.nix similarity index 68% rename from pkgs/development/python-modules/google-crc32c/default.nix rename to pkgs/development/python-modules/google_crc32c/default.nix index fbed406cebce..aaf16d9e7c82 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google_crc32c/default.nix @@ -1,31 +1,31 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: buildPythonPackage rec { pname = "google-crc32c"; - version = "1.0.0"; - - disabled = !isPy3k; + version = "1.1.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + sha256 = "0vbidg9yrv9k8xvk8rl43lsf4cg3dci4a9k4srwwrchbxivz1gr6"; }; - buildInputs = [ crc32c ]; + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; meta = with lib; { homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with maintainers; [ freezeboy SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9ee4d23a0e..bb03ae13bf65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2605,7 +2605,7 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - google-crc32c = callPackage ../development/python-modules/google-crc32c { + google_crc32c = callPackage ../development/python-modules/google_crc32c { inherit (pkgs) crc32c; };