* format the expression and reorder to canonical order
* gobject-introspection is used for setup hooks so it should be in native inputs
* wrapPython is not necessary
* 1.5.11 switched from intltool to gettext
* We need PyGObject since it is not propagated by ibus anymore.
* With python.withPackage, we no longer need wrapPython.
* We need wrapGAppsHook still, to find GSettings schemas.
This fixes:
FAILED: obj/engine/engine.engine.o
clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -include base/namespace.h -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x -c ../../engine/engine.cc -o obj/engine/engine.engine.o
In file included from ../../engine/engine.cc:30:
In file included from /build/source/src/engine/engine.h:33:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66:
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator'
--__i;
^ ~~~
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance<mozc::ZeroQueryDict::iterator, long>' requested here
std::__advance(__i, __d, std::__iterator_category(__i));
^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance<mozc::ZeroQueryDict::iterator, long>' requested here
std::advance(__middle, __half);
^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range<mozc::ZeroQueryDict::iterator, unsigned long, __gnu_cxx::__ops::_Iter_less_val, __gnu_cxx::__ops::_Val_less_iter>' requested here
return std::__equal_range(__first, __last, __val,
^
/build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range<mozc::ZeroQueryDict::iterator, unsigned long>' requested here
return std::equal_range(begin(), end(), iter.index());
^
1 error generated.
This fixes:
FAILED: obj/engine/engine.engine.o
clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -Wno-unknown-warning-option -Wno-inconsistent-missing-override -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x -c ../../engine/engine.cc -o obj/engine/engine.engine.o
In file included from ../../engine/engine.cc:30:
In file included from /build/source/src/engine/engine.h:33:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66:
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator'
--__i;
^ ~~~
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance<mozc::ZeroQueryDict::iterator, long>' requested here
std::__advance(__i, __d, std::__iterator_category(__i));
^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance<mozc::ZeroQueryDict::iterator, long>' requested here
std::advance(__middle, __half);
^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range<mozc::ZeroQueryDict::iterator, unsigned long, __gnu_cxx::__ops::_Iter_less_val, __gnu_cxx::__ops::_Val_less_iter>' requested here
return std::__equal_range(__first, __last, __val,
^
/build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range<mozc::ZeroQueryDict::iterator, unsigned long>' requested here
return std::equal_range(begin(), end(), iter.index());
^
1 error generated.
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
wrapGAppsHook adds gconf to runtime even though we only need
gsettings-schema-convert utility during build.
This decreases the closure size 514M → 394M
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
This package providesa completion input method for faster typing.
See https://mike-fabian.github.io/ibus-typing-booster
Detailed instructions how to activate this IBus engine on your desktop
can be found in the upstream docs: https://mike-fabian.github.io/ibus-typing-booster/documentation.html
A simple VM with the Gnome3 desktop and activated `ibus' looks like
this:
```nix
{
emojipicker = { pkgs, ... }: {
services.xserver = {
enable = true;
desktopManager.gnome3.enable = true;
desktopManager.xterm.enable = false;
};
users.extraUsers.vm = {
password = "vm";
isNormalUser = true;
};
i18n.inputMethod.ibus.engines = [
pkgs.ibus-engines.typing-booster
];
i18n.inputMethod.enabled = "ibus";
virtualisation.memorySize = 2048;
};
}
```
Fixes#38721
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/ibus-table/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb -h’ got 0 exit code
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb --help’ got 0 exit code
- found 1.9.20 with grep in /nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20
- directory tree listing: https://gist.github.com/ace63b0dd5941c9f17222549a08ee23c
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-config --version` and found version 1.8.0
- found 1.8.0 with grep in /nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0
- directory tree listing: https://gist.github.com/3d3a5a6fc658c968ce3a1298c9f32c56
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.
Also fixes jbake source URL, which was broken.
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.3 with grep in /nix/store/z3sdj8l860r4vdb41pi3siakp98pnx8j-ibus-libpinyin-1.9.3
- directory tree listing: https://gist.github.com/bf125939ed0636cedf0daea5f6d08219
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
/tmp/tmp.2tbPvTstTb /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.5.10 with grep in /nix/store/3h4a30xh4ddij4i5nmyi8p478y804jv7-ibus-anthy-1.5.10
- directory tree listing: https://gist.github.com/2a6dbfad474173b76f5f0d7aa35964f6
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db -h` got 0 exit code
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db --help` got 0 exit code
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db -v` and found version 1.8.0
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db --version` and found version 1.8.0
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db -h` and found version 1.8.0
- ran `/nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0/bin/m17n-db --help` and found version 1.8.0
- found 1.8.0 with grep in /nix/store/l9vsx891cc7hrp4gic87djcmbfi3dg1a-m17n-db-1.8.0
- directory tree listing: https://gist.github.com/dfe2a7729da99276c71f68cf0c227fcd
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.9 with grep in /nix/store/xjlb70932y0prqlw4p7iizbffm89pi7a-ibus-table-others-1.3.9
- directory tree listing: https://gist.github.com/aafa62fbd6afde2d7ca2d96e39eaa850
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb -h` got 0 exit code
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb --help` got 0 exit code
- found 1.9.18 with grep in /nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18
- directory tree listing: https://gist.github.com/8f2d6146d5348401ca9117762e2befbc
Semi-automatic update. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.33 with grep in /nix/store/axjjpwcbb3s56m0fk68y8w8vji56f2a5-libinput-gestures-2.33
- found 2.33 in filename of file in /nix/store/axjjpwcbb3s56m0fk68y8w8vji56f2a5-libinput-gestures-2.33
xf86-input-synaptics is unmaintained, and touchegg doesn't work with
the latest synaptics driver or libinput. Ideally DEs would implement this
themselves, but at least KDE/Plasma doesn't (yet)
0002-paths.patch was contributed by @peterhoeg.
This fixes ibus-setup.
* Update cldrEmojiAnnotation: 31.0.1_1 -> 31.90.0_1
* Move ibus-setup back to out, and use a smaller Python 3 at runtime
than doesn't pull in some dev paths
* Build from Git
* Use autoreconfHook so that we don't have to patch ./configure scripts
when we could just generate them correctly in the first place
* Drop patch that removes IBUS_* environment variables from ibus-setup
wrapper: unsetting them breaks ibus-setup
* Add withWayland option (building with Wayland requires libxcbcommon
package, previously wayland was included into buildInputs w/o
libxcbcommon and respective configure flag)
* Add license (LGPLv2.1)
Relies on two other commits in this branch that add GI_TYPELIB_PATH
discovery and fix gconf Python scripts.
* master: (81 commits)
Add NixOS 17.09 AMIs
gradle: 4.2 -> 4.2.1
maintainers.nix: use my GitHub handle as maintainer name
fcitx-engines.rime: init at 0.3.2
brise: init at 2017-09-16
librime: init at 1.2.9
marisa: init at 0.2.4
opencc: build shared library and programs
josm: 12712 -> 12914
exa: 0.7.0 -> 0.8.0
krb5: add deprecation date for old configuration
rustRegistry: 2017-09-10 -> 2017-10-03
go-ethereum: Fix libusb segmentation faults on Darwin
tor-browser-bundle-bin: 7.0.5 -> 7.0.6
libsodium: 1.0.13 -> 1.0.15
tor-browser-bundle: geoip support
tor-browser-bundle: support transports obfs2,obfs3
tor-browser-bundle: bump https-everywhere to 2017.9.12
tint2: limit platforms to Linux since macOS is not supported and fails the tests
eclipse-plugin-vrapper: init at 0.72.0
...
The latest release of libyamlcpp in nixpkgs does not build because it
uses an older version of boost than the one in nixpkgs and therefore
expects a particular header file which does not exist in the latest
boost anymore. For this reason, a later (git) version of libyamlcpp is
used here (which actually doesn't even require boost).
The substituteInPlace in the prePatch phase is needed because libevdev
places its headers in non-standard places, meaning Nix cannot normally
find them. The `cut` command removes the first two "-I" characters from
the output of `pkg-config`. This needs to be in the prePatch phase
because otherwise Nix will patch these lines to `/var/empty`, meaning
you would have less specific replacement (in case other lines are also
patched to `/var/empty`).
I wrote the patch. (I believe it is NixOS specific.)
