1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 18:34:41 +00:00
Commit graph

6733 commits

Author SHA1 Message Date
Frederik Rietdijk 00bf3a9dca Revert "kbd: 2.0.3 -> 2.0.4"
This reverts commit fd43b50877.

```
substitute(): ERROR: Invalid command line argument: /nix/store/8f42syfzv3cpw3jjq96sdzvnclivi783-kbd-2.0.4/bin/unicode_stop
```

@rnhmjoj please check
2017-07-28 16:11:10 +02:00
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Tim Steinbach e59ecf8a1b Merge pull request #27585 from NeQuissimus/exfat_2017-06-19
exfat-nofuse: 2017-01-03 -> 2017-06-19
2017-07-28 09:16:56 -04:00
Joachim F c36a68e7d3 Merge pull request #27639 from jfrankenau/update-firejail
firejail: 0.9.44.10 -> 0.9.48
2017-07-28 05:45:57 +01:00
Jörg Thalheim 229b249281 sysdig: 0.16.0 -> 0.17.0 2017-07-27 22:21:00 +01:00
Robin Gloster 2799a94963
zfs, spl: 0.6.5.11 -> 0.7.0 2017-07-27 19:00:54 +02:00
Tuomas Tynkkynen 4456076bc7 keyutils: 1.5.9 -> 1.5.10 2017-07-27 18:57:02 +03:00
Nikolay Amiantov 81bb5856eb bbswitch: quote homepage 2017-07-27 17:07:45 +03:00
Peter Hoeg 354c979ea8 mcelog: 148 -> 153 2017-07-27 13:03:26 +08:00
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
rnhmjoj fd43b50877 kbd: 2.0.3 -> 2.0.4 2017-07-26 16:58:53 +03:00
Johannes Frankenau fcf7b6761b firejail: 0.9.44.10 -> 0.9.48 2017-07-25 14:30:36 +02:00
Tim Steinbach 907fa51d68 Merge pull request #27583 from NeQuissimus/cryptodev_1_9
cryptodev: 1.8 -> 1.9
2017-07-24 18:54:52 -04:00
Tim Steinbach 8f77f7b486 Merge pull request #27586 from NeQuissimus/dpdk_17_05_1
dpdk: 16.07.2 -> 17.05.1
2017-07-24 18:54:36 -04:00
Tim Steinbach 1dd6e7dcbc
linux: 4.13-rc1 -> 4.13-rc2 2017-07-24 09:50:32 -04:00
Tim Steinbach c355fd85ed
cryptodev: 1.8 -> 1.9 2017-07-23 16:32:30 -04:00
Tim Steinbach ebf5df0365
exfat-nofuse: 2017-01-03 -> 2017-06-19 2017-07-23 11:43:01 -04:00
Tim Steinbach fe101d0fb7
dpdk: 16.07.2 -> 17.05.1 2017-07-23 11:40:25 -04:00
Jörg Thalheim 887570883e perf: remove binutils patch by wrapper
starting with linux 4.12 our patch no longer applied. In order to
avoid having to maintain patches for different linux kernels it is
easier to use a wrapper instead.
2017-07-23 15:18:02 +01:00
Frederik Rietdijk 29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Tim Steinbach 869bb2e486
linux-copperhead: 4.12.2.a -> 4.12.3.a 2017-07-22 19:08:02 -04:00
Graham Christensen 2fb3cc1e6d Merge pull request #27548 from roberth/lvm-update
lvm2: 2.02.140 -> 2.02.173
2017-07-22 09:16:59 -04:00
Thomas Tuegel 6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Thomas Tuegel bec5797290
syslinux: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 16:51:53 -05:00
Thomas Tuegel b21defaf51
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 15:47:37 -05:00
Thomas Tuegel 631f6b3e11
systemd: unset RANLIB
Commit 093cc00cdd sets the RANLIB environment
variable by default, causing `make' to invoke the wrong program.
2017-07-21 15:46:40 -05:00
Thomas Tuegel aa11af8bbe
systemd: fix broken source hash 2017-07-21 15:46:33 -05:00
Thomas Tuegel 7d010ab5f4
mdadm: unset STRIP
Commit 093cc00cdd, sets the STRIP environment
variable by default, but this confuses the mdadm Makefile, which uses STRIP as a
flag to `install'.
2017-07-21 15:43:25 -05:00
Robert Hensing fbd3f8698a lvm2: 2.02.140 -> 2.02.173 2017-07-21 16:25:34 +02:00
Tim Steinbach ba9275da88
linux: Remove 4.11
4.11.x has been EOL'd
2017-07-21 07:33:14 -04:00
Tim Steinbach 98ad0f4dab
linux: 4.12.2 -> 4.12.3 2017-07-21 07:28:24 -04:00
Tim Steinbach 232f497169
linux: 4.9.38 -> 4.9.39 2017-07-21 07:25:50 -04:00
Tim Steinbach 5181d7568f
linux: 4.4.77 -> 4.4.78 2017-07-21 07:23:12 -04:00
Al Zohali 0b3d29d4ac linux_samus_4_12: init at 4.12.2
Co-authored-by: Nikolay Amiantov <ab@fmap.me>

fixes #26038
2017-07-18 23:31:18 +01:00
Daniel Peebles bd2e91e3a2 Merge pull request #27318 from copumpkin/darwin-high-sierra
Support High Sierra on Darwin
2017-07-18 17:06:06 -04:00
aszlig c71233f12c
broadcom_sta: Add patch for supporting Linux 4.12
The patch is from Arch Linux at:

https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl

Tested this by building against the following attributes:

  * linuxPackages.broadcom_sta
  * linuxPackages_latest.broadcom_sta
  * pkgsI686Linux.linuxPackages.broadcom_sta
  * pkgsI686Linux.linuxPackages_latest.broadcom_sta

I have not tested whether this works at runtime, because I do not posess
the hardware.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-07-18 21:37:02 +02:00
Tuomas Tynkkynen 638adf2d90 iproute: 4.11.0 -> 4.12.0 2017-07-18 13:41:06 +03:00
Jörg Thalheim 4154279179 zfsUnstable: mark as stable with 4.12 2017-07-18 11:15:37 +01:00
Frederik Rietdijk 3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Franz Pletz 7f0994c33d
zfsUnstable: 0.7.0-rc4 -> 0.7.0-rc5 2017-07-17 02:53:14 +02:00
Franz Pletz e4eea75fa7
zfs: 0.6.5.10 -> 0.6.5.11 2017-07-17 02:53:14 +02:00
Robin Gloster ae26f291bc
systemd: 233 -> 234 2017-07-16 17:22:45 +02:00
Tim Steinbach df929d6216
linux-copperhead: 4.12.1.a -> 4.12.2.a 2017-07-15 19:44:12 -04:00
Tim Steinbach b103e9317a
linux-testing: 4.12-rc7 -> 4.13-rc1 2017-07-15 19:30:44 -04:00
Tim Steinbach 81b993369c
linux: 4.4.76 -> 4.4.77 2017-07-15 19:25:42 -04:00
Tim Steinbach b04858db1b
linux: 4.9.37 -> 4.9.38
Remove temporary patches to perf as well
2017-07-15 19:22:07 -04:00
Tim Steinbach ccec16579d
linux: 4.11.10 -> 4.11.11 2017-07-15 19:17:06 -04:00
Tim Steinbach c5ef98bb34
linux: 4.12.1 -> 4.12.2 2017-07-15 19:14:44 -04:00
Tim Steinbach 954c66983d
perf: Apply patch for offline kernels
As per https://lkml.org/lkml/2017/7/13/314, perf is broken in 4.9.36 and 4.9.37
Patches in this commit are taken from
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=39f4f2c018bd831c325e11983f8893caf72fd9eb

This will allow perf to build again and should be included in a future 4.9.x release,
allowing the custom patching to be removed again
2017-07-14 20:07:16 -04:00
Tuomas Tynkkynen 42395a191b kernel-config: Disable Xen on non-x86
There's an upstream build failure on ARM (not directly related to Xen
but rather some other config options it enables). The xen package is
x86_64-only anyways.
2017-07-13 20:12:50 +03:00