3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

950 commits

Author SHA1 Message Date
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] 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 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
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
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
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
WORLDofPEACE a1c5bd00ab
Merge pull request #98974 from Mathnerd314/video-drivers
xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0
2020-10-13 07:07:03 -04:00
TredwellGit dd6a204464 xorg.xf86inputlibinput: 0.28.2 -> 0.30.0
https://lists.x.org/archives/xorg-announce/2019-August/003017.html
https://lists.x.org/archives/xorg-announce/2020-May/003045.html
2020-10-13 07:34:17 +00:00
TredwellGit 3a23e46d6e xorg.libxcb: 1.13.1 -> 1.14
https://lists.x.org/archives/xorg-announce/2020-February/003039.html
2020-10-13 06:25:31 +00:00
TredwellGit 9601605ede xorg.xcbproto: 1.13 -> 1.14.1
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://lists.x.org/archives/xorg-announce/2020-October/003061.html
2020-10-13 06:17:20 +00:00
TredwellGit 55eba47ef6 xorg.libXvMC: 1.0.11 -> 1.0.12
https://lists.x.org/archives/xorg-announce/2019-September/003023.html
2020-10-13 05:15:01 +00:00
TredwellGit 9c4f4aa099 xorg.xorgproto: 2019.1 -> 2020.1
https://lists.x.org/archives/xorg-announce/2019-October/003029.html
https://lists.x.org/archives/xorg-announce/2020-April/003042.html
2020-10-13 05:02:44 +00:00
Frederik Rietdijk 692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Emilio Perez 52f028f2d9 nixos/xwayland: add new module and allow configuring a default font path
- Add option `programs.xwayland.defaultFontPath`
- Modify sway to enable Xwayland
2020-10-04 14:56:30 +01:00
TredwellGit 5235437533 generate-expr-from-tarballs.pl: fix insecure temporary file
https://cwe.mitre.org/data/definitions/377.html
2020-09-30 09:21:55 +00:00
Jonathan Ringer f2de9ca370 xorg.xkeyboardconfig: build man pages 2020-09-29 08:10:27 -07:00
Mathnerd314 ed054f7815 xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0 2020-09-27 15:57:35 -06:00