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

Commits on Apr 28, 2020

  1. fasttext: 0.9.1 -> 0.9.2 

    Changelog:

https://github.com/facebookresearch/fastText/releases/tag/v0.9.2
    @danieldk
    danieldk committed Apr 28, 2020
    Copy the full SHA
    3ba5bc7 View commit details

  2. python3Packages.fasttext: reuse pname, version, and src from fasttext

    @danieldk
    danieldk committed Apr 28, 2020
    Copy the full SHA
    90136f0 View commit details

  3. python3.pkgs.fasttext: add pythonImportsCheck

    @Mic92
    Mic92 committed Apr 28, 2020
    Copy the full SHA
    deda5e8 View commit details

  4. Merge pull request #86193 from danieldk/fasttext-0.9.2 

    fasttext: 0.9.1 -> 0.9.2
    @Mic92
    Mic92 authored Apr 28, 2020
    Copy the full SHA
    f66d5bc View commit details
Showing with 6 additions and 12 deletions.
  1. +2 −2 pkgs/applications/science/machine-learning/fasttext/default.nix
  2. +4 −10 pkgs/development/python-modules/fasttext/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/machine-learning/fasttext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
14 changes: 4 additions & 10 deletions pkgs/development/python-modules/fasttext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
{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 ];

pythonImportsCheck = [ "fasttext" ];

propagatedBuildInputs = [ numpy ];

preBuild = ''