Commit graph

1123 commits

Author SHA1 Message Date
Sergei Trofimovich fc6631d3e7 xorg.xev: 1.2.3 -> 1.2.4 2021-10-10 10:32:50 +01:00
TredwellGit ed148c2890 xorg.xf86inputlibinput: 1.1.0 -> 1.2.0
https://lists.x.org/archives/xorg-announce/2021-September/003110.html
2021-10-09 09:34:20 +00:00
TredwellGit 3251722dcd xorg.libXi: 1.7.10 -> 1.8
https://lists.x.org/archives/xorg-announce/2021-September/003109.html
2021-10-04 11:42:18 +00:00
TredwellGit 3e1d4f321e xorg.xorgproto: 2021.4 -> 2021.5
https://lists.x.org/archives/xorg-announce/2021-September/003108.html
2021-09-19 08:18:40 +00:00
github-actions[bot] a21275cdae
Merge master into staging-next 2021-09-17 18:01:14 +00:00
oxalica 6076184227
xorg.xf86*: fix include dir
`installFlags` do not work since .pc files are generated during
configure phase. We need to override them with configure flags.
2021-09-16 00:42:24 +08:00
github-actions[bot] b56a4e5e6e
Merge staging-next into staging 2021-09-09 00:02:15 +00:00
Sergei Trofimovich 6073831a11 imake: do not skip Linux* vendor definitions
Initial build failure is onserved on `staging` branch:

```
$ nix-build -A transfig
...
make[1]: Entering directory '/build/transfig.3.2.4'
Imakefile.c:20:2: Include file Imake.tmpl not found
imake: Exit code 1.
  Stop.
```

This happened after 8675ca0 ("xorg.xorgcffiles: 1.0.6 -> 1.0.7")
bump which exposed an old bug in `imake.patch`. `imake.patch`
dropped by accident definiton of `LinuxRedHat` enum and changed
evaluation of the following code:

```
 #if LinuxDistribution == LinuxRedHat
 ...
 # define ProjectRoot /usr
 #endif
```

References to `/usr` were addded in d47131ed97.

Before this change `LinuxDistribution == LinuxRedHat` evaluated to true.
After this change `LinuxDistribution == LinuxRedHat` evaluates to false.

Mechanically I moved `#if 0` right after enum definitions but still
before system autodetection.

Now `transfig` builds successfully.

Closes: https://github.com/NixOS/nixpkgs/issues/135337
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
2021-09-06 07:46:13 +01:00
Martin Weinelt 7f732aca66 Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
2021-09-05 15:02:25 +02:00
Alyssa Ross a3c3bb0de9 xorg.libXft: 2.3.3 -> 2.3.4 2021-08-25 07:27:31 +00:00
Jan Tojnar 807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
TredwellGit 01a6d30016 xorg.xrdb: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2021-August/003107.html
2021-08-10 13:25:40 +00:00
Vladimír Čunát 8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
Sandro eccbf31e05
Merge pull request #132491 from TredwellGit/xorg.libXfont2
xorg.libXfont2: 2.0.4 -> 2.0.5
2021-08-05 16:51:27 +02:00
Sandro 6f7ee408c9
Merge pull request #127986 from TredwellGit/generate-expr-from-tarballs.pl
generate-expr-from-tarballs.pl: use nix-shell as script interpreter
2021-08-05 10:10:14 +02:00
Sandro a81e601d28
Merge pull request #132485 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.12 -> 1.20.13
2021-08-05 09:31:39 +02:00
Sandro fef0331b1a
Merge pull request #132489 from TredwellGit/xorg.xwd 2021-08-04 22:58:43 +02:00
Sandro 091f18e07b
Merge pull request #132487 from TredwellGit/xorg.xeyes
xorg.xeyes: 1.1.2 -> 1.2.0
2021-08-04 22:58:22 +02:00
TredwellGit 8675ca0e94 xorg.xorgcffiles: 1.0.6 -> 1.0.7
https://lists.x.org/archives/xorg-announce/2021-August/003105.html
2021-08-04 08:29:53 +00:00
TredwellGit fccbcf5568 xorg.libXfont2: 2.0.4 -> 2.0.5
https://lists.x.org/archives/xorg-announce/2021-August/003103.html
2021-08-04 02:07:26 +00:00
TredwellGit 845aa1a760 xorg.xf86videoamdgpu: 19.1.0 -> 21.0.0
https://lists.x.org/archives/amd-gfx/2021-July/067146.html
2021-08-04 01:31:53 +00:00
TredwellGit a51c130827 xorg.xwd: 1.0.7 -> 1.0.8
https://lists.x.org/archives/xorg-announce/2021-August/003102.html
2021-08-03 03:35:29 +00:00
TredwellGit 273b06dd03 xorg.xeyes: 1.1.2 -> 1.2.0
https://lists.x.org/archives/xorg-announce/2021-August/003101.html
2021-08-03 03:20:16 +00:00
TredwellGit 0687032f69 xorg.xorgserver: 1.20.12 -> 1.20.13
https://lists.x.org/archives/xorg-announce/2021-July/003100.html
2021-08-03 03:09:58 +00:00
Felix Buehler a56d117bdb servers: replace name with pname&version 2021-07-26 20:15:46 +02:00
Sandro a0fe575c2c
Merge pull request #129812 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.11 -> 1.20.12
2021-07-15 18:20:30 +02:00
Sandro Jäckel 388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
Atemu 4b4c8650a8 xorgserver: override build OS name 2021-07-13 22:41:16 +02:00
TredwellGit a888c7fb80 xorg.xorgserver: 1.20.11 -> 1.20.12
https://lists.x.org/archives/xorg-announce/2021-July/003098.html
2021-07-10 01:54:25 +00:00
Herman Fries 3956639b58 xwayland: 21.1.1 -> 21.1.2 2021-07-09 15:06:42 +02:00
Michael Weiss 0b93eb68a2
xwayland: support cross-compilation 2021-07-03 15:48:10 +02:00
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