Yury G. Kudryashov
84c0185038
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès
652712b77a
udisks: Autoreconf properly.
...
svn path=/nixpkgs/trunk/; revision=31679
2012-01-19 09:23:24 +00:00
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Peter Simons
1646bc36da
wpa_supplicant: fixed crashing bug
...
on some hardware, wpa_supplicant would crash when controlled via dbus
(wicd/networkmanager), this patch fixes it.
svn path=/nixpkgs/trunk/; revision=31651
2012-01-18 20:32:29 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
0c79434ccb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Arie Middelkoop
32327df918
Removed the now obsolete firmware-linux-free package.
...
svn path=/nixpkgs/trunk/; revision=31528
2012-01-14 09:31:12 +00:00
Arie Middelkoop
37fe977ad8
Fixed the hash of the multitouch package.
...
Note: the specified rev is still the latest in the master branch,
so it's actually odd that the computed hash is not correct.
svn path=/nixpkgs/trunk/; revision=31506
2012-01-13 08:26:45 +00:00
Arie Middelkoop
0fa0da35ef
Added firmware-linux-nonfree and directly also the free variant.
...
Todo for later: take the files from the various .deb files instead of the source distribution.
This version already improves upon my previous implementation, hence I commit it.
svn path=/nixpkgs/trunk/; revision=31501
2012-01-12 17:16:11 +00:00
Arie Middelkoop
0a2ad94a0e
Fixed rtl8192cfw firmware package.
...
Also, added a package that fetches all firmware from dwmw2's repo on kernel.org.
Specific firmware can then simply copy the driver out of this repo. Perhaps it
would actually be useful to write some abstraction for that.
Anyway, I'm not sure if fetching the git repo is a good idea to start with. The
repo does not have tags, so I'm forced to either take the HEAD or a particular
commit (chose the last option). However, this is likely to need ongoing
maintenance.
svn path=/nixpkgs/trunk/; revision=31492
2012-01-12 10:17:29 +00:00
Peter Simons
061fe164be
Added linux rtl8168e-2 firmware.
...
svn path=/nixpkgs/trunk/; revision=31475
2012-01-10 23:23:15 +00:00
Lluís Batlle i Rossell
6733613253
Updating sysstat
...
svn path=/nixpkgs/trunk/; revision=31464
2012-01-10 13:28:58 +00:00
Yury G. Kudryashov
3a83df3438
conky-1.8.1, fix FTBFS
...
svn path=/nixpkgs/trunk/; revision=31460
2012-01-09 23:44:44 +00:00
Peter Simons
827479dc80
htop: updated to version 1.0
...
svn path=/nixpkgs/trunk/; revision=31435
2012-01-08 16:29:57 +00:00
Yury G. Kudryashov
9ee0a9df9b
svn merge ^/nixpkgs/trunk
...
A few trivial conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov
f1c3a0f83c
pam_usb-0.5.0; still depend on HAL
...
svn path=/nixpkgs/trunk/; revision=31410
2012-01-07 19:16:52 +00:00
Yury G. Kudryashov
f4cfdb0619
pmount: disable HAL
...
pmount failed to find HAL for a long time, and nobody cared. So, I've just
removed it.
Also configure does not recognize "--with-cryptsetup", so I've removed it as
well.
svn path=/nixpkgs/trunk/; revision=31409
2012-01-07 19:16:45 +00:00
Lluís Batlle i Rossell
d126fe5806
Making fbtermStdenv both crossbuild and natively build. It failed to build without overriden patches.
...
svn path=/nixpkgs/trunk/; revision=31405
2012-01-07 16:11:20 +00:00
Lluís Batlle i Rossell
80717672b4
Updating fbterm.
...
svn path=/nixpkgs/trunk/; revision=31399
2012-01-07 14:41:04 +00:00
Lluís Batlle i Rossell
29e69f119d
Making perf cross-build again, now with manpages.
...
svn path=/nixpkgs/trunk/; revision=31371
2012-01-06 19:35:12 +00:00
Cillian de Roiste
9686b7def6
Adding a single expression to provide all ralink firmware, if there are no objections this could replace all the rt* firmware expressions
...
svn path=/nixpkgs/trunk/; revision=31365
2012-01-06 18:42:39 +00:00
Lluís Batlle i Rossell
75d5ffe7ac
Adding perf manual pages.
...
I copied the docbook inputs from awesome. I don't understand them.
svn path=/nixpkgs/trunk/; revision=31355
2012-01-06 17:45:53 +00:00
Lluís Batlle i Rossell
b76352800e
Adding slang to perf. It looks like it wants slang too.
...
svn path=/nixpkgs/trunk/; revision=31354
2012-01-06 17:04:32 +00:00
Lluís Batlle i Rossell
cae619da08
Updating elfutils/perf to cross-build. I tested this for the nanonote.
...
I add newt, checking that it cross-builds too.
I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.
svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Yury G. Kudryashov
900c6e18cd
svn merge ^/nixpkgs/trunk
...
Conflicts: openssl, libplist
svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Lluís Batlle i Rossell
4c814dd003
Adding linux 'perf' tool.
...
svn path=/nixpkgs/trunk/; revision=31319
2012-01-05 21:24:51 +00:00
Michael Raskin
da6b6a9332
Update Linux 3.2 to release
...
svn path=/nixpkgs/trunk/; revision=31306
2012-01-05 07:24:37 +00:00
Lluís Batlle i Rossell
95b42b8134
Updating linux to 2.6.32.52 and 3.1.7
...
svn path=/nixpkgs/trunk/; revision=31299
2012-01-04 21:34:03 +00:00
Yury G. Kudryashov
3d61c49b42
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Cillian de Roiste
35879729d2
Ralink firmware is no longer available directly from ralinktech.com, it is now available from git.kernel.org. I've used the debian svn repo here instead for convenience
...
svn path=/nixpkgs/trunk/; revision=31256
2012-01-03 22:02:34 +00:00
Yury G. Kudryashov
2bca92e32d
Merge trunk
...
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Florian Friesdorf
9e050a9226
iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
...
Author: Sergey Mironov <ierton@gmail.com>
svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov
08761e83fc
Merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Lluís Batlle i Rossell
076977b462
Making procps crossbuild.
...
svn path=/nixpkgs/trunk/; revision=31190
2012-01-01 20:01:02 +00:00
Florian Friesdorf
d5709cfb64
cryptsetup-1.4.1
...
Thanks to Mathijs Kwik and Peter Simons for preparing this.
Make sure you have nixos r31132.
svn path=/nixpkgs/trunk/; revision=31134
2011-12-28 21:48:58 +00:00
Michael Raskin
0efe938292
A newer rc
...
svn path=/nixpkgs/trunk/; revision=31081
2011-12-26 04:20:15 +00:00
Yury G. Kudryashov
f77741e018
merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Michael Raskin
435c32b5b6
A fresher Linux rc
...
svn path=/nixpkgs/trunk/; revision=31048
2011-12-23 04:26:36 +00:00
Lluís Batlle i Rossell
6db6983bc2
Updating nvidia legacy 96.x, so it builds with the linux 3.1 kernel.
...
svn path=/nixpkgs/trunk/; revision=31047
2011-12-22 22:35:57 +00:00
Eelco Dolstra
e1a96b2b88
* Add cpufrequtils to the channel.
...
svn path=/nixpkgs/trunk/; revision=31017
2011-12-21 16:24:40 +00:00
Eelco Dolstra
9eecf0e076
* lm_sensors -> lm-sensors.
...
svn path=/nixpkgs/trunk/; revision=30997
2011-12-21 10:28:51 +00:00
Eelco Dolstra
5f0536dc27
* lm-sensors updated to 3.3.1. Also fixed the name to match upstream.
...
svn path=/nixpkgs/trunk/; revision=30996
2011-12-21 10:28:09 +00:00
Eelco Dolstra
c3a52c32a4
* Fix the upower build in the case where /var/lib/upower doesn't exist
...
already (http://hydra.nixos.org/build/1646705 ).
svn path=/nixpkgs/trunk/; revision=30994
2011-12-20 23:10:06 +00:00
Eelco Dolstra
a9a3aed0c2
* udisks updated to 1.0.4.
...
svn path=/nixpkgs/trunk/; revision=30993
2011-12-20 23:04:07 +00:00
Eelco Dolstra
32a88887c6
* upower updated to 0.9.15.
...
svn path=/nixpkgs/trunk/; revision=30992
2011-12-20 22:47:57 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Eelco Dolstra
cfde88976b
* Streamline the stdenv bootstrap and resulting closure by removing
...
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Peter Simons
8d2d9449f7
Revert cryptsetup update to version 1.4.1.
...
The patch committed in revision 30839 causes nixos-rebuild to fail:
| building Nix...
| building the system configuration...
| these derivations will be built:
| /nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv
| /nix/store/csagx61sw5mzd4hb9lajx65ds5212331-udev-initrd.conf.drv
| /nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv
| /nix/store/k40r1l30amnbxqidbdl480xq46rqr0pa-udev-rules.drv
| /nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv
| /nix/store/wqhdw86v24z0x7fhp8xrqvw6g12lphij-extra-utils.drv
| building path(s) `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils'
| [pbuilding /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/ld-linux-x86-64.so.2'
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/libc.so.6'
| [...]
| `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sh' -> `bash'
| `/nix/store/pmsabjn87gxlmkqlnj3hj502l687hw0f-module-init-tools-3.16/sbin/modprobe' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real'
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ata_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/basename...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/bash...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/blkid...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cat...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cdrom_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chmod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chroot...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cryptsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/dmsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/e2fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/edd_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/input_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ln...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/lvm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mdadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mkdir...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mknod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/path_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/reiserfsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/scsi_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sleep...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/switch_root...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/tune2fs...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevd...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/umount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/usb_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/v4l_id...
| testing patched programs...
| GNU bash, version 4.1.2(1)-release (x86_64-unknown-linux-gnu)
| mount from util-linux-ng 2.18 (with libblkid support)
| umount (util-linux-ng 2.18)
| e2fsck 1.41.14 (22-Dec-2010)
| tune2fs 1.41.14 (22-Dec-2010)
| 173
| blkid from util-linux-ng 2.18 (libblkid 2.18.0, 30-Jun-2010)
| Library version: 1.02.66 (2011-08-12)
| LVM version: 2.02.87(2) (2011-08-12)
| reiserfsck 3.6.21 (2009 www.namesys.com)
|
| mdadm - v3.1.2 - 10th March 2010
| basename (GNU coreutils) 8.7
| Copyright (C) 2010 Free Software Foundation, Inc.
| License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html >.
| This is free software: you are free to change and redistribute it.
| There is NO WARRANTY, to the extent permitted by law.
|
| Written by David MacKenzie.
| module-init-tools version 3.16
| [qoutput is not allowed to refer to path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'
| cannot build derivation `/nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv': 1 dependencies couldn't be built
| error: build of `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv' failed
svn path=/nixpkgs/trunk/; revision=30885
2011-12-14 10:42:49 +00:00
Michael Raskin
0e3d2e236e
Update Linux kernel to 3.1
...
svn path=/nixpkgs/trunk/; revision=30876
2011-12-14 07:27:58 +00:00
Eelco Dolstra
c044d7f56f
* Forgot a few utillinuxng references.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +00:00
