3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3130 commits

Author SHA1 Message Date
Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát 694fa543af Merge 'staging'
Conflicts:
	pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Vladimír Čunát 25351012b2 nvidia: fix problems with -glsi and glx
..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
2014-08-20 23:37:41 +02:00
Austin Seipp 36e1412143 musl: 1.0.0 -> 1.1.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:55:02 -05:00
Austin Seipp 87393f2f2b lockdep: 3.14.4 -> 3.16.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:46:28 -05:00
Vladimír Čunát 2015aecd44 Revert "Copy all so files over from nVidia blob"
This reverts commit 816d971aea.
See discussion on https://github.com/Fuuzetsu/nixpkgs/commit/816d971ae
2014-08-20 02:22:29 +02:00
Cray Elliott 477eb18d18 nvidia-x11: update to 340.32 (close #3365)
Also close #3634.
2014-08-19 21:03:52 +02:00
Eelco Dolstra e4752d7877 linux: Enable ACLs in ext3
http://hydra.nixos.org/build/13462892
2014-08-18 14:33:09 +02:00
Michael Raskin fba7d7c4b8 Add Firejail cheap-sandbox-building package 2014-08-18 02:18:33 +04:00
William A. Kennington III 5dfcfefec2 firmware-linux-nonfree: 0.41 -> 0.43 2014-08-17 19:40:59 +02:00
Thomas Strobel fecd0095ca Upgrade: Intel microcodes -> 20160624 2014-08-17 00:11:43 +02:00
Eelco Dolstra 97d6afafaa systemd: Fix uninitialised memory issue in veth setup
This caused containers to randomly fail, in particular if the machine
name was 8 characters.
2014-08-15 04:07:45 +02:00
Luca Bruno b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
William A. Kennington III 83b2d409ff kernel: 3.2.60 -> 3.2.62 2014-08-14 12:48:06 -05:00
William A. Kennington III b07f77b2fb kernel: 3.4.101 -> 3.4.103 2014-08-14 12:46:53 -05:00
William A. Kennington III ca68015291 kernel: 3.10.51 -> 3.10.53 2014-08-14 12:45:14 -05:00
William A. Kennington III f143df3a09 kernel 3.14.15 -> 3.14.17 2014-08-14 12:44:25 -05:00
William A. Kennington III ca0aa7e8d1 kernel: 3.15.8 -> 3.15.10 2014-08-14 12:43:41 -05:00
William A. Kennington III e9ae222199 kernel: 3.16 -> 3.16.1 2014-08-14 12:42:53 -05:00
Vladimír Čunát a4e1c7df08 selinux: update to 2014-05-06
Sadly, policycoreutils still fails on i686-linux.
2014-08-14 17:59:00 +02:00
Thomas Strobel 0b2b06f9a9 Upgrade: powertop: 2.5 -> 2.6.1 2014-08-14 12:54:21 +02:00
Eelco Dolstra ab402dc1a4 systemd: Apply a patch that improves systemd-nspawn startup notification
Systemd-nspawn now sends startup notification *after* it has forked
the container init process and performed initialisation (such as
creating veth network interfaces).
2014-08-13 00:47:24 +02:00
Moritz Ulrich a163d484fc ldm: Bump to 0.5.
We don't build docs because it would pull in git and perl as deps.
2014-08-12 13:52:48 +02:00
Domen Kožar cb2242a2c2 bluez: 5.16 -> 5.22 2014-08-12 12:23:07 +02:00
Eelco Dolstra 38567ddc80 systemd: Apply backport fixes
In particular, added a few patches that improve systemd-nspawn
container behaviour.
2014-08-12 03:08:22 +02:00
Michael Raskin c346d22647 Fix checkpolicy build; no idea how to test it 2014-08-12 04:07:29 +04:00
Boris Sukholitko 28463543eb criu: upgrade to 1.3-rc2 2014-08-11 21:49:54 +03:00
Vladimir Kirillov 5011fe17df sysdig: update to 0.1.87 2014-08-11 12:07:16 +03:00
Luca Bruno 1ee786fc3d criu: fix build for ZHF 2014-08-10 11:50:43 +02:00
Eelco Dolstra 9f822e5477 stdenv: Move paxmark function to paxctl's setup hook 2014-08-09 12:44:50 +02:00
Luca Bruno e9aadfd807 checkpolicy: mark as broken for ZHF 2014-08-09 11:42:18 +02:00
Mateusz Kowalczyk 816d971aea Copy all so files over from nVidia blob 2014-08-09 01:57:42 +02:00
Mateusz Kowalczyk a5ee903e60 Copy over libGLESv2 and libEGL too for nVidia blob 2014-08-09 01:07:39 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
aszlig 4834717507
linux-kernel: Add new upstream version 3.16.
Also set linux_latest to it as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-04 02:41:54 +02:00
Michael Raskin 619c368f54 Update Sysdig system tracing tool 2014-08-03 22:29:41 +04:00
Vladimír Čunát 1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
William A. Kennington III 317d4253ea kernel: 3.15.7 -> 3.15.8 2014-08-02 18:04:08 -05:00
William A. Kennington III 63cc1fd8ad kernel: 3.14.14 -> 3.14.15 2014-08-02 18:02:15 -05:00
William A. Kennington III eb9ee180d9 kernel: 3.12.25 -> 3.12.26 2014-08-02 18:00:46 -05:00
William A. Kennington III 89d5655670 kernel: 3.10.50 -> 3.10.51 2014-08-02 17:58:31 -05:00
William A. Kennington III ae11e59949 kernel: 3.4.100 -> 3.4.101 2014-08-02 17:56:53 -05:00
Cillian de Róiste c5788e6fd4 xf86_input_wacom: update from 0.23.0 to 0.25.0 2014-08-02 11:32:00 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Bjørn Forsman 62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00