Commit Graph

3690 Commits

Author SHA1 Message Date
William A. Kennington III
acefc22209 kernel: 3.18.0-rc5 -> 3.18.0-rc6 2014-11-23 16:49:25 -08:00
Jaka Hudoklin
4159d37e5a Merge pull request #5081 from joachifm/macchanger
macchanger: new expression
2014-11-23 15:29:13 +01:00
William A. Kennington III
d1493bc1ee kernel: 3.14.24 -> 3.14.25 2014-11-23 02:47:36 -08:00
Jonathan Rudenberg
30578e30d8 kernel: 3.17.3 -> 3.17.4 2014-11-22 16:50:16 -05:00
Joachim Fasting
4fdb98f540 macchanger: new expression
GNU macchanger is a tool for viewing/changing the MAC
address of a network device, with support for address
randomisation.
2014-11-22 16:20:52 +01:00
William A. Kennington III
30597a9c7a kernel: 3.12.32 -> 3.12.33 2014-11-21 14:39:15 -08:00
William A. Kennington III
f1b9f88e5b kernel: 3.10.60 -> 3.10.61 2014-11-21 14:38:48 -08:00
William A. Kennington III
745c2e9d73 systemd: Enable networking features 2014-11-19 13:26:25 -08:00
Mateusz Kowalczyk
3f8ff5b5ba b43FirmwareCutter: update from 018 to 019 2014-11-17 18:06:55 +00:00
Mateusz Kowalczyk
99439dc4ee bluez5: update from 5.24 to 5.25 2014-11-17 18:06:36 +00:00
William A. Kennington III
eac8fcff1a kernel: 3.18-rc4 -> 3.18-rc5 2014-11-17 00:13:04 -08:00
Michael Raskin
4dd7bf116b Adding eudev 2014-11-17 09:44:44 +03:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
William A. Kennington III
1d30b4aabd systemd: Patch systemd-journald.service to be Type=notify
https://bugs.freedesktop.org/show_bug.cgi?id=85871
https://bugzilla.redhat.com/show_bug.cgi?id=1159641
2014-11-16 02:01:43 -08:00
Michael Raskin
ee9e181ac6 Add a working module-init-tools manual Gentoo mirror 2014-11-16 11:10:31 +03:00
William A. Kennington III
44b1600be6 bridge-utils: Add missing patch 2014-11-15 14:21:32 -08:00
William A. Kennington III
c4ea8be9fa bridge-utils: Cleanup and add patch to correct for broken headers 2014-11-15 14:18:19 -08:00
William A. Kennington III
ec453f984e bridge-utils: Fail if brctl is not built 2014-11-15 13:23:57 -08:00
Aristid Breitkreuz
2885cf525a fix bluez4 build 2014-11-15 22:22:49 +01:00
Eelco Dolstra
cef0bcefc6 linux-headers: Update to 3.12.32
We can do this because bootstrap-tools contains an unxz program now
(via busybox).
2014-11-15 21:49:57 +01:00
Evgeny Egorochkin
d4b190cc4c apparmor: update from 2.8.3 to 2.8.4 2014-11-15 22:20:16 +02:00
William A. Kennington III
9f8804f664 libnl: Remove old 3.2.19 version 2014-11-14 23:18:09 -08:00
William A. Kennington III
e68bf778a5 libnl: 3.2.23 -> 3.2.25 2014-11-14 23:15:06 -08:00
William A. Kennington III
f4a27311b7 kernel: 3.14.23 -> 3.14.24 2014-11-14 23:03:54 -08:00
William A. Kennington III
0ef4ee5d06 kernel: 3.17.2 -> 3.17.3 2014-11-14 23:03:47 -08:00
William A. Kennington III
1a405c999e kernel: Remove 3.15 2014-11-14 11:05:51 -08:00
William A. Kennington III
256669cf41 kernel: Remove 3.17 buildfix 2014-11-14 10:59:46 -08:00
William A. Kennington III
642a161112 kernel: 3.2.63 -> 3.2.64 2014-11-14 10:59:46 -08:00
William A. Kennington III
2fab8d1198 kernel: 3.10.59 -> 3.10.60 2014-11-14 10:49:29 -08:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
William A. Kennington III
557a3c92e3 kernel: Don't enable the iommu by default as this breaks for some hardware 2014-11-13 16:23:49 -08:00
Ricardo M. Correia
12e77fdc3f nixos/zfs: Improve the ZFS boot process
It turns out that the upstream systemd services that import ZFS pools contain
serious bugs. The first major problem is that importing pools fails if there
are no pools to import. The second major problem is that if a pool ends up in
/etc/zfs/zpool.cache but it disappears from the system (e.g. if you
reboot but during the reboot you unplug your ZFS-formatted USB pen drive),
then the import service will always fail and it will be impossible to get rid
of the pool from the cache (unless you manually delete the cache).

Also, the upstream service would always import all available ZFS pools every
boot, which may not be what is desired in some cases.

This commit will solve these problems in the following ways:

1. Ignore /etc/zfs/zpool.cache. This seems to be a major source of
issues, and also does not play well with NixOS's philosophy of
reproducible configurations. Instead, on every boot NixOS will try to import
the set of pools that are specified in its configuration.  This is also the
direction that upstream is moving towards.

2. Instead of trying to import all ZFS pools, only import those that are
actually necessary. NixOS will automatically determine these from the
config.fileSystems.* option. Also, the user can import any additional
pools every boot by adding them to the config.boot.zfs.extraPools
option, but this is only necessary if their filesystems are not
specified in config.fileSystems.*.

3. Added options to configure if ZFS should force-import ZFS pools. This may
currently be necessary, especially if your pools have not been correctly
imported with a proper host id configuration (which is probably true for 99% of
current NixOS ZFS users). Once host id configuration becomes mandatory when
using ZFS in NixOS and we are sure that most users have updated their
configurations and rebooted at least once, we should disable force-import by
default. Probably, this shouldn't be done before the next stable release.

WARNING: This commit may change the order in which your non-ZFS vs ZFS
filesystems are mounted.  To avoid this problem (now or in the future)
it is recommended that you set the 'mountpoint' property of your ZFS
filesystems to 'legacy', and that you manage them using
config.fileSystems, just like any other non-ZFS filesystem is usually
managed in NixOS.
2014-11-12 22:31:49 +01:00
Ricardo M. Correia
3b0fa60a98 zfs: Enable systemd
Also remove custom zfs services from NixOS.  This makes NixOS more aligned with
upstream.

More importantly, it prepares the way for NixOS to use ZED (the ZFS event
daemon). This service will automatically be enabled but it is not possible to
configure it via configuration.nix yet.
2014-11-12 22:31:49 +01:00
Michael Raskin
232f6bb4d2 Merge pull request #4929 from abbradar/prl-tools
Add packages and support for Parallel Guest Tools
2014-11-13 00:22:42 +03:00
Michael Raskin
efe5eb4709 Merge pull request #4573 from fpletz/feature/lxc-configuration
Add support for global LXC config files
2014-11-13 00:14:46 +03:00
Ricardo M. Correia
2c038410ea Merge pull request #4932 from wkennington/master.zfs
zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds
2014-11-12 21:56:02 +01:00
Cillian de Róiste
471b532a90 xf86_input_wacom: update from 0.26.99.1 to 0.27.0 2014-11-12 20:56:38 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Nikolay Amiantov
3c8fe179f6 prl-tools: add package 2014-11-12 01:26:23 +03:00
Eelco Dolstra
5cf4905f3b Merge remote-tracking branch 'origin/systemd-217' into staging 2014-11-11 19:32:48 +01:00
Brian McKenna
e9b6ad43a6 Add Lightum package: MacBook light sensor daemon
Also a NixOS service could make sense but the daemon puts
configuration under the Xdg user path.
2014-11-11 10:22:08 -07:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
William A. Kennington III
c202893b8d zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds
Additionally, recognize that the contents of the nix-build.patch are
included in the upstream tree as 3cd33ff and will be released in 0.6.4.
2014-11-11 00:52:14 -08:00
Domen Kožar
7ff9cd2c41 more kernel fixes 2014-11-11 09:22:18 +01:00
William A. Kennington III
189e73de98 kernel-testing: 3.18-rc3 -> 3.18-rc4 2014-11-10 22:30:43 -08:00
Domen Kožar
b9388e9711 fix kernel builds on 32bit linux 2014-11-11 07:06:09 +01:00
Eelco Dolstra
e78a1603fc linux: Enable BPF_JIT only on 64-bit
It's not supported on i686.

http://hydra.nixos.org/build/16834647
2014-11-10 20:21:28 +01:00
Ricardo M. Correia
c108ab47be grsecurity: Update stable and test patches
stable: 3.0-3.14.23-201411062033 -> 3.0-3.14.23-201411091053
test:   3.0-3.17.2-201411062034  -> 3.0-3.17.2-201411091054
2014-11-10 19:34:00 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Brian McKenna
a6bacd4d81 Add "light" package and setuid wrapper 2014-11-09 19:45:43 -07:00
Cray Elliott
08f66013ae change optionalString to optional in bluez5, fixes evalutation 2014-11-08 20:47:34 -08:00
Cray Elliott
e47c1c1829 add enableWiimote to bluez5 options 2014-11-08 20:44:12 -08:00
Ricardo M. Correia
5701e40681 grsecurity: Update stable and test patches
stable: 3.0-3.14.23-201410312212 -> 3.0-3.14.23-201411062033
test:   3.0-3.17.2-201410312213  -> 3.0-3.17.2-201411062034
2014-11-09 02:47:54 +01:00
ambrop7@gmail.com
45aeaf6938 Add conntrack-tools and missing dependencies. 2014-11-09 00:28:21 +01:00
Arseniy Seroka
417216aa57 Revert "Add conntrack-tools and missing dependencies." 2014-11-09 02:12:04 +03:00
ambrop7@gmail.com
085b5ec48c Add conntrack-tools and missing dependencies. 2014-11-08 23:06:09 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
lethalman
27b79a0469 Merge pull request #4780 from ambrop72/kernel-ppp-filter
kernel: Enable PPP_FILTER by default.
2014-11-08 12:41:13 +01:00
William A. Kennington III
d88c5eed1d kernel: Add more supported features 2014-11-08 02:44:19 -08:00
Domen Kožar
a0696b4536 linux_3_12: fix hash 2014-11-07 12:39:04 +01:00
Eelco Dolstra
1d5147dd17 linux: Update to 3.12.32 2014-11-06 15:12:01 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát
66ae2a5322 Revert "syslinux: disable parallel building"
The change fixed nothing. I'm sorry, I confused the platforms when testing.
The actual problem was fixed by peti.
This reverts commit e682e8018c.
2014-11-05 13:24:01 +01:00
Eelco Dolstra
884ff252fd systemd: Update to 217 2014-11-04 15:43:12 +01:00
Rob Vermaas
c4ab4ce59b sysklogd: update from 1.5 to 1.5.1, potentially fixes CVE-2014-3634, CVE-2014-3683 2014-11-04 10:18:52 +01:00
Aristid Breitkreuz
b320aad351 Merge pull request #4770 from titanous/linux-testing
linux: Update testing 3.17-rc2 -> 3.18-rc3
2014-11-03 20:18:12 +01:00
Jonathan Rudenberg
a97452a000 linux: Update testing 3.17-rc2 -> 3.18-rc3 2014-11-03 14:14:53 -05:00
Mateusz Kowalczyk
219ddb65e1 audit: update from 2.4 to 2.4.1 2014-11-03 17:11:45 +00:00
Evgeny Egorochkin
ab59ef2c52 syslinux: update from 6.02 to 6.03 2014-11-03 12:58:07 +02:00
Vladimír Čunát
e682e8018c syslinux: disable parallel building
It started breaking on master and staging,
e.g. http://hydra.nixos.org/build/16663521 .

Related: #3007.
2014-11-03 10:32:05 +01:00
Michael Raskin
f3b947bfeb Update Firejail 2014-11-02 23:51:58 +03:00
Michael Raskin
79254bba65 Update SysDig 2014-11-02 23:51:58 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
ambrop7@gmail.com
fc533f0e84 kernel: Enable PPP_FILTER by default.
pppd will try to use it to improve efficiency and complain if it's not available
(but is is not mandatory).
2014-11-02 15:10:09 +01:00
Ricardo M. Correia
268c72b92b grsecurity: Update stable and test patches
stable: 3.0-3.14.22-201410250026 -> 3.0-3.14.23-201410312212
test:   3.0-3.17.1-201410281754  -> 3.0-3.17.2-201410312213
2014-11-01 17:25:22 +01:00
Alexander Kjeldaas
85972fb58d Document likely breakage when people update the kernel. 2014-11-01 09:35:20 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
William A. Kennington III
0467a79129 kernel: 3.16.6 -> 3.16.7 2014-10-30 14:39:17 -07:00
William A. Kennington III
5b37f998fd kernel: 3.14.22 -> 3.14.23 2014-10-30 14:38:41 -07:00
William A. Kennington III
3ff30fa254 kernel: 3.10.58 -> 3.10.59 2014-10-30 14:38:10 -07:00
William A. Kennington III
6e91f53d87 kernel: Add update script 2014-10-30 14:37:22 -07:00
Shea Levy
659db7e5b2 linux-3.17: bump 2014-10-30 13:09:18 -04:00
Ricardo M. Correia
a9170c0dba grsecurity: Update stable and test patches
stable: 3.0-3.14.22-201410192047 -> 3.0-3.14.22-201410250026
test:   3.0-3.17.1-201410192051  -> 3.0-3.17.1-201410281754
2014-10-30 12:47:36 +01:00
Eelco Dolstra
ac8e5cd145 uclibc: Update to the latest prerelease
This resolves a segfault in busybox.
2014-10-29 14:55:04 +01:00
Eelco Dolstra
41a479b15f busybox: Optionally use uclibc 2014-10-29 14:44:56 +01:00
Eelco Dolstra
c77b30e3fb uclibc: Fix building against recent kernel headers 2014-10-29 14:18:00 +01:00
Eelco Dolstra
3b2177b769 busybox: Allow running from within the Nix store
This enables running the busybox program directly from the Nix store
(i.e. as /nix/store/<hash>-busybox). We need this for the stdenv
bootstrap.
2014-10-29 13:43:00 +01:00
Eelco Dolstra
423e923182 busybox: Enable building a minimal configuration
This starts with "make allnoconfig" rather than "make defconfig",
making it easier to turn on only the needed features.

Also, fix broken .config generation (the presence of "#" lines
confused parseconfig).
2014-10-29 13:43:00 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Eelco Dolstra
937e1280c0 Rename badly named linuxHeaders_3_7 (it's actually 3.12) 2014-10-29 13:43:00 +01:00
Eelco Dolstra
5b50f0cbc5 busybox: Remove unused patch 2014-10-29 13:42:59 +01:00
Cillian de Róiste
bdf010ba65 xf86_input_wacom: update from 0.26.1 to 0.26.99.1 2014-10-28 21:44:45 +01:00
Eelco Dolstra
bac50c5c1f linux: Update to 3.12.31 2014-10-27 11:21:18 +01:00
Eelco Dolstra
f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
lethalman
2c0cc6cedc Merge pull request #4587 from uzska/master
Added line SCSI_SAS_ATA y on line 62
2014-10-24 09:39:40 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Aristid Breitkreuz
0ab9b14e17 make top less red 2014-10-22 21:21:01 +02:00
Ricardo M. Correia
f59afe3994 pax-utils: Update from 0.8.1 -> 0.9.1 2014-10-22 16:47:09 +02:00
Alexander Kjeldaas
005bb796e6 Updated grsec. 2014-10-22 02:18:41 +02:00
Domen Kožar
3514fad7cd lttng-modules: disable on 3.12 kernel 2014-10-21 21:46:34 +02:00
Domen Kožar
f86ef02678 lttng-modules: update to 2.6.0-rc1 2014-10-21 21:24:02 +02:00
Jaka Hudoklin
ea04d4a77c Merge pull request #4529 from geerds/ati-driver
ati-driver: Fix "Catalyst Control Center"
2014-10-21 01:30:13 +02:00
Eelco Dolstra
38ed4d4d0f linux: Enable FW_LOADER_USER_HELPER_FALLBACK
We don't really need this anymore, except that our docs say that you
can put firmware in /root/test-firmware, which doesn't work via
/sys/module/firmware_class/parameters/path.
2014-10-20 13:25:00 +02:00
William A. Kennington III
bcc687649b iproute: Remove stale patch 2014-10-19 17:53:41 -07:00
William A. Kennington III
664909d31b iproute2: 3.16.0 -> 3.17.0 2014-10-19 15:50:48 -07:00
Franz Pletz
2c321bf296 Add support for global LXC config files 2014-10-18 05:02:39 +02:00
uzska
0fa57137cf Added line SCSI_SAS_ATA y on line 62
This kernel change will make the nixOS live cd detect the hard drive upon boot.
2014-10-17 13:31:08 -07:00
William A. Kennington III
13b9917298 kernel: Fix missing ; 2014-10-16 13:58:18 -07:00
William A. Kennington III
1962fd80f6 kernel: 3.4.103 -> 3.4.104 2014-10-16 13:56:14 -07:00
William A. Kennington III
fdb4e34459 kernel: 3.2.62 -> 3.2.63 2014-10-16 13:56:10 -07:00
William A. Kennington III
0a82ce360d kernel: 3.17 -> 3.17.1 2014-10-16 13:56:06 -07:00
William A. Kennington III
b8ee248137 kernel: 3.16.4 -> 3.16.6 2014-10-16 13:56:01 -07:00
William A. Kennington III
287ce68d38 kernel: 3.14.20 -> 3.14.22 2014-10-16 13:55:55 -07:00
William A. Kennington III
8c138fd489 kernel: 3.12.29 -> 3.12.30 2014-10-16 13:55:50 -07:00
William A. Kennington III
242070abfc kernel: 3.10.56 -> 3.10.58 2014-10-16 13:55:38 -07:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Jascha Geerds
d071a25dec ati-driver: Fix "Catalyst Control Center" 2014-10-15 00:37:39 +02:00
Bjørn Forsman
b9b193e4a3 lttng-modules: use proper version number
And note why we're not using the latest stable release (because of
support for linux >= 3.16).
2014-10-14 21:12:23 +02:00
Domen Kožar
9db2312a50 lttng-modules: fix on kernel 3.2, 3.16, 3.17 2014-10-14 13:48:55 +02:00
Bjørn Forsman
391c2778d4 lttng: update to latest (2.4.1 -> 2.5.0)
- This unbreaks lttng linux kernel modules[1]
- lttng-tools has grown a dependency on libxml2

[1]: Build tested (for default NixOS Linux kernel) and run tested with
lttng-sessiond (it successfully loads kernel modules).
2014-10-13 22:16:32 +02:00
Shea Levy
1a7c1615bf Update broadcom-sta and fix for new kernels 2014-10-13 13:37:56 -04:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Michael Raskin
299abee9ab Update wpa_supplicant 2014-10-12 12:34:16 +04:00
Michael Raskin
1602f9b90a Update hostapd 2014-10-12 12:34:16 +04:00
Aristid Breitkreuz
cc484f31d2 Merge pull request #4402 from NixOS/udisks-1.0.5
udisks: update from 1.0.4 to 1.0.5
2014-10-11 14:06:16 +02:00
Domen Kožar
2e8c67d300 kernelPackages_3_17.{netatop,betman-adv}: disable 2014-10-10 21:35:26 +02:00
Shea Levy
af4455d853 Merge branch 'master' of github.com:ip1981/nixpkgs
Fixes for atool & sysstat
2014-10-10 11:40:00 -04:00
Austin Seipp
df4c8d85ae lockdep: 3.16.1 -> 3.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 16:59:14 -05:00
Igor Pashev
c5f4d996fc Fixed buidling sysstat
https://github.com/NixOS/nixpkgs/issues/4441
2014-10-09 21:59:53 +04:00
Eelco Dolstra
666cf992f0 Revert "mdadm: update from 3.3 to 3.3.2"
This reverts commit 1faf6106c3. It
causes the size of the initrd to explode from ~6 MB to 19 MB:

  http://hydra.nixos.org/build/15728196

The reason is that mdadm now contains a self-reference:

  $ strings ./result/sbin/mdadm  | grep /nix/store
  ...
  ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="%s", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
  ACTION=="add", SUBSYSTEM=="block", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdmon

(Previously, it referred to /sbin/mdadm.) This causes mdadm, glibc and
linux-headers to be added to the initrd.
2014-10-09 18:34:37 +02:00
Aristid Breitkreuz
43a5282d08 procps: update from 3.3.9 to 3.3.10 2014-10-07 23:41:21 +02:00
Aristid Breitkreuz
30f5230b8b lxc: update from 1.0.3 to 1.0.6 2014-10-07 22:51:54 +02:00
Aristid Breitkreuz
1faf6106c3 mdadm: update from 3.3 to 3.3.2 2014-10-07 21:50:40 +02:00
Ricardo M. Correia
c615793317 grsecurity: Update stable and test patches
stable: 3.0-3.14.19-201409282024 -> 3.0-3.14.20-201410062037
test:   3.0-3.16.3-201409282025  -> 3.0-3.16.4-201410062041
2014-10-07 16:55:49 +02:00
Ricardo M. Correia
ebfb506036 spl: Backport compatibility patches for newer kernels 2014-10-07 16:52:14 +02:00
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