1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

6283 commits

Author SHA1 Message Date
Eelco Dolstra 6ef630a125
systemd: Include https://github.com/NixOS/systemd/pull/8 2017-03-27 15:37:49 +02:00
Vladimír Čunát c1a9dc3d37
Merge branch 'master' into staging 2017-03-23 13:31:28 +01:00
Robin Gloster 785e45ac06
Revert "Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1""
This reverts commit 8c410f4b18 with a fix
to make the tests run correctly. bochs-drm must not be blacklisted for
that.
2017-03-23 10:10:04 +01:00
Joachim Fasting 94ab4932ae
grsecurity: 4.9.16-201703180820 -> 4.9.17-201703221829 2017-03-23 01:03:14 +01:00
Joachim Fasting a2fdf72ec4
linux_4_9: 4.9.16 -> 4.9.17 2017-03-23 01:03:11 +01:00
Vladimír Čunát 8c410f4b18
Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1"
This reverts commit 0c262a639e.
It broke X tests, though it's not clear why ATM.  Discussion:
https://github.com/NixOS/nixpkgs/pull/23890#issuecomment-288528788
2017-03-22 21:45:22 +01:00
Dan Peebles 5561abd556 libauto: more obscene hackery to make it work on LLVM 4
This sort of thing is going to get revamped to be less hackish soon but
for now I want it to work. In this particular case, libc++ 4 (and maybe
earlier) gets very upset if we're imprecise about our const markers, and
I guess libauto was careless. This fixes it (PtrPtrMap) to be correct.
2017-03-21 22:24:12 -04:00
Joachim Fasting 41e2ffa1d7
pax-utils: meta cleanups
- Description from upstream
- A more informative homepage
- Per upstream, pax-utils should work for unix-likes beyond linux
2017-03-22 02:27:30 +01:00
Tim Steinbach c60102d177
linux: 4.11-rc2 -> 4.11-rc3 2017-03-21 20:32:36 -04:00
Frederik Rietdijk 94eb74eaad Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-21 13:04:37 +01:00
Frederik Rietdijk 3760c8c7fd Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function,
`buildPythonPackage`.
2017-03-21 13:01:49 +01:00
Jörg Thalheim 818a37598c
wireguard: 0.0.20170223 -> 0.0.20170320.1 2017-03-21 01:46:17 +01:00
Tobias Geerinckx-Rice 4a53b2eaf7
crda: Add usage hint to longDescription.
Reported by samae on #nixos.
2017-03-20 23:24:46 +01:00
Benno Fünfstück 8c0074dd9f drbd: fix output file location (#23541)
drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
2017-03-20 22:25:10 +01:00
Kristoffer Søholm f9e8ef7e6d nixos/bluetooth: add extraConfig option (#23427) 2017-03-20 14:28:02 +01:00
Tuomas Tynkkynen addffa41b4 kmscube: 2016-09-19 -> 2017-03-19 2017-03-20 07:27:57 +02:00
Tim Steinbach bef5607e20
linux: 4.4.54 -> 4.4.55 2017-03-19 12:18:46 -04:00
Tim Steinbach 6879d560cb
linux: 4.10.3 -> 4.10.4 2017-03-19 12:15:40 -04:00
Kosyrev Serge d860a68fd0 nvidia-x11: $bin can be empty 2017-03-19 05:29:57 +03:00
Kosyrev Serge d18f55269c nvidia-x11: don't patch things if libsOnly requested 2017-03-19 05:29:33 +03:00
Michael Raskin fb26aadbe4 Merge pull request #23689 from sh01/hwdata_hashaddr
hwdata: Use content-addressed source file; previous source tarball changes contents.
2017-03-18 19:16:27 +01:00
Michael Raskin 309f10b00c Merge pull request #23134 from ljli/earlyoom-init
earlyoom: init at 0.11
2017-03-18 17:22:57 +01:00
Frederik Rietdijk 06527e8217 Merge remote-tracking branch 'upstream/staging' into HEAD 2017-03-18 15:35:46 +01:00
Joachim Fasting b5da6ca213
linux_4_9: 4.9.15 -> 4.9.16 2017-03-18 15:32:56 +01:00
Joachim Fasting d4409817a6
grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820 2017-03-18 15:32:48 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
Tim Steinbach ca3fb4d1d4
linux: 4.4.53 -> 4.4.54 2017-03-17 17:25:40 -04:00
Tim Steinbach 81ad24d4d7
linux: 4.10.2 -> 4.10.3 2017-03-17 17:19:59 -04:00
Peter Hoeg cb73e06989 Merge pull request #23890 from peterhoeg/u/kmod
kmod: 23 -> 24 and update kmod-blacklist-ubuntu to zesty
2017-03-17 16:01:09 +08:00
Joachim Fasting 12648a455b
linux_4_9: 4.9.14 -> 4.9.15 2017-03-15 20:03:34 +01:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
Daniel Peebles 38a03817b0 Merge pull request #22571 from LnL7/darwin-frameworks-hook
add setup-hook to fix darwin frameworks
2017-03-15 11:33:23 -04:00
Daniel Peebles d78f3de21b Merge pull request #23907 from copumpkin/update-frameworks
Update macOS frameworks from 10.9 to 10.10
2017-03-15 11:22:55 -04:00
Joachim Fasting 9e60a17cb8
grsecurity: 4.9.14-201703121245 -> 4.9.15-201703150049
Contains a fix for the n_hdlc double free bug.
2017-03-15 07:25:21 +01:00
Dan Peebles 59b795c590 apple-sdk: 10.9 -> 10.10
This is a slightly less ambitious version of the (now reverted) commit
377cef8d16, which had a bunch of issues
that I don't have time to resolve right now.
2017-03-14 22:36:21 -04:00
Franz Pletz 44bd7c45dc
linux_4_10: 4.10.1 -> 4.10.2 2017-03-14 23:08:43 +01:00
Franz Pletz a691c06556
linux_testing: 4.11-rc1 -> 4.11-rc2 2017-03-14 23:08:43 +01:00
Frederik Rietdijk ad21793dac Merge pull request #23852 from jlesquembre/conky_1.10.6
conky: 1.10.5 -> 1.10.6
2017-03-14 13:37:26 +01:00
Peter Hoeg 89724f152a kmod: 23 -> 24 2017-03-14 18:06:55 +08:00
Peter Hoeg 605ee9e92b kmod-blacklist-ubuntu: do not blacklist i2c_i801 2017-03-14 18:06:44 +08:00
Peter Hoeg 0c262a639e kmod-blacklist-ubuntu: 9.3 -> 22.1 2017-03-14 18:06:29 +08:00
Peter Hoeg 80750f459c Merge pull request #17303 from peterhoeg/iio
iio-sensor-proxy: init at 2.2 and nixos module
2017-03-14 11:16:09 +08:00
Tim Steinbach 18684a4892
linux: 4.1.38 -> 4.1.39 2017-03-13 20:15:42 -04:00
Tim Steinbach 9ac82a773c
linux: 4.4.52 -> 4.4.53 2017-03-13 20:15:26 -04:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
José Luis Lafuente c70ded3295
conky: 1.10.5 -> 1.10.6 2017-03-13 18:18:42 +01:00
Tuomas Tynkkynen b2c96062ca kernel: Add a validity check for modDirVersion
Because if you get it wrong, you get a very confusing error message at
the end of the kernel build, which is quite painful as the build can
take a long time.
2017-03-13 18:47:21 +02:00
Vladimír Čunát 8bfa9f528c
syslinux: fixup build via a Debian patch
It stopped working probably since binutils update.
2017-03-13 15:40:43 +01:00
Cray Elliott 8799254eac nvidia_x11_beta: add patch to support Linux 4.10.x
thanks to bendlas for the review for pointing out a way to grab the patch remotely!
2017-03-13 00:00:26 -07:00
Cray Elliott 12083de992 nvidia_x11: 375.26 -> 375.39
nvidia_x11_beta: 378.09 -> 378.13
2017-03-12 23:54:08 -07:00