Commit Graph
100 Commits
Author SHA1 Message Date
Jan Tojnar 6be14ee97b Merge pull request #53843 from hedning/session-default
nixos/displayManager: introduce defaultSession
2019-12-18 21:16:06 +01:00
Jan Tojnar 6842813bb1 aegisub: slight clean up 2019-12-15 05:44:17 +01:00
Jan Tojnar 955be27f58 aegisub: fix build 2019-12-15 05:36:24 +01:00
Jan Tojnar 8dc5ff7dcf nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
2019-12-15 04:16:20 +01:00
Jan Tojnar 429561978b Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Jan Tojnar 919297f369 nixosTests.xmonad: fix 2019-12-13 17:16:59 +01:00
Jan Tojnar 968afa4dd8 Merge pull request #75054 from novoxudonoser/dupeguru
dupeguru: init at 4.0.4
2019-12-13 16:37:52 +01:00
Jan Tojnar 4ee7f487fe Merge pull request #75267 from r-ryantm/auto-update/liblouis
liblouis: 3.11.0 -> 3.12.0
2019-12-10 21:06:13 +01:00
Jan Tojnar 5b4908c1d6 Merge pull request #75226 from r-ryantm/auto-update/gnome-desktop
gnome3.gnome-desktop: 3.34.1 -> 3.34.2
2019-12-10 20:42:18 +01:00
Jan Tojnar 832cf9a43e Merge pull request #75217 from r-ryantm/auto-update/evolution
gnome3.evolution: 3.34.1 -> 3.34.2
2019-12-10 20:28:31 +01:00
Jan Tojnar 18a3fd064b Merge pull request #75315 from r-ryantm/auto-update/pulseeffects
pulseeffects: 4.6.8 -> 4.6.9
2019-12-10 03:38:23 +01:00
Jan Tojnar 6b73d29775 Merge pull request #73266 from demin-dmitriy/fix-libredirect-open-bug
libredirect: fix argument forwarding in `open*` functions
2019-12-10 00:46:21 +01:00
Jan Tojnar 4538eeac6f Merge pull request #75344 from worldofpeace/libnotify-propagated
libnotify: propagate glib and gdk-pixbuf
2019-12-09 13:39:30 +01:00
Jan Tojnar 22c1f967a2 Merge pull request #74385 from r-ryantm/auto-update/fwup
fwup: 1.3.1 -> 1.5.0
2019-12-07 17:46:11 +01:00
Jan Tojnar 36de08ebe1 Merge pull request #71442 from jtojnar/ibus-fixes
Fix/clean up various ibus-engines
2019-12-07 12:10:44 +01:00
Jan Tojnar c7db566278 Merge pull request #74387 from jtojnar/geany-clean-up
geany: clean up and switch to GTK3
2019-12-07 01:19:00 +01:00
Jan Tojnar f6afb29ee1 ibus: add installed tests 2019-12-07 00:58:30 +01:00
Jan Tojnar 973c2fcf3d nixosTests.installed-tests: allow passing extra makeTest args
For example, extra meta tags.
2019-12-07 00:58:30 +01:00
Jan Tojnar 175359cfac nixos/ibus: install D-Bus services
IBus contains some D-Bus services, we should install them too. And enable dconf properly.
2019-12-07 00:58:30 +01:00
Jan Tojnar 0378baa5fc ibus: 1.5.20 → 1.5.21
https://github.com/ibus/ibus/releases/tag/1.5.21
2019-12-07 00:58:30 +01:00
Jan Tojnar 133da5970f gucharmap: use ucd from pkgs 2019-12-07 00:58:29 +01:00
Jan Tojnar ad9135a4b2 gucharmap: format with nixpkgs-fmt 2019-12-07 00:58:29 +01:00
Jan Tojnar 8ed93984ed ibus: use external unicode data 2019-12-07 00:58:29 +01:00
Jan Tojnar f6836269fa ibus: format with nixpkgs-fmt 2019-12-07 00:58:29 +01:00
Jan Tojnar 808082f6b6 unicode-emoji: init at 12.1 2019-12-07 00:58:29 +01:00
Jan Tojnar 523f0dd754 cldr-emoji-annotation: init at 36.12.120191002_0 2019-12-07 00:58:28 +01:00
Jan Tojnar fe59567e08 unihan-database: init at 12.1.0 2019-12-07 00:58:28 +01:00
Jan Tojnar 2d405f9078 unicode-character-database: init at 12.1.0 2019-12-07 00:58:28 +01:00
Jan Tojnar ed4ed5869a ibus-engines.uniemoji: modernize
* Rely on patchShebangsHook instead of wrapPython
* Format the expression
2019-12-07 00:58:28 +01:00
Jan Tojnar 6bc71fb30e ibus-engines.m17n: fix setup
* add setup again
* patch shebangs instead of wrapping
* format the expression
2019-12-07 00:51:29 +01:00
Jan Tojnar c86b5ea0ff ibus-engines.hangul: 1.5.1 → 1.5.3
* https://github.com/libhangul/ibus-hangul/releases/tag/1.5.2
* https://github.com/libhangul/ibus-hangul/releases/tag/1.5.3
* switch to gettext (https://github.com/libhangul/ibus-hangul/commit/8745e3f2630cdad6b1715b4a074e4efc4db14534)
* drop wrapPython, patch shebangs hook will take care of that
2019-12-07 00:51:28 +01:00
Jan Tojnar c1e498514a ibus-engines.anthy: clean up
* 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
2019-12-07 00:51:15 +01:00
Jan Tojnar 6f61770170 ibus-engines.table: drop unnecessary wrapPython
* We are using python3.withPackages, which will be used via shebang.
- gobject-introspection is used for setup hook
2019-12-07 00:51:15 +01:00
Jan Tojnar 16c89d65b7 ibus-engines.libpinyin: 1.10.0 → 1.11.1
* https://github.com/libpinyin/ibus-libpinyin/releases/tag/1.10.91
* https://github.com/libpinyin/ibus-libpinyin/releases/tag/1.10.92
* https://github.com/libpinyin/ibus-libpinyin/releases/tag/1.11.0
* https://github.com/libpinyin/ibus-libpinyin/releases/tag/1.11.1
    * intltool → gettext
2019-12-07 00:50:47 +01:00
Jan Tojnar 866dd4c0b4 Merge pull request #66390 from KoviRobi/mandelbulber2-init-at-2.19
mandelbulber: init at 2.20
2019-12-06 11:19:32 +01:00
Jan Tojnar 3e074a47b6 Merge pull request #74301 from risicle/ris-gmic-opencv3
gmic, gmic-qt: switch to opencv3
2019-12-06 02:24:11 +01:00
Jan Tojnar 7b530d0158 ibus-engines.libpinyin: fix runtime deps
* 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.
2019-12-05 21:05:44 +01:00
Jan Tojnar 5a139f0e7d gst_all_1.gst-plugins-base: Fix building Wayland support
Apparently, generic builder sets `nullglob`, disappearing any flags containing square brackets
not resolving to file names (e.g. `mesonFlags = [ "-Dgl_winsys=[x11,wayland]" ];`). This caused
the `gl_winsys` flag default to `auto` and, since we were missing `wayland-protocols`, Wayland
support was not built.

Fortunately, Meson also supports simple array notation without square brackets, so we can use
that. No need to wait for `_structuredAttrs`.

We also no longer set `gl_platform` flag, since passing the default auto value is redundant.
2019-12-05 15:14:29 +01:00
Jan Tojnar a46fa21e43 scribusUnstable: Fix build with Poppler 0.83
Another fallout from https://github.com/NixOS/nixpkgs/pull/74558
2019-12-04 23:02:30 +01:00
Jan Tojnar fe6953eb27 Merge pull request #74994 from jonringer/fix-texlive-bin
texlive.bin: fix darwin build
2019-12-04 20:43:32 +01:00
Jan Tojnar b6284fd70f libreoffice: use external Poppler 0.83 patch 2019-12-04 13:22:50 +01:00
Jan Tojnar 80913b53c1 Merge pull request #74955 from mmilata/lo-poppler-0.82
libreoffice: fix build with poppler-0.83
2019-12-04 11:53:08 +01:00
Jan Tojnar deecdeae30 Merge pull request #74961 from jtojnar/gimp-libdir
gimp: use prefix-relative libdir
2019-12-04 09:56:30 +01:00
Jan Tojnar 375c4b110f gimp: use prefix-relative libdir
Multiple outputs hard-code libdir, which prevents plug-ins to override it in gimpplugindir variable.
2019-12-04 02:33:42 +01:00
Jan Tojnar 77b605546c Merge branch 'staging-next' into staging 2019-12-03 16:52:44 +01:00
Jan Tojnar 30fae2883e Merge branch 'master' into staging-next 2019-12-03 16:51:48 +01:00
Jan Tojnar d2da3202ea Merge pull request #74558 from r-ryantm/auto-update/poppler-utils
poppler: 0.81.0 -> 0.83.0
2019-12-03 16:50:55 +01:00
Jan Tojnar daa676f1d1 Merge pull request #74282 from d-goldin/pango_update_split
pango, pygtk: fixing up newer pango and pygtk
2019-12-03 15:31:39 +01:00
Jan Tojnar af963b72ef pdf2djvu: Fix build with Poppler 0.83.0 2019-12-03 14:50:50 +01:00
Jan Tojnar 65952e7d27 inkscape: fix build with Poppler 0.83.0 2019-12-03 14:50:49 +01:00
Jan Tojnar ae323f8566 gummi: fix eval with allowAliases = false 2019-12-03 01:57:49 +01:00
Jan Tojnar da04dee9c0 bookworm: fix eval with allowAliases = false 2019-12-03 01:57:38 +01:00
Jan Tojnar 7f275732dd gscan2pdf: fix eval with allowAliases = false 2019-12-03 01:57:12 +01:00
Jan Tojnar 9e4d564543 texlive.bin.core: Fix build with Poppler 0.83.0 2019-12-03 01:33:10 +01:00
Jan Tojnar 8718c78b6b poppler: 0.81.0 → 0.83.0
https://lists.freedesktop.org/archives/poppler/2019-October/014027.html
https://lists.freedesktop.org/archives/poppler/2019-November/014066.html
2019-12-02 21:51:32 +01:00
Jan Tojnar 9fe1b95c3d python3Packages.deprecated: fix build 2019-12-02 19:24:31 +01:00
Jan Tojnar 39bf8a7b28 Merge pull request #74685 from r-ryantm/auto-update/tepl
tepl: 4.2.0 -> 4.2.1
2019-12-02 18:35:28 +01:00
Jan Tojnar 3a53ef08f1 Merge pull request #70650 from jtojnar/meson-0.52
meson: 0.51.2 → 0.52.1
2019-12-02 18:27:05 +01:00
Jan Tojnar 9129616919 nixos/pantheon fix GNOME_SESSION_DEBUG conflict
When session debugging was enabled in GNOME but not in Pantheon

	{
	  services.xserver = {
	    desktopManager.pantheon = {
	      enable = true;
	    };
	    desktopManager.gnome3 = {
	      enable = true;
	      debug = true;
	    };
	  };
	}

it caused a conflict:

	error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
2019-12-02 17:25:24 +01:00
Jan Tojnar 65a007868a Merge pull request #74790 from d-goldin/gegl_0_4_jasper
gegl_0_4: disabling jasper, fixing build
2019-12-02 13:22:23 +01:00
Jan Tojnar cb7da0944e meson: 0.51.2 → 0.52.1
https://mesonbuild.com/Release-notes-for-0-52-0.html
https://github.com/mesonbuild/meson/compare/0.52.0...0.52.1
2019-12-02 00:23:09 +01:00
Jan Tojnar f7f7b759ef gnome-builder: fix build with Meson 0.52 2019-12-02 00:23:08 +01:00
Jan Tojnar d4b4bcd416 gdk-pixbuf: fix setup hook
b78e84097f tried to make the script better but used the wrong test
syntax: [[ 113 > 99 ]] is false. This caused the librsvg not being added
to $GDK_PIXBUF_MODULE_FILE.

Fixes: https://github.com/NixOS/nixpkgs/pull/73586#issuecomment-560106317
2019-12-01 18:55:40 +01:00
Jan Tojnar 9ee20bf138 dconf: fix build with Meson 0.52 2019-12-01 03:07:40 +01:00
Jan Tojnar d7cdd6b090 Merge pull request #74760 from NixOS/revert-74715-baloo/no-x-libs/polkit
Revert "environment.noXlibs: do not pull gobject-introspection"
2019-12-01 02:34:11 +01:00
Jan Tojnar 4cb7f43d3a polkit: rename misleading flag
gobject-introspection has nothing to do with graphical systems or GNOME, it is needed for language bindings like Python.
2019-12-01 02:18:00 +01:00
Jan Tojnar 32b8c88ce4 Revert "environment.noXlibs: do not pull gobject-introspection"
gobject-introspection has nothing to do with graphical systems or GNOME, it is needed for language bindings like Python.

This reverts commit d757135c05
2019-12-01 02:16:04 +01:00
Jan Tojnar a4bbc84e16 Merge branch 'staging-next' into staging 2019-12-01 01:44:03 +01:00
Jan Tojnar 75c88b57f9 dconf: move to top-level (#74755)
dconf: move to top-level
2019-12-01 01:41:12 +01:00
Jan Tojnar 8cbc862b83 dconf: move to top-level 2019-12-01 01:01:40 +01:00
Jan Tojnar ab38b44030 Merge pull request #74734 from nyanloutre/fix_transsmission_remote_gtk
transmission-remote-gtk: fix build for new version of gettext
2019-11-30 21:09:50 +01:00
Jan Tojnar 55a72926e1 Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Jan Tojnar a69ad18da9 Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
Jan Tojnar 1edd4ceb61 xapian: 1.4.13 -> 1.4.14 (#74707)
xapian: 1.4.13 -> 1.4.14
2019-11-30 19:16:21 +01:00
Jan Tojnar eabb843ba8 libappindicator-gtk2: add missing automake step (#74733)
libappindicator-gtk2: add missing automake step
2019-11-30 19:08:58 +01:00
Jan Tojnar ee355d50a3 gnome3.rygel: 0.38.1 -> 0.38.3 (#74640)
gnome3.rygel: 0.38.1 -> 0.38.3
2019-11-30 19:08:24 +01:00
Jan Tojnar 52c34d3a61 gnome3.yelp-xsl: 3.34.0 -> 3.34.2 (#74697)
gnome3.yelp-xsl: 3.34.0 -> 3.34.2
2019-11-30 15:18:20 +01:00
Jan Tojnar 11ff53e7cb zam-plugins: fix build
Did not find <GL/gl.h> with libGLU_combined for some reason, libGL works and seems to be sufficient.
2019-11-29 02:26:31 +01:00
Jan Tojnar 9cbc6984d4 input-fonts: 2017-08-10 → 2019-11-25 2019-11-29 02:24:30 +01:00
Jan Tojnar d8d5ffaac7 Merge pull request #74522 from r-ryantm/auto-update/openimageio
openimageio2: 2.0.11 -> 2.0.12
2019-11-28 21:00:36 +01:00
Jan Tojnar 482ec0c127 mypaint: format with nixpkgs-fmt
addendum
2019-11-28 14:34:09 +01:00
Jan Tojnar 80051c2247 mypaint: format with nixpkgs-fmt 2019-11-28 14:33:15 +01:00
Jan Tojnar 0243f4455b libmypaint: use Python 3
Results in binary-indentical library 🎉
2019-11-28 13:56:44 +01:00
Jan Tojnar 60779d004e Merge pull request #74359 from worldofpeace/libappindicator-no-python2
libappindicator: remove python2
2019-11-28 13:14:25 +01:00
Jan Tojnar e44fec5df2 gnome3.iagno: 3.34.2 -> 3.34.3 (#74402)
gnome3.iagno: 3.34.2 -> 3.34.3
2019-11-28 02:43:41 +01:00
Jan Tojnar dabd535775 xfce.xfce4-verve-plugin: 1.1.0 → 2.0.0
Fix build, exo-1 no longer required.

https://git.xfce.org/panel-plugins/xfce4-verve-plugin/commit/?h=isaacschemm/gtk3&id=ca80d4b0471b5419105bb2ad4fbf0037be765d42
2019-11-28 01:33:00 +01:00
Jan Tojnar 25a95a9764 python3.pkgs.babelgladeextractor: 0.6.0 → 0.6.1 (#74374)
python3.pkgs.babelgladeextractor: 0.6.0 → 0.6.1
2019-11-28 00:41:25 +01:00
Jan Tojnar fb1a3ef494 gnome3.gnome-taquin: 3.34.1 -> 3.34.2 (#74369)
gnome3.gnome-taquin: 3.34.1 -> 3.34.2
2019-11-28 00:28:04 +01:00
Jan Tojnar 5d3e94f462 gnome3.gnome-boxes: 3.34.1 -> 3.34.2 (#74367)
gnome3.gnome-boxes: 3.34.1 -> 3.34.2
2019-11-28 00:27:32 +01:00
Jan Tojnar a0c5076861 gnome3.gedit: 3.34.0 -> 3.34.1 (#74354)
gnome3.gedit: 3.34.0 -> 3.34.1
2019-11-28 00:23:43 +01:00
Jan Tojnar ecc42dabb4 gnome3.gnome-maps: 3.34.1 -> 3.34.2 (#74383)
gnome3.gnome-maps: 3.34.1 -> 3.34.2
2019-11-28 00:21:08 +01:00
Jan Tojnar 14111de3cb gst_all_1.gst-plugins-good: fix build with gtkSupport (#74350)
gst_all_1.gst-plugins-good: fix build with gtkSupport
2019-11-28 00:20:21 +01:00
Jan Tojnar 615a5a3dae geany: clean up and switch to GTK3
GTK 2 has been deprecated for ages now.

Also split the outputs and convert geany-with-vte to symlinkJoin for easier merging.
2019-11-28 00:05:22 +01:00
Jan Tojnar 854c537f98 python3.pkgs.babelgladeextractor: 0.6.0 → 0.6.1
https://github.com/gnome-keysign/babel-glade/compare/0.6.0...0.6.1
2019-11-27 22:34:00 +01:00
Jan Tojnar 2dfd94ac4a gnome-keysign: stop requiring lxml
Required to build with BabelGladeExtractor 0.6.1.
2019-11-27 22:33:24 +01:00
Jan Tojnar 4ea81e7891 gst_all_1.gst-plugins-good: fix build with gtkSupport
Fixes regression from https://github.com/NixOS/nixpkgs/pull/70690
2019-11-27 18:56:48 +01:00
Jan Tojnar 352775cc51 cawbird: fix build with disallowed aliases
also clean up
2019-11-27 18:53:58 +01:00
Jan Tojnar 16a1c8384c gnome3.gnome-flashback: 3.34.1 -> 3.34.2 (#74232)
gnome3.gnome-flashback: 3.34.1 -> 3.34.2
2019-11-26 15:18:31 +01:00
Jan Tojnar 5b2b82c821 evolution-data-server: 3.34.1 -> 3.34.2 (#74221)
evolution-data-server: 3.34.1 -> 3.34.2
2019-11-26 14:50:00 +01:00
Jan Tojnar 8cf56826e3 ofono: 1.30 → 1.31 (#74217)
ofono: 1.30 → 1.31
2019-11-26 01:21:28 +01:00