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: ad9db2a3edbd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52e59ba4ad16
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 10, 2019

  1. marisa-python: fix build (#57013) 

    (cherry picked from commit 6a11ba3)
    @vanzef @xeji
    vanzef authored and xeji committed Mar 10, 2019
    Copy the full SHA
    52e59ba View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/development/python-modules/marisa/default.nix
12 changes: 8 additions & 4 deletions pkgs/development/python-modules/marisa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig }:
{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig
, isPy3k
}:

buildPythonPackage rec {
pname = "marisa";
version = "1.3.40";

disabled = isPy3k;

src = fetchFromGitHub {
owner = "s-yata";
repo = "marisa-trie";
rev = "59e410597981475bae94d9d9eb252c1d9790dc2f";
sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb";
rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b";
sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933";
};

nativeBuildInputs = [ swig marisa ];
buildinputs = [ marisa ];
buildInputs = [ marisa ];

sourceRoot = "${src.name}/bindings/python";