1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 14:47:06 +00:00
Commit graph

7918 commits

Author SHA1 Message Date
Nikolay Amiantov 2ff2045053
Merge pull request #37100 from abbradar/nvidiabl
nvidiabl: 0.87 -> 2017-09-26
2018-03-16 16:45:15 +03:00
Tuomas Tynkkynen d66b87682b Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-15 22:31:29 +02:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Tim Steinbach ff9db1ffc4
linux-copperhead: 4.15.9.a -> 4.15.10.a 2018-03-15 16:28:09 -04:00
Tim Steinbach 09cb7d73ea
linux: 4.15.9 -> 4.15.10 2018-03-15 10:52:25 -04:00
Tim Steinbach 525dc15c5a
linux: 4.14.26 -> 4.14.27 2018-03-15 10:52:25 -04:00
Nikolay Amiantov 7cf6df8903 nvidiabl: 0.87 -> 2017-09-26
Fix build on newer kernels. Fixes #36356.

Thanks to yorickvP for suggestions and maintainership.
2018-03-15 17:15:57 +03:00
lewo a3205ea5f3
Merge pull request #36928 from roosemberth/pcm
pcm: init at 201710
2018-03-15 08:48:40 +01:00
Andreas Rammhold fb5e496b10
Merge pull request #36950 from DarkScythe97/microcode-intel
microcode-intel: 20171117 -> 20180312
2018-03-15 08:43:29 +01:00
Will Dietz b546c7440e busybox: patchshebangs to fix build on "limited" /bin/sh builders 2018-03-14 16:58:54 -05:00
Roosembert Palacios 3328709918
pcm: init at 201710
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2018-03-14 21:28:55 +01:00
DarkScythe97 a4fd4e3af0 microcode-intel: 20171117 -> 20180312 2018-03-14 12:09:07 +10:30
xeji 591fd5ee9b libsemanage: fix build w/gcc7 2018-03-13 22:40:07 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Franz Pletz cede103220
Merge pull request #36654 from xeji/jfbview-broken
jfbview: mark as broken (upstream issue)
2018-03-12 23:16:51 +00:00
John Ericson 62ca2316a4
Merge pull request #36885 from obsidiansystems/meta-host-prepare
treewide: Prepare for #34444
2018-03-12 19:06:35 -04:00
John Ericson 79d8353b5e treewide: Make shouldUsePackages copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
2018-03-12 18:55:41 -04:00
Franz Pletz 9715e278c1
Merge pull request #36879 from markuskowa/beegfs-6.18
beegfs: 6.17 -> 6.18
2018-03-12 21:30:57 +00:00
Franz Pletz ce23a71e49
Merge pull request #36818 from jfrankenau/update-wireguard
wireguard: 0.0.20180218 -> 0.0.20180304
2018-03-12 21:14:15 +00:00
Markus Kowalewski 11d40d5331 beegfs: 6.17 -> 6.18 2018-03-12 13:30:51 -07:00
Tim Steinbach a5a90aed1a
linux: 4.16-rc4 -> 4.16-rc5 2018-03-12 09:04:31 -04:00
Izorkin c10b7a7d27 nftables: 0.8.2 -> 0.8.3 2018-03-12 11:05:19 +03:00
Tuomas Tynkkynen e31f49f671 sssd: 1.16.0 -> 1.16.1 2018-03-12 01:47:18 +02:00
Shea Levy aabfda6d5d
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging 2018-03-11 17:28:07 -04:00
Johannes Frankenau a0cc592c3e wireguard: 0.0.20180218 -> 0.0.20180304 2018-03-11 18:49:38 +01:00
Tim Steinbach 6c5aa934dd
linux-copperhead: 4.15.8.a -> 4.15.9.a 2018-03-11 13:48:36 -04:00
Tim Steinbach 5fc2133493
linux: 4.9.86 -> 4.9.87 2018-03-11 13:48:36 -04:00
Tim Steinbach daded89d95
linux: 4.4.120 -> 4.4.121 2018-03-11 13:48:36 -04:00
Tim Steinbach 68294bb272
linux: 4.14.25 -> 4.14.26 2018-03-11 13:48:36 -04:00
Tim Steinbach cc18de181f
linux: 4.15.8 -> 4.15.9 2018-03-11 13:48:36 -04:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Daiderd Jordan 43be4ebfb1
Merge pull request #36581 from matthewbauer/darwin-fixes
darwin: fixes
2018-03-09 19:32:54 +01:00
Tim Steinbach 72dede4203
linux-copperhead: 4.15.7.a -> 4.15.8.a 2018-03-09 12:32:54 -05:00
Tim Steinbach 245dcb4a58
linux: 4.15.7 -> 4.15.8 2018-03-09 12:28:05 -05:00
Tim Steinbach f5ac2dd6e2
linux: 4.14.24 -> 4.14.25 2018-03-09 12:28:05 -05:00
xeji a4f53eae2c jfbview: mark as broken (upstream issue)
incompatible with current libmupdf:
https://github.com/jichu4n/JFBView/issues/17
does not appear actively maintained.
2018-03-09 15:14:53 +01:00
Nikolay Amiantov 1890fe359a linuxPackages.bbswitch: disable on AArch64
It makes no sense on non-x86 platforms.
2018-03-09 16:35:10 +03:00
Matthew Bauer c7abef4c5d network_cmds: fix on darwin 2018-03-08 19:00:09 -06:00
Matthew Bauer 54e2c28b09 darwin: disable broken packages 2018-03-08 17:21:17 -06:00
Daiderd Jordan 697847bfe3
Merge pull request #36351 from LnL7/skhd
skhd: init at 0.0.10
2018-03-08 21:03:55 +01:00
John Ericson ce5a76274d
Merge pull request #34672 from teto/kernel_overrides
buildLinux: add overrides for modules
2018-03-08 11:11:51 -05:00
Matthieu Coudron 3ccc65a36c buildLinux: allow to override arch/modules/builtin
- Easy override of autoModules and preferBuiltin and kernelArch parameters (currently living in `hostSystem` set).
2018-03-08 12:47:06 +09:00
Matthieu Coudron 600e977898 buildLinux: removes unnecessary parameters
and passes parameters in a single set
2018-03-08 12:45:39 +09:00
Tuomas Tynkkynen 2372e93981 trinity: Fix 32-bit build 2018-03-06 21:37:18 +02:00
Will Dietz 3a40b33461 kernel-headers: remove deprecated and broken asm symlink fixups
Discussion:
https://github.com/NixOS/nixpkgs/pull/36303
2018-03-06 11:14:00 -06:00
Daiderd Jordan b84d22cbbd
skhd: init at 0.0.10 2018-03-05 20:05:39 +01:00
Tim Steinbach 1d1275ef8b
linux: 4.16-rc3 -> 4.16-rc4 2018-03-05 11:30:23 -05:00
Franz Pletz 48bd537814
batman-adv: 2017.4 -> 2018.0 2018-03-05 15:43:42 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Tad Fisher f4bea835ae fwts: init at 18.01.00 2018-03-04 12:22:20 -08:00