Commit Graph

7487 Commits

Author SHA1 Message Date
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
Peter Hoeg
15bdbc21f9 nvidia-firmware: init at 325.15 2017-10-14 14:38:04 +08:00
Peter Hoeg
178a96f99b firewalld: init at 0.4.4.4
Includes systemd module.
2017-10-14 14:38:04 +08:00
Peter Hoeg
51f1c635e6 hyperv-daemons: init at current linux kernel version 2017-10-14 14:38:04 +08:00
Joerg Thalheim
acee0f9bea android-udev-rules: 20170612 -> 20171014 2017-10-13 20:15:49 +01:00
Tim Steinbach
cc5dd66c03
linux: 4.9.55 -> 4.9.56 2017-10-12 20:02:15 -04:00
Tim Steinbach
64a727b160
linux-copperhead: 4.13.5.a -> 4.13.6.a 2017-10-12 13:09:36 -04:00
Tim Steinbach
5a8f9a8b6c
linux: 4.13.5 -> 4.13.6 2017-10-12 07:58:46 -04:00
Tim Steinbach
8940265231
linux: 4.9.54 -> 4.9.55 2017-10-12 07:58:33 -04:00
Dan Peebles
e86991e1e8 darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there.
We'll need to get xcbuild into the stdenv bootstrap before we can make the main build,
but it's nice to see that it can work.
2017-10-12 07:16:22 -04:00
Shea Levy
48595335f4
Add system_cmds apple project
Actually just build sysctl for now, as xcbuild segfaults.
2017-10-11 15:13:27 -04:00
Tim Steinbach
5dda1324be
linux-hardened: Disable GCC_PLUGIN_RANDSTRUCT 2017-10-11 13:50:20 -04:00
Tim Steinbach
2262b2332d
linux: 4.14-rc3 -> 4.14-rc4 2017-10-10 13:07:42 -04:00
Vladimír Čunát
f4c9d517db
tiptop: bugfix 2.3 -> 2.3.1 2017-10-10 18:13:18 +02:00
Eelco Dolstra
67c3eab348
linux: 4.9.53 -> 4.9.54 2017-10-10 12:41:50 +02:00
Joerg Thalheim
1439972bfb wireguard: 0.0.20171001 -> 0.0.20171005 2017-10-09 14:44:21 +01:00
Vladimír Čunát
994036d857
Merge branch 'master' into staging
Hydra: ?compare=1400181
2017-10-09 11:24:35 +02:00
Peter Hoeg
4817454366 wireguard: wg-quick systemd unit was referencing /usr/bin 2017-10-09 11:46:42 +08:00
Daniel Peebles
416979f3f7 Merge pull request #30150 from copumpkin/no-rpath-nonsense
Get rid of most @rpath nonsense on Darwin
2017-10-08 16:21:27 -04:00
Dan Peebles
b426c85ce2 Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Michael Raskin
76cec2dfa6 fbterm: fix build 2017-10-08 20:53:13 +02:00
Jan Tojnar
08b283b37e
criu: Rely on XML_CATALOG_FILES variable 2017-10-07 23:39:15 +02:00
Jan Tojnar
7c690aec16
conky: Rely on XML_CATALOG_FILES variable 2017-10-07 23:38:32 +02:00
Frederik Rietdijk
acfec163b1 Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-07 12:15:17 +02:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Tuomas Tynkkynen
a06d64ea69 kernel config: Explicitly enable device mapper
A no-op change on x86 but enables it on ARM.
2017-10-07 11:05:05 +03:00
Franz Pletz
662f82aee8
zfs, spl: 0.7.1 -> 0.7.2 2017-10-07 00:48:51 +02:00
Will Dietz
78785a06f9 lsb-release: wrap to ensure needed utilities are available 2017-10-06 08:57:23 -05:00
Tim Steinbach
3e5b594732
linux-copperhead: 4.13.4.a -> 4.13.5.a 2017-10-05 16:06:19 -04:00
Tim Steinbach
0bd1f7a92f
linux: 4.13.4 -> 4.13.5 2017-10-05 09:50:00 -04:00
Tim Steinbach
aee224c8a5
linux: 4.9.52 -> 4.9.53 2017-10-05 09:49:40 -04:00
Orivej Desh
66d4941afe Merge branch 'master' into staging
* master: (48 commits)
  Mathematica: 11.0.1 -> 11.2.0
  kbfs: 20170922.f76290 -> 20171004.40555d
  packer: 1.0.3 -> 1.1.0
  libxdg-basedir: 1.0.2 -> 1.2.0
  fscrypt: 0.2.1 -> 0.2.2
  devtodo: init at 0.1.20
  keybase: 1.0.30 -> 1.0.33
  elixir: Fix locale problem on NixOS
  keybase-gui: 1.0.25 -> 1.0.33
  terraform: 0.10.2 -> 0.10.7  (#30055)
  emby: 3.2.32.0 -> 3.2.33.0
  sbcl: 1.3.21 -> 1.4.0
  ardour: 5.11 -> 5.12
  axoloti: fix evaluation
  axoloti: init at 1.0.12-1
  melpa-packages: Add new lean packages
  fastlane: init at 2.60.1
  nixos/traefik: guard example path
  go-ethereum: 1.7.0 -> 1.7.1
  xzgv: 0.9.1 -> 0.9.2
  ...
2017-10-05 07:41:39 +00:00
Michael Weiss
c42b878ed3 fscrypt: 0.2.1 -> 0.2.2 2017-10-05 01:29:45 +02:00
Orivej Desh
f137004179 Merge branch 'master' into staging
* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
2017-10-03 17:46:39 +00:00
Franz Pletz
37521cfd54
iproute: 4.12.0 -> 4.13.0 2017-10-02 20:24:35 +02:00
Franz Pletz
1988f762ff
batman-adv: 2017.2 -> 2017.3 2017-10-02 20:24:21 +02:00
Tim Steinbach
1e85d28fdc
linux: 4.14-rc2 -> 4.14-rc3 2017-10-02 09:29:51 -04:00
Jason A. Donenfeld
c2842b92f8 wireguard: 0.0.20170810 -> 0.0.20171001 2017-10-02 03:14:15 +02:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Jörg Thalheim
d67137dd55 iwd: 2017-06-02 -> 2017-09-22 2017-10-01 10:22:18 +01:00
Tim Steinbach
e479b5ea6f
linux-copperhead: 4.13.3.a -> 4.13.4.a 2017-09-30 10:05:39 -04:00
Joerg Thalheim
3db9841d34 bcc: fix relocation bug downgrading to llvm 3.9
https://github.com/iovisor/bcc/issues/1276

fixes #29913
2017-09-30 00:33:14 +01:00
Joerg Thalheim
09d3bab32d sysdig: remove broken patchelf call
patchelf broke sysdig/csysdig binaries
2017-09-29 16:52:45 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Cray Elliott
56d1a14419 nvidia-x11: 384.69 -> 384.90 2017-09-28 00:01:37 -07:00
Robin Gloster
50fb62994b
bluez: remove unneeded dependencies and fix test bins 2017-09-27 21:25:05 +02:00
Tim Steinbach
ab3ff4af9f
linux: 4.13.3 -> 4.13.4 2017-09-27 13:08:21 -04:00
Tim Steinbach
2ca84cfa29
linux: 4.9.51 -> 4.9.52 2017-09-27 13:03:27 -04:00
Tim Steinbach
964672dde5
linux: Remove 4.12 (EOL) 2017-09-27 13:03:06 -04:00
WilliButz
43b7e69d13 splUnstable: fix hash 2017-09-27 15:22:02 +02:00
Jan Solanti
4ec3d311cb nvidia-x11: generate nvidia_icd.json from template 2017-09-26 21:53:44 +02:00
Jörg Thalheim
bbdca85b17 Merge pull request #29644 from yegortimoshenko/patch-3
mba6x_bl: 2016-04-22 ->2016-12-08
2017-09-26 19:56:26 +01:00
Yegor Timoshenko
fbc8fa8b42 mba6x_bl: update to 2016-12-08 2017-09-26 17:08:59 +00:00
Joerg Thalheim
8fcf95f102 {zfsUnstable,splUnstable}: 2017-09-12 -> 2017-09-26 2017-09-26 09:08:56 +01:00
Joerg Thalheim
b064137b7b sysdig: 0.17.0 -> 0.18.0 2017-09-26 00:15:51 +01:00
Daiderd Jordan
b196241f42
reattach-to-user-namespace: 2.5 -> 2.6 2017-09-26 00:58:51 +02:00
Tim Steinbach
b13a6d5720
linux: 4.14-rc1 -> 4.14-rc2 2017-09-25 09:24:23 -04:00
Michael Weiss
ec075b40ec fscryptctl: init at 2017-09-12 2017-09-24 23:12:30 +02:00
Vladimír Čunát
cb9a846762
Merge older staging
Hydra looks OK; not finished yet but already has more successes than
on master.
2017-09-24 20:56:11 +02:00
Michael Weiss
2037f1bbe8 fscrypt: init at 0.2.1 2017-09-24 02:38:45 +02:00
Daiderd Jordan
bb02b800a2
darwin-frameworks: add impure version of CoreFoundation 2017-09-23 22:29:43 +02:00
Michael Weiss
1a9467edd5 fuse3: 3.1.1 -> 3.2.0 2017-09-23 21:31:15 +02:00
Robin Gloster
08b09fdc5c
fanctl, fan module: remove
This has been broken nearly all the time due to the patches needed to
iproute2 not being compatible with the newer versions we have been
shipping. As long as Ubuntu does not manage to upstream these changes
so they are maintained with iproute2 and we don't have a maintainer
updating these patches to new iproute2 versions it is not feasible to
have this available.
2017-09-23 17:55:33 +02:00
Vladimír Čunát
73282c8cc2
Merge branch 'master' into staging
Thousands of rebuilds from master :-/
2017-09-23 09:57:23 +02:00
Jörg Thalheim
743848bb46 Merge pull request #29581 from eqyiel/fix-rpc-gssd
nixos/nfs: allow setting the path to krb5.keytab
2017-09-22 01:41:10 +01:00
John Ericson
1dd63de9a0 Merge some Master PRs into staging
No native hashes should be changed
2017-09-21 20:11:59 -04:00
John Ericson
56574e6087 Merge pull request #29610 from obsidiansystems/no-gccCrossStageFinal
top-level: No `gccCrossStageFinal` needed anymore
2017-09-21 18:57:16 -04:00
Michael Weiss
351f5fc585 fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by
upstream. But while fuse(2) and fuse3 would normally depend on
fuse-common we can't do that in nixpkgs while fuse-common is just
another output from the fuse3 multiple-output derivation (i.e. this
would result in a circular dependency). To avoid building fuse3 twice I
decided it would be best to copy the shared files (i.e. the ones
provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and
avoid collision warnings by defining priorities. Now it should be
possible to install an arbitrary combination of "fuse", "fuse3", and
"fuse-common" without getting any collision warnings. The end result
should be the same and all changes should be backwards compatible
(assuming that mount.fuse from fuse3 is backwards compatible as stated
by upstream [0] - if not this might break some /etc/fstab definitions
but that should be very unlikely).

My tests with sshfs (version 2 and 3) didn't show any problems.

See #28409 for some additional information.

[0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
2017-09-21 23:59:46 +02:00
John Ericson
bac21681a1 systemd: Use some nativeBuildInputs
I erred on the side of caution when changing these.
2017-09-21 15:49:54 -04:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
John Ericson
9f2e05662b treewide: Manually fix miscategorized autoreconfHook buildInputs
These are the ones with odd indentation my script will mess up on.
2017-09-21 15:49:53 -04:00
John Ericson
b9bf90ca6c all-packages: Remove gccCrossStageFinal; any gcc will not work 2017-09-21 15:49:18 -04:00
Vladimír Čunát
4683c374fa
Merge branch 'master' into staging
A couple thousand rebuilds again.
2017-09-21 21:09:32 +02:00
Tim Steinbach
7d3d276a16
linux-copperhead: 4.13.2.a -> 4.13.3.a 2017-09-21 14:37:44 -04:00
Ruben Maher
98a2316166 nfs-utils: set /etc/krb5.keytab as default path for rpc-gssd
Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can
never be met, because it's looking for stateful data inside `/nix/store`.

`auth-rpcgss-module.service` also only starts if this file exists.

Fixes NixOS/nixpkgs#29509.
2017-09-20 15:36:26 +01:00
Tim Steinbach
eab480ac3d
linux: 4.13.2 -> 4.13.3 2017-09-20 08:36:27 -04:00
Tim Steinbach
726765404b
linux: 4.12.13 -> 4.12.14 2017-09-20 08:36:13 -04:00
Tim Steinbach
7cfa6895e8
linux: 4.9.50 -> 4.9.51 2017-09-20 08:35:44 -04:00
John Ericson
e9c1f64048 Merge branch 'master' into staging 2017-09-20 01:39:59 -04:00
John Ericson
19e3c580ad Merge pull request #29584 from obsidiansystems/no-wrapCCCross
top-level: Remove useless abstractions
2017-09-20 01:25:02 -04:00
John Ericson
e19bb868dc all-packages: Remove forcedNativePackages; we no longer need it
Its kept around in the Hurd package set, but all that code is
presumably broken.
2017-09-20 00:59:19 -04:00
Frank Doepper
28dd1158ff circumvent hdaps name clash 2017-09-19 23:57:28 +02:00
Frank Doepper
a3e806ef0f tp_smapi with hdaps 2017-09-19 23:57:28 +02:00
Vladimír Čunát
d4c33d5e4e
Merge branch 'master' into staging 2017-09-19 18:03:09 +02:00
Robin Gloster
5c18c55062
dmtcp: fix buffer overflow due to too long ld-linux.so path
fixes #29565
2017-09-19 13:41:12 +02:00
Tuomas Tynkkynen
779aea8868 linuxPackages.mxu11x0: Mark broken on >= 4.13
https://hydra.nixos.org/build/61465503
2017-09-19 08:40:01 +03:00
Tuomas Tynkkynen
3e495bfd94 linuxPackages.cryptodev: Mark broken on >= 4.13
https://hydra.nixos.org/build/61470492
2017-09-19 08:37:44 +03:00
Franz Pletz
94bbe7db22
bluez4: remove, unused and probably vulnerable 2017-09-18 21:19:15 +02:00
Franz Pletz
dadb16a57f
bluez: 5.43 -> 5.47 for CVE-2017-1000250
Fixes #29289.
2017-09-18 21:19:15 +02:00
Aneesh Agrawal
49fc06ed0a audit: Remove openldap dependency
The openldap dependency is only used for the audisp z/OS plugin.
This is not useful on Linux, so always disable this.
2017-09-18 02:49:01 -07:00
Joachim F
aa818c5dbd Merge pull request #29467 from mguentner/wi.fi-urls
hostapd/wpa_supplicant: update urls
2017-09-17 14:59:05 +00:00
Jan Malakhovski
8525b78d05
linuxPackages: properly propagate features and extraConfig
`kernel.override { features = ... }` didn't work before, now it works as
expected.
2017-09-17 16:33:47 +02:00
Tim Steinbach
c8f43edaf5
linux: 4.13-rc7 -> 4.14-rc1 2017-09-17 09:11:04 -04:00
Maximilian Güntner
daf07c9d62
hostapd/wpa_supplicant: update urls 2017-09-17 13:46:11 +02:00
Joachim Fasting
7d69e5a18f linuxPackages.lttng-modules: broken on kernels >4.11 2017-09-17 09:44:04 +02:00
Joachim Fasting
9e395545e8 linuxPackages.lttng-modules: 2.9.3 -> 2.10.0 2017-09-17 09:44:04 +02:00
Tim Steinbach
08229bba30
linux-copperhead: 4.13.1.b -> 4.13.2.a 2017-09-16 08:57:45 -04:00
Tuomas Tynkkynen
9a6aa33422 kernel: Disable DEBUG_INFO
Since we don't have a split debug info output yet, don't waste time
writing several gigabytes of debug info that's all going to be stripped
out at the end.

This change only affects Aarch64 (where some joker has enabled it in the
architecture defconfig) and is a no-op on the others.
2017-09-16 15:09:10 +03:00
Jan Malakhovski
62fa45eac5
linuxPackages: hardened-config: enable DEBUG_PI_LIST 2017-09-16 13:14:05 +02:00
Jan Malakhovski
c345761c13
linuxPackages: hardened-config: check kernelArch, not system 2017-09-16 13:14:04 +02:00
Jan Malakhovski
616a7fe237
linuxPackages: hardened-config: disable BUG_ON_DATA_CORRUPTION for older kernels
They don't support it.
2017-09-16 13:14:03 +02:00
Frederik Rietdijk
03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Joachim Fasting
dd170cd5df
hardened-config: build with fortify source 2017-09-16 00:31:25 +02:00
Joachim Fasting
9a763f8f59
hardened-config: enable the randstruct plugin 2017-09-16 00:31:23 +02:00
Joachim Fasting
edd0d2f2e9
hardened-config: additional refcount checking 2017-09-16 00:31:17 +02:00
John Ericson
a31365d831 Revert "Merge commit on master into staging"
This was reverted on master in
3510197dcc, and so needs to be reverted
here too.

This reverts commit 3befba542a, reversing
changes made to 3655e7e18b.
2017-09-15 13:01:12 -04:00
Peter Simons
3510197dcc Revert "haskell infra, ghc: Slight cleanup" 2017-09-15 18:45:15 +02:00
John Ericson
fd988f8481 Merge another master commit into staging
Again, this is for sake of chained PRs having readable diffs
2017-09-15 12:38:26 -04:00
John Ericson
3befba542a Merge commit on master into staging
Doing this surgically so a future PR has a readable diff.
2017-09-15 12:13:09 -04:00
John Ericson
2295533f43 Merge pull request #29424 from obsidiansystems/slight-haskell-cleanup
haskell infra, ghc: Slight cleanup
2017-09-15 12:12:47 -04:00
Jörg Thalheim
1ecf3e862f zfsUnstable: init at 2017-09-12 2017-09-15 17:59:37 +02:00
John Ericson
c13cf47e79 linux-headers 4.4: Remove arch fallback code
@dezgeg was right: The `platform` field of a linux platorm is already
manadatory---if not specified it is inferred, and all such inferences
include a `kernelArch` field. Therefore linux packages can indeed rely
on it being defined.
2017-09-15 18:41:03 +03:00
John Ericson
baaed4c801 linux-headers: Remove dead old version
This sat around unused for who knows how long
2017-09-15 18:41:03 +03:00
John Ericson
e92cda161a haskell infra: Fix cross as much as possible without changing hashes 2017-09-15 11:37:39 -04:00
Jörg Thalheim
419869269d Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
John Ericson
81680d44c8 linux-headers 4.4: Remove arch fallback code
@dezgeg was right: The `platform` field of a linux platorm is already
manadatory---if not specified it is inferred, and all such inferences
include a `kernelArch` field. Therefore linux packages can indeed rely
on it being defined.
2017-09-14 19:30:20 -04:00
John Ericson
fb5d7b218d linux-headers: Remove dead old version
This sat around unused for who knows how long
2017-09-14 19:30:16 -04:00
John Ericson
3655e7e18b Merge commit 'bf7b5215001ca5adb283dfd68facc914fce96c49' into staging
This is part of master
2017-09-14 18:52:01 -04:00
John Ericson
0d12d040e7 Merge pull request #29402 from obsidiansystems/binutils-output-ref
treewide: Fix some references to binutils
2017-09-14 18:51:12 -04:00
John Ericson
bf7b521500 treewide: Fix some references to binutils
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
   with a cross binutils.

 - Last two `binutils.binutils` which weren't reverted
2017-09-14 18:12:54 -04:00
Daiderd Jordan
3161790ed2 Merge pull request #27376 from matthewbauer/duti
duti: init at 1.5.4pre
2017-09-14 19:26:10 +02:00
Tuomas Tynkkynen
94454384c2 linuxPackages.evdi: Mark broken on >= 4.13 2017-09-14 18:54:33 +03:00
Tuomas Tynkkynen
2459616f0f linuxPackages.netatop: Mark broken on >= 4.13 2017-09-14 18:54:33 +03:00
Tuomas Tynkkynen
808ddd86fc linuxPackages.sch_cake: Mark broken on >= 4.13 2017-09-14 18:54:33 +03:00
John Ericson
e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
Tim Steinbach
43b3029a4a
linux: 4.9.49 -> 4.9.50 2017-09-14 08:40:13 -04:00
Tim Steinbach
537da6cb50
linux: 4.12.12 -> 4.12.13 2017-09-14 08:40:13 -04:00
Tim Steinbach
232fc6a806
linux: 4.13.1 -> 4.13.2 2017-09-14 08:40:13 -04:00
Matthew Bauer
9111b53325 duti: init at 1.5.4pre
I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+.
2017-09-13 16:33:54 -05:00
Tuomas Tynkkynen
204a15ec42 _915resolution: Only works on x86
https://hydra.nixos.org/build/60928068
2017-09-13 15:42:50 +03:00
Tuomas Tynkkynen
9aa998eb48 libsmbios: Only works on x86
https://hydra.nixos.org/build/60942499
2017-09-13 15:30:48 +03:00
Tim Steinbach
87fa247867
linux-copperhead: 4.13.1.a -> 4.13.1.b 2017-09-13 08:20:58 -04:00
Tuomas Tynkkynen
4f34a3b230 reptyr: Only works on x86
https://hydra.nixos.org/build/60933200
2017-09-13 15:19:14 +03:00
Tuomas Tynkkynen
f567d0a5a6 syslinux: Only works on x86
https://hydra.nixos.org/build/60930963
2017-09-13 15:17:45 +03:00
Tuomas Tynkkynen
21298fd3f7 x86info: only works on x86
https://hydra.nixos.org/build/60931250
2017-09-13 15:08:42 +03:00
Tuomas Tynkkynen
4d205eb044 policycoreutils: Fix setuid install 2017-09-13 14:21:18 +03:00
Joachim F
e7f90c9c22 Merge pull request #29270 from rnhmjoj/btfs
btfs: 2.13 -> 2.17
2017-09-12 22:35:38 +00:00
Joachim F
01e642b15a Merge pull request #29284 from abuibrahim/master
odp-dpdk: fix a typo
2017-09-12 22:32:48 +00:00
Ruslan Babayev
4ac8529dd4 odp-dpdk: fix a typo 2017-09-12 13:23:36 -07:00
rnhmjoj
b9dc49e847
btfs: 2.13 -> 2.17 2017-09-12 14:10:50 +02:00
Frederik Rietdijk
628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
Tim Steinbach
114a2bcc80
linux-copperhead: 4.13.a -> 4.13.1.a 2017-09-10 19:21:31 -04:00
Tim Steinbach
80486ba971
linux: 4.13 -> 4.13.1 2017-09-10 12:13:15 -04:00
Tim Steinbach
9c723d4b2b
linux: 4.12.11 -> 4.12.12 2017-09-10 12:13:15 -04:00
Tim Steinbach
1ab2b06a36
linux: 4.9.48 -> 4.9.49 2017-09-10 12:13:15 -04:00
Frederik Rietdijk
dab3272f47 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-10 08:56:39 +02:00
Ruslan Babayev
f319314c35 ofp: mark as broken due to odp-dpdk change 2017-09-08 18:33:46 -07:00
Ruslan Babayev
f1e1d71494 pktgen: 3.1.0 -> 3.4.0 2017-09-08 18:33:39 -07:00
Ruslan Babayev
f6075fc211 dpdk: drop examples output; simplify install phase 2017-09-08 18:33:39 -07:00
Ruslan Babayev
ec85e42c0b odp-dpdk: 1.12.0.0 -> 1.15.0.0 2017-09-08 18:33:39 -07:00
Frederik Rietdijk
febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Robin Gloster
04f456ef94
dmtcp: 2.5.0 -> 2.5.1 2017-09-08 15:53:13 +02:00
Tim Steinbach
dc8b228a89
linux: 4.9.47 -> 4.9.48 2017-09-07 10:31:02 -04:00
Tim Steinbach
a1912c9eb4
linux: 4.12.10 -> 4.12.11 2017-09-07 10:27:39 -04:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
Frederik Rietdijk
38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
Cray Elliott
6df5f88aca nvidia-x11: 375.66 -> 384.69 2017-09-05 16:12:31 -07:00
Franz Pletz
bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
Jörg Thalheim
44f93731d6 linux_chromiumos_3_18: remove kernel due lack of maintainer/breakage
There is no maintainer for this package, probably not many users.
It requires effort to fix all third-party modules for this old kernel
versions. It might contain unpatched security holes.

For Pixel chromebooks, we have the samus-kernel.
Apart from that https://github.com/GalliumOS/linux might be a good choice.
2017-09-05 14:42:23 +02:00
Franz Pletz
bdd7630b53
can-utils: 20140427 -> 20170830 2017-09-05 14:24:58 +02:00
Frederik Rietdijk
d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Peter Hoeg
6f6a7aae8f dbus-broker: meson and ninja hooks handle most things for us 2017-09-05 09:51:54 +08:00
Tuomas Tynkkynen
e6a83ed89c apple-source-releases: Add some meta.platforms
Or Hydra tries to build them on Linux...
2017-09-04 19:04:05 +03:00
Tuomas Tynkkynen
19387e3123 mdadm4: Fix build by including change from 7d010ab5f4
And drop `-std=gnu89` while at it.
2017-09-04 18:55:57 +03:00
Tim Steinbach
967077537b
linux-copperhead: 4.12.10.a -> 4.13.a 2017-09-04 11:09:29 -04:00
Cray Elliott
1af75ba802 mwprocapture: fix build with kernels <4.13
also do some minor cleanup
2017-09-03 18:50:09 -07:00
Cray Elliott
deb50bcdc7 mwprocapture: 1.2.0.3269 -> 1.2.0.3589
remove linux 4.11 patch as it was included upstream, include
a new patch needed for linux 4.13
2017-09-03 18:21:48 -07:00
Tim Steinbach
c1e2a0b6f4
linux: Add 4.13 2017-09-03 19:41:44 -04:00
John Ericson
0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Robin Gloster
61733ed6cc systemd: use fetchpatch for patch with the correct hash
the fetchurl failed on hydra sometimes
2017-09-03 10:33:27 -04:00
Vladimír Čunát
37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Joachim F
2fdbcb28a7 Merge pull request #28912 from disassembler/jfbview
jfbview: 0.5.3 -> 0.5.4
2017-09-03 07:45:15 +00:00
Samuel Leathers
2fdb8f9b8f jfbview: 0.5.3 -> 0.5.4 2017-09-02 20:03:06 -04:00
Shea Levy
35f89413e2 fwupd: bump 2017-09-02 20:00:20 -04:00
Tim Steinbach
2c301b1b48
linux: 4.9.46 -> 4.9.47
(cherry picked from commit 27c8378c0c81aa17aef615615421aa5de3d8246b)
2017-09-02 11:17:47 -04:00
Joachim Fasting
697cbbc617
kernelPatches.grsecurity_testing: remove 2017-09-02 15:56:49 +02:00
Frederik Rietdijk
91ede67a5a systemd: use fetchurl for patch
because a hash corresponding to fetchurl was provided.
2017-09-02 13:09:58 +02:00
Frederik Rietdijk
d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
Thomas Mader
2a0f1ecdc8 apple-sdk: Move cf-private first in list, otherwise the build fails because CoreFoundation/CFAttributedString.h could not be found.
The problem appeared when building ldc on Mac OSX. See also 13778.
2017-09-02 08:35:07 +02:00
John Ericson
b64736a8e4 darwin binutils: Unwrap GNU Binutils before splicing with cctools 2017-09-01 11:44:56 -04:00
John Ericson
3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
aszlig
7f99876f50
conky: Don't enable nvidiaSupport by default
This has been introduced in 6a6fb6d31c.

Relying on non-free software by default is probably a bad idea. Apart
from the fact that (sane) people usually don't want to have it sitting
on their system even people who don't care will have to set
"allowUnfree" to true in order to install conky.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @canndrew, @Mic92
2017-09-01 17:35:17 +02:00
Samuel Leathers
e92f5b54fb crda: fix build with gcc6 2017-09-01 08:37:50 -04:00
Orivej Desh
d70006c6d9 mkDerivation: fix hardening flags check
- allow "all" in hardeningDisable
- fix busybox flags
- print detailed error message

Discussed at https://github.com/NixOS/nixpkgs/pull/28555#issuecomment-326413032
2017-09-01 01:01:24 +00:00
davidak
4134db36d0 linux-testing-bcachefs: init at 4.11.2017.08.23 2017-08-31 05:39:17 -05:00
teh
3e50f0ae0e systemd: add patch to fix suspend.target 2017-08-30 21:22:58 +02:00
Frederik Rietdijk
6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Franz Pletz
e269e9d4d8 Merge pull request #28651 from NeQuissimus/evdi_1_4_1_master
evdi: 1.4.1 -> 1.4.1+git2017-06-12
2017-08-30 19:36:47 +02:00
Franz Pletz
a28c62d411 Merge pull request #28653 from NeQuissimus/rtlwifi_new_2017_07_18
rtlwifi_new: 2016-09-12 -> 2017-07-18
2017-08-30 19:36:12 +02:00
Franz Pletz
c38b8aba16 Merge pull request #28654 from NeQuissimus/rtl8723bs_2017_04_06
rtl8723bs: 2016-04-11 -> 2017-04-06
2017-08-30 19:35:45 +02:00
Franz Pletz
9e6bc51cf5 Merge pull request #28661 from NeQuissimus/ixgbevf_4_2_1
ixgbevf: 4.1.2 -> 4.2.1
2017-08-30 19:35:16 +02:00
Tim Steinbach
4c91e32da6
linux-copperhead: 4.12.9.a -> 4.12.10.a 2017-08-30 13:17:51 -04:00
John Ericson
97a48835b7 mkDerivation, cc-wrapper: Check hardening flag validity in Nix
This becomes necessary if more wrappers besides cc-wrapper start
supporting hardening flags. Also good to make the warning into an
error.

Also ensure interface is being used right: Not as a string, not just in
bash.
2017-08-30 17:53:42 +02:00
Tim Steinbach
fab79d08e9
linux: 4.9.45 -> 4.9.46 2017-08-30 07:59:42 -04:00
Tim Steinbach
a27c6c7374
linux: 4.12.9 -> 4.12.10 2017-08-30 07:59:42 -04:00
Jörg Thalheim
8df6c177a3 Merge pull request #28728 from canndrew/conky-nvidia
conky: enable nvidia support
2017-08-30 07:43:51 +01:00
Andrew Cann
6a6fb6d31c conky: enable nvidia support 2017-08-30 12:29:57 +08:00
Sang Hak (Andy) Chun
48291b066d displaylink: use requireFile instead of fetchurl
The direct link used with fetchurl is no longer a direct link (see #28279)
Users will need to accept a EULA and add the source themselves to the store.
2017-08-30 02:56:45 +02:00
Franz Pletz
b91ed35325 Merge pull request #28660 from NeQuissimus/frandom_patch
frandom: Remove
2017-08-30 02:04:56 +02:00
Tim Steinbach
ae742fa495
frandom: Remove 2017-08-29 20:01:25 -04:00
Tim Steinbach
4f3b8c5e7c
evdi: 1.4.1 -> 1.4.1+git2017-06-12 2017-08-29 19:59:31 -04:00
Franz Pletz
c7feb2380a Merge pull request #28652 from NeQuissimus/sch_cake_2017_07_16
sch_cake: 2017-01-28 -> 2017-07-16
2017-08-30 01:39:37 +02:00
Franz Pletz
de45b2d840 Merge pull request #28662 from NeQuissimus/mxu11x0_1_3_11
mxu11x0: 1.3.11 -> 1.3.11+git2017-07-13
2017-08-30 01:13:10 +02:00
Daiderd Jordan
adca58c2e7 Merge pull request #27598 from LnL7/darwin-cf-rpath
CoreFoundation: use rpath to fix issues when using frameworks
2017-08-29 22:16:56 +02:00
Michael Raskin
10f5aad602 acpi_call: mark as broken on ChromiumOS kernels 2017-08-29 16:12:14 +02:00
Tim Steinbach
40d05c1073
ixgbevf: 4.1.2 -> 4.2.1 2017-08-29 07:17:38 -04:00
Tim Steinbach
13f4ce8cc9
mxu11x0: 1.3.11 -> 1.3.11+git2017-07-13 2017-08-29 07:15:07 -04:00
Jörg Thalheim
1c240b913e Merge pull request #28650 from NeQuissimus/ena_1_2_0
ena: 20160629 -> 1.2.0
2017-08-29 10:43:15 +01:00
Jörg Thalheim
1812667b8b Merge pull request #28657 from zraexy/broadcom-bt-firmware
broadcom-bt-firmware: 12.0.1.1011 -> 12.0.1.1012
2017-08-29 10:42:31 +01:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Jörg Thalheim
18036996a5 Merge pull request #28664 from NeQuissimus/ply_folder_kernel
ply: Allow building for git-fetched kernels
2017-08-29 06:39:42 +01:00
Tim Steinbach
56beae4db6
ply: Allow building for git-fetched kernels 2017-08-28 20:12:17 -04:00
Tuomas Tynkkynen
ff3f6f38c4 linux_rpi: 1.20170515 -> 1.20170811 2017-08-29 02:37:52 +03:00
Tuomas Tynkkynen
b1749aecbe raspberrypifw: 1.20170515 -> 1.20170515n 2017-08-29 02:37:38 +03:00
Daiderd Jordan
5a28fd660a
darwin-frameworks: move fixup setup-hook 2017-08-28 23:25:11 +02:00
Daiderd Jordan
cc1bfbd9a7
darwin-frameworks: use the system CF when frameworks are used
This will get propagated down to other libraries loaded because
everything in nixpkgs references CF based on an rpath entry.
2017-08-28 23:25:09 +02:00
Daiderd Jordan
92652b4d79
darwin-CF: use @rpath for library id and add an rpath entry for CF based on NIX_COREFOUNDATION_RPATH 2017-08-28 23:24:58 +02:00
Tim Steinbach
7d36b34bb8
rtl8723bs: 2016-04-11 -> 2017-04-06 2017-08-28 17:18:58 -04:00
Tim Steinbach
c9be778453
rtlwifi_new: 2016-09-12 -> 2017-07-18 2017-08-28 16:58:58 -04:00
Tim Steinbach
86c55fbb99
sch_cake: 2017-01-28 -> 2017-07-16 2017-08-28 16:55:14 -04:00
Tim Steinbach
be17a1c525
ena: 20160629 -> 1.2.0 2017-08-28 16:45:48 -04:00
zraexy
30ad3834a9 broadcom-bt-firmware: 12.0.1.1011 -> 12.0.1.1012 2017-08-28 12:04:11 -08:00
John Ericson
7a22c01b54 apple misc pkgs: buildInputs -> nativeBuildInputs 2017-08-28 15:21:55 -04:00
Robin Gloster
8dca9bff66
upstart: remove ancient 2017-08-28 21:13:03 +02:00
Tim Steinbach
163b3e853b
linux: 4.13-rc6 -> 4.13-rc7 2017-08-28 11:59:37 -04:00
Michael Raskin
fd3e1ce776 fbterm: import Arch Linux patches to fix build 2017-08-28 13:53:34 +02:00
Vladimír Čunát
a4c2613f3d
darwin.usr-include: set meta.platforms
Otherwise scripts may try to evaluate it and that fails due to
missing `stdenv.libc`.
2017-08-27 17:06:45 +02:00
Tim Steinbach
bebaf083cd
linux-copperhead: 4.12.8.a -> 4.12.9.a 2017-08-27 09:43:23 -04:00
Tim Steinbach
9b9d0cc06b
linux: 4.9.44 -> 4.9.45 2017-08-26 09:50:02 -04:00
Tim Steinbach
d23bed7cc6
linux: 4.12.8 -> 4.12.9 2017-08-26 09:47:57 -04:00
Phil
4f2935390e nixos/usbguard: create package and module (#28363)
* nixos/usbguard: create package and module

No usbguard module or package existed for NixOS previously. USBGuard
will protect you from BadUSB attacks. (assuming configuration is done
correctly)

* nixos/usbguard: remove extra packages

Users can override this by themselves.

* nixos/usbguard: add maintainer and fix style
2017-08-25 23:35:18 +01:00
Jörg Thalheim
7182b71489 ffado: 2.2.1 -> 2.3.0 2017-08-25 21:43:31 +01:00
John Ericson
3964990a3f Merge pull request #28519 from obsidiansystems/linux-headers-improve
linux-headers: Improve derivation, removing cross arg
2017-08-24 11:35:04 -04:00
John Ericson
791ce593ce linux-headers: Improve derivation, removing cross arg
- Perl is used at build time, so must be in `nativeBuildInputs`. It's
   not used at run time so it should not be in `buildInputs`, too.

 - Don't treat headers like a compiler---use the build and host
   platforms not host and target. Perhaps that would make sense if every
   library's headers could be a separate derivation, but since that is
   not feasible, best to keep the implementation and interface in the
   same stage.

   To do this, we used `stdenvNoCC` to get rid of the normal toolchain,
   and added a dependency for the toolchain targeting the build platform
   --- `buildPackages.stdenv.cc` --- thus everything is effectively slid
   a stage black.
2017-08-24 11:31:56 -04:00
Peter Hoeg
2724f65392 dbus-broker: use the proper license 2017-08-23 23:51:00 +08:00
Peter Hoeg
9f2ef9c25b dbus-broker: init at 3 2017-08-23 22:50:26 +08:00
Matthew Justin Bauer
2eacddf0dc treewide: homepage URL fixes (#28475)
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
2017-08-22 20:50:04 +02:00
Tim Steinbach
cd85a704a5
linux: 4.13-rc4 -> 4.13-rc6 2017-08-22 03:23:30 -04:00
John Ericson
056a389d3b ios cross cc-wrapper: Fail assertion to avoid breaking tarball job
Previously, this wasn't being evaluated by CI.
2017-08-21 11:50:29 -04:00
Gabriel Ebner
0c36f8569f Merge pull request #28420 from canndrew/intel-microcode
microcode-intel: 2017-05-11 -> 2017-07-07
2017-08-21 14:09:38 +02:00
Tim Steinbach
746979e0fc
busybox: 1.27.1 -> 1.27.2 2017-08-21 03:11:00 -04:00
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Vladimír Čunát
7c7c83e233
buildLinux: allow overriding stdenv on each call 2017-08-20 08:24:52 +02:00
Andrew Cann
c19d06b70b microcode-intel: 2017-05-11 -> 2017-07-07 2017-08-20 13:33:01 +08:00
Tim Steinbach
7209ed6d4b
linux-copperhead: 4.12.7.a -> 4.12.8.a 2017-08-18 15:47:03 -04:00
Tim Steinbach
9281b05c7f
linux: 4.12.7 -> 4.12.8 2017-08-18 15:33:53 -04:00
Tim Steinbach
a5f01aa745
linux: 4.9.43 -> 4.9.44 2017-08-18 15:30:37 -04:00
Matthew Bauer
ed180d21ea acpitool: use sourceforge.net for project page
old url was broken
2017-08-17 15:04:40 -07:00
Frederik Rietdijk
8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
Rickard Nilsson
5f8a45c136 shadow: 4.4 -> 4.5
Fixes CVE-2017-12424
2017-08-17 13:23:56 +02:00
Will Dietz
c20d41de0e Revert "busybox: downgrade 1.27.1 -> 1.26.2"
This reverts commit 9c3702ad35.
2017-08-14 22:40:11 +03:00
Tim Steinbach
b94210b066
linux-copperhead: 4.12.5.a -> 4.12.7.a 2017-08-14 12:51:30 -04:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Franz Pletz
eb9f427d4e
zfs: use multiple outputs
Some dev headers are especially large.
2017-08-14 07:57:31 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Tim Steinbach
5c29873e99
linux: 4.9.42 -> 4.9.43 2017-08-13 15:42:15 -04:00
Tim Steinbach
59e34685da
linux: 4.12.6 -> 4.12.7 2017-08-13 15:42:15 -04:00
Vladimír Čunát
9c3702ad35
busybox: downgrade 1.27.1 -> 1.26.2
... to fix our bootstrap tools until we find what exactly is wrong.
This effectively reverts 06a513ee05 and 50831d543d.
Discussion thread: #27746.
2017-08-13 21:38:39 +02:00
Vladimír Čunát
34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Frederik Rietdijk
7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Frederik Rietdijk
2a8cd14d5f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-13 09:50:47 +02:00
Jörg Thalheim
317786c689 zfs: 0.7.0 -> 0.7.1 2017-08-12 19:38:10 +01:00
Jörg Thalheim
758421c0ab spl: 0.7.0 -> 0.7.1 2017-08-12 19:38:10 +01:00
Jörg Thalheim
5839cefb33 Merge pull request #28203 from danielfullmer/rtl8812-fix
rtl8812au driver fixes
2017-08-12 19:31:17 +01:00
Jörg Thalheim
e888cfb130 Merge pull request #27983 from hhomar/openelec-dvb-firmware
openelec-dvb-firmware: init at 0.0.51
2017-08-12 19:17:49 +01:00
Robin Gloster
89ad46d9b4
sysdig: fix build with current curl 2017-08-12 18:38:36 +02:00
Robin Gloster
4502e61c5d
audit: 2.7.6 -> 2.7.7 2017-08-12 18:13:53 +02:00
Vladimír Čunát
e207d1f04a
Merge older staging
There's a security fix for curl.
2017-08-12 09:48:17 +02:00
Daniel Fullmer
c08ceb1df8 rtl8812au: Fixes for newer linux kernels
This includes the patches from the pull requests #42, #43, and #46
submitted to Grawp/rtl8812au_rtl8821au
2017-08-11 23:47:07 -04:00
Daniel Fullmer
afa9031062 rtl8812au: Fix comment typo
The commit 5d693c84d2 cleaned up the
substitute() function in stdenv and caused this line to
fail.
2017-08-11 23:31:12 -04:00
Jörg Thalheim
6c1528c48d Merge pull request #28169 from zx2c4/patch-6
wireguard: 0.0.20170726 -> 0.0.20170810
2017-08-11 22:30:29 +01:00
Joachim Fasting
345e0e6794
hardened-config: enable read-only LSM hooks
Implies that SELinux can no longer be disabled at runtime (only at boot
time, via selinux=0).

See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dd0859dccbe291cf8179a96390f5c0e45cb9af1d
2017-08-11 23:27:58 +02:00
Jason A. Donenfeld
decbc7d50e wireguard: 0.0.20170726 -> 0.0.20170810 2017-08-11 21:04:17 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Lancelot SIX
e34ce9d1c5 gnupg: 2.1.22 -> 2.1.23
This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.

This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
2017-08-11 19:24:06 +02:00
Robin Gloster
897eec7d79
linuxHeaders_2_{4,6}: remove 2017-08-11 19:13:09 +02:00
Robin Gloster
05b8cae9ec
linux: remove unused kernel patches 2017-08-11 19:13:09 +02:00
Robin Gloster
9f3f575ab3
linux_4_4: remove
Support ends in Feb 2018
2017-08-11 19:13:09 +02:00
Robin Gloster
0eb9c5bd42
linux_3_10: remove
Support ends in Oct 2017
2017-08-11 19:13:08 +02:00
Tim Steinbach
47d9b48e4d
linux: 4.12.5 -> 4.12.6 2017-08-11 12:14:53 -04:00
Tim Steinbach
f2d420e4c9
linux: 4.9.41 -> 4.9.42 2017-08-11 12:10:10 -04:00
Domen Kožar
486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Robin Gloster
28cc2642f0
treewide: use less phases if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
2017-08-11 11:40:36 +02:00
Tim Steinbach
f40f4f5440 Merge pull request #28120 from NeQuissimus/plymouth_0_9_3
plymouth: 0.9.2 -> 0.9.3
2017-08-10 21:05:29 -04:00
Jörg Thalheim
637cea679d Merge pull request #28109 from womfoo/bump/mbpfan-2.0.1
mbpfan: 1.9.1 -> 2.0.1
2017-08-10 21:22:18 +01:00
Tim Steinbach
ecd4c58d0a
plymouth: 0.9.2 -> 0.9.3 2017-08-10 16:21:24 -04:00
Kranium Gikos Mendoza
151fab911e mbpfan: 1.9.1 -> 2.0.1
removed patch for lsmod/grep as they are no longer used (dgraziotin/mbpfan@5f2da79)
2017-08-11 01:52:04 +10:00
Robin Gloster
60418e9196
edac-utils: fix makeWrapper call 2017-08-10 03:44:03 +02:00
Robin Gloster
46a25ea7ea
linuxPackages.bcc: fix using wrapProgram on .c file 2017-08-09 19:45:05 +02:00
Kranium Gikos Mendoza
725089bb2d powerstat: 0.02.11 -> 0.02.12 2017-08-08 23:46:01 +10:00
Kranium Gikos Mendoza
c943cf7c26 forkstat: 0.01.17 -> 0.02.00 2017-08-08 23:44:25 +10:00
Tim Steinbach
f46f98ad31
Revert 0cf0d7186a
Order common kernel config by functionality
See #27949
2017-08-07 17:34:10 -04:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Tim Steinbach
fa10497834 Merge pull request #27684 from gnidorah/bfq
linux: BFQ Group Scheduling support
2017-08-07 11:58:45 -04:00
Tim Steinbach
06af1df857
linux: 4.13-rc3 -> 4.13-rc4 2017-08-07 11:40:01 -04:00
Tim Steinbach
ea2a10e143
linux: 4.4.79 -> 4.4.80 2017-08-07 11:35:42 -04:00
Tim Steinbach
4825e4818b
linux: 4.9.40 -> 4.9.41 2017-08-07 11:32:26 -04:00
gnidorah
dc21f1ad65 linux: BFQ Group Scheduling support 2017-08-07 10:12:21 +03:00
Tim Steinbach
1ec7242bc2
linux-copperhead: 4.12.4.a -> 4.12.5.a 2017-08-06 22:04:46 -04:00
Tim Steinbach
ff9479cd54
linux: 4.12.4 -> 4.12.5 2017-08-06 19:22:15 -04:00
Tim Steinbach
0cf0d7186a
linux-common-config: Refactor, clean up 2017-08-06 19:17:30 -04:00
Joachim Fasting
f963014829
linux-hardened-config: various fixups
Note
- the kernel config parser ignores "# foo is unset" comments so they
  have no effect; disabling kernel modules would break *everything* and so
  is ill-suited for a general-purpose kernel anyway --- the hardened nixos
  profile provides a more flexible solution
- removed some overlap with the common config (SECCOMP is *required* by systemd;
  YAMA is enabled by default).
- MODIFY_LDT_SYSCALL is guarded by EXPERT on vanilla so setting it to y breaks
  the build; fix by making it optional
- restored some original comments which I feel are clearer
2017-08-06 23:38:07 +02:00
Heitham Omar
5ac00265a8 linux-common-config: add CONFIG_HOTPLUG_PCI_ACPI 2017-08-06 20:41:28 +02:00
Heitham Omar
d3107e4508 openelec-dvb-firmware: init at 0.0.51 2017-08-06 16:29:09 +01:00
Tim Steinbach
ff10bafd00
linux: Expand hardened config
Based on latest recommendations at
http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
2017-08-06 09:58:02 -04:00
Robin Gloster
2b4811887a
kernel: add IP_NF_TARGET_REDIRECT 2017-08-04 08:26:09 +02:00
Jörg Thalheim
3ab208e108 Merge pull request #27924 from carlsverre/wpa_supplicant_bgscan
Enable BGSCAN for wpa_supplicant
2017-08-04 05:51:26 +01:00
Carl Sverre
6b62b566a1 wpa_supplicant: Enable BGSCAN module
Compile wpa_supplicant with the BGSCAN module enabled. This allows the
user to configure an SSID to use the bgscan module.  This module causes
wpa_supplicant to periodically perform a background scan for additional
access points and switch to the one with the highest signal.  This scan
can be kicked off when the current connection drops below a target
threshold signal strength.
2017-08-03 21:37:24 -07:00
Robin Gloster
dc13376ee2
wvdial: remove 2017-08-04 02:24:07 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Franz Pletz
4afb3f4ade
ipsecTools: add patch to fix CVE-2016-10396 2017-08-01 10:26:19 +02:00
Franz Pletz
1a4ce79a0d
pam_ldap: 183 -> 186 2017-08-01 08:36:35 +02:00
Franz Pletz
e5e556f19a
irqbalance: 1.1.0 -> 1.2.0 2017-08-01 08:36:33 +02:00
Franz Pletz
9719e43494
jool: 3.5.3 -> 3.5.4 2017-08-01 06:15:59 +02:00
Tuomas Tynkkynen
3db9a2bdff linux_rpi: 1.20170427 -> 1.20170515 2017-07-31 19:47:23 +03:00
Tuomas Tynkkynen
8523ab5e8d raspberrypifw: 1.20170427 -> 1.20170515 2017-07-31 19:47:23 +03:00
Franz Pletz
ee8df19a25
batman-adv: 2017.1 -> 2017.2 2017-07-31 12:23:14 +02:00
aszlig
979817d153
linux-testing: 4.13-rc2 -> 4.13-rc3
Tested via building the linux_testing attribute, but didn't test it at
runtime (yet).

Diffed unpacked tarball against my local git clone and the contents
match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-07-31 09:39:42 +02:00
Robin Gloster
a974ee0188
tcp_wrappers: fix weird use of STRINGS in the Makefile 2017-07-30 14:03:31 +02:00
Frederik Rietdijk
20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Nikolay Amiantov
69e24c044a kbd: fix build 2017-07-30 01:33:26 +03:00
Nikolay Amiantov
373a623daa Revert "Revert "kbd: 2.0.3 -> 2.0.4""
This reverts commit 00bf3a9dca.
2017-07-30 01:21:44 +03:00
Tim Steinbach
06a513ee05 busybox: 1.27.0 -> 1.27.1 2017-07-29 23:15:40 +02:00
Thomas Tuegel
cdb18068cd
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.

(cherry picked from commit b21defaf51)

Re-applied due to bad merge in b116fa5ff2.
2017-07-29 20:59:08 +02:00
Franz Pletz
65f9631b87
linuxPackages.acpi_call: add patch for 4.12 compat 2017-07-29 18:28:00 +02:00
Aristid Breitkreuz
9d4d963097 wireguard: 0.0.20170706 -> 0.0.20170726 2017-07-29 17:28:18 +02:00
Frederik Rietdijk
b2608b8910 Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-29 13:08:11 +02:00
Tim Steinbach
a918521c1e
linux-copperhead: 4.12.3.a -> 4.12.4.a 2017-07-28 17:54:37 -04:00
Frederik Rietdijk
55357de67a Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-28 19:37:36 +02:00