Commit Graph

7000 Commits

Author SHA1 Message Date
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
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