Skip to content

Commit 010bfaa

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-next
2 parents ead01ee + 04691f3 commit 010bfaa

1,194 files changed

Lines changed: 7057 additions & 6894 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎maintainers/maintainer-list.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9556,6 +9556,12 @@
95569556
githubId = 127353;
95579557
name = "Geoffrey Huntley";
95589558
};
9559+
gibbert = {
9560+
email = "gbjgms@gmail.com";
9561+
github = "zgibberish";
9562+
githubId = 67570424;
9563+
name = "gibbert";
9564+
};
95599565
gigahawk = {
95609566
email = "Jasper Chan";
95619567
name = "jasperchan515@gmail.com";

‎pkgs/applications/audio/mmlgui/default.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
pkg-config,
77
glfw,
88
libvgm,
9-
libX11,
10-
libXau,
11-
libXdmcp,
9+
libx11,
10+
libxau,
11+
libxdmcp,
1212
cppunit,
1313
}:
1414

@@ -55,9 +55,9 @@ stdenv.mkDerivation {
5555
libvgm
5656
]
5757
++ lib.optionals stdenv.hostPlatform.isLinux [
58-
libX11
59-
libXau
60-
libXdmcp
58+
libx11
59+
libxau
60+
libxdmcp
6161
];
6262

6363
checkInputs = [

‎pkgs/applications/audio/open-music-kontrollers/generic.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
ninja,
88
lv2,
99
sord,
10-
libX11,
11-
libXext,
10+
libx11,
11+
libxext,
1212
glew,
1313
lv2lint,
1414
pname,
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
4040
buildInputs = [
4141
lv2
4242
sord
43-
libX11
44-
libXext
43+
libx11
44+
libxext
4545
glew
4646
lv2lint
4747
]

‎pkgs/applications/audio/rakarrack/default.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
alsa-utils,
77
fltk,
88
libjack2,
9-
libXft,
10-
libXpm,
9+
libxft,
10+
libxpm,
1111
libjpeg,
1212
libpng,
1313
libsamplerate,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
3737
alsa-utils
3838
fltk
3939
libjack2
40-
libXft
41-
libXpm
40+
libxft
41+
libxpm
4242
libjpeg
4343
libpng
4444
libsamplerate

‎pkgs/applications/audio/zynaddsubfx/default.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
fltk,
3737
libGL,
3838
libjpeg,
39-
libX11,
40-
libXpm,
39+
libx11,
40+
libxpm,
4141
ntk,
4242

4343
# Test dependencies
@@ -116,16 +116,16 @@ stdenv.mkDerivation rec {
116116
++ lib.optionals (guiModule == "fltk") [
117117
fltk
118118
libjpeg
119-
libXpm
119+
libxpm
120120
]
121121
++ lib.optionals (guiModule == "ntk") [
122122
ntk
123123
cairo
124-
libXpm
124+
libxpm
125125
]
126126
++ lib.optionals (guiModule == "zest") [
127127
libGL
128-
libX11
128+
libx11
129129
];
130130

131131
cmakeFlags = [

‎pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
ruby,
99
libGL,
1010
libuv,
11-
libX11,
11+
libx11,
1212
}:
1313

1414
stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
buildInputs = [
3838
libGL
3939
libuv
40-
libX11
40+
libx11
4141
];
4242

4343
# Force optimization to fix:

‎pkgs/applications/display-managers/sddm/unwrapped.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
pkg-config,
88
qttools,
99
libxcb,
10-
libXau,
10+
libxau,
1111
pam,
1212
qtbase,
1313
qtdeclarative,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
6262

6363
buildInputs = [
6464
libxcb
65-
libXau
65+
libxau
6666
pam
6767
qtbase
6868
qtdeclarative

‎pkgs/applications/editors/android-studio-for-platform/common.nix‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
fontsConf,
2626
fontconfig,
2727
freetype,
28-
libX11,
29-
libXext,
30-
libXi,
31-
libXrandr,
32-
libXrender,
33-
libXtst,
28+
libx11,
29+
libxext,
30+
libxi,
31+
libxrandr,
32+
libxrender,
33+
libxtst,
3434
makeFontsConf,
3535
makeWrapper,
3636
ncurses5,
@@ -107,14 +107,14 @@ let
107107
# Crash at startup without these
108108
fontconfig
109109
freetype
110-
libXext
111-
libXi
112-
libXrender
113-
libXtst
114-
libX11
110+
libxext
111+
libxi
112+
libxrender
113+
libxtst
114+
libx11
115115
116116
# Support multiple monitors
117-
libXrandr
117+
libxrandr
118118
119119
# For GTKLookAndFeel
120120
gtk2

‎pkgs/applications/editors/android-studio/common.nix‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
libpng,
3535
libuuid,
3636
libsecret,
37-
libX11,
37+
libx11,
3838
libxcb,
3939
libxkbcommon,
4040
mesa-demos,
@@ -44,15 +44,15 @@
4444
libxcb-image,
4545
libxcb-cursor,
4646
libxkbfile,
47-
libXcomposite,
48-
libXcursor,
49-
libXdamage,
50-
libXext,
51-
libXfixes,
52-
libXi,
53-
libXrandr,
54-
libXrender,
55-
libXtst,
47+
libxcomposite,
48+
libxcursor,
49+
libxdamage,
50+
libxext,
51+
libxfixes,
52+
libxi,
53+
libxrandr,
54+
libxrender,
55+
libxtst,
5656
makeWrapper,
5757
ncurses5,
5858
nspr,
@@ -141,10 +141,10 @@ let
141141
# Crash at startup without these
142142
fontconfig
143143
freetype
144-
libXext
145-
libXi
146-
libXrender
147-
libXtst
144+
libxext
145+
libxi
146+
libxrender
147+
libxtst
148148
libsecret
149149
150150
# No crash, but attempted to load at startup
@@ -159,7 +159,7 @@ let
159159
zlib
160160
pkgsi686Linux.zlib
161161
# Support multiple monitors
162-
libXrandr
162+
libxrandr
163163
164164
# For Android emulator
165165
alsa-lib
@@ -168,7 +168,7 @@ let
168168
libbsd
169169
libpulseaudio
170170
libuuid
171-
libX11
171+
libx11
172172
libxcb
173173
libxkbcommon
174174
libxcb-wm
@@ -179,10 +179,10 @@ let
179179
libice
180180
libsm
181181
libxkbfile
182-
libXcomposite
183-
libXcursor
184-
libXdamage
185-
libXfixes
182+
libxcomposite
183+
libxcursor
184+
libxdamage
185+
libxfixes
186186
libGL
187187
libdrm
188188
libpng

‎pkgs/applications/editors/cudatext/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
coreutils,
66
lazarus,
77
fpc,
8-
libX11,
8+
libx11,
99

1010
# GTK2/3
1111
pango,
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868
++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
6969

7070
buildInputs = [
71-
libX11
71+
libx11
7272
]
7373
++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
7474
pango

0 commit comments

Comments
 (0)