From 3ba5bc71303ca9ad249ed74d8fff80deaf254376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 12:14:39 +0200 Subject: [PATCH 1/3] fasttext: 0.9.1 -> 0.9.2 Changelog: https://github.com/facebookresearch/fastText/releases/tag/v0.9.2 --- .../science/machine-learning/fasttext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 2ae5e0eeddc..64124594e1e 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; From 90136f0b7747223424a167443c5e73b3a6e3e76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 12:16:20 +0200 Subject: [PATCH 2/3] python3Packages.fasttext: reuse pname, version, and src from fasttext --- pkgs/development/python-modules/fasttext/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 050b3873a00..68f0f0e938f 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,15 +1,7 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { - pname = "fasttext"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = "fastText"; - rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; - }; + inherit (pkgs.fasttext) pname version src; buildInputs = [ pybind11 ]; From deda5e8b0535fb3a268cb50fe60765930a0881a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Apr 2020 14:23:36 +0100 Subject: [PATCH 3/3] python3.pkgs.fasttext: add pythonImportsCheck --- pkgs/development/python-modules/fasttext/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 68f0f0e938f..42e6446e864 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -5,6 +5,8 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; + pythonImportsCheck = [ "fasttext" ]; + propagatedBuildInputs = [ numpy ]; preBuild = ''