Commit graph

7299 commits

Author SHA1 Message Date
John Ericson bc3a6e260a Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix 2017-12-29 15:28:56 -05:00
John Ericson 5d336d36bb Merge commit 'e82bd498d1a2a28fb20249569a6f49fcaab9aca8' into mingw32-w64-fix 2017-12-29 15:28:49 -05:00
John Ericson 169227bfd2 Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix 2017-12-29 14:24:10 -05:00
Bojan Nikolic 2e0ebc0532 mingw-w64: Disable stack hardening of the runtime
Do this because it is built with the static stage
2017-12-29 14:23:30 -05: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