Commit Graph

209 Commits

Author SHA1 Message Date
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
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
2018-07-18 23:25:20 -04:00
volth
0304445996 xfce.gtk-xfce-engine: fix build when withGtk3=true (#43621) 2018-07-18 01:14:54 +02:00
volth
101df126bb config.skipAliases -> config.allowAliases 2018-07-17 14:46:21 +00:00
volth
4bafaaff8a config.skipAliases: also disable vimPlugins, git, xfce and gnome3 aliases 2018-07-17 14:46:21 +00:00
xeji
dca7b10fd5
Merge pull request #43522 from volth/patch-187
orage: "/usr/share/zoneinfo" -> "${tzdata}/share/zoneinfo"
2018-07-16 17:19:01 +02:00
Frederik Rietdijk
3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Robert Schütz
18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
volth
1137200d6b xfce.xfce4-hardware-monitor-plugin: 1.5.0 -> 1.6.0 (#43520) 2018-07-14 21:11:17 +02:00
volth
d30b429cf8 xfce4-panel: fix tzdata path 2018-07-14 13:13:25 +00:00
volth
070b6e6fa4
orage: fix tzdata pathes 2018-07-14 12:19:54 +00:00
Jan Tojnar
d77abebf89
xfce.orage: fix build with libical3 2018-06-29 15:38:32 +02:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
jD91mZM2
d7e49cfc56
vala-panel-appmenu: init at 0.6.94 2018-05-12 18:36:39 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthias Beyer
ce1c1e3093 Remove maintainership
With this patch I remove myself as a maintainer for all packages I
currently maintain.

This is due the fact that I will be basically off the grid from May 2018
until early 2019, as I will be on a trip through north america.

I will revert this patch as soon as I'm back, as I plan to continue
contributing to nixpkgs then.
But as I cannot maintain anything during that time, I'd like to get this
patch merged.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2018-04-06 10:57:19 +02:00
volth
a54709202e xfce.xfwm4: 4.12.3 -> 4.12.4 2018-03-21 22:19:46 +00:00
volth
4ddb7a76f2 xfce.xfce4-panel: 4.12.1 -> 4.12.2 2018-03-21 22:19:46 +00:00
volth
fe70fbdefe xfce: do not use old names 2018-03-12 23:01:06 +00:00
Robert Helgesson
c7f40209c1
xfce4-timer-plugin: remove icon cache file from output
Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.
2018-03-05 21:47:38 +01:00
Robert Helgesson
0203ab2ff9
parole: remove icon cache file from output
Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.
2018-03-05 21:47:33 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Jörg Thalheim
a42cea1a65
Merge pull request #34468 from grwlf/xfce4-weather
Fix and update xfce4-panel weather plugin
2018-02-11 11:56:53 +00:00
Sergey Mironov
87451cc113 xfce4-weather-plugin 0.8.7 -> 0.8.10; add glib_networking 2018-02-03 11:29:27 +03:00
Vladimír Čunát
aa8217d622
xfce: timestamp the aliased names 2018-01-21 09:52:18 +01:00
Yegor Timoshenko
cf536c3e66
xfce: hyphenate attributes, prepare for Xfce 4.13 import 2018-01-08 04:27:35 +00:00
Yegor Timoshenko
c1cc1a701e mousepad: backport fix of issue 12134, resolves #14862
https://bugzilla.xfce.org/show_bug.cgi?id=12134
2017-12-20 00:40:26 +03:00
Gonzalo Andreani
c9c1ccda4f xfce4-session: Backport lock command setting in xflock4
Up until xfce 4.13, xflock4 only had support for "whitelisted"
(*cough* hardcoded *cough*) locks screens. Version 4.13 added the
ability for the user to specify the lock command via the xfce
settings. This PR backports that functionality

https://github.com/xfce-mirror/xfce4-session/blob/xfce4-session-4.13.0/scripts/xflock4
2017-12-20 00:27:47 +03:00
Wei Tang
62a974bbbf xfce: delay package selection for pulseaudio volume to nixos modules (#23382)
Now there are separate `xfce4.xfce4mixer_pulse` and `xfce4.xfcevolumed_pulse` attributes for PulseAudio versions of these packages, instead of relying on Nixpkgs option. Mind that xfce4-volumed and xfce4-volumed-pulse are actually two separate programs without much overlap.
2017-12-19 22:28:12 +03:00
Yell0w Ghost
d9f4f9e3f9 xfdesktop: fix #12832 GTK 2.24.31 regression
Contains bug fix for #12832 which solves issue with GTK 2.24.31
regression - grayed out folders in wallpaper chooser dialog.
2017-12-18 18:17:51 +00:00
Yegor Timoshenko
7d3eb4782a garcon: fix issues 10967, 12700
https://bugzilla.xfce.org/show_bug.cgi?id=10967
https://bugzilla.xfce.org/show_bug.cgi?id=12700
2017-12-15 01:25:00 +00:00
Orivej Desh
b7734b61a0
Merge pull request #31736 from ChengCat/chengcat
thunar: add wrapGAppsHook
2017-11-17 20:59:47 +00:00
Orivej Desh
a368bbb57d
Merge pull request #31024 from yegortimoshenko/xfce4-panel/gettext
xfce4-panel: patch gettext in xfce4-popup-* scripts, fixes #30033
2017-11-16 20:49:34 +00:00
Orivej Desh
28ebb17f46 xfce4-settings: enable parallel building 2017-11-16 20:40:33 +00:00
Yucheng Zhang
517741c98e thunar: add wrapGAppsHook 2017-11-16 18:06:37 +08:00
Yegor Timoshenko
bd4c66886a xfce4-panel: patch gettext in xfce4-popup-* scripts, fixes #30033 2017-10-31 05:51:14 +00:00
Yegor Timoshenko
c55a0cdeb3 xfce4-settings: build w/ xorg-libinput, make some dependencies optional
Closes #30148.
2017-10-31 05:17:59 +00:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
moesasji
71203503f9 xfce4-session: fix lock screen not working with light-locker 2017-08-07 10:17:40 +01:00
Jan Tojnar
c9d419a22b gnome: Further fixes for Using the 'memory' GSettings backend issue 2017-08-05 12:21:00 +02:00
volth
26abdb81c8 xfce4-dockbarx-plugin: fix unwrapped python scripts 2017-06-10 10:44:23 +01:00
Volth
9edfc2b02b xfce4_namebar_plugin: init at 0.3.1 2017-06-05 13:50:22 +00:00
Piotr Bogdan
a19efc1e30 xfce4-volumed-pulse: 0.2.0 -> 0.2.2. 2017-05-17 14:05:24 +01:00
Jörg Thalheim
59c699e9b9 Merge pull request #25331 from volth/xfce4-screenshooter-glib-networking
xfce4-screenshooter: add glib_networking dependency
2017-05-01 23:42:28 +02:00