Commit graph

2859 commits

Author SHA1 Message Date
Shea Levy e4961c63f7 Remove sec_perm patch that was needed by AUFS
Now the kernel is unpatched by default on non-MIPS!
2014-03-21 04:37:23 -04:00
Shea Levy f4c989ede4 Merge branch 'master' of git://github.com/hrdinka/nixpkgs
conky: add config options
2014-03-20 20:14:14 -04:00
Austin Seipp 9bcc48a4b2 criu: attempt to fix doc building on Hydra
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-20 14:01:57 -05:00
Austin Seipp 7dcf9f6907 criu: only supported on 64-bit
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-20 13:41:05 -05:00
Vladimír Čunát 8a8ae81e40 acpid: update from 2.0.21 to 2.0.22 2014-03-19 21:56:48 +01:00
Vladimír Čunát 3cf4029981 Merge pull request #1972 from vcunat/p/procps
procps-ng: make it the default procps (name and attr)
2014-03-19 17:54:30 +01:00
Ricardo M. Correia cc69228119 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403142107 -> 3.0-3.2.55-201403172027
test:   3.0-3.13.6-201403142112 -> 3.0-3.13.6-201403172032
2014-03-18 16:51:25 +01:00
Eelco Dolstra c0f3f6e396 linux: Update to 3.4.83 2014-03-17 11:25:48 +01:00
mornfall ec353692ad Merge pull request #1849 from thoughtpolice/criu
criu: version 1.2
2014-03-16 22:58:54 +01:00
Vladimír Čunát ca09a878d0 procps-ng: make it the default procps (name and attr) 2014-03-16 19:07:38 +01:00
Austin Seipp 47b35d5e80 criu: version 1.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-16 07:16:34 -05:00
Christoph Hrdinka 26d5d506c9 conky: add config options 2014-03-16 12:30:15 +01:00
Cillian de Róiste b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Ricardo M. Correia e76c059b23 grsecurity: Fix grsec-path.patch to apply with newest patches 2014-03-15 18:01:47 +01:00
Peter Simons f1a30454f6 Merge pull request #1942 from thoughtpolice/fixups
Trivial fixes for my packages
2014-03-15 09:35:35 +01:00
Ricardo M. Correia ceec014020 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403122114 -> 3.0-3.2.55-201403142107
test:   3.0-3.13.6-201403122116 -> 3.0-3.13.6-201403142112
2014-03-15 04:15:28 +01:00
Ricardo M. Correia 3c97fdc7a8 spl, zfs: Add myself as a maintainer 2014-03-15 02:01:57 +01:00
Shea Levy 602cf8d78c Merge branch 'u/zfs-import' of git://github.com/wizeman/nixpkgs
zfs: Misc fixes
2014-03-14 19:40:34 -04:00
Shea Levy 0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs
systemd: python support & journal http gateway

Conflicts:
	nixos/modules/misc/ids.nix
2014-03-14 19:16:59 -04:00
Shea Levy 3f6603a80e Fix alsa-utils 2014-03-14 09:08:04 -04:00
Nixpkgs Monitor 69fff447aa alsaUtils: update from 1.0.27 to 1.0.27.2 2014-03-14 11:16:56 +01:00
Vladimír Čunát d6349df0dd put systemd unit dirs on the right place
Also see #1936.
2014-03-13 21:44:51 +01:00
Vladimír Čunát 344f2e6518 udisks1: bump to fix CVE-2014-0004
Also systemd unit is now installed.
Thanks to nixpkgs monitor again, as for all my CVE commits.
2014-03-13 21:16:50 +01:00
Shea Levy 0f72effdd9 The derivation primop doesn't play well with null outputs attribute 2014-03-13 15:05:15 -04:00
Evgeny Egorochkin 0ffbfd38bf udisks2: update from 2.1.1 to 2.1.3, potentially fixes CVE-2014-0004 2014-03-13 08:59:25 +02:00
Ricardo M. Correia 86b8cf954a grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403072107 -> 3.0-3.2.55-201403122114
test:   3.0-3.13.6-201403072241 -> 3.0-3.13.6-201403122116
2014-03-13 02:28:58 +01:00
Domen Kozar 059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Peter Simons 24d0e07a47 wpa_supplicant: cosmetic to un-break syntax highlighting 2014-03-11 12:34:48 +01:00
Peter Simons 813533f49a wpa_supplicant: cherry-pick future patch that disable strict SSL certificate checks
Close #1913.
2014-03-11 12:34:33 +01:00
Ricardo M. Correia d999872b8d grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403022154 -> 3.0-3.2.55-201403072107
test:   3.0-3.13.5-201403031445 -> 3.0-3.13.6-201403072241
2014-03-10 17:23:17 +01:00
Ricardo M. Correia 9b650b074b linux: Update to 3.13.6 2014-03-10 17:23:17 +01:00
Bjørn Forsman 8d18d58f91 can-utils: new package
CAN userspace utilities and tools (for use with Linux SocketCAN).

There is no real "homepage" for this project (the only thing I could
find was the gitorious page) and they haven't produced any proper
releases (source archives and/or git tags), even though git history goes
back to 2006 and things seem stable.
2014-03-09 14:19:39 +01:00
Peter Simons c9f64fb8ba lxc: update from 1.0.0 to 1.0.1 2014-03-08 12:47:18 +01:00
Austin Seipp fb055c10f6 Make my packages slightly more consistent.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:27:02 -06:00
Rob Vermaas 7047235acb Now properly add nvidiabl. 2014-03-07 16:08:38 +01:00
Domen Kožar 339651b855 Merge pull request #1817 from wkennington/cache.wpasupplicant
wpa_supplicant: Update 2.0 -> 2.1
2014-03-07 13:20:39 +01:00
Ricardo M. Correia a7e65a8a95 zfs: Fix compilation on 3.13 and later kernels 2014-03-04 12:58:59 +01:00
Ricardo M. Correia c5b3257388 spl: Fix compilation on 3.13 and later kernels 2014-03-04 12:58:55 +01:00
Ricardo M. Correia 17073197e9 spl: Fix compilation on 3.12 and later kernels 2014-03-04 12:58:39 +01:00
Ricardo M. Correia d01242edb8 zfs: Fix minor filesystem corruption with gcc 4.8
It turns out that some of gcc 4.8's aggressive optimizations may
cause minor filesystem corruption in ZFS. To fix it, a patch was
cherry-picked from the upstream's git tree.

See: https://github.com/zfsonlinux/zfs/pull/2051
2014-03-04 12:58:11 +01:00
Ricardo M. Correia e0fe5e7c38 zfs: Fix libblkid detection (backport from upstream)
This fixes issues with importing ZFS pools, such as when the ZFS device is a
partition that covers the end of the disk.

See: https://github.com/zfsonlinux/zfs/issues/1684
2014-03-04 12:58:11 +01:00
Moritz Ulrich 5d05dde655 ldm: Use meta.repositories.git.
Improves reliability of nixpkgs-monitor.
2014-03-04 12:44:15 +01:00
Austin Seipp c4d5757e29 grsecurity updates
- stable:  3.0-3.2.55-201402241936 -> 3.0-3.2.55-201403022154
  - testing: 3.0-3.13.5-201402241943 -> 3.0-3.13.5-201403031445

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-04 01:13:22 +01:00
Corey O'Connor 19c59ab984 upgrade bbswitch to 0.8 2014-03-04 01:05:12 +01:00
mornfall 528b600ec6 Merge pull request #1867 from thoughtpolice/fixes
Some minor fixes for my packages - ktap, cb0cat, etc
2014-03-03 20:36:08 +01:00
William A. Kennington III a19cf91652 wpa_supplicant: Update 2.0 -> 2.1 2014-03-03 10:26:04 -06:00
Peter Simons f9af98f1fd ipsecTools: update from 0.8.1 to 0.8.2 2014-03-03 11:10:24 +01:00
Ricardo M. Correia 69a83ba99f grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201402221305 -> 3.0-3.2.55-201402241936
test:   3.0-3.13.4-201402221308 -> 3.0-3.13.5-201402241943
2014-03-03 02:16:58 +01:00
Ricardo M. Correia 8109de905a linux: Update to 3.13.5 2014-03-03 02:16:50 +01:00
Austin Seipp 812d17f177 ktap: don't use FFI by default
It's not yet supported on i386 - instead, make it optional and
controlled by a `useFFI` attribute.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-02 06:16:56 -06:00