Vladimír Čunát
13797ff522
linux-4.13: mark as insecure (+required generic changes)
...
extraMeta was being fed as passthru without being processed by stdenv,
so without those changes, adding the security attribute would be useless.
2017-12-04 09:33:39 +01:00
aszlig
d747c27387
linux-testing: 4.15-rc1 -> 4.15-rc2
...
Built successfully on x86_64-linux.
I've verified the contents of the tarball by comparing its contents
against the tag of my local checkout. Furthermore, I've checked the GPG
signature of the tag.
Signed-off-by: aszlig <aszlig@nix.build>
2017-12-04 05:24:37 +01:00
adisbladis
74857c9dce
Revert "linux_4_13: Remove, no longer supported."
...
This reverts commit b39ab30ba7
.
There are some show stopper issues in the 4.14 kernel that are still
not resolved.
https://github.com/NixOS/nixpkgs/issues/31640
2017-12-04 09:59:11 +08:00
Tuomas Tynkkynen
b39ab30ba7
linux_4_13: Remove, no longer supported.
2017-12-03 23:20:08 +02:00
Tuomas Tynkkynen
b51cc95a61
ioport: Broken on non-x86
...
https://hydra.nixos.org/build/65057213
2017-12-03 19:51:58 +02:00
Ben Gamari
dc10c551eb
lvm2: Enable cross-compilation
2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen
7cf9900b48
kexectools: 2.0.15 -> 2.0.16
2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen
27a77af62f
pam: 1.2.1 -> 1.3.0
2017-12-03 01:50:42 +02:00
Tim Steinbach
4e7deb7100
linux-copperhead: 4.14.2.a -> 4.14.3.a
2017-12-02 14:01:14 -05:00
sg2002
af9cf7ec77
lm-sensors: add option to enable sensord ( #32172 )
2017-12-02 15:46:14 +00:00
Tim Steinbach
a57a32e07c
linux: 4.4.102 -> 4.4.103
2017-12-01 10:07:28 -05:00
Tim Steinbach
777f49bfff
linux: 4.9.65 -> 4.9.66
2017-12-01 10:04:09 -05:00
Tim Steinbach
2863022480
linux: 4.14.2 -> 4.14.3
2017-12-01 10:00:48 -05:00
Peter Hoeg
efd4ad0b16
dbus-broker: 8 -> 9
2017-12-01 19:55:17 +08:00
Vladimír Čunát
e9550f290c
nvidia_x11_legacy340: add another patch
...
I *suspect* that NV_VM_OPERATIONS_STRUCT_HAS_FAULT isn't detected
in our case for some reason, so this patch doesn't make a difference.
In any case, the patch seems unlikely to make anything worse.
2017-11-30 12:06:27 +01:00
Vladimír Čunát
b934716782
nvidia_x11_legacy304: fix build with kernel 4.14
...
/cc #31640 .
2017-11-30 09:51:17 +01:00
Vladimír Čunát
1e4d675c4e
nvidia_x11_legacy304: 304.135 -> 304.137
...
This now builds with kernel 4.13; Debian has only the typo patch there.
Curiously, .settings still fails to link on x86_64-linux but works
on i686-linux, just as with .135.
2017-11-30 09:50:22 +01:00
Vladimír Čunát
6aa3f54f8d
nvidia_x11_legacy340: patch to support kernel 4.14
...
/cc #31640 .
2017-11-29 23:26:00 +01:00
Tuomas Tynkkynen
a43ec91901
usbutils: 008 -> 009
2017-11-29 23:40:33 +02:00
Vladimír Čunát
2dfbc5f8ed
nvidia_x11_legacy340: 340.102 -> 340.104
...
Fixes #32169 : build with kernel 4.13.
Unfortunately, 4.13 is going away very soon and for 4.14 doesn't build.
I only tested building it, but these minor bumps should be safe.
2017-11-29 19:04:48 +01:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
...
There are security fixes in multiple packages /cc #32117 ,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Peter Hoeg
226c5699e7
dbus-broker: 3 -> 8
2017-11-29 08:42:44 +08:00
Vladimír Čunát
94cba39aa2
systemd resolved: patch CVE-2017-15908
...
fix loop on packets with pseudo dns types
https://github.com/NixOS/systemd/pull/14
2017-11-28 20:11:40 +01:00
Vladimír Čunát
addd20e6f9
Merge branch 'master' into staging
2017-11-28 18:19:34 +01:00
Philipp Steinpass
e8fcced76e
linux-testing: 4.14-rc8 -> 4.15-rc1
...
Closes #32137
2017-11-28 15:19:23 +02:00
Tuomas Tynkkynen
acbaefa615
Revert "linux-testing: 4.14-rc8 -> 4.15-rc1"
...
This reverts commit 9335f1dda2
.
Doesn't compile, a working version is at #32137 .
2017-11-28 15:18:49 +02:00
Orivej Desh
f8077b7ef1
criu: fix build with glibc 2.26
2017-11-28 08:12:32 +00:00
Tim Steinbach
9335f1dda2
linux-testing: 4.14-rc8 -> 4.15-rc1
2017-11-27 16:34:06 -05:00
Vladimír Čunát
6705f30e2c
Merge branch 'master' into staging
2017-11-27 15:09:53 +01:00
John Ericson
e755a8a27d
treewide: Use targetPrefix
instead of prefix
for platform name prefixes
...
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Renaud
819d089772
Merge pull request #31538 from c0bw3b/pkg/libsmbios
...
libsmbios: 2.3.2 -> 2.3.3
2017-11-26 18:19:14 +01:00
Tim Steinbach
3fc7f924af
linux-copperhead: 4.14.1.a -> 4.14.2.a
2017-11-26 12:07:04 -05:00
Tuomas Tynkkynen
bc98f13222
numactl: Not supported on 32-bit ARM
2017-11-26 11:13:20 +02:00
Renaud
11c92ba6ba
libsmbios: 2.3.2 -> 2.3.3
2017-11-25 16:08:31 +01:00
Andreas Rammhold
141644e752
conky: fix compilation with gcc-7
2017-11-25 15:57:40 +01:00
Vladimír Čunát
7dfa97969a
Merge branch 'staging' (older one)
...
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
2017-11-24 18:36:54 +01:00
Tim Steinbach
c3ce21dd98
linux: 4.14.1 -> 4.14.2
2017-11-24 08:28:12 -05:00
Tim Steinbach
4f7fb7125a
linux: 4.13.15 -> 4.13.16
2017-11-24 08:28:12 -05:00
Tim Steinbach
3774309986
linux: 4.9.64 -> 4.9.65
2017-11-24 08:28:12 -05:00
Tim Steinbach
9d86ddc685
linux: 4.4.100 -> 4.4.102
2017-11-24 08:28:12 -05:00
Jörg Thalheim
d3c14c8efa
Merge pull request #31986 from andir/ipset
...
ipset: 6.27 -> 6.34
2017-11-24 12:55:58 +00:00
Jan Tojnar
193c4c5701
Merge pull request #30252 from jtojnar/fwupd
...
fwupd: 0.9.6 → 1.0.1
2017-11-24 04:07:52 +01:00
Andreas Rammhold
d96cac2e63
ipset: 6.27 -> 6.34
2017-11-23 20:30:22 +01:00
Jörg Thalheim
487c4a6f6e
Merge pull request #27513 from lukeadams/prl-tools-fix
...
[NixOS] Fix + update `hardware.parallels` config option
2017-11-23 14:10:21 +00:00
Moritz U
f6dfa221c9
usbip: init at ${kernel.version} ( #31948 )
...
* usbip: Init at ${kernel.version}
* usbip: simplify build
* usbip: fix build on bcachefs kernel
* usbip: revert autoreconfHook
sorry for breakage, I was testing the wrong code
2017-11-22 22:54:50 +00:00
Tim Steinbach
843ee55b66
linux-copperhead: 4.13.14.a -> 4.14.1.a
2017-11-22 08:03:56 -05:00
Jörg Thalheim
9ae72f2715
Merge pull request #31908 from andir/alsa-1.1.5
...
alsa upgrade to 1.1.5
2017-11-22 08:23:26 +00:00
Daiderd Jordan
76e50a3fbf
Merge pull request #31917 from LnL7/darwin-csu
...
Csu: fix build with CoreFoundation
2017-11-22 08:58:44 +01:00
Cray Elliott
2517cea040
nvidia-x11-stable: 384.90 -> 387.22
2017-11-21 19:15:37 -08:00
Orivej Desh
b8e1e7191e
Merge branch 'master' into staging
...
* master: (80 commits)
lkl: Supports aarch64
wimlib: nitpicks
gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
wimlib: init at 1.12.0
kernel: improve modDirVersion error message
releaseTools.sourceTarball: Clean up temporary files
dotnetPackages.SmartIrc4net: rehash source
migmix: make it a fixed-output derivation
vm: Create /dev/full
samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
microcodeIntel: 20170707 -> 20171117
sshd: Remove ripemd160 MACs
kernel config: Enable MEDIA_CONTROLLER
linux: 4.4.99 -> 4.4.100
linux: 4.9.63 -> 4.9.64
nix-bash-completions: 0.4 -> 0.5
linux: 4.14 -> 4.14.1
linux: 4.13.14 -> 4.13.15
nix-zsh-completions: 0.3.3 -> 0.3.5
dns-root-data: use a stable URL that I maintain anyway
...
2017-11-21 22:48:36 +00:00
Daiderd Jordan
a0948ffdb0
Csu: fix build with CoreFoundation
2017-11-21 23:15:00 +01:00
Matthieu Coudron
28f9262092
kernel: improve modDirVersion error message
...
Now prints the current modDirVersion. Close #31887 .
2017-11-21 20:42:41 +01:00
Andreas Rammhold
111c8f1287
alsa-plugins: 1.1.4 -> 1.1.5
2017-11-21 20:23:38 +01:00
Andreas Rammhold
e1f8c72ec8
alsa-tools: 1.1.3 -> 1.1.5
2017-11-21 20:23:14 +01:00
Andreas Rammhold
9b8ebd8e14
alsa-utils: 1.1.4 -> 1.1.5
2017-11-21 20:22:54 +01:00
Andreas Rammhold
e207ac1ee3
alsa-lib: 1.1.4.1 -> 1.1.5
2017-11-21 20:22:14 +01:00
Jörg Thalheim
a4e178b3a5
Merge pull request #31900 from andir/update-intel-microcode
...
microcodeIntel: 20170707 -> 20171117
2017-11-21 17:22:24 +00:00
Andreas Rammhold
89fab17749
microcodeIntel: 20170707 -> 20171117
...
From the changelog:
```
Intel Processor Microcode Package for Linux
20171117 Release
-- New Platforms --
CFL U0 (06-9e-0a:22) 70
CFL B0 (06-9e-0b:2) 72
SKX H0 (06-55-04:b7) 2000035
GLK B0 (06-7a-01:1) 1e
APL Bx (06-5c-09:3) 2c
-- Updates --
KBL Y0 (06-8e-0a:c0) 66->70
-- Removed files --
SKX H0 (06-55-04:97) 2000022
```
2017-11-21 17:17:49 +01:00
Raymond Gauthier
7cdd12e4e9
kernel config: Enable MEDIA_CONTROLLER
...
With this disabled, cameras would not get a `/dev/mediaX` entry matching
the `/dev/videoX` which broke any application (e.g: `uvcdynctrl -l`,
`media-ctl -p`) depending on this interface.
2017-11-21 16:33:31 +02:00
Tim Steinbach
3300ec2b92
linux: 4.4.99 -> 4.4.100
2017-11-21 08:08:40 -05:00
Tim Steinbach
03a3ab5db1
linux: 4.9.63 -> 4.9.64
2017-11-21 08:06:47 -05:00
Tim Steinbach
e3877445aa
linux: 4.14 -> 4.14.1
2017-11-21 08:04:26 -05:00
Tim Steinbach
332ac0bdec
linux: 4.13.14 -> 4.13.15
2017-11-21 08:02:12 -05:00
Tim Steinbach
58cc833df4
linux-copperhead: 4.13.13.a -> 4.13.14.a
2017-11-20 11:44:03 -05:00
Raymond Gauthier
fb3ad1455a
libwebcam: Init at 0.2.5
2017-11-20 16:34:15 +00:00
Orivej Desh
ab0d141f44
Merge branch 'master' into staging
...
* master: (23 commits)
silver-searcher: patch bash completions location
shairplay: init at 2016-01-01
ocamlPackages.rope: 0.5 -> 0.6
ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8
mupdf: Patch openjpeg version
nextcloud-client: fix build after qt updates
gstreamer.gst-plugins-bad: Patch openjpeg version
silver-searcher: move bash completion to etc/bash-completion.d/
neomutt: use mime.types from dedicated mime-types derivation
mime_types: rename to mime-types
XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672
nixos/matrix-synapse: remove unused log_file config
nixos: run parted with --script option (3rd)
nixos: run parted with --script option (2nd)
nixos/release: add nixos/tests/switch-test.nix to tested job
nixos/system: make switch-to-configuration script pure.
nixos/release: include mutableUsers test to release tests.
nixos/tests: Add a test for config.users.mutableUsers.
corebird: 1.7.2 -> 1.7.3
nixos/matrix-synapse: make home directory configurable
...
2017-11-20 09:21:51 +00:00
Pascal Wittmann
afcf6742dd
Merge pull request #31804 from NeQuissimus/beagleboard_4_9_61
...
linux-beagleboard: 4.9.59-r73 -> 4.9.61-r76
2017-11-20 09:20:25 +01:00
Tuomas Tynkkynen
dfd2e6ff74
iproute: 4.13.0 -> 4.14.1
2017-11-19 19:14:22 +02:00
Tuomas Tynkkynen
d1f7d794cf
devicemapper: 2.02.175 -> 2.02.176
2017-11-19 19:14:19 +02:00
Orivej Desh
b089c21506
Merge branch 'master' into staging
...
* master: (39 commits)
python.pkgs.pybfd: move to python-modules
documentation: python 2.6 is no more
documentation: python3Packages is python36Packages
wireguard: 0.0.20171101 -> 0.0.20171111
php_excel: init at 1.0.2
libxl: init at 3.8.1
matrix-synapse: 0.24.1 -> 0.25.1
grafana: 4.6.1 -> 4.6.2
linux: 4.4.98 -> 4.4.99
linux: 4.9.62 -> 4.9.63
linux: 4.13.13 -> 4.13.14
nixos/zsh: add the type for enableAutosuggestions option
zsh-powerlevel9k: init at 2017-11-10
fio: 3.1 -> 3.2
filebench: rehash source
nano: 2.8.7 -> 2.9.0
bonnie: replace dead source link
less: 520 -> 529
strace: 4.19 -> 4.20
iperf: 3.2 -> 3.3
...
2017-11-19 08:30:14 +00:00
Franz Pletz
265f4c58a1
wireguard: 0.0.20171101 -> 0.0.20171111
2017-11-19 04:41:16 +01:00
Tim Steinbach
170f5c7543
linux-beagleboard: 4.9.59-r73 -> 4.9.61-r76
2017-11-18 17:33:40 -05:00
Tim Steinbach
ac470a67f8
linux: 4.4.98 -> 4.4.99
2017-11-18 17:19:50 -05:00
Tim Steinbach
c6f1290250
linux: 4.9.62 -> 4.9.63
2017-11-18 17:16:14 -05:00
Tim Steinbach
790f096a45
linux: 4.13.13 -> 4.13.14
2017-11-18 17:12:18 -05:00
Shea Levy
a8dc88258f
Merge branch 'system_cmds'
2017-11-18 08:34:05 -05:00
John Ericson
ccb93aee17
Merge pull request #31754 from obsidiansystems/simplify-darwin-binutils
...
cctools, darwin-bintuils: Don't always bring in headers
2017-11-17 15:31:45 -05:00
Orivej Desh
1161741351
Merge branch 'master' into staging
...
* master: (28 commits)
go_1_9: skip flaky TestWaitGroupMisuse2
erlangR18: fix patch hashes with fetchpatch
xml2: replace dead links
nixos/pam: fix docs about path to u2f_keys file
cinelerra: add a note about parallel building
msmtp: install docs and examples (#31769 )
kernel: Fix out-of-tree modules on aarch64
nixos/tests/acme: update terms of service to fix test
gixy: init at 0.1.8
pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
mono: init at 4.8
wal-g: fix license so not to break evaluation
wal-g: init at 0.1.2
maintainers: add backuitist
nixos/prometheus: Correct documentation for external_labels
spidermonkey: replace broken links
vagrant: removed custom rake gem
vagrant: 2.0.0 -> 2.0.1
nixos/prometheus: add external_labels option
nixos/prometheus: add scrape_configs.honor_labels
...
2017-11-17 18:06:22 +00:00
Jan Tojnar
227a92f698
fwupd: 0.9.6 → 1.0.1
2017-11-17 18:54:45 +01:00
Tuomas Tynkkynen
eb85761137
kernel: Fix out-of-tree modules on aarch64
...
https://hydra.nixos.org/build/62813493
2017-11-17 17:06:52 +02:00
Orivej Desh
d99a2fc093
Merge branch 'master' into staging
...
* master: (293 commits)
go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
qsyncthingtray: fix build
qt56.qtwebengine: fix build
stdman: d860212 -> 2017.04.02
jackett: use mono50
hg-git: disable with python3
hg-git: 0.8.5 -> 0.8.10
xfce4-settings: enable parallel building
gcc-snapshot: mark as broken
heaptrack: 2017-02-14 -> 2017-10-30
nixos-container: Modify existing test to cover show-ip command
nixos-container: Make show-ip work together with ipv4 + netmask
linux-copperhead: 4.13.12.a -> 4.13.13.a
matterbridge: 1.1.0 -> 1.4.1
nixos/nghttpx: add module for the nghttpx proxy server (#31680 )
mattermost: 4.3.0 -> 4.4.0
breakpad: delete
simp_le: 0.2.0 -> 0.6.1
certbot: 0.11.1 -> 0.19.0
afl: 2.51b -> 2.52b
...
2017-11-17 05:35:09 +00:00
John Ericson
652c2beda9
cctools: Don't always bring in headers
...
- Give cctools a dev output for the headers
- Update Libsystem to grab the headers from that dev output
- Don't include the headers in Darwin binutils, just as GNU Binutils no
longer does.
2017-11-16 17:45:41 -05:00
John Ericson
32a6838bc6
darwin-bintuils: Don't try to bring in missing bits of GNU Binutils
...
libbfd and libopcdes are separate derivations which now provide all
headers and libraries. Binutils should just provide executables.
2017-11-16 17:40:38 -05:00
Tim Steinbach
55851579d9
linux-copperhead: 4.13.12.a -> 4.13.13.a
2017-11-16 13:58:47 -05:00
Jake Waksbaum
232ff39115
darwin: trash 0.9.0
2017-11-16 07:47:47 -05:00
adisbladis
0bdaedbe87
zfsUnstable: 2017-11-12 -> 2017-11-16
2017-11-16 19:28:23 +08:00
adisbladis
be52cff377
splUnstable: 2017-10-31 -> 2017-11-16
...
Fixes breakage with 4.14 kernels
2017-11-16 19:28:15 +08:00
Orivej Desh
5018c27a3d
kmscon: fix build with glibc 2.26
...
Tracking issue: #31696
2017-11-16 01:47:33 +00:00
Orivej Desh
c0794dc140
libnscd: delete
...
This library is unused sinse e0afec2edc
.
Tracking issue: #31696
2017-11-15 22:58:21 +00:00
Orivej Desh
ea011d65a8
libnscd: fix build with glibc 2.26
...
Tracking issue: #31696
2017-11-15 22:57:03 +00:00
Tim Steinbach
8b3293d947
linux: 4.4.97 -> 4.4.98
2017-11-15 16:44:20 -05:00
Tim Steinbach
ff16004273
linux: 4.9.61 -> 4.9.62
2017-11-15 16:44:20 -05:00
Joachim Fasting
870c86d0ee
linux_hardened: structleak covers structs passed by address
2017-11-15 22:10:50 +01:00
Joachim Fasting
8ecae36963
linux_hardened: enable slab freelist hardening
2017-11-15 22:10:44 +01:00
Orivej Desh
b8f7027360
Merge pull request #31037 from NeQuissimus/virtualbox_5_2_0
...
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 18:31:12 +00:00
Tim Steinbach
dd53d0f1a0
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 10:14:44 -05:00
Michael Weiss
f46003798e
fuse3: 3.2.0 -> 3.2.1
2017-11-15 13:42:44 +01:00
Tim Steinbach
bd9b124f2a
linux: 4.13.12 -> 4.13.13
2017-11-15 07:32:24 -05:00
Orivej Desh
a7f4d977a7
Merge pull request #31678 from flokli/fix-iwlwifi-linux-4.14
...
linux_4_14: fix iwlwifi fw reset
2017-11-15 11:32:53 +00:00
Florian Klink
f919c7faec
linux_4_14: fix iwlwifi fw reset
...
Currently, moving to kernel_4_14 breaks at least Intel Wireless 8260 and
8265 cards due to a API change in the firmware, which is not yet honored
in the driver.
2017-11-15 11:30:24 +00:00
Daiderd Jordan
dadcca3f40
frameworks-coremedia: add impure dependnecy on CoreImage
...
Fixes ffmpeg sandbox build on darwin
2017-11-14 21:51:40 -05:00
Dan Peebles
49a5791bc4
darwin.stdenv: fix up to allow sandboxing
2017-11-14 10:36:04 -05:00
Dan Peebles
762a05cbb6
cctools-port: add a couple of (temporary) impure dependencies
2017-11-14 10:35:18 -05:00
Dan Peebles
b2f8185695
configd: remove unsupported sandbox profile
2017-11-14 10:34:28 -05:00
Franz Pletz
172d346ff1
Merge pull request #31628 from lheckemann/fbterm-arm
...
fbterm: fix build on non-x86
2017-11-14 12:39:51 +01:00
Linus Heckemann
e50745712c
fbterm: fix build on non-x86
2017-11-14 09:01:13 +00:00
Cray Elliott
3c0c18792d
mwprocapture: forgot to include a file
2017-11-13 20:26:24 -08:00
Cray Elliott
7f473fa506
mwprocapture: minor correctness fix to 4.14 patch
2017-11-13 20:21:56 -08:00
Cray Elliott
ce8dea6bdd
mwprocapture: patch to fix build for linux 4.14
2017-11-13 19:54:57 -08:00
Graham Christensen
c886b170b1
Merge pull request #31629 from lheckemann/jfbview-mujs
...
jfbview: remove mujs and no-longer-necessary patch
2017-11-13 17:10:44 -05:00
Linus Heckemann
2c4e1e975c
jfbview: remove mujs and no-longer-necessary patch
...
mujs is only required when older versions of mupdf are used, but
we have a more recent one in nixpkgs.
2017-11-13 21:08:01 +00:00
Joerg Thalheim
b22f75748e
android-udev-rules: 20171107 -> 20171113
2017-11-13 21:04:33 +00:00
Orivej Desh
fab6760e75
devmem2: provide a better mirror
...
lartmaker.nl fails to respond to IPv6 queries.
2017-11-13 19:37:11 +00:00
Joerg Thalheim
7f7aa08332
linuxPackages_latest.spl: fix evaluation
2017-11-13 19:13:35 +00:00
adisbladis
8e2bd255e1
spl: Broken with 4.14 kernels
2017-11-14 01:37:52 +08:00
Tim Steinbach
53730c5a92
linux: Add 4.14
2017-11-13 08:34:36 -05:00
Jörg Thalheim
be86b91d27
Merge pull request #31594 from sjau/master
...
zfsUnstable: 2017-10-16 -> 2017-11-12
2017-11-13 13:02:19 +00:00
Matthieu Coudron
38737386d5
linux_mptcp: makes linux_mptcp.override works
...
I needed to override some parameters because of an error I had:
"Error: modDirVersion specified in the Nix expression is wrong, it should be: 4.9.60+"
but the following override would not be taken into account
pkg.override ({
modDirVersion="4.9.60+";
src=pkgs.lib.cleanSource /home/teto/mptcp;
})
because the override would be overriden by the nixpkgs parameters
because of concatenation order:
https://nixos.org/nix/manual/#sec-language-operators
2017-11-13 11:19:26 +01:00
sjau
8ccaa882a1
zfsUnstable: 2017-10-16 -> 2017-11-12
2017-11-13 10:06:57 +01:00
tv
9f4a461278
update skarnet.org packages
...
execline: 2.2.0.0 -> 2.3.0.3
s6: 2.4.0.0 -> 2.6.1.1
s6-dns: 2.1.0.0 -> 2.2.0.1
s6-linux-utils: 2.2.0.0 -> 2.4.0.2
s6-networking: 2.2.1.0 -> 2.3.0.2
s6-portable-utils: 2.1.0.0 -> 2.2.1.1
s6-rc: 0.1.0.0 -> 0.3.0.0
skalibs: 2.4.0.1 -> 2.6.0.1
2017-11-13 00:09:32 +01:00
Vladimír Čunát
ab1859e027
Merge branch 'staging'
...
Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.
2017-11-12 19:08:05 +01:00
Luke Adams
6ead149ff9
prl-tools: remove user services using .desktop files
2017-11-11 17:05:08 -06:00
Luke Adams
029b44db9d
prl-tools: hardeningDisable: +"format"
2017-11-11 17:05:08 -06:00
Luke Adams
019cbdaa6a
prl-tools: unpackPhase: extract prl-tools-lin.iso from dmg; add undmg, fetchurl inputs; update sourceRoot
2017-11-11 17:05:08 -06:00
Luke Adams
0b845abd22
prl-tools: 10.0.2.27712 -> 12.2.1-41615; src: download parallels dmg
2017-11-11 17:05:07 -06:00
Luke Adams
e58b67ab2b
prl-tools: Update platforms and url
2017-11-11 17:05:07 -06:00
Luke Adams
1aef116e41
prl-tools: ignore patchelf errors
2017-11-11 17:05:07 -06:00
Vladimír Čunát
cbfb586151
Merge security fixes adapted from #31437
2017-11-11 13:33:25 +01:00
Andreas Rammhold
17fae2499a
busybox: fix CVE-2017-1587{34}
2017-11-11 13:32:29 +01:00
Vladimír Čunát
8559b6db82
Merge branch 'master' into staging
...
A couple thousand rebuilds from master.
2017-11-11 09:25:07 +01:00
Pascal Wittmann
24e87b49b6
Change many homepage urls from http to https #30636
2017-11-10 22:13:46 +01:00
Herwig Hochleitner
8ba0b7bc3b
firmware-linux-nonfree: 2017-07-05 -> 2017-10-09-iwlwifi-fw-2017-11-03
...
- update and automate merging
The automated merging process should eliminate the need for keeping a
nixos-specific merged repository around
fixes #29806
2017-11-10 21:54:15 +01:00
Daiderd Jordan
63bac2c23e
cf-private: overwrite headers from CF
2017-11-09 23:29:41 +01:00
Vladimír Čunát
304259bdb1
Merge branch 'master' into staging
...
Mass rebuild, mainly on Darwin.
2017-11-09 22:37:01 +01:00
Drew Hess
67ba83a934
kernel: add beagleboard.org kernel
...
And update the existing platform variant to use it
2017-11-09 18:28:14 +02:00
Tuomas Tynkkynen
d209612496
trinity: 1.6 -> 1.8
2017-11-09 10:53:33 +02:00
Dan Peebles
bb863378d3
adv_cmds: remove custom sandbox profile (not allowed in recent Nix)
2017-11-08 22:32:44 -05:00
Dan Peebles
48a34be41c
Support frameworks properly in sandbox
2017-11-08 22:06:52 -05:00
aszlig
2a894cd2d1
lxc: Fix build error with glibc 2.26
...
This issue doesn't necessarily have to do with glibc 2.26 and it could
have been fixed if we'd replace -Werror with -Wall.
The error in question was:
storage/overlay.c:808:13: error: 'dirlen' may be used uninitialized in
this function [-Werror=maybe-uninitialized]
After looking at the code in overlay.c it indeed might use dirlen
unitialized.
Unrelated to the glibc upgrade which brought the problem to the surface,
this also has been fixed upstream at lxc/lxc@180c477a32 .
The reason however, that led to the upstream fix was a segfault which
has been reported at lxc/lxc#1802 .
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @wkennington, @globin, @fpletz
2017-11-09 02:21:00 +01:00
Vladimír Čunát
94efde5119
Merge #31402 : mlt, ffado: fix includeds with glibc-2.26
2017-11-08 23:01:47 +01:00
Joerg Thalheim
55e6a5a4da
android-udev-rules: 20171031 -> 20171107
2017-11-08 20:24:00 +00:00
Tim Steinbach
4cb8c5dc3c
linux-copperhead: 4.13.11.a -> 4.13.12.a
2017-11-08 14:34:31 -05:00
Tim Steinbach
087d1e8d36
linux: 4.13.11 -> 4.13.12
2017-11-08 14:34:31 -05:00
Tim Steinbach
db1e2444a5
linux: 4.9.60 -> 4.9.61
2017-11-08 14:34:31 -05:00
Tim Steinbach
bd4b9062ea
linux: 4.4.96 -> 4.4.97
2017-11-08 14:34:31 -05:00
Piotr Bogdan
1e78b48666
ffado: fix build with glibc-2.26
...
see https://sourceforge.net/p/ffado/mailman/message/36008067/
2017-11-08 17:35:51 +00:00
makefu
292f60504c
linux.kernel: enable build of stk1160 modules
2017-11-08 12:41:54 +02:00
Vladimír Čunát
c2b9ab578d
nfs-utils: fixup includes with glibc-2.26
2017-11-08 10:27:39 +01:00
Tuomas Tynkkynen
34f3ef2c4d
tcp_wrappers: Use libnsl to fix build after new glibc
...
https://hydra.nixos.org/build/63759192
https://sourceware.org/ml/libc-alpha/2017-02/msg00478.html
2017-11-07 20:38:41 +02:00
Vladimír Čunát
d51f9b364e
checkpolicy: fixup includes with glibc-2.26
2017-11-07 15:27:53 +01:00
Jörg Thalheim
84f40186b2
lxcfs: do not inherit enableDebugBuild from global namespace
2017-11-07 11:04:05 +00:00
Domen Kožar
2b995c544d
osx_private_sdk: reduce output size and remove it from runtime closures
2017-11-07 11:06:10 +01:00
Vladimír Čunát
9aa37b159b
Merge branch 'master' into staging
2017-11-07 06:41:23 +01:00
Vladimír Čunát
1ac1581253
libselinux: fix missing include after glibc-2.26
2017-11-06 20:18:43 +01:00
Tuomas Tynkkynen
bf585f2881
linux_rpi: 1.20170811 -> 1.20171029
2017-11-06 20:49:48 +02:00
Tuomas Tynkkynen
967ecb802e
raspberrypifw: 1.20170811 -> 1.20171029
2017-11-06 20:49:48 +02:00
Tim Steinbach
a9bf922bb7
Merge pull request #31308 from adisbladis/firejail-0_9_50
...
firejail: 0.9.48 -> 0.9.50
2017-11-06 12:47:57 +00:00
Vladimír Čunát
bc90fe1fbb
Merge #30371 : update misc. gnome3-related libraries
2017-11-06 13:00:15 +01:00
adisbladis
0af15f6f45
firejail: 0.9.48 -> 0.9.50
2017-11-06 17:21:03 +08:00
Tim Steinbach
30f6d630f1
linux: 4.14.0-rc7 -> 4.14.0-rc8
2017-11-05 16:47:03 -05:00
Jan Tojnar
3f12993f3a
xf86_input_wacom: 0.34 → 0.35
2017-11-05 20:44:11 +01:00
Orivej Desh
0a8d30c3b1
Merge pull request #31279 from rnhmjoj/rewritefs
...
rewritefs: 2016-07-27 -> 2017-08-14
2017-11-05 17:08:02 +00:00
Tuomas Tynkkynen
0d9f2f0bb4
platforms.nix: Clean up more 'uboot' legacy
...
For a while now, the only thing the 'uboot' attribute does is to tell
whether to add ubootTools to kernel/initrd builds. That can be
determined with platform.kernelTarget == "uImage" just as well.
2017-11-05 17:06:59 +02:00
rnhmjoj
896ec47a39
rewritefs: 2016-07-27 -> 2017-08-14
2017-11-05 15:52:37 +01:00
Franz Pletz
b032b3544f
linux_mptcp: 0.92.1 -> 0.93
2017-11-05 14:56:06 +01:00
Tuomas Tynkkynen
b50693d16c
kernel, initrd: Remove legacy ubootChooser
2017-11-05 15:11:12 +02:00
Michael Raskin
d715c087b1
Merge pull request #20423 from DerTim1/add-service-wrapper
...
service-wrapper: init at 16.04.0
2017-11-04 22:16:59 +00:00
Vladimír Čunát
bb87d2c81a
drbd: fix evaluation after #30872
2017-11-04 10:20:39 +01:00
Frederik Rietdijk
decaeb3040
Merge pull request #30872 from FRidh/udev
...
systemd: remove udev attributes
2017-11-04 10:02:01 +01:00
Joerg Thalheim
6ec3bf3a77
bcc: add myself as maintainer
2017-11-04 08:58:04 +00:00
Joerg Thalheim
292f23c4b5
bcc: fix module installation
...
BCC_KERNEL_MODULES_DIR should have not been removed
2017-11-04 08:57:20 +00:00
Franz Pletz
94043f511a
zfs: 0.7.2 -> 0.7.3
...
Bugfix release.
2017-11-03 21:39:05 +01:00
c0bw3b
525380b472
treewide: abandon Google Code homepages
2017-11-03 18:52:28 +00:00
Tuomas Tynkkynen
b2093d4611
linuxPackages.bcc: Fix quoting for older Nix versions
...
Issue #31179 .
2017-11-03 13:11:36 +02:00
Tim Steinbach
449a053152
linux-copperhead: 4.13.10.a -> 4.13.11.a
2017-11-02 19:54:31 -04:00
Orivej Desh
a41342ba58
Merge pull request #30103 from dtzWill/fix/lsb-release-PATH
...
lsb-release: wrap to ensure needed utilities are available
2017-11-02 21:22:33 +00:00
Jörg Thalheim
5cfd049a03
Merge pull request #31057 from dtzWill/update/musl-1.1.18
...
musl: 1.1.17 -> 1.1.18
2017-11-02 18:53:11 +00:00
Orivej Desh
672efa467d
Merge pull request #31132 from pbogdan/sourceroot-fixes
...
fix source root locations after c3255fe8ec
2017-11-02 15:18:25 +00:00
Joerg Thalheim
7c8ec77db2
android-udev-rules: 20171014 -> 20171031
2017-11-02 15:12:43 +00:00
Piotr Bogdan
8904ce343a
fix source root locations.
...
These have changed following commit
c3255fe8ec
.
See also:
- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
Matthieu Coudron
7dce131b86
kernelmptcp: 0.91.3 -> 0.92.1
2017-11-02 13:14:57 +01:00
Richard Marko
22beeeab76
criu: 2.0 -> 2.12.1
2017-11-02 12:45:51 +01:00
zimbatm
c34c737172
Merge pull request #31100 from zimbatm/hashcat4
...
Hashcat4
2017-11-02 11:23:07 +00:00
Franz Pletz
68b5ec06b9
linux: 4.9.59 -> 4.9.60
2017-11-02 11:28:40 +01:00
Franz Pletz
6021ca25db
linux: 4.4.95 -> 4.4.96
2017-11-02 11:28:27 +01:00
Franz Pletz
c37c896ee0
linux: 4.13.10 -> 4.13.11
2017-11-02 11:28:14 +01:00
Richard Marko
c75c99f42e
lxcfs: 2.0.7 -> 2.0.8, add debugBuild option
2017-11-02 03:56:59 +01:00
Franz Pletz
2df0fe91d4
Merge pull request #31038 from orivej/autofs
...
autofs: do not strip needed symbols
2017-11-01 22:10:15 +01:00
zimbatm
309373ea68
intel-ocl: r4.0-59481 -> 5.0-63503
2017-11-01 17:59:49 +00:00
zimbatm
8a59ef7354
wireguard: 0.0.20171017 -> 0.0.20171101
2017-11-01 11:00:20 +00:00
Will Dietz
399020d2f5
musl: 1.1.17 -> 1.1.18
...
Use this as an opportunity to remove
empty patches array.
2017-10-31 15:45:24 -05:00
Orivej Desh
2ad3933dca
autofs: do not strip needed symbols
...
Fixes #28282 after #27415
2017-10-31 14:38:30 +00:00
Daniel Peebles
dc1ef6ce8c
Merge pull request #31013 from NixOS/darwin-parallel
...
darwin: build applle stuff in parallel
2017-10-31 11:16:38 +01:00
Domen Kožar
ea6a4068cf
darwin: build apple stuff in parallel
2017-10-31 07:47:58 +00:00
Vladimír Čunát
2d403e668c
Merge #30851 : util-linux: 2.30.2 -> 2.31
...
Includes a fix for CVE-2016-2779.
2017-10-30 23:01:19 +01:00
Vladimír Čunát
687943763c
Merge branch 'master' into staging
2017-10-30 22:30:14 +01:00
Franz Pletz
0a5ecde808
linux: 4.4.80 -> 4.4.95
2017-10-30 17:57:00 +01:00
Franz Pletz
36be7d3e85
Revert parts of "linux: remove unused kernel patches"
...
This reverts commit 05b8cae9ec
that
removed the cgroup v2 patch for the 4.4 kernel.
2017-10-30 17:57:00 +01:00
Franz Pletz
517606d1d4
Revert "linux_4_4: remove"
...
This reverts commit 9f3f575ab3
.
Support from upstream has been extended to Feb 2022.
2017-10-30 17:57:00 +01:00
Tim Steinbach
70f35a99a4
linux: 4.14-rc6 -> 4.14-rc7
2017-10-30 08:30:29 -04:00
Frederik Rietdijk
6d41ae55dd
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-30 07:51:09 +01:00
Shea Levy
9e37df185c
fwupd: Remove manual rpath settings now that meson is fixed.
...
Thanks @yegortimoshenko!
2017-10-29 14:42:55 -04:00
Frederik Rietdijk
d0d0308876
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-29 14:08:20 +01:00
Tim Steinbach
e76d8af375
linux-copperhead: 4.13.9.a -> 4.13.10.a
2017-10-28 13:42:32 -04:00
Frederik Rietdijk
97c7b69e25
systemd: remove udev attributes
2017-10-27 22:20:20 +02:00
Frederik Rietdijk
8634a2e2c5
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-27 21:35:58 +02:00
adisbladis
7b64943e8b
util-linux: 2.30.2 -> 2.31
2017-10-27 22:01:07 +08:00
Tim Steinbach
2c373d818d
linux: 4.13.9 -> 4.13.10
2017-10-27 07:48:05 -04:00
Tim Steinbach
85e79da31b
linux: 4.9.58 -> 4.9.59
2017-10-27 07:47:56 -04:00
Brian McKenna
ed0f558fb0
uvcdynctrl: init at 0.2 ( #30806 )
...
* uvcdynctrl: init at 0.3.0
* uvcdynctrl: nitpicks
2017-10-26 11:10:28 +01:00
Tuomas Tynkkynen
2351947c57
sssd: 1.14.2 -> 1.16.0
2017-10-25 19:36:30 +03:00
Jörg Thalheim
f3a2570ba4
Merge pull request #30695 from flokli/libcap-pkgconfig
...
libcap: already patch Make.Rules in prePatch
2017-10-25 09:00:28 +01:00
Joerg Thalheim
59382564ff
bcc: fix install
2017-10-24 22:24:08 +01:00
Joerg Thalheim
8ee94216d3
bcc: 0.3.0 -> 0.4.0
2017-10-24 22:14:50 +01:00
Tuomas Tynkkynen
681c8006f5
read-edid: Only depend on libx86 on x86
2017-10-23 16:37:22 +03:00
Tim Steinbach
4ea79d3f36
linux: 4.14-rc5 -> 4.14-rc6
2017-10-23 08:49:39 -04:00
Florian Klink
a505abc948
libcap: already patch Make.Rules in prePatch
...
Make.Rules gets already included during compilation, so set paths before
invoking make. This fixes wrong paths in libcap.pc.
2017-10-22 21:21:27 +02:00
Tim Steinbach
e9aa686d3b
linux-copperhead: 4.13.8.a -> 4.13.9.a
2017-10-22 14:41:01 -04:00
Tim Steinbach
69ebd73571
linux: 4.13.8 -> 4.13.9
2017-10-22 14:35:49 -04:00
Tim Steinbach
c529454c60
linux: 4.9.57 -> 4.9.58
2017-10-22 14:35:32 -04:00
Tuomas Tynkkynen
7b4db5da18
utillinux: 2.30 -> 2.30.2
2017-10-22 01:40:58 +03:00
Tuomas Tynkkynen
89e5c3b700
devicemapper: 2.02.173 -> 2.02.175
2017-10-22 01:40:58 +03:00
Tuomas Tynkkynen
cc048f0b45
audit: 2.7.7 -> 2.8.1
2017-10-22 01:40:58 +03:00
Michael Weiss
a0221824fb
nvme-cli: 0.9 -> 1.4
2017-10-21 21:37:26 +02:00
Daniel Kuehn
eafcfaf62c
sssd: Add optional bindings for building sssd library that sudo can use to fetch sudoers rules from SSSD
2017-10-21 20:21:27 +02:00
Jörg Thalheim
3219511469
Merge pull request #30407 from sorki/lxc_2.1.0
...
lxc: 2.0.8 -> 2.1.0
2017-10-20 21:54:02 +01:00
Michael Raskin
83fdd2699c
eudev: 3.2.1 -> 3.2.4
2017-10-20 18:37:39 +02:00
Will Dietz
4eb090efc8
musl: 1.1.16 -> 1.1.17, build with stack protector
2017-10-19 15:57:19 -05:00
Joerg Thalheim
485fe61657
zfsUnstable: 2017-09-26 -> 2017-10-16
2017-10-19 16:06:21 +01:00
Joerg Thalheim
d8842199cb
splUnstable: 2017-09-26 -> 2017-10-16
2017-10-19 16:06:13 +01:00
Tim Steinbach
0b409b37d4
linux-copperhead: 4.13.7.a -> 4.13.8.a
2017-10-19 08:02:26 -04:00
Nikolay Amiantov
0bc4216bf0
Merge branch 'staging'
2017-10-19 12:46:38 +03:00
Joerg Thalheim
65256b7f26
wireguard: 0.0.20171011 -> 0.0.20171017
2017-10-19 09:40:51 +01:00
Tim Steinbach
67343e2f30
linux: 4.13.7 -> 4.13.8
2017-10-18 08:38:39 -04:00
Tim Steinbach
1b0e69966b
linux: 4.9.56 -> 4.9.57
2017-10-18 08:38:27 -04:00
Vladimír Čunát
3d1dee3692
Merge branch 'master' into staging
...
Thousands of rebuilds from master.
2017-10-16 20:12:06 +02:00
Tim Steinbach
00669df0c1
linux: 4.14-rc4 -> 4.14-rc5
2017-10-16 09:26:36 -04:00
Joerg Thalheim
3f4a6754ef
wireguard: 0.0.20171005 -> 0.0.20171011
2017-10-16 13:50:40 +01:00
Graham Christensen
ea50efcc67
wpa_supplicant: patch for KRACKAttack
...
CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake.
CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake.
CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake.
CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake.
CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake.
CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it.
CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake.
CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake.
CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
2017-10-16 07:33:44 -04:00
Graham Christensen
629965a532
hostapd: patch for KRACKAttack
...
CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake.
CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake.
CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake.
CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake.
CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake.
CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it.
CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake.
CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake.
CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
2017-10-16 07:33:43 -04:00
Tim Steinbach
19997f0100
linux-copperhead: 4.13.6.a -> 4.13.7.a
2017-10-15 15:28:16 -04:00
Jörg Thalheim
043529822b
Merge pull request #30413 from symphorien/kexec
...
kexectools: 2.0.14 -> 2.0.15
2017-10-15 18:24:02 +01:00
Vladimír Čunát
3ee33f35f8
Merge branch 'staging'
...
Contains security fixes in X server and X libs.
On Hydra, the amount to rebuild on master is now higher than on staging;
the comparison looks OK.
2017-10-15 13:59:18 +02:00
Symphorien Gibol
8e53ca98f2
kexectools: 2.0.14 -> 2.0.15
2017-10-14 16:50:45 +02:00
Tim Steinbach
8c618fce30
linux: 4.13.6 -> 4.13.7
...
CVE-2017-5123
2017-10-14 10:29:04 -04:00
Richard Marko
7357d7b5ea
lxc: 2.0.8 -> 2.1.0
...
Related to #30023
Note that this comes with new configuration format,
for migrating see https://linuxcontainers.org/lxc/news/#lxc-21-release-announcement-5th-of-september-2017
2017-10-14 15:14:46 +02:00
Vladimír Čunát
6525c22ef1
Merge branch 'master' into staging
...
Hydra: ?compare=1401528
2017-10-14 10:36:13 +02:00
Peter Hoeg
f22ce20ec0
Revert "hyperv-daemons: init at current linux kernel version"
...
This reverts commit 51f1c635e6
.
2017-10-14 14:42:49 +08:00
Peter Hoeg
8df1c9ac17
Revert "firewalld: init at 0.4.4.4"
...
This reverts commit 178a96f99b
.
2017-10-14 14:42:48 +08:00
Peter Hoeg
5f6d2d15ac
Revert "nvidia-firmware: init at 325.15"
...
This reverts commit 15bdbc21f9
.
2017-10-14 14:42:48 +08:00