Commit Graph

1675 Commits

Author SHA1 Message Date
Vladimír Čunát
2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Robert Schütz
a9780a095b Merge branch 'master' into staging-next 2018-08-30 21:56:13 +02:00
Vladimír Čunát
80b25db15c
treewide: use glib tools from build-time $PATH
Using explicit output feels more flaky in case we e.g. move the binary.
(No strong opinion on my side, feel free to revert if you think so.)
2018-08-30 19:47:41 +02:00
Vladimír Čunát
8fc6472ace
gnome-documents, tlaplus: fix glib references 2018-08-30 19:47:41 +02:00
Jan Tojnar
6cefc9c1b0
Revert "treewide: remove placeholder usage"
This reverts commit 025881c236.
2018-08-30 18:18:30 +02:00
Jan Tojnar
69a17c7a19
Revert "treewide: remove placeholder usage"
This reverts commit 82f6267023.
2018-08-30 18:18:29 +02:00
Vladimír Čunát
19c68fe28c
Merge branch 'master' into staging 2018-08-30 12:25:43 +02:00
Vladimír Čunát
91b01208a0
gnome3.gnome-shell: fix build (missing xsltproc) 2018-08-30 09:56:16 +02:00
Frederik Rietdijk
6038628ea5 Merge master into staging-next 2018-08-29 20:54:55 +02:00
Jörg Thalheim
3a56156866 vala_0_32: remove 2018-08-29 11:39:28 +01:00
Frederik Rietdijk
b61b993b75 Merge master into staging 2018-08-26 12:10:05 +02:00
Jan Tojnar
c429c9a8bb
Merge pull request #45571 from jtojnar/gconf-to-error
gnome3.gconf: re-add as a pointer to the removal PR
2018-08-26 01:20:36 +02:00
Jan Tojnar
9364a931e9
gnome3.quadrapassel: clean up 2018-08-26 01:18:31 +02:00
Jan Tojnar
6e2c115235
gnome3.gnome-desktop: use substituteAll for patch 2018-08-25 21:41:14 +02:00
Jan Tojnar
1bd430e3d4
gnome3.gnome-keyring: clean up 2018-08-25 21:41:13 +02:00
Jan Tojnar
9f0eb759a4
gnome3.gconf: re-add as a pointer to the removal PR
https://github.com/NixOS/nixpkgs/pull/43268 removed GConf from GNOME 3
package set, let’s add an error for a little while to save people
digging through the commit log.
2018-08-25 20:41:34 +02:00
Jan Tojnar
5e3c1c2e32
gnome3.gnome-documents: 3.28.1 → 3.28.2 2018-08-25 15:57:25 +02:00
Jan Tojnar
f3f6854033
gnome3.gnome-nibbles: 3.24.0 → 3.24.1 2018-08-25 15:57:24 +02:00
Jan Tojnar
d6a6f9eb95
gnome3.caribou: fix on GNOME Flashback 2018-08-25 15:57:24 +02:00
Jan Tojnar
40535ced63
gnome3.vinagre: clean up 2018-08-25 15:57:24 +02:00
Jan Tojnar
05992b9b1b
gtk-vnc: rename from gtkvnc
Upstream uses gtk-vnc, let’s be consistent.
2018-08-25 15:57:23 +02:00
Jan Tojnar
21e9b85928
gnome3.tracker-miners: 2.0.5 → 2.1.1 2018-08-25 15:57:23 +02:00
Jan Tojnar
c219d313dd
gnome3.tracker: 2.0.4 → 2.1.2 2018-08-25 15:57:23 +02:00
Jan Tojnar
ede0b56cae
gnome3.libgnome-games-support: 1.4.1 → 1.4.2 2018-08-25 15:57:22 +02:00
Jan Tojnar
9c066735d5
gnome3.gnome-bluetooth: 3.28.1 → 3.28.2 2018-08-25 15:57:22 +02:00
Vladimír Čunát
2c1e736ae8
gnome3.libgda: build with gcc6 on aarch64
Fixes #45618.  I don't know what's the matter.
Feel free to come with a better fix.
2018-08-25 10:49:18 +02:00
Vladimír Čunát
153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát
209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Andreas Rammhold
a4ded94f95
gnome3.gdm: 2.28.2 -> 2.28.3
Changes:
  - CVE-2018-14424 - double free fix
  - lifecycle fixes to libgdm/GdmClient
  - follow up fixes dealing with login screen reaping form last release
  - allow pam modules to use SIGUSR1
  - set PWD for user session
  - tell cirrus not to use wayland
  - Translation updates
2018-08-17 09:22:27 +02:00
Jan Tojnar
2f801195fc
gnome3.libgnome-games-support: propagate required dependencies 2018-08-14 22:02:20 +02:00
Jan Tojnar
5d62b6698a
gnome3.atomix: init at 3.29.3 2018-08-14 22:02:20 +02:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski
99974ea930 gnome3.gcr: make tests run, but disable 2018-08-11 09:35:34 +00:00
Jan Malakhovski
411ef0e0f9 gnome3.gnome-keyring: use checkInputs 2018-08-11 09:35:23 +00:00
Jan Tojnar
59186af889
Merge pull request #44803 from cdepillabout/add-correct-propagatedbuildinput-to-vte
add gtk3 as propagatedBuildInput to vte
2018-08-09 18:56:33 +02:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Jan Tojnar
e4929b7c1a
gnome3: fix networkmanager gnome usage 2018-08-09 18:17:41 +02:00
Jan Tojnar
aab242e1c5
gnome3.gucharmap: clean up
Clean up package, split into multiple outputs, enable devdoc.
2018-08-09 17:36:46 +02:00
Jan Tojnar
c3ce3714ac
gnome3.gnome-applets: init at 3.28.0 2018-08-09 17:36:45 +02:00
Jan Tojnar
ea286b0610
gnome3.gnome-flashback: init at 3.28.0 2018-08-09 17:36:44 +02:00
Jan Tojnar
64b5e0773b
gnome3.gnome-panel: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar
46dcfd27c3
gnome3.metacity: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar
f48108e52a
gnome3.gnome-desktop: clean up 2018-08-09 17:36:43 +02:00
Jan Tojnar
0c9273509a
gnome3.gnome-terminal: clean up 2018-08-09 17:36:43 +02:00
(cdep)illabout
05c0c3f05c
vte: Change comment to talk about vte-2.91.pc file instead of .gir file. 2018-08-09 23:21:50 +09:00
(cdep)illabout
8edc67c468
vte: Add gtk3 as propagatedBuildInput
The `Vte.2.91.gir` imports `Gtk.3.0.gir`.  So in order to use
`Vte.2.91.gir`, you must also have `Gtk.3.0.gir` on the GI_TYPELIB_PATH.
Adding gtk3 to the `propagatedBuildInputs` of vte accomplishes this.
2018-08-09 11:58:17 +09:00
Jan Tojnar
83a18e14d9
Merge pull request #39792 from Moredread/fwupd
WIP fwupd: 1.0.5 -> 1.1.0
2018-08-08 11:57:39 +02:00
Jan Tojnar
82bf0a2cd2
gnome3.gnome-software: enable fwupd 2018-08-07 23:25:22 +02:00
Tuomas Tynkkynen
008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
Jan Tojnar
880bc29d45
gnome3.gnome-todo: init at 3.28.1 2018-08-04 11:58:05 +02:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Jan Tojnar
f735d6a38d
Merge pull request #43992 from jtojnar/upstream-sessions
Upstream sessions
2018-08-03 14:23:17 +02:00
Jan Tojnar
adbe4e1c68
gnome3.gnome-session: use absolute paths
TryExec needs absolute path too, otherwise the desktop file will be ignored
unless gnome-session is in PATH, in which case, we would not need to patch
Exec.
2018-08-01 19:14:31 +02:00
Jan Tojnar
f63d94eba3
gnome3.gpaste: hard-code paths
GPaste GNOME Shell extension uses GPaste library generated via introspection. Previously, we added the gpaste package to services.xserver.desktopManager.gnome3.sessionPath option, which
added its typelib directory to GI_TYPELIB_PATH environment variable globally, in order for GNOME Shell to be able to find it. This is not very Nix-y, though, so we have decided to patch the code to
append the path to the GI repository search path.

Additionally, the code relies on GPaste’s GSettings schemas, so we had to hard-code the paths to them as well. We ignored the GNOME Shell’s schemas, since they will already be available for the
extension inside GNOME Shell program.
2018-08-01 19:14:30 +02:00
Jan Tojnar
cc6d77c83f
gnome3.gdm: add upstream xsession 2018-08-01 19:14:30 +02:00
Jan Tojnar
be066d0b27
Merge pull request #44278 from jtojnar/gnome-update
Gnome update
2018-08-01 14:38:45 +02:00
Jan Tojnar
f91dd5a610
gnome3.totem: 3.28.1 → 3.28.2 2018-07-31 23:05:08 +02:00
Jan Tojnar
c1c9119699
gnome3.mutter: 3.28.2 → 3.28.3 2018-07-31 23:03:40 +02:00
Jan Tojnar
a0cecbf159
gnome3.grilo: 0.3.4 → 0.3.6 2018-07-31 23:03:23 +02:00
Jan Tojnar
11845d65cb
gnome3.grilo-plugins: 0.3.5 → 0.3.7 2018-07-31 23:03:09 +02:00
Jan Tojnar
d15f2f0e0a
gnome3.gnome-shell: 3.28.2 → 3.28.3 2018-07-31 23:01:40 +02:00
Jan Tojnar
c4f1123342
gnome3.gnome-bluetooth: 3.28.0 → 3.28.1 2018-07-31 23:01:24 +02:00
Jan Tojnar
ca565a3015
evolution-data-server: 3.28.3 → 3.28.5 2018-07-31 23:01:02 +02:00
Jan Tojnar
5644addb3c
gnome3.eog: 3.28.2 → 3.28.3 2018-07-31 23:00:44 +02:00
Jan Tojnar
82482073d7
gnome3.polari: 3.28.0 → 3.28.1 2018-07-31 23:00:29 +02:00
Jan Tojnar
30e535a93f
gnome3.file-roller: 3.28.0 → 3.28.1 2018-07-31 23:00:17 +02:00
Jan Tojnar
c5d8e70a42
gnome3.evolution: 3.28.3 → 3.28.5 2018-07-31 22:58:52 +02:00
Jan Tojnar
e0d8c80f01
gnome3.devhelp: 3.28.1 → 3.30.0 2018-07-31 11:34:52 +02: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
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
Frederik Rietdijk
12949bf84a Merge master into staging 2018-07-17 10:05:50 +02:00
Frederik Rietdijk
1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
Jan Tojnar
e2d9a9d4db
gnome3.gnome-sound-recorder: init at 3.28.1 2018-07-16 21:43:20 +02:00
Frederik Rietdijk
6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Frederik Rietdijk
3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Jan Tojnar
db00e457ac
gnome3.totem: disable vala plug-ins again
Apparently the intermittent build failure is still there,
not sure why I thought it was fixed.

Closes: https://github.com/NixOS/nixpkgs/issues/43518
2018-07-15 16:57:27 +02:00
Robert Schütz
18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Jan Tojnar
fccbb2a9e6
gucharmap: 10.0.0 → 11.0.1 2018-07-14 15:52:20 +02:00
Jan Tojnar
1997deab8d
gnome3.geary: 3.28.2 → 3.28.3 2018-07-14 15:52:20 +02:00
Jan Tojnar
ef76db05a5
gnome3.gnome-logs: 3.28.3 → 3.28.5 2018-07-13 23:46:40 +02:00
Jan Tojnar
28b6f74c3f
gnome3.gconf: remove 2018-07-10 12:14:40 +02:00
Ambroz Bizjak
f26153754a nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens.

The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started.

Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session.

Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable.

Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation:
- `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU.
- `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
2018-07-09 18:46:13 +02:00
Matthew Bauer
6eb508a3e8 Merge remote-tracking branch 'upstream/master' into staging 2018-07-09 11:58:38 -04:00
Jan Tojnar
188e487dd1
gnome3: simplify package set using makeScope 2018-07-06 18:20:06 +02:00
Jan Tojnar
eb97acb64a
gnome3.gnome-calculator: 3.28.1 → 3.28.2 2018-07-06 09:35:03 +02:00
Jan Tojnar
18b79b8fcb
gnome3.gnome-logs: 3.28.2 → 3.28.3 2018-07-06 09:35:02 +02:00
Jan Tojnar
8abddf8373
gnome3.gnome-boxes: 3.28.4 → 3.28.5 2018-07-06 09:35:02 +02:00
Jan Tojnar
6070fb3978
gnome3.bijiben: 3.28.2 → 3.28.3 2018-07-06 09:35:01 +02:00
Vladimír Čunát
c1ffc65d1a
Merge branch 'master' into staging
This apparently fixes some broken src fetches (gnuradio, twisted).
2018-07-02 11:10:26 +02:00
Jan Tojnar
3ca1571d89
Merge pull request #42797 from jtojnar/tracker-update
gnome3.tracker update
2018-06-30 06:06:35 +02:00