1092 Commits

Author	SHA1	Message	Date
Herman Fries	46d9fddd71	xwayland: Fix build option default_font_path	2021-06-30 02:44:00 +02:00
Herman Fries	e266a62d6d	xwayland: Fix build options ... Logs https://hydra.nixos.org/build/146088556/nixlog/7 show `WARNING: Unknown options: "default-font-path, xwayland-eglstream"` The option names should contain underscores https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/meson_options.txt#L9	2021-06-30 01:21:51 +02:00
Robert Schütz	c1dca92daf	Merge branch 'master' into staging-next	2021-06-25 10:02:10 +02:00
TredwellGit	f6ea60666c	generate-expr-from-tarballs.pl: use nix-shell as script interpreter	2021-06-24 06:49:43 +00:00
TredwellGit	3e73f3c7ff	xorg.xf86inputlibinput: 1.0.1 -> 1.1.0 ... https://lists.x.org/archives/xorg-announce/2021-June/003094.html	2021-06-24 04:40:19 +00:00
Naïm Favier	ba602382e1	xorg: regenerate default.nix	2021-06-22 14:10:56 +02:00
github-actions[bot]	9c8cef37d2	Merge master into staging-next	2021-06-20 12:04:37 +00:00
Michele Guerini Rocco	57d4300e33	Merge pull request #126756 from Atemu/fix/xorg-bigelow-holmes-font-license ... xorg: fix Bigelow & Holmes fonts license	2021-06-20 11:54:23 +02:00
Jan Tojnar	e3dfa79441	Merge branch 'staging-next' into staging ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.	2021-06-16 19:59:05 +02:00
Jonathan Ringer	413994ab1c	xorg: fix bad merge conflict	2021-06-15 19:43:00 -07:00
Jonathan Ringer	d1d37feb6d	Merge branch 'master' into staging-next ... Conflicts: pkgs/servers/x11/xorg/default.nix	2021-06-15 19:32:36 -07:00
Jan Tojnar	91171e2955	Merge branch 'master' into staging-next ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.	2021-06-15 11:19:41 +02:00
Naïm Favier	f49c857a1d	fonttosfnt: 1.2.1 -> 1.2.2 ... https://lists.x.org/archives/xorg-announce/2021-June/003093.html	2021-06-15 10:06:13 +02:00
Felix Buehler	6c48964a0d	xorg: change generator "name" to "pname" & "version"	2021-06-14 22:20:35 +02:00
Sandro	5b80702b19	Merge pull request #122792 from TredwellGit/xorg.libXfixes	2021-06-14 20:02:40 +02:00
Atemu	41fe4148a1	xorg: fix Bigelow & Holmes fonts license	2021-06-13 16:15:34 +02:00
TredwellGit	b1370dea54	xkeyboard_config: 2.31 -> 2.33 ... https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/tags/xkeyboard-config-2.33	2021-06-09 13:33:26 +00:00
Louis Bettens	a0c4e9863b	generate-exprs-from-tarballs.pl: clearly broadcast auto-generation	2021-06-09 15:14:45 +02:00
TredwellGit	e46a6ab222	xorg.libX11: 1.7.1 -> 1.7.2 ... https://lists.x.org/archives/xorg-announce/2021-June/003092.html	2021-06-06 19:19:44 +00:00
TredwellGit	fa8d1b336d	xorg.libX11: 1.7.0 -> 1.7.1 ... https://lists.x.org/archives/xorg-announce/2021-May/003089.html https://lists.x.org/archives/xorg-announce/2021-May/003088.html	2021-05-19 04:10:17 +00:00
TredwellGit	8c4b268d27	xorg.libXfixes: 5.0.3 -> 6.0.0 ... https://lists.x.org/archives/xorg-announce/2021-May/003086.html	2021-05-15 11:48:57 +00:00
TredwellGit	3b7fd1ad3f	xorg.xorgproto: 2021.3 -> 2021.4 ... https://lists.x.org/archives/xorg-announce/2021-April/003085.html	2021-05-15 11:48:57 +00:00
Silvan Mosberger	5f7f084ab7	xorg.xorgdocs: Make man pages discoverable by manpages	2021-05-04 23:11:32 +02:00
Martin Weinelt	8b3e8d917d	Merge pull request #115552 from Emantor/topic/xwayland_bump ... xwayland: 1.20.10 -> 21.1.1	2021-04-27 13:31:08 +02:00
Rouven Czerwinski	c7ddfc0760	xwayland: 1.20.10 -> 21.1.1 ... The new xwayland release uses meson exclusively, switch the derivation over to meson. See [1] for further reasoning. Also turn xwayland into its own derivation instead of using the override infrastructure. [1]: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/582 Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>	2021-04-27 08:43:48 +02:00
github-actions[bot]	b95da5efb6	Merge master into staging-next	2021-04-22 18:14:27 +00:00
Jörg Thalheim	eab5c73a13	Merge pull request #120064 from pennae/startx-dbus ... xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx	2021-04-22 15:52:08 +01:00
pennae	fc0a5b577e	xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx ... upstream startx unsets DBUS_SESSION_BUS_ADDRESS, which in turn breaks applications run under the startx display manager. arch has shipped this patch for years as well. (with review changes from @Mic92)	2021-04-22 13:03:41 +02:00
github-actions[bot]	a28d31ed86	Merge master into staging-next	2021-04-19 00:15:22 +00:00
TredwellGit	286c1918da	xorg.xf86inputlibinput: 1.0.0 -> 1.0.1 ... https://lists.x.org/archives/xorg-announce/2021-April/003083.html	2021-04-18 21:34:28 +00:00
Vladimír Čunát	d2eb7a7887	Merge branch 'staging' into staging-next ... A few conflicts but relatively clear ones (I think).	2021-04-14 10:08:25 +02:00
TredwellGit	c7fba6a472	xorg.xorgserver: 1.20.10 -> 1.20.11 ... https://lists.x.org/archives/xorg-announce/2021-April/003081.html https://lists.x.org/archives/xorg-announce/2021-April/003080.html	2021-04-13 14:42:09 +00:00
Gabriel Ebner	acbfd3f7c0	mesa: add driversdev output and test that dev doesn't depend on drivers ... OpenGL applications should not depend on the Mesa drivers, since these are supposed to be loaded at runtime from /run/opengl-driver using the glvnd library. Furthermore, the drivers output has a large closure since it depends on LLVM. The only dependency from dev to drivers came from the xatracker pkg-config file. This commit moves this file into a new output called driversdev.	2021-04-09 09:26:12 +02:00
Jan Tojnar	714ef27ffe	Merge branch 'master' into staging-next	2021-04-07 05:32:57 +02:00
TredwellGit	551f1dac03	xorg.xf86inputlibinput: 0.30.0 -> 1.0.0 ... https://lists.x.org/archives/xorg-announce/2021-April/003079.html	2021-04-06 22:34:14 +00:00
github-actions[bot]	74200a7126	Merge master into staging-next	2021-04-03 00:14:57 +00:00
Sandro	0e04d7db6c	Merge pull request #116945 from SuperSandro2000/xlibs-related	2021-04-02 21:41:46 +02:00
TredwellGit	584f82352e	xorg.libXres: 1.2.0 -> 1.2.1 ... https://lists.x.org/archives/xorg-announce/2021-March/003078.html	2021-04-01 00:40:23 +00:00
github-actions[bot]	d466353dd5	Merge staging-next into staging	2021-03-30 12:06:28 +00:00
github-actions[bot]	c9e9ff786b	Merge master into staging-next	2021-03-30 12:06:24 +00:00
Ivan Kozik	ac032f85c6	xorg.xf86videovmware: build with llvm instead of llvm_6 ... I don't see issues when it is built with llvm.	2021-03-29 17:35:35 +00:00
TredwellGit	c0172b1885	xorg.libXaw: 1.0.13 -> 1.0.14 ... https://lists.x.org/archives/xorg-announce/2021-March/003077.html	2021-03-28 02:27:04 +00:00
Sandro	0cfe88d88f	Merge pull request #114601 from TredwellGit/xorg.xorgproto ... xorg.xorgproto: 2020.1 -> 2021.3	2021-03-21 05:32:19 +01:00
Sandro Jäckel	21c17bf758	xorg.xf86videoopenchrome: fix build	2021-03-19 17:33:30 +01:00
TredwellGit	8d351c013d	xorg.xkbcomp: 1.4.4 -> 1.4.5 ... https://lists.x.org/archives/xorg-announce/2021-March/003075.html	2021-03-18 03:23:00 +00:00
Sandro	448b953d56	Merge pull request #111403 from TredwellGit/xorg.libXt ... xorg.libXt: 1.2.0 -> 1.2.1	2021-03-06 05:55:39 +01:00
TredwellGit	f00fde643e	xorg.utilmacros: 1.19.2 -> 1.19.3 ... https://lists.x.org/archives/xorg-announce/2021-January/003069.html	2021-03-05 19:04:19 +00:00
TredwellGit	38462b44c6	xorg.xorgproto: 2020.1 -> 2021.3 ... https://lists.x.org/archives/xorg-announce/2021-February/003072.html https://lists.x.org/archives/xorg-announce/2021-February/003073.html	2021-02-27 22:41:20 +00:00
TredwellGit	f296c4f81f	xorg.libXt: 1.2.0 -> 1.2.1 ... https://lists.x.org/archives/xorg-announce/2021-January/003070.html	2021-01-31 07:12:32 +00:00
Sandro	ad97ca4e51	Merge pull request #110912 from siraben/stdenv-lib-inherit ... treewide: remove inherited stdenv.lib	2021-01-27 10:28:55 +01:00
Ben Siraphob	3bbad8b041	treewide: remove inherited stdenv.lib	2021-01-27 12:44:43 +07:00
Pavol Rusnak	a6ce00c50c	treewide: remove stdenv where not needed	2021-01-25 18:31:47 +01:00
volth	bc0d605cf1	treewide: fix double quoted strings in meta.description ... Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>	2021-01-24 19:56:59 +07:00
TredwellGit	ba5dedbbd0	xorg.xf86videonouveau: 1.0.16 -> 1.0.17 ... https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html	2021-01-24 07:33:12 +00:00
Jonathan Ringer	9bb3fccb5b	treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix ... continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.	2021-01-19 01:16:25 -08:00
Jan Tojnar	c0d2951fa6	Merge branch 'master' into staging-next	2021-01-15 17:46:46 +01:00
Ben Siraphob	872973d7d1	pkgs/servers: stdenv.lib -> lib	2021-01-15 14:24:03 +07:00
Jan Tojnar	2b9372b2ca	Merge branch 'master' into staging-next	2021-01-11 13:36:42 +01:00
Profpatsch	4a7f99d55d	treewide: with stdenv.lib; in meta -> with lib; ... Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix	2021-01-11 10:38:22 +01:00
github-actions[bot]	bd9e17e21f	Merge staging-next into staging	2021-01-10 18:41:46 +00:00
github-actions[bot]	76394e4624	Merge master into staging-next	2021-01-10 18:41:43 +00:00
Profpatsch	66c01cf6f1	x11/xorg: run generator to apply change to stdenv.lib -> lib	2021-01-10 17:45:48 +01:00
Profpatsch	8ec2c88110	x11/xorg: stdenv.lib -> lib in meta generator ... The library does not depend on stdenv, that stdenv exposes lib is an artifact of the ancient origins of nixpkgs. I didn’t run the generator since it takes quite a while, but it should be automatically done the next time somebody updates a package.	2021-01-10 17:45:48 +01:00
Jan Tojnar	0ea0dacc20	Merge branch 'staging-next' into staging	2021-01-07 13:06:41 +01:00
Jan Tojnar	f19eb635b4	Merge branch 'master' into staging-next ... b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.	2021-01-07 13:04:31 +01:00
Sandro	8529423aa3	Merge pull request #108442 from TredwellGit/xorg.xf86videovesa	2021-01-06 01:26:47 +01:00
Sandro	f52c8d5705	Merge pull request #108443 from TredwellGit/xorg.xf86videonouveau ... xorg.xf86videonouveau: 1.0.15 -> 1.0.16	2021-01-05 22:23:47 +01:00
Michele Guerini Rocco	5748022aa3	Merge pull request #107117 from TredwellGit/xorg.fonttosfnt ... xorg.fonttosfnt: 1.0.5 -> 1.2.1	2021-01-05 09:40:37 +01:00
TredwellGit	730976960a	xorg.xf86videonouveau: 1.0.15 -> 1.0.16 ... https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html	2021-01-05 03:24:56 +00:00
TredwellGit	45c86b688c	xorg.xf86videovesa: 2.4.0 -> 2.5.0 ... https://lists.x.org/archives/xorg-announce/2020-September/003060.html	2021-01-05 03:21:15 +00:00
TredwellGit	8121c9badb	xorg.xkbcomp: 1.4.2 -> 1.4.4 ... https://lists.x.org/archives/xorg-announce/2020-February/003037.html https://lists.x.org/archives/xorg-announce/2020-November/003063.html	2021-01-04 18:07:56 +01:00
John Ericson	5c2965145f	treewide: Inline more of the static overlay ... Picking up where #107238 left off. I think I'll have gotten all the easy stuff with this.	2021-01-03 21:46:14 +00:00
TredwellGit	ad86bc75eb	xorg.fonttosfnt: 1.0.5 -> 1.2.1 ... https://lists.x.org/archives/xorg-announce/2020-January/003035.html https://lists.x.org/archives/xorg-announce/2020-October/003062.html https://lists.x.org/archives/xorg-announce/2020-December/003068.html	2020-12-17 19:59:37 +00:00
Timo Kaufmann	d6dba0d7c1	Merge pull request #100774 from Atemu/startx-improvements ... Startx improvements	2020-12-13 18:28:21 +01:00
Atemu	d3113a62b8	nixos/startx: send Xorg log to the default location ... This partially reverts bf3d3dd19b. I don't know why we weren't getting a default logfile back then but Xorg definitely provides one now ($XDG_DATA_HOME for regular users and /var/log for root, see `man Xorg`)	2020-12-13 06:15:33 +01:00
Atemu	a5ea1b6fb3	xorgserver: set log-dir to /var/log instead of the Nix store ... Xorg creates the log-dir in its output path because X crashes if it can't write to its logfile. On a regular distro, this dir would be installed into the root to prevent that from happening but with Nix, it sits in the read-only Nix store. Ironically, when Xorg tries to write here, it fails and crashes. To make Xorg log to /var/log, we have to stop the build script from trying to create the log-dir as the sandbox doesn't (and shouldn't) have access to /var. This creates a runtime dependency on /var when running as root but that should exist on any Linux system (on NixOS, journald always creates /var/log). Previously, the startx displayManager required some workarounds for logfiles which are obsolete now. patchPhase -> postPatch because overriding the patchPhase prevents patches from being applied	2020-12-13 06:15:32 +01:00
Atemu	338939d464	xinit: use the system xserverrc ... Previously it'd try to use the one under its output path which is read-only of course	2020-12-13 06:15:32 +01:00
TredwellGit	88fcd687d0	xorg.xrandr: 1.5.0 -> 1.5.1 ... https://lists.x.org/archives/xorg-announce/2019-August/003018.html	2020-12-08 05:20:24 +01:00
github-actions[bot]	4763e8b8fd	Merge master into staging-next	2020-12-05 00:38:01 +00:00
TredwellGit	0309973b82	xorg.xorgserver: 1.20.9 -> 1.20.10 ... https://lists.x.org/archives/xorg-announce/2020-December/003067.html https://lists.x.org/archives/xorg-announce/2020-December/003066.html	2020-12-01 23:47:01 +00:00
Vladimír Čunát	48b3694562	Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security)	2020-11-29 09:55:14 +01:00
TredwellGit	95e815b5ff	xorg.libX11: 1.6.12 -> 1.7.0 ... https://lists.x.org/archives/xorg-announce/2020-November/003065.html	2020-11-24 23:54:22 +00:00
TredwellGit	233849a14d	xorg.xprop: 1.2.4 -> 1.2.5 ... https://lists.x.org/archives/xorg-announce/2020-November/003064.html	2020-11-24 23:42:45 +00:00
TredwellGit	fc03fe100a	xorg: fix update generation ... Both e3d3bc66dc and 1d15641433 were done incorrectly. Also, use python3 in generate-expr-from-tarballs.pl instead of overrides.nix.	2020-11-23 13:30:25 -08:00
Frederik Rietdijk	20f001c01e	Merge master into staging-next	2020-11-09 14:33:52 +01:00
Danielle Lancashire	f7e691ac7e	xorg.xf86videointel: Fix build ... Since c252654584, building xf86videointel has been broken on my system due to missing libXv. This commit explicitly includes the dependency when building the package to hopefully avoid things being broken for others.	2020-11-06 15:01:43 +01:00
Matthieu Coudron	e3d3bc66dc	Merge pull request #101695 from lourkeur/xkeyboard-config ... xkeyboard-config: 2.27 -> 2.31	2020-10-27 15:11:04 +01:00
Louis	3f381d579d	setxkbmap: include xkeyboard-config manpage	2020-10-27 13:59:14 +01:00
Vladimír Čunát	89023c38fc	Recover the complicated situation after my bad merge ... I made a mistake merge. Reverting it in c778945806 undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state	2020-10-26 09:01:04 +01:00
Vladimír Čunát	336bc8283b	Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" ... This reverts commit c778945806. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).	2020-10-26 08:19:17 +01:00
Vladimír Čunát	c778945806	Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" ... I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c, reversing changes made to a8a018ddc0.	2020-10-25 09:41:51 +01:00
Vladimír Čunát	17f5305b6c	Merge #101508: libraw: 0.20.0 -> 0.20.2	2020-10-25 09:28:53 +01:00
Louis	3cf12aa9c6	xkeyboard-config: 2.27 -> 2.31	2020-10-24 20:22:31 +02:00
Andreas Rammhold	f0af7d27b8	Merge pull request #98748 from TredwellGit/xorg.xorgserver ... xorg.xorgserver: 1.20.8 -> 1.20.9	2020-10-24 00:44:52 +02:00
Vladimír Čunát	2324085f9f	Merge #100385: xorg xcb updates (into staging)	2020-10-20 12:09:58 +02:00
Vladimír Čunát	744f449aa4	Merge #100376: xorg.xorgproto: 2019.1 -> 2020.1 (into staging)	2020-10-20 12:07:12 +02:00
Vladimír Čunát	b4d8c62423	Merge #100378: xorg.libXvMC: 1.0.11 -> 1.0.12 (into staging)	2020-10-20 12:05:30 +02:00
Vladimír Čunát	b623690daf	Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security)	2020-10-15 07:55:16 +02:00
Rok Garbas	ec49d7a686	Merge pull request #100391 from TredwellGit/xorg.xf86inputlibinput ... xorg.xf86inputlibinput: 0.28.2 -> 0.30.0	2020-10-14 14:17:12 +02:00
TredwellGit	3e079834a9	xorg.libX11: 1.6.8 -> 1.6.12 ... https://lists.x.org/archives/xorg-announce/2020-August/003056.html https://lists.x.org/archives/xorg-announce/2020-July/003050.html	2020-10-13 22:47:33 -04:00