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

Commits on Jun 15, 2019

  1. xgboost: use stdenv.hostPlatform.extensions.sharedLibrary

    @FRidh
    FRidh committed Jun 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b7b6388 View commit details

  2. pythonPackages.mecab-python3: fix build, disable tests

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    a6b2d4b View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 pkgs/development/libraries/xgboost/default.nix
  2. +4 −0 pkgs/development/python-modules/mecab-python3/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/xgboost/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
++ lib.optional ncclSupport "-DUSE_NCCL=ON";

installPhase = let
libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}";
in ''
mkdir -p $out
cp -r ../include $out
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/mecab-python3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, fetchPypi
, mecab
, swig
, setuptools_scm
}:

buildPythonPackage rec {
@@ -17,10 +18,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
mecab # for mecab-config
swig
setuptools_scm
];

buildInputs = [ mecab ];

doCheck = false;

meta = with lib; {
description = "A python wrapper for mecab: Morphological Analysis engine";
homepage = https://github.com/SamuraiT/mecab-python3;