Commit Graph

4176 Commits

Author SHA1 Message Date
Arseniy Seroka
582ed94aa2 Merge pull request #9559 from k0ral/conky
conky: 1.9.0 -> 1.10.0
2015-08-30 23:10:13 +03:00
William A. Kennington III
dc506110c1 nvidia: 352.30 -> 352.41 2015-08-30 10:57:16 -07:00
Cillian de Róiste
6e58e2307a xf86_input_wacom: update from 0.30.0 to 0.31.0 2015-08-30 17:37:36 +02:00
koral
7eb5b00d82 conky: 1.9.0 -> 1.10.0 2015-08-30 14:18:47 +00:00
William A. Kennington III
b409331a5a ipset: 6.24 -> 6.26 2015-08-28 17:49:15 -07:00
William A. Kennington III
5a303519fa kernel: 3.12.46 -> 3.12.47 2015-08-28 15:46:34 -07:00
Robert Helgesson
ca11cb8288 reptyr: 0.5 -> 0.6.2 2015-08-27 10:11:11 +02:00
Vladimír Čunát
8c2f7fcfed apparmor: don't depend on tetex
It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
2015-08-26 20:38:41 +02:00
Tobias Geerinckx-Rice
a94e8f24f2 mcelog: update 123 -> 124 2015-08-26 17:23:11 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Eelco Dolstra
9c61317002 Put all firmware in $out/lib/firmware
This way, hardware.firmware can be a list of packages.
2015-08-25 00:40:34 +02:00
Bob van der Linden
5cdf3d4f8e can-utils: updated homepage url (close #9425) 2015-08-24 18:55:55 +02:00
Eelco Dolstra
3c114b827e systemd: Update URL to the NixOS fork 2015-08-24 14:16:59 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Charles Strahan
7408ede358 fanctl: fix state directory 2015-08-22 14:14:56 -04:00
Charles Strahan
648973d641 nixos: rename service 'ubuntu-fan' as 'fan' 2015-08-22 14:05:35 -04:00
Desmond O. Chang
5986ec0923 android-udev-rules: 20150301 -> 20150821 2015-08-22 18:24:20 +08:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Tobias Geerinckx-Rice
c757628f0a mcelog: 122 -> 123
Also flesh out descriptions and restrict to Linux platforms.
2015-08-21 13:42:51 +02:00
William A. Kennington III
b3fb6dc5aa htop: Update to fix issues with ncurses 6.0
```
william@exodus ~> htop

htop 1.0.3 aborting. Please report bug at http://hisham.hm/htop

 Please include in your report the following backtrace:
 htop(CRT_handleSIGSEGV+0x32)[0x4177b2]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(+0x33460)[0x7f9fb9157460]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(+0x33f91)[0x7f9fb97faf91]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(doupdate_sp+0xc1d)[0x7f9fb97fe0ad]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wrefresh+0x39)[0x7f9fb97ecf09]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(_nc_wgetch+0x12a)[0x7f9fb97e583a]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wgetch+0x25)[0x7f9fb97e6555]
 htop(ScreenManager_run+0x15a)[0x40ee8a]
 htop(main+0x487)[0x4069b7]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(__libc_start_main+0xf5)[0x7f9fb9144995]
 htop(_start+0x29)[0x406af9]

 Additionally, in order to make the above backtrace useful,
 please also run the following command to generate a disassembly of your
 binary:

    objdump -d `which htop` > ~/htop.objdump

    and then attach the file ~/htop.objdump to your bug report.

    Thank you for helping to improve htop!

    fish: “htop” terminated by signal SIGABRT (Abort)
```
2015-08-20 15:32:47 -07:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
aszlig
710f8a7170
Merge pull request #9271 from @Profpatsch.
Not sure whether this was broken in the first place (8cd6d53) or if it
went broken afterwards (due to the version bump in 04e39bd), but it
isn't included in the store path at current master.

So I've tested the commit and kbd now correctly includes the Neo layout.
2015-08-19 18:46:41 +02:00
aszlig
50e9dd7da1
uclibc: Provide a more stable location for source.
At the upstream URL at http://git.uclibc.org/uClibc/snapshot/, older
versions are dropped at a regular basis. Unfortunately the tarball
"uClibc-20150131.tar.bz2" has already been deleted from that directory
and I didn't find a mirror providing the same file.

So I've switched it to use fetchzip from the cgit site instead of using
fetchgit directly. The reason why I didn't use fetchgit is that we'd
need need git, which depends (indirectly? not sure, haven't checked) on
libiconv and that in turn triggers an assertion if we're on Linux and
are cross-building using uclibc.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-19 18:43:24 +02:00
William A. Kennington III
d70c01daec grsecurity: Update patches 2015-08-18 21:06:45 -07:00
William A. Kennington III
429d4beaa2 lvm2: 2.02.124 -> 2.02.128 2015-08-18 17:01:13 -07:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
William A. Kennington III
5ec252e7ca kbd: 2.0.2 -> 2.0.3 2015-08-18 11:35:50 -07:00
William A. Kennington III
31a27c44c8 lxc: 1.1.2 -> 1.1.3 2015-08-18 11:33:37 -07:00
William A. Kennington III
74a885d13e bluez5: 5.32 -> 5.33 2015-08-18 11:33:23 -07:00
William A. Kennington III
c4dc3aa97f acpid: 2.0.23 -> 2.0.25 2015-08-18 11:32:29 -07:00
William A. Kennington III
0b907d875c procps-ng: 3.3.10 -> 3.3.11 2015-08-18 11:12:34 -07:00
William A. Kennington III
eb859dc816 kernel: 4.1.5 -> 4.1.6 2015-08-18 11:12:34 -07:00
William A. Kennington III
e4fa08711c kernel: 3.14.50 -> 3.14.51 2015-08-18 11:12:34 -07:00
William A. Kennington III
109ff7ddee kernel: 3.10.86 -> 3.10.87 2015-08-18 11:12:34 -07:00
Peter Simons
93b830f111 htop: use a version number that corresponds to the output from "git describe --tags"
This approach avoids potential problems with "nix-env --update" when
we'll go back to a release version. Kindly suggested by @vcunat in
https://github.com/NixOS/nixpkgs/pull/9307#issuecomment-132112840.
2015-08-18 12:18:19 +02:00
Tobias Geerinckx-Rice
54916ba657 htop: 1.0.3 -> (git) 2015-08-12
Temporarily update to git HEAD for the "display program basename"
functionality it provides.
2015-08-18 01:13:59 +02:00
Profpatsch
c34d852ea1 kbd: really do include neo layout 2015-08-16 01:46:50 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Charles Strahan
c1ee8fefd4 nixos: add support for Ubuntu Fan Networking
This provides support for Ubuntu Fan Networking [1].

This includes:

* The fanctl package, and a corresponding NixOS service.
* iproute patches.
* kernel patches.

closes #9188

1: https://wiki.ubuntu.com/FanNetworking
2015-08-13 14:27:14 -04:00
Vladimír Čunát
e2e21ef320 nvidia-x11-legacy{340,304}: fix build with linux-3.18
Close #9218.
It's our default kernel (now and for the upcoming release).
- 304 won't build with 4.1,
- 173 didn't even build with 3.14 due to other issues (3.12 is OK ATM)
- all legacy drivers are up-to-date with upstream releases.
2015-08-13 14:11:06 +02:00
Charles Strahan
963e70a7e8 iproute: remove unused patch
In f18efaf26e, the "patches" attribute was erroneously renamed to
"patch". If you follow the original bug report[1], you'll see that this
has long since been fixed upstream (using a different patch).

1: https://bugs.gentoo.org/show_bug.cgi?id=331447
2015-08-11 17:47:53 -04:00
William A. Kennington III
52e55d85cb kernel: 3.14.49 -> 3.14.50 2015-08-10 23:35:43 -07:00
William A. Kennington III
2cec29f646 linux-3.19: Remove stale nix file 2015-08-10 23:34:32 -07:00
William A. Kennington III
974b9cc8cc kernel: 4.1.4 -> 4.1.5 2015-08-10 23:34:31 -07:00
William A. Kennington III
9f79c1e6eb kernel: 3.18.19 -> 3.18.20 2015-08-10 23:34:31 -07:00
William A. Kennington III
5e33890995 kernel: 3.12.45 -> 3.12.46 2015-08-10 23:31:07 -07:00
William A. Kennington III
5fe578d706 kernel: 3.10.85 -> 3.10.86 2015-08-10 23:30:59 -07:00
Charles Strahan
8b91812de6 pipework: init at 2015-07-30
Pipework lets you connect together containers in arbitrarily complex
scenarios. Pipework uses cgroups and namespace and works with "plain"
LXC containers (created with lxc-start), and with the awesome Docker.
2015-08-10 15:01:34 -04:00
Vladimír Čunát
6cf49480a6 Merge #9094: ati-drivers: 14.12 -> 15.7, fix builds
... with newer kernels up to 4.1 (including).
2015-08-10 08:43:49 +02:00