1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Commit graph

3502 commits

Author SHA1 Message Date
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra 4b2ce84872 linux-headers: Bump to 3.12.6
(Why 3.12.6? It's the last version that provided a .bz2 tarball ;-)
2014-10-06 23:58:26 +02:00
Aristid Breitkreuz 776af364f3 udisks: update from 1.0.4 to 1.0.5 2014-10-06 22:23:00 +02:00
Aristid Breitkreuz 5b1a616d87 bluez5: update from 5.23 to 5.24 2014-10-06 21:50:59 +02:00
Aristid Breitkreuz 6bdba69702 cifs_utils: update from 6.3 to 6.4 2014-10-06 21:49:44 +02:00
Michael Raskin 2d3b4575a7 Try to fix acpi_call for 3.17 2014-10-06 12:15:46 +04:00
William A. Kennington III 5b80f24b9d kernel: 3.16.3 -> 3.16.4 2014-10-05 21:34:31 -07:00
William A. Kennington III c2a301731a kernel: 3.14.19 -> 3.14.20 2014-10-05 21:34:18 -07:00
William A. Kennington III 4a2ecb2c62 kernel: 3.12.28 -> 3.12.29 2014-10-05 21:34:04 -07:00
William A. Kennington III c4c28e36e6 kernel: 3.10.55 -> 3.10.56 2014-10-05 21:33:50 -07:00
Michael Raskin 4397ec5cab Add Linux 3.17 2014-10-06 02:43:58 +04:00
Michael Raskin e5c90ad374 Update firejail 2014-10-06 02:43:57 +04:00
Michael Raskin 42baf049c5 Update sysdig 2014-10-06 02:43:57 +04:00
Michael Raskin 517a5dbc18 Only update via external upstream information: nead to specify version format 2014-10-06 02:43:57 +04:00
Daniel Peebles aa7839c145 Clean up command-line tools a bit to allow us to use an impure
hdiutil (for an upcoming bootstrapped stdenv for darwin!)

Closes #4382
2014-10-04 20:21:15 +01:00
Nathaniel Baxter ab8ef63ff4 alsa: Add multilib plugin support via "libs" entry in asound config.
alsa: Remove unused $ALSA_PLUGIN_DIRS support.
2014-10-04 14:48:58 +02:00
aszlig 499c51016e
dmraid: Fix install target in lib/Makefile.in.
The dmraid shared object file is created with a soname that contains a
version. Unfortunately, the install target in the Makefile does not
properly match on files ending with .so and so does not install it with
the version suffix.

Previously we only had a static library, which doesn't do much trouble
if the version is missing, but with the dynamic library the ELF file
depending on libdmraid uses the version, while the library itself isn't
present with that suffix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-03 01:14:53 +02:00
Daniel Peebles c55c435ade Add Apple command-line tools
Closes #4365
2014-10-02 06:50:09 +01:00
Shea Levy 516be15130 Merge branch 'mac-purity' of git://github.com/copumpkin/nixpkgs
Let’s compile the Mac OS X SecurityTool ourselves

copumpkin:

This allows us to compile SecurityTool ourselves. There are several more
Apple opensource projects that can be compiled this way that I'll slowly
add.

Remaining sources of impurity:

Reference to absolute path to Xcode. This should be integrated with the
xcode derivation (and the iOS wrapper chain that exists under mobile
development) but it's not obvious how to do that yet.
Absolute reference to xcodebuild.
Adding this should make it possible for #3629 to work reasonably
cleanly.
2014-09-30 21:28:07 -04:00
Cillian de Róiste 990f6406e5 xf86_input_wacom: update from 0.26.0 to 0.26.1 2014-09-30 20:39:47 +02:00
Bjørn Forsman f96684c71a nfs-utils: add missing python dependency
nfsiostat is written in python.

python is already in the closure of nfs-utils, so this adds no cost.
2014-09-30 18:40:35 +02:00
Mateusz Kowalczyk a345f5cb20 hdparm: fix expression 2014-09-30 11:26:23 +01:00
Mateusz Kowalczyk 397b0de1c1 hdparm: update from 9.43 to 9.45 2014-09-30 10:39:30 +01:00
Mateusz Kowalczyk 5ca2d7fa03 bluez5: update from 5.22 to 5.23 2014-09-30 10:29:08 +01:00
Mateusz Kowalczyk f78171792c audit: update from 2.3.2 to 2.4 2014-09-30 10:27:18 +01:00
Dmitry V 3eef950762 seturgent: new package
Closes #4329
2014-09-30 09:53:52 +01:00
Daniel Peebles 58ea86bd87 Let’s compile the Mac OS X SecurityTool ourselves 2014-09-30 01:14:14 -04:00
Pascal Wittmann f214d5394c linuxconsoletools: update from 1.4.6 to 1.4.7 2014-09-29 20:49:03 +02:00
Ricardo M. Correia bbdc35d4dd grsecurity: Update stable and test patches
stable: 3.0-3.14.19-201409180900 -> 3.0-3.14.19-201409282024
test:   3.0-3.16.3-201409180901  -> 3.0-3.16.3-201409282025
2014-09-29 14:44:20 +02:00
William A. Kennington III d084245e74 iproute: Fix regressions introduced in 3.16.0
3.16.0 introduced a regression where vlan and veth devices could not be
created due to a check in the code for existing devices. This applies
the upstream patch which fixes the issue.

Additionally, this corrects the nixos network-interfaces task which now
needs to specify the name parameter when adding links.
2014-09-26 00:45:38 -07:00
Ricardo M. Correia cf61fa8013 grsecurity: Update stable and test patches
stable: 3.0-3.14.18-201409060013 -> 3.0-3.14.19-201409180900
test:   3.0-3.16.2-201409060014  -> 3.0-3.16.3-201409180901
2014-09-25 23:37:26 +02:00
Michael Raskin 4e92bee51d Update LVM2 2014-09-24 13:39:08 +04:00
Michael Raskin af5d18edb5 Update atop 2014-09-24 13:32:46 +04:00
Michael Raskin ea12fb639b Update Firejail 2014-09-24 13:32:46 +04:00
Eelco Dolstra 0bc83f656a iproute2: Update to 3.16.0 2014-09-23 12:07:29 +02:00
Eelco Dolstra cae28df8fa sysstat: Update to 11.0.1 and install systemd units 2014-09-23 11:51:46 +02:00
Mateusz Kowalczyk 1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
Nixpkgs Monitor 60933879e1 acpid: update from 2.0.22 to 2.0.23 2014-09-21 18:22:16 +01:00
Nathaniel Baxter 61e29cff68 ati_unfree: Cleanup whitespace in builder.sh 2014-09-20 22:45:21 +10:00
Nathaniel Baxter 6ae760b311 ati_unfree: Patch ati binary libs to use /run/opengl-driver-*/lib/dri . 2014-09-20 22:34:51 +10:00
William A. Kennington III df12cc6ad0 kernel: 3.16.2 -> 3.16.3 2014-09-19 16:28:45 -07:00
William A. Kennington III a235f6fc70 kernel: 3.14.18 -> 3.14.19 2014-09-19 16:28:32 -07:00
William A. Kennington III 03f044bb5a kernel: 3.10.54 -> 3.10.55 2014-09-19 16:28:20 -07:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Rob Vermaas f7f9580545 Merge pull request #4092 from ts468/pam_mount
New packages: pam_mount and libHX
2014-09-17 13:15:22 +02:00
Shea Levy e2331b52cd util-linux: bump 2014-09-16 11:53:20 -04:00
Cillian de Róiste f19dec0404 xf86_input_wacom: update from 0.25.99.1 to 0.26.0 2014-09-15 21:53:43 +02:00
Shea Levy f904ca14a2 kmod: bump 2014-09-15 12:07:00 -04:00
Thomas Strobel 7e4c24af7a Fix description in pam_mount and libHX. Add tstrobel as maintainer. 2014-09-15 12:30:19 +02:00
Thomas Strobel 6366509e54 Merge branch 'upstream' into pam_mount
Conflicts:
	pkgs/top-level/all-packages.nix
2014-09-15 12:15:11 +02:00
Thomas Strobel 66dbde4002 New packages: pam_mount and libHX
Add pam_mount package. Integration into NixOS is still missing.
2014-09-15 11:55:23 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Alexander Kjeldaas bee22ab79e libgcrypt, libgpg-error, busybox: improve determinism 2014-09-13 15:04:43 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Eelco Dolstra 9a6484b255 smem: Add package
This is a memory reporting tool that accounts for shared memory.
2014-09-11 22:20:02 +02:00
William A. Kennington III 9b6f329813 iw: 3.14 -> 3.15 2014-09-09 21:29:43 -07:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra 19b1fafe5f linux: Update to 3.12.28 2014-09-08 15:49:27 +02:00
Ricardo M. Correia 238a84ac78 grsecurity: Update stable and test patches
stable: 3.0-3.14.17-201408260041 -> 3.0-3.14.18-201409060013
test:   3.0-3.15.10-201408212335 -> 3.0-3.16.2-201409060014
2014-09-08 15:16:38 +02:00
Ricardo M. Correia c155ae31ee Merge pull request #3992 from wkennington/master.kernel
Kernel Updates
2014-09-08 15:15:54 +02:00
Ricardo M. Correia 99d0c10a0b paxctl: Update from 0.8 -> 0.9 2014-09-08 15:14:48 +02:00
Ricardo M. Correia d5df399a4b gradm: Update from 3.0-201405281853 -> 3.0-201408301734 2014-09-08 15:14:11 +02:00
Eelco Dolstra 152ae27aac Merge remote-tracking branch 'origin/systemd-216' into staging 2014-09-08 13:53:33 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nathaniel Baxter 45f4b8b3ad ati_unfree: Towards using ati unfree 32bit binary libs 2014-09-07 12:40:40 +10:00
Nathaniel Baxter c16874c4c0 ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
2014-09-07 12:40:32 +10:00
Nathaniel Baxter 9a48f9d1b6 ati-drivers: bump version to 14.4 2014-09-07 12:40:24 +10:00
William A. Kennington III 844aef5bcf kernel: 3.16.1 -> 3.16.2 2014-09-06 18:10:13 -07:00
William A. Kennington III ed7ce2bd81 kernel: 3.14.17 -> 3.14.18 2014-09-06 18:10:01 -07:00
William A. Kennington III d3f80b36ba kernel: 3.10.53 -> 3.10.54 2014-09-06 18:09:48 -07:00
Shea Levy f4ebb3ebac klibc: bump 2014-09-05 19:09:00 -04:00
Michael Raskin bf1493401b Update BATMAN module 2014-09-05 00:24:34 +04:00
Eelco Dolstra 3d821c068a Merge remote-tracking branch 'origin/master' into systemd-216 2014-09-02 14:43:27 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Michael Raskin 416b20fbd5 Don't specify Perl version 2014-09-02 03:04:17 +04:00
Michael Raskin d33a20ef4a Merge pull request #3869 from pmahoney/skarnet
skarnet.org UNIX utilities
2014-09-02 02:15:22 +04:00
Chris Farmiloe 76a4de68c1 formatting/retab 2014-09-02 01:48:50 +04:00
Chris Farmiloe 8ef11bb0ee add openvswitch package + basic nixos module to enable it 2014-09-02 01:48:50 +04:00
Vladimir Kirillov e15aa51f2f sysdig: cheat nix into not capturing linux-dev as a runtime dependency 2014-09-01 21:28:14 +03:00
Michael Raskin d9b13c1eb1 Make dmeventd support in lvm2 optional; use it for dmraid 2014-09-01 02:06:41 +04:00
Michael Raskin 5f22bc48cd Update dmraid 2014-08-31 21:16:07 +04:00
Michael Raskin eecfa6d657 Enable dmeventd 2014-08-31 21:15:57 +04:00
Michael Raskin eb66d3654f Update and adopt LVM2. 2014-08-31 21:08:56 +04:00
Michael Raskin 8fe8cb204e Update conspy; note the project move to SF.net 2014-08-31 20:18:53 +04:00
Michael Raskin bddcee7747 Update Firejail 2014-08-31 18:20:06 +04:00
Michael Raskin b28d7974fb Update SysDig 2014-08-31 18:20:06 +04:00
Eelco Dolstra 4b7f1a9be3 lttng-modules: Mark as broken
These do not build for any kernel:

  http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981
2014-08-30 23:14:17 +02:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Patrick Mahoney b5f33dc133 s6-linux-utils: new package
s6-linux-utils is a set of minimalistic Linux-specific system utilities.
2014-08-30 00:12:38 -05:00
Mateusz Kowalczyk badb705a5c libaio: update to 0.3.110 2014-08-29 13:45:04 +01:00
Daniel Peebles 0bb14e4fea Disable NFC on 3.17 or above
This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process.
2014-08-29 01:49:32 -04:00
Daniel Peebles 1eb08ee693 Add patch to fix 3.17 build breakage (also submitted to lkml, but not yet merged) 2014-08-28 22:45:32 -04:00
Michael Raskin 1fd14fa415 Merge pull request #3100 from tailhook/new-shadow
Upgrade "shadow" to 4.2.1
2014-08-29 00:42:57 +04:00
Austin Seipp 2dc2699ca4 linux/grsec: updates
3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-27 15:14:19 -05:00
William A. Kennington III 39b1e2fffc nftables: Add derivation 2014-08-25 14:55:15 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Cillian de Róiste df88d89332 FFADO: fix build on i686 2014-08-24 19:50:22 +02:00
Cillian de Róiste 4203cdec22 xf86_input_wacom: update from 0.25.0 to 0.25.99.1 2014-08-24 15:19:08 +02:00
Cillian de Róiste 93106b319b ffado: update from 2.1.0 to 2.2.1 2014-08-24 15:11:22 +02:00
Eelco Dolstra 891657b634 systemd: Drop unnecessary dependency 2014-08-24 10:04:55 +02:00
Eelco Dolstra 84fa62b4f3 systemd: Build manpages 2014-08-24 09:59:26 +02:00
Eelco Dolstra c23bf4ec74 systemd: Update to 216 2014-08-23 23:28:03 +02:00
Eelco Dolstra ce6b86cc68 Fix various evaluation problems
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Luca Bruno dcf17d3d5d policycoreutils: fix build on i686 for ZHF 2014-08-21 17:29:51 +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
Paul Colomiets fb948c4f28 Upgrade shadow package 2014-08-01 21:19:21 +03: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
Eelco Dolstra b7c543136a Move CIFS support into a separate module 2014-07-30 12:39:35 +02:00
William A. Kennington III ff747dd24f kernel: 3.15.5 -> 3.15.7 2014-07-29 13:17:11 -05:00
William A. Kennington III 2494e2bb09 kernel: 3.14.12 -> 3.14.14 2014-07-29 13:15:42 -05:00
William A. Kennington III dd9a5aeade kernel: 3.10.48 -> 3.10.50 2014-07-29 13:13:38 -05:00
William A. Kennington III 47d50bf684 kernel: 3.4.98 -> 3.4.100 2014-07-29 13:08:37 -05:00
Petr Rockai 559f423417 gnu: Fix (evaluation of the) call to forceSystem. 2014-07-28 20:46:32 +02:00
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	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-07-28 11:30:49 +02:00
Eelco Dolstra 0852d9e364 linux: Update to 3.12.25 2014-07-24 18:14:53 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Bjørn Forsman 28cb0f58c4 linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels
Linux v3.6 is the earliest version with CONFIG_NFS_SWAP support. This
change unbreaks NixOS tests for older kernels.
2014-07-16 12:13:06 +02:00
Vladimír Čunát 18de3952b8 wpa_supplicant: update 2.1 -> 2.2, drop a patch
Fixes #3238.
2014-07-16 10:30:38 +02:00
Eelco Dolstra 6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Ricardo M. Correia 85e444f4f8 linux: Enable NFSv4.1, v4.2 clients and swap on NFS
I'm only enabling for kernels >= 3.11 to be conservative, because clients and
servers automatically negotiate and use the highest mutually supported version
by default, but only in kernel 3.11 server NFSv4.1 support actually became RFC
compliant.

I'm also adding support for swap on NFS, which is enabled by default on
Ubuntu kernels.
2014-07-15 15:07:25 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Cray Elliott a1a9f3f14a nvidia legacy 304xx driver updated to .123 point release
among other things, fixes compilation with Linux 3.14
2014-07-14 14:50:01 +02:00
aszlig e07e3a7591
conky: Link against GCC runtime library.
This is needed for Conky to shut down cleanly, because it relies on
pthread_cancel() to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-14 09:35:24 +02:00
Vladimír Čunát eb659e89b4 linux_*: update, including CVE-2014-4699 (most likely)
CC #3196. No updates yet on 3.2 and 3.12 branches.
2014-07-09 22:54:08 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Eelco Dolstra 1596c3a012 linux: Update to 3.12.24
CVE-2014-4508, CVE-2014-0206.
2014-07-07 18:21:34 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Michael Raskin 5e066f9741 Update acpi_call 2014-07-04 21:30:11 +04:00
Ricardo M. Correia b50074929e grsecurity: Update stable and test patches
stable: 3.0-3.14.9-201406262057 -> 3.0-3.14.10-201407012152
test:   3.0-3.15.2-201406262058 -> 3.0-3.15.3-201407012153
2014-07-03 11:37:19 +02:00
Ricardo M. Correia d4243e2a00 linux: Update to 3.14.10 2014-07-03 11:35:28 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Ricardo M. Correia 80709b141c zfs.git: Fix vdev_id error when plugging in a disk (#3161) 2014-07-02 17:23:35 +02:00
Ricardo M. Correia 7e20124875 zfs: Fix vdev_id error when plugging in a disk (#3161) 2014-07-02 16:34:46 +02:00
Michael Raskin e303e18608 Update Linux 3.15 to 3.15.3 2014-07-01 14:28:52 +04:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin 285e112357 Allow search of updates for atop 2014-07-01 12:11:08 +04:00
Oliver Charles 200e3535dc Merge pull request #3141 from cstrahan/iomelt
iomelt: new package
2014-07-01 08:46:12 +01:00
Charles Strahan 25b53cddb4 iomelt: new package
This adds the IOMelt pacakge, "a simple yet effective way to benchmark disk IO
in Linux systems."
2014-06-30 23:50:38 -04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin efb0c56db4 Update linux_testing and enable parallel build of Linux kernel 2014-06-30 10:52:33 +04:00
Michael Raskin 5a8a92c01a Merge pull request #3007 from wkennington/master.syslinux
syslinux: Update 4.07 -> 6.02
2014-06-30 10:29:28 +04:00
Michael Raskin dcf5e85c2f Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
2014-06-30 09:26:24 +04:00
Michael Raskin 0ecfc6cb49 Merge pull request #2213 from thoughtpolice/kernel-config
nixos: make several kernel common-config options optional
2014-06-30 09:01:08 +04:00
Austin Seipp dd56bfbd00 kernel/grsec: updates
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 00:52:12 -05:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát 7998a598b6 linux-3.13: remove, as it's vulnerable
CC #3090.
2014-06-26 11:50:15 +02:00
Vladimír Čunát 7f97fafe4f linux-3.12: security update .22 ->.23, CVE-2014-0206
CC #3090.
2014-06-26 11:33:00 +02:00
William A. Kennington III aac54c6699 syslinux: Update 4.07 -> 6.02 2014-06-24 16:10:13 -05:00
Shea Levy ee8ea41d58 Fix broadcom-sta on linux >= 3.15
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch?view=markup
2014-06-24 09:25:25 -04:00
Eelco Dolstra 69deced59b util-linux: Update to 2.24.2 2014-06-24 14:01:54 +02:00
Ricardo M. Correia 9e1ec18624 zfs, zfs.git: Update to 0.6.3 2014-06-23 15:52:21 +02:00
Ricardo M. Correia b5b8b5247a spl, spl.git: Update to 0.6.3 2014-06-23 15:52:20 +02:00
Austin Seipp 0399c5ee24 grsecurity: update stable/testing kernels, refactoring
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.

This also removes the vserver kernel, since it's probably not nearly as
used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 22:29:10 -05:00
Austin Seipp 125c2b9468 gradm: 3.0-201401291757 -> 3.0-201405281853
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 20:26:24 -05:00
Michael Raskin c68e3418fb Update 3.16-rc to -rc2: -rc1 has problems with mounting BtrFS, will test -rc2 2014-06-22 19:45:07 +04:00
Austin Seipp b8ede68b25 kernel/grsec: updates
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-21 22:13:49 -05:00
Vladimír Čunát a4042c373b alsa{Oss,Utils}: update to 1.0.28
I somehow forgot to update these other parts.
2014-06-20 10:12:43 +02:00
Vladimír Čunát 3ec2cea214 Merge master into x-updates
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
Vladimír Čunát 36e79e3b90 upower: pull patches used in Ubuntu/trusty (fix #2884) 2014-06-19 20:51:30 +02:00
Vladimír Čunát 1a1c83fa77 alsa{Lib,Plugins}: update to 1.28.0
Dropped unrecognized option, patch no longer applying, fixed licenses.
2014-06-19 20:24:23 +02:00
Rok Garbas 870a8a0833 alsa-plugins: upgrade to 1.0.28
adding libogg as dependency should fix the build
2014-06-19 16:06:03 +01:00
Michael Raskin 8297a26746 Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16. 2014-06-18 00:23:48 +02:00
Mathijs Kwik 5bc69209b1 linux-3.15: upgrade to 3.15.1 2014-06-17 08:17:38 +02:00
Vladimír Čunát 9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Eelco Dolstra 27c72f337b linux: Update to 3.12.22
Fixes CVE-2014-3153 (local privilege escalation via futex()).
2014-06-13 17:44:02 +02:00
Vladimír Čunát de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Joel Taylor 58971f7b14 add htop fork for darwin (close #2690)
@vcunat made it a single conditional attribute.

Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:36:10 +02:00
Vladimír Čunát f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Domen Kožar 7334e38af5 Merge pull request #2678 from offlinehacker/pkgs/systemd/fix_python
systemd: fix python support
2014-06-09 23:09:32 +02:00
Vladimír Čunát 5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
William A. Kennington III 8bb2313915 kernel: Add 3.15 2014-06-08 16:39:47 -05:00
William A. Kennington III d91eacd720 kernel: 3.14.5 -> 3.14.6 (close #2868) 2014-06-08 09:12:05 +02:00
Vladimir Kirillov 1859dbc4a2 sysdig: update to 0.1.83 2014-06-06 17:21:00 +03:00
Austin Seipp b43421221f kernel/grsec: updates; add mainline package for brave souls
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-05 06:06:19 -05:00
Eelco Dolstra 246edc3df2 linux: Update to 3.12.21 2014-06-05 12:54:37 +02:00
William A. Kennington III 3a0b265af9 kernel: 3.14.4 -> 3.14.5 (close #2831) 2014-06-05 10:34:40 +02:00
Ricardo M. Correia 2030328fea disk-indicator: Add package
A program that will turn a LED into a hard disk indicator.
2014-05-30 21:24:46 +02:00
Vladimír Čunát 872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Cillian de Róiste a1d350287b Plymouth: update to 0.9.0, fix build, sanitize, enable systemd-integration
NOTE: I can start the daemon and ping it, but I haven't been able to
get it to do more than that.
2014-05-29 14:39:37 +02:00
Moritz Ulrich 29da3bce27 usermount: New Package.
A simple tool to automatically mount removable drives using UDisks2 and
D-Bus.

https://github.com/tom5760/usermount
2014-05-29 13:39:16 +02:00
Rob Vermaas ce87d3e307 Merge pull request #2465 from robberer/nvidia/driver
nvidia-x11: add nvidia-uvm module which is necessary for blender GPU support
2014-05-28 08:30:22 +02:00
Michael Raskin 515a7e78fa Updating conspy 2014-05-28 01:33:29 +04:00
Michael Raskin f9c05a3bad Merge pull request #2378 from wizeman/u/kernel-zram
linux: Add support for zram
2014-05-27 01:40:18 -07:00
Eelco Dolstra fc70d6f712 nvidia-x11: Don't install nvidia-xconfig
Rewriting the X11 config doesn't work on NixOS.
2014-05-22 13:00:52 +02:00
Eelco Dolstra 5ec3a63fcb nvidia-x11: Update to 331.79 2014-05-22 13:00:51 +02:00
Luca Bruno df95a8cc2f upower: add 0.99 version for gnome 3.12 2014-05-20 13:41:39 +02:00
Eelco Dolstra 2ee6c0c63e linux: Update to 3.12.20 2014-05-19 16:03:37 +02:00
Austin Seipp 0781563b46 lockdep: 3.14.2 -> 3.14.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-18 15:28:50 -05:00
Austin Seipp ac38b32974 kernel/grsec: another optional option
This should fix the testing kernels.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-18 08:57:10 -05:00
Austin Seipp e64e3ad88a kernel: only use DEBUG_STACKOVERFLOW if !grsecurity
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-18 08:56:52 -05:00
Austin Seipp 80d0e31a94 kernel: allow features to be used in common-config
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-18 08:49:32 -05:00
Austin Seipp 657998dbcb kernel/common-config: Another optional option
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 19:44:03 -05:00
Austin Seipp b5b434c98a kernel: make some common-config options optional for grsec
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 16:37:22 -05:00
Austin Seipp 4f27ad14a1 grsec: refactor grsecurity packages
This now provides a handful of different grsecurity kernels for slightly
different 'flavors' of packages. This doesn't change the grsecurity
module to use them just yet, however.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:43 -05:00
Austin Seipp cb894d4fc3 grsec: updates
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Austin Seipp 92abc4c610 kernel: enable AppArmor by default
AppArmor only requires a few patches to the 3.2 and 3.4 kernels in order
to work properly (with the minor catch grsecurity -stable includes the
3.2 patches.) This adds them to the kernel builds by default, removes
features.apparmor (since it's always true) and makes it the default MAC
system.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Austin Seipp 3efdeef6a3 linux-3.{4,10}: update
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Austin Seipp f7123982c2 apparmor: 2.8.2 -> 2.8.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00