alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
54307 commits 217 branches 121 tags 4.5 GiB
Commit graph

3470 commits

Author SHA1 Message Date
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