alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
120200 commits 217 branches 121 tags 4.5 GiB
Commit graph

3390 commits

Author SHA1 Message Date
Graham Christensen a1a5c9887a Merge pull request #28955 from jtojnar/eds-goa 
gnome3.evolution-data-server: Re-add GNOME Online Accounts support
 2017-09-30 19:23:45 -04:00
Jan Tojnar baa7e397c1
gnome3.nautilus: add thumbnailers 
Nautilus, resp. gnome-desktop, scans `thumbnailers` directories
under the paths in `XDG_DATA_DIRS`. gdk-pixbuf was not, for some
reason, listed in the variable, therefore Nautilus did not generate
image thumbnails.

I also add librsvg to the variable so that SVG files can be rendered.
It does not work at the moment, though, because of incorrect path to
the renderer.
 2017-10-01 00:37:43 +02:00
Orivej Desh 2f522ce25e Merge pull request #29885 from xzfc/gucharmap 
gucharmap: 3.18.2 -> 10.0.1
 2017-09-29 13:46:14 +00:00
José Romildo Malaquias 3e91da5ece efl: 1.20.3 -> 1.20.4 2017-09-28 23:04:52 -03:00
Albert Safin 1ae19b6c4e gucharmap: 3.18.2 -> 10.0.1 
- Gucharmap no longer follow the GNOME major versioning.
- Gucharmap no longer includes Unicode data. Instead the data should be
  downloaded from unicode.org.
 2017-09-29 02:25:41 +07:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Jan Tojnar 13649ee12f
libgnomeui: fix compatibility with GLib 
Picked from #29392, like the parent commit.
 2017-09-28 12:17:27 +02:00
Jan Tojnar d9d65fb275
libgda: finally fix compatibility with GLib 
vcunat ported this and changed fetchpatch to fetchurl,
as the patch is just an attachement, it's not generated.
 2017-09-28 12:13:29 +02:00
Vladimír Čunát f1e6c43d45
gnome2.glibgnome: fixup build with updated glib 2017-09-28 12:00:22 +02:00
José Romildo Malaquias 7d883056a0 lxqt.screengrab: 2017-02-18 -> 1.97 (#29835) 2017-09-28 00:52:18 +02:00
Eelco Dolstra 28299f669a Add even more dev outputs 2017-09-27 12:08:48 +02:00
Eelco Dolstra 8ccce8de89 Add more dev outputs 2017-09-25 19:52:10 +02:00
Eelco Dolstra 60aaced9a0
Add some dev outputs 2017-09-25 16:05:10 +02:00
Jan Tojnar 29dd3accf5
gnome3.evolution-data-server: Re-add GNOME Online Accounts support 
In #26879, GNOME Online Accounts support was removed resulting in
repeated authentication prompts for users relying on services like
Google Calendar.

This commit removes the build flag that disabled the support.
 2017-09-25 01:12:56 +02:00
Jan Tojnar 69698ec11c gnome3: only maintain single GNOME 3 package set (#29397) 
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
 2017-09-24 12:15:50 +01:00
Tuomas Tynkkynen 4acb425c39 darwin: Disable yet another bunch of packages never having built successfully 
cjdns: https://hydra.nixos.org/build/61134279
jonprl: https://hydra.nixos.org/build/61123711
mate.libmatemixer: https://hydra.nixos.org/build/61126968
dirac: https://hydra.nixos.org/build/61132432
idnkit: https://hydra.nixos.org/build/61123544
trousers: https://hydra.nixos.org/build/61109766
packetdrill: https://hydra.nixos.org/build/61116190
osm2pgsql: https://hydra.nixos.org/build/61118017
nawk: https://hydra.nixos.org/build/61139000
 2017-09-22 21:16:39 +03:00
Tuomas Tynkkynen ab71280823 darwin: Disable some packages that have never built successfully 
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724
 2017-09-22 17:25:38 +03:00
John Ericson 7c73ff4e92 gnome-vfs: Recategorize dependencies 2017-09-21 15:49:55 -04:00
John Ericson ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed 
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
 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
Joachim F 707b281432 Merge pull request #29332 from romildo/fix.gnome-shell-extensions 
gnome-shell-extensions: enable all extensions
 2017-09-17 11:00:46 +00:00
Bastian Köcher 4bfb9e3c9b kde4Workspace: Remove, because it is not maintained anymore 2017-09-14 13:01:43 +02:00
romildo 349782cee4 gnome-shell-extensions: enable all extensions 2017-09-13 18:41:02 -03:00
Vladimír Čunát 422adc3063
Merge branch 'staging' 
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
 2017-09-12 19:17:52 +02:00
Jörg Thalheim cfb198015e Merge pull request #29012 from gnidorah/maxx 
maxx: allow launching individual components
 2017-09-12 11:37:22 +01:00
Frederik Rietdijk dab3272f47 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-10 08:56:39 +02:00
Aleksey Kladov 6ce21acf32 lxqt-session: fix the build 
closes #29130
 2017-09-08 23:39:33 +03:00
romildo b776cd02bf efl: 1.20.2 -> 1.20.3 2017-09-08 21:33:33 +02:00
Frederik Rietdijk febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
romildo dce314e55b terminology: 1.1.0 -> 1.1.1 2017-09-08 07:43:36 +02:00
Anderson Torres 936dca89df Merge pull request #28969 from disassembler/xiphos 
xiphos: 4.0.3 -> 4.0.6
 2017-09-07 17:11:45 -03:00
Eelco Dolstra ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
 2017-09-07 12:51:21 +02:00
gnidorah d627ded461 maxx: allow launching individual components 2017-09-05 16:49:49 +03:00
Frederik Rietdijk d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Vladimír Čunát 8414d8386b
maxx: license fixups 
The main thing is that I'm convinced the license can't be free when it
restricts redistribution to certain platforms.  That probably holds with
the usual definitions like from Debian, FSF or OSI.
 2017-09-04 22:57:03 +02:00
Samuel Leathers 2aa8bc45d3 gnome2.gtkhtml4: init at 4.10.0 2017-09-04 08:23:52 -04:00
Jörg Thalheim 4391330033 Merge pull request #28893 from jtojnar/gpaste-service 
gnome3.gpaste: Add GPaste service
 2017-09-03 16:27:30 +01:00
Jörg Thalheim c2881983fb gpaste: add adwaita-icon-theme theme 2017-09-03 16:26:51 +01:00
John Ericson 0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper 
Binutils-wrapper: Init by refactoring out of cc-wrapper
 2017-09-03 10:37:27 -04:00
Vladimír Čunát 37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Jan Tojnar 4069cb2b0f
gnome3.gpaste: refactor 2017-09-02 17:43:16 +02:00
Thomas Tuegel 71d377fcb0
kscreenlocker: 5.10.5 -> 5.10.5.1 
Fix segfault with nVidia drivers; see
https://bugs.kde.org/show_bug.cgi?id=384005
 2017-09-02 09:14:39 -05:00
Frederik Rietdijk d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
romildo f907ad9f2f mate-notification-daemon: init at 1.18.0 2017-09-01 18:02:24 -03:00
romildo 8087940327 mate-control-center: add dependence libappindicator 2017-09-01 17:43:28 -03:00
romildo c4dd81b81d mate: remove icon cache 2017-09-01 17:27:24 -03:00
romildo fbed066d4b mate-control-center: add dependence librsvg, needed by the mate-control-center application 2017-09-01 17:22:07 -03:00
romildo b02f227791 mate-desktop: remove unneeded dependencies gnome3.defaultIconTheme and gnome3.gnome_themes_standard 2017-09-01 17:18:59 -03:00
John Ericson 3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed 
Certain files are now only there instead of $NIX_CC (some are in both)
 2017-09-01 11:44:55 -04:00
Gabriel Ebner 52eb0e0fbd gnome3.dconf-editor: include gsettings_desktop_schemas 2017-09-01 13:07:39 +02:00
Jörg Thalheim d0e4aef32a Merge pull request #28781 from romildo/mate 
mate: add the MATE desktop environment
 2017-08-31 18:57:20 +01:00
romildo 8f8d308fe1 mate: use newScope 2017-08-31 13:30:32 -03:00
romildo a9f66285b7 mate-icon-theme: build icon cache 2017-08-31 13:29:02 -03:00
romildo 934b9bef41 mate-session-manager: init at 1.18.1 2017-08-31 00:10:20 -03:00
romildo 25f65c4339 mate-panel: init at 1.18.4 2017-08-31 00:08:40 -03:00
romildo c1e18929f0 mate-control-center: init at 1.18.2 2017-08-31 00:07:11 -03:00
romildo 8f7d80339a mate-settings-daemon: init at 1.18.1 2017-08-31 00:03:41 -03:00
romildo 5bbe177b3f marco: init at 1.18.1 2017-08-31 00:01:39 -03:00
romildo 7e151599f4 mate-menus: init at 1.18.0 2017-08-30 23:59:38 -03:00
romildo dd3703e166 libmateweather: init at 1.18.1 2017-08-30 23:56:47 -03:00
romildo 20f3dfd579 libmatemixer: init at 1.18.0 2017-08-30 23:55:20 -03:00
romildo 75d643ee83 libmatekbd: init at 1.18.2 2017-08-30 23:53:16 -03:00
romildo 6c4424efb2 mate-desktop: add maintainer 2017-08-30 23:49:46 -03:00
romildo dd230e33d6 mate: organize packages in base and extra 2017-08-30 23:48:20 -03:00
Frederik Rietdijk 6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Symphorien Gibol bd54589233 networkmanager_iodine: init at 1.2.0 2017-08-30 02:58:29 +02:00
Jan Tojnar b64f149ea9
gnome-disk-utility: fix missing schemas for gnome-disk-image-mounter 
Continuation of #28053

gnome-disk-image-mounter from gnome-disk-utility was not wrapped, resulting in an
error due to the inability to find gsettings schemas.

This commit replaces the manual wrapping of gnome-disks binary with wrapGAppsHook
so that all binaries are wrapped correctly.
 2017-08-29 13:29:04 +02:00
Vladimír Čunát 2858c41823
Merge branch 'master' into staging 
There were some conflicts in python modules, commented at #28314.
 2017-08-29 10:51:54 +02:00
Tom Hunger 64e4b9637b Remove unused gdm/3.16-wip 2017-08-28 19:52:06 +01:00
Tom Hunger 3247c940e0 gnome-photos: 3.24.2 -> -3.24.3 2017-08-28 15:55:05 +01:00
Linus Heckemann b73e3b6095 GNOME: 3.22 -> 3.24 
This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
 2017-08-28 15:32:49 +01:00
Vladimír Čunát 592d23d7db
maxx: fix evaluation 
Occurences of `$'` apparently do have to be quoted in ''-strings.
 2017-08-27 17:06:46 +02:00
Joachim F 3c4ffdcbbc Merge pull request #28477 from romildo/fix.efl 
enlightenment fixes and updates
 2017-08-26 21:51:09 +00:00
Vladimír Čunát 1e7358a875
kde4.kde_workspace: fixup build with gcc-6 2017-08-26 11:31:41 +02:00
Jörg Thalheim ddf540d44c Merge pull request #27096 from gnidorah/maxx 
maxx: init at 1.1.0
 2017-08-25 06:40:31 +01:00
Thomas Tuegel 639c355b3a Merge pull request #28500 from bkchr/lxqt_config_fixes 
LXQT-config: Adds patch for Cmake >3.8
 2017-08-24 12:48:06 -05:00
gnidorah 15ae2cbeea maxx: use libredirect 2017-08-24 19:34:08 +03:00
Bastian Köcher 0cf6830309 LXQT-config: Adds patch for Cmake >3.8 2017-08-23 12:17:32 +02:00
Bastian Köcher b7d1b3214d Plasma: 5.10.4 -> 5.10.5 2017-08-23 10:58:21 +02:00
romildo 7ffee4de3c efl: use vanilla pkg-config 
Use vanilla pkg-config to build EFL applications.

The EFL library has a set of pkg-config files (*.pc) which uses
private requirements. The default pkg-config setup on nixpkgs is
patched to disable resolving those requirements. See
http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.

As a consequence each package depending on efl has to explicitly set
the search path in order to be able to find the corresponding header
files.

By using vanilla pkg-config this is not necessary (and this is the
expected behaviour for pkg-config), allowing simpler nix expressions.
 2017-08-22 15:54:56 -03:00
romildo d1cbd546e0 terminology: 1.0.0 -> 1.1.0 2017-08-22 15:13:17 -03:00
romildo 5340a0aee0 efl: remove old version 1.19.1 
- Version 1.19.1 is not needed anymore to build ephoto.
 2017-08-22 15:08:59 -03:00
romildo 978c9f02dc ephoto: 1.0 -> 1.5 
- Update to version 1.5, which builds of the latest efl versions
 2017-08-22 15:01:25 -03:00
romildo 0c16f356bd efl: propagate utillinux, fribidi and SDL2, which are runtime dependencies 2017-08-22 14:56:47 -03:00
Thomas Tuegel 49fb3b9313 Merge pull request #28366 from vandenoever/kde-applications 
KDE Frameworks: 5.36 -> 5.37 and KDE Applications 17.04.3 -> 17.08.0
 2017-08-22 06:53:25 -05:00
Vladimír Čunát b2ae23a391
Merge branch 'staging' (older version) 
This just adds some fixups, not any mass rebuild.
 2017-08-22 12:30:04 +02:00
WilliButz a49c1fc0b2 caribou: fix build 2017-08-22 00:45:42 +02:00
Jos van den Oever ca90567174 lxqt-notificationd: add missing dependency 2017-08-21 21:49:32 +02:00
Jos van den Oever 161118af02 lxqt-runner: add missing dependency 2017-08-21 21:49:32 +02:00
Jos van den Oever e20afe8d2e kde-frameworks: 5.36 -> 5.37 2017-08-21 21:47:15 +02:00
Thomas Tuegel 7c850a0fd6
libkscreen: fix circular references 2017-08-21 06:51:33 -05:00
Thomas Tuegel d0337b0874
libgnome-keyring: separate $dev output 2017-08-21 06:51:33 -05:00
Frederik Rietdijk 6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Joachim F bc98d1fe97 Merge pull request #28362 from romildo/mate 
mate: caja-extensions: init at 1.18.1, engrampa: init at 1.18.2
 2017-08-20 20:16:22 +00:00
Vladimír Čunát 1919bb5043
gnome3.caribou: fixup build after automake update #28232 
/cc gnome update #28053.
 2017-08-20 10:52:30 +02:00
romildo e04c4d0fbb engrampa: init at 1.18.2 2017-08-18 09:57:19 -03:00
romildo b5eab8f943 cajaWithExtensions: init at 1.18.3 2017-08-18 00:19:58 -03:00
romildo 1a04652900 caja-extensions: init at 1.18.1 2017-08-18 00:16:18 -03:00
Frederik Rietdijk c732164e36 Merge pull request #27941 from romildo/upd.efl 
efl: add version 1.20.2
 2017-08-17 19:43:11 +02:00
romildo e78a08be8b enlightenment: 0.21.8 -> 0.21.9 2017-08-17 12:23:35 -03:00
romildo 0fb920b474 efl: add version 1.20.2 
- Add the new version 1.20.2.

- Keep version 1.19.1 for now because ephoto still needs it. As soon
  as a new release o ephoto which works with efl-1.20.x is availaible,
  efl-1.19.x may be removed.
 2017-08-17 12:23:35 -03:00
Eelco Dolstra 9eb901b70d
Merge remote-tracking branch 'origin/gcc-6' into staging 2017-08-14 11:38:00 +02:00
gnidorah b73ae0a695 maxx: move deps from module to package 2017-08-14 11:13:49 +03:00
Frederik Rietdijk 62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Vladimír Čunát 34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Robin Gloster 6d7b0dcdf1
gnome3.pomodoro: no need for automake113x 2017-08-12 21:38:18 +02:00
Robin Gloster bb5702c521
treewide: remove automake pinning to the newest version 
quasi no-op
 2017-08-12 18:49:58 +02:00
Jörg Thalheim 025222ec79 pluma: also add default icon theme 2017-08-12 09:23:08 +01:00
Vladimír Čunát 6899c7fdb9
Merge branch 'master' into gcc-6 2017-08-12 10:09:41 +02:00
José Romildo Malaquias 392090ca6a Merge branch 'master' into new.pluma 2017-08-11 15:50:32 -03:00
Tuomas Tynkkynen 1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc) 
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
 2017-08-11 21:32:54 +03:00
romildo 48ffb8284f eom: init at 1.18.2 2017-08-11 00:14:26 -03:00
Robin Gloster 5e89bcae00
evolution_data_server: wrap all and only executables 2017-08-09 23:35:50 +02:00
Wout Mertens b6f19f79aa Merge pull request #28004 from moesasji/master 
xfce4-session: fix lock screen not working with light-locker
 2017-08-07 18:40:48 +02:00
Frederik Rietdijk 2203908e5f Merge commit 'b679e14' into HEAD 2017-08-07 13:19:09 +02:00
moesasji 71203503f9 xfce4-session: fix lock screen not working with light-locker 2017-08-07 10:17:40 +01:00
romildo c6207abe9c pluma: init at 1.18.2 2017-08-06 12:40:13 -03:00
romildo 8ba81342dc mate-terminal: 1.18.0 -> 1.18.1 2017-08-06 10:36:42 -03:00
romildo eb70dfb130 caja: 1.18.0 -> 1.18.3 2017-08-06 10:35:11 -03:00
romildo 2f1ae93e43 mate-themes: 3.20.19 -> 3.20.22, 3.22.10 -> 3.22.13 2017-08-06 10:32:48 -03:00
romildo 1048cefa7a mate-icon-theme-faenza: 1.18.0 -> 1.18.1 2017-08-06 10:31:59 -03:00
romildo e3629d05cb mate-icon-theme: 1.18.1 -> 1.18.2 2017-08-06 10:29:29 -03:00
Vladimír Čunát f779df87b1
Merge branch 'master' into staging 
Let's drop i686-linux here as well.
 2017-08-06 10:03:25 +02:00
Frederik Rietdijk 8fcb070363 Merge pull request #27320 from jtojnar/fix/unbreak-polari 
polari: unbreak
 2017-08-05 17:49:47 +02:00
Jan Tojnar ec6f8320f4
polari: unbreak 
The build was failing due to missing telepathy_logger dependency,
I added it. Additionally, the connection to server was failing due to
telepathy executables not having an access to dconf, which was fixed
in #26113. Lastly, when I tried running Polari directly, it terminated
with SIGTRAP and the following error:

    (org.gnome.Polari:22998): GLib-GIO-ERROR **: Settings schema 'org.gnome.desktop.interface' is not installed

adding `gnome3.gsettings_desktop_schemas` as a buildInput fixed that.
 2017-08-05 13:23:06 +02:00
Jan Tojnar c9d419a22b gnome: Further fixes for Using the 'memory' GSettings backend issue 2017-08-05 12:21:00 +02:00
midchildan 0e192d5d4f gnome: Fix the issue Using the 'memory' GSettings backend issue 2017-08-05 12:21:00 +02:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Jascha Geerds 0854c85678 gnome3: Remove myself from maintainer list 2017-08-02 18:21:50 +02:00
Robin Gloster 5d91e806b9
Revert "gnome-tweak-tool: fix eval" 
This reverts commit d9521c3418.

Cleaner fix in 6e6271e82f
 2017-08-02 16:14:34 +02:00
Frederik Rietdijk 4f66c0cf21 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-02 10:22:24 +02:00
Robin Gloster d9521c3418
gnome-tweak-tool: fix eval 2017-08-01 22:47:03 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Frederik Rietdijk 740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
Thomas Tuegel 346bc1fbf5
Merge commit 'refs/pull/27491/head' of github.com:NixOS/nixpkgs into feature/plasma-5.10.4 2017-07-29 14:34:23 -05:00
John Ericson f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files 
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
 2017-07-26 09:07:55 -04:00
Eelco Dolstra d65e528a37
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-24 18:27:24 +02:00
gnidorah 52deb4b460 maxx: 1.0.0 -> 1.1.0 2017-07-24 13:19:45 +03:00
John Ericson b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*" 
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
 2017-07-24 01:05:30 -04:00
Eelco Dolstra a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
adisbladis 176c15a06e
plasma5: 5.10.3 -> 5.10.4 2017-07-19 12:36:52 +08:00
vbgl c17ddcd40c Merge pull request #25412 from romildo/fix.efl 
{terminology,ephoto,rage,econnman}: wrap libcurl.so in LD_LIBRARY_PATH
 2017-07-18 21:30:38 +02:00
Robin Gloster adb178c0e5
gnomeExtensions.topicons-plus: fix version string 
It has to start with a digit.
 2017-07-18 18:43:47 +02:00
Robin Gloster 46ead28a58
gnome3.gexiv2: 0.10.4 -> 0.10.6 2017-07-18 00:05:50 +02:00
Vladimír Čunát efe66e221f
evince: patch CVE-2017-1000083 + minor changes 
This removes help for now but fixes #27388.
The minor update might be related to the patch so it's included.
 2017-07-15 10:07:45 +02:00
Domen Kožar 0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417' 
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
 2017-07-14 11:55:41 +02:00
Robin Gloster d518096abc
gnome3.gnome_control_center: remove unused variable 
This broke the evaluation.
 2017-07-13 15:50:48 +02:00
Stefan Lau 2b4bc03969 gnome-online-accounts: wrap with wrapGAppsHook 2017-07-13 15:05:07 +02:00