1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

90 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 f8db20fb3a.
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 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01: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
volth 0304445996 xfce.gtk-xfce-engine: fix build when withGtk3=true (#43621) 2018-07-18 01:14:54 +02:00
volth d30b429cf8 xfce4-panel: fix tzdata path 2018-07-14 13:13:25 +00:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00: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
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
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
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
Vladimír Čunát b4588ee03c
xfce4-panel: maintenance 4.12.0 -> 4.12.1 2017-02-11 10:40:29 +01:00
Vladimír Čunát 9b185b6b87
xfce.xfconf: minor update 4.12.0 -> 4.12.1 2017-02-11 10:40:28 +01:00
José Romildo Malaquias 61554b15f5 xfce4-settings: 4.12.0 -> 4.12.1 2016-09-17 09:59:46 -03:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
obadz ecd3617d7a xfce.xfce4-power-manager: add withGtk3 version 1.6.0
test passed: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux

Closes: #8595
2016-06-16 15:32:07 +01:00
José Romildo Malaquias e72d29020c libxfce4ui: add libICE and libSM as propagated build inputs 2016-06-14 11:53:11 -03:00
José Romildo Malaquias 370cc4f44f libxfce4ui: use nativeBuildInputs for dependencies not needed at runtime 2016-06-14 11:51:04 -03:00
obadz 31f4a9b559 xfce.thunar: patch to avoid error
«the desktop file … is in an insecure location»
which pops up when invoking desktop files that are
symlinks to the /nix/store

this error was added by this commit:

1ec8ff89ec

«Only allow direct execution of desktop files in an
XDG directory and if they are executable.»
2016-06-09 12:10:15 +01:00
José Romildo Malaquias f0da9ff412 gtk-xfce-engine: add support to Gtk3 2016-05-03 15:18:23 -03:00
José Romildo Malaquias f72a2faa28 gtk-xfce-engine: 2.10.1 -> 3.2.0 2016-05-03 15:14:50 -03:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Raymond Gauthier 662bbb526c thunar: improvements (close #10306)
Add the possibility to specify plugin set to
be used as overridable `thunar` derivation argument.

New nixos config attribute:
`services.xserver.desktopManager.xfce.thunarPlugins`
that allows user to specify plugins in the context
of nixos.

Tests:

 -  With and without plugins.
 -  Using the nixos attributes.
2015-11-24 09:51:39 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Demin Dmitriy b030236799 libxfce4ui xfce4panel: add gtk3 support 2015-11-01 08:12:59 +03:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát 04c7506f0f xfce core: split into outputs, change style
- The split was only done where it seemed that some parts aren't really
  needed, which were mainly headers and gtk-doc.
- Update style to be closer with what's common in nixpkgs.
- Change explicit removal of icon theme cache into including the
  hicolor theme.
2015-10-14 14:32:26 +02:00
Eelco Dolstra b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Raymond Gauthier eebe362911 xfce.thunar-archive-plugin: init at 0.3.1 (close #10029)
A `thunar` plugin that adds archive manipulation features to
right click on file/directory menu. It can use either gnome or
kde archive managers. Detection of backend based on
`*.desktop` files mime types.

Should supercede non-functional pre-existing
`xfce.thunar_archive_plugin` (which for some
unknown reason is building the volume manager
plugin).

Also removed `xfce.thunar_archive_plugin` because
superceded.

Tests:

 -  When plugin package is installed, the supplementary
    menu entries appear in thunar.
 -  Succesfully extracted an archive using backend
    `file-roller` through thunar menu entry.

+ minor changes from vcunat, mainly meta.
2015-09-26 08:18:06 +02:00
Vladimír Čunát 57287106be xfce.xfdesktop: maintenance update 2015-09-24 11:17:26 +02:00
Vladimír Čunát 735f0f2ca8 thunar-dropbox-plugin: fixup after #9935
Close #9935.
I don't think it's good to split thunarx into a separate derivation in
this way. We would have the library and associated stuff twice and two
expressions, etc. Distributions do these things by an analogy to multiple-output
derivation (Debian does, for example), so we could use that, but it
doesn't seem important in this case and would be better after #7701 anyway.
2015-09-23 19:19:31 +02:00
Raymond Gauthier 8d2e4761c8 xfce.thunar-dropbox-plugin: init at 0.2.1
A thunar dropbox plugin that allows to copy links and
add files to dropbox.

Depends on new `xfce.thunarx-2-dev` plugin sdk package instead of
thunar. Doing so seem standard on other distributions such as
Ubuntu and narrows depedencies to only the sdk headers (i.e.:
what's needed by plugins).

Note that replacing the `xfce.thunarx-2-dev` dependency directly
by `xfce.thunar` work equally well. However it now would be
impossible for the `thunar` executable to depend on the plugin.

Tests:

 -  When dropbox daemon active, functionalities are added
    to right click on file and folders menu.
 -  When dropbox daemon inactive, functionalities **not** added
    to menu.
 -  Successfully copied a dropbox link.
 -  Successfully moved a file to dropbox.
2015-09-23 19:19:31 +02:00
Raymond Gauthier e9f2dc8830 thunar: plugin improvements (close #9908)
Improve thunar/thunarx so that thunar's plugin directory
could be overriden using a `THUNARX_MODULE_DIR`
environment variable so that plugins not built along
with the `thunar` package could be installed as well.

This could allow one to wrap `thunar` in a `thunar-with-plugins`
package where plugins are declared instead of being found (a
bit in the same fashion as gstreamer plugins).
2015-09-23 18:57:50 +02:00