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

Commits on May 29, 2018

  1. yoda: fix build after #28029

    @orivej
    orivej committed May 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    842f1af View commit details

  2. kytea: fix build after #28029 

    It moved our -O2 before their -O3, but -O3 inlines "checkValueVecEqual(&,&)" into
"checkValueVecEqual(*,*)".
    @orivej
    orivej committed May 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    51af2c3 View commit details
Showing with 18 additions and 1 deletion.
  1. +2 −0 pkgs/development/libraries/physics/yoda/default.nix
  2. +3 −1 pkgs/tools/text/kytea/default.nix
  3. +13 −0 pkgs/tools/text/kytea/gcc-O3.patch
2 changes: 2 additions & 0 deletions pkgs/development/libraries/physics/yoda/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
done
'';

hardeningDisable = [ "format" ];

meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
license = stdenv.lib.licenses.gpl2;
4 changes: 3 additions & 1 deletion pkgs/tools/text/kytea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
};

patches = [ ./gcc-O3.patch ];

meta = with stdenv.lib; {
homepage = http://www.phontron.com/kytea/;
description = "General toolkit developed for analyzing text";

longDescription = ''
A general toolkit developed for analyzing text, with a focus on Japanese,
A general toolkit developed for analyzing text, with a focus on Japanese,
Chinese and other languages requiring word or morpheme segmentation.
'';

13 changes: 13 additions & 0 deletions pkgs/tools/text/kytea/gcc-O3.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/lib/kytea-util.cpp b/src/lib/kytea-util.cpp
index 7c8c4c6..4492df1 100644
--- a/src/lib/kytea-util.cpp
+++ b/src/lib/kytea-util.cpp
@@ -49,5 +49,8 @@ void checkValueVecEqual(const std::vector<T> * a, const std::vector<T> * b) {

+template void checkValueVecEqual(const std::vector<unsigned int> & a, const std::vector<unsigned int> & b);
template void checkValueVecEqual(const std::vector<unsigned int> * a, const std::vector<unsigned int> * b);
+template void checkValueVecEqual(const std::vector<short> & a, const std::vector<short> & b);
template void checkValueVecEqual(const std::vector<short> * a, const std::vector<short> * b);
template void checkValueVecEqual(const std::vector<vector<KyteaString> > * a, const std::vector<vector<KyteaString> > * b);
+template void checkValueVecEqual(const std::vector<int> & a, const std::vector<int> & b);
template void checkValueVecEqual(const std::vector<int> * a, const std::vector<int> * b);