Shea Levy
21d7f598c8
efibootmgr: Create patch to allow arbitrary loader filenames
...
This is required for the NixOS efiBootStub module, since the default 40
characters is not enough for efi\nixos\{hash}-linux-3.3-rc7-bzImage.efi
svn path=/nixpkgs/trunk/; revision=33049
2012-03-13 21:32:09 +00:00
Lluís Batlle i Rossell
446b01489a
Updating tcpdump and libpcap. I also remove a patch of libpcap I don't know
...
what's for. It builds and runs equally for me with or without it. I couldn't
find notes in svn log about it.
svn path=/nixpkgs/trunk/; revision=32996
2012-03-11 19:37:49 +00:00
Florian Friesdorf
36fbb68247
fix typo maitainers -> maintainers
...
svn path=/nixpkgs/trunk/; revision=32992
2012-03-11 15:20:12 +00:00
Yury G. Kudryashov
7c4a72dd77
NM-pptp: 0.9.2.0, optional GNOME support
...
svn path=/nixpkgs/trunk/; revision=32986
2012-03-11 14:07:37 +00:00
Yury G. Kudryashov
d7e089e820
Add myself to etworkmanager.meta.maintainers
...
svn path=/nixpkgs/trunk/; revision=32985
2012-03-11 14:07:34 +00:00
Yury G. Kudryashov
1fef26d8f7
NM purity patch: substitute before build, fix typos
...
svn path=/nixpkgs/trunk/; revision=32978
2012-03-10 23:13:32 +00:00
Lluís Batlle i Rossell
7c92bab1e5
Made xbursttools have libusb and libusb1. Looks like depending on both.
...
svn path=/nixpkgs/trunk/; revision=32969
2012-03-10 11:26:55 +00:00
Eelco Dolstra
d1cbcc3971
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=32965
2012-03-09 19:57:33 +00:00
Yury G. Kudryashov
93683bf273
networkmanagement-0.9.0
...
svn path=/nixpkgs/trunk/; revision=32964
2012-03-09 19:34:10 +00:00
Yury G. Kudryashov
b94c51c2f7
gnome-keyring -> libgnome-keyring
...
svn path=/nixpkgs/trunk/; revision=32906
2012-03-08 16:49:14 +00:00
Joachim Schiele
88b69df2dc
Added two missing dependencies (to make the packages build)
...
svn path=/nixpkgs/trunk/; revision=32890
2012-03-08 13:31:16 +00:00
Lluís Batlle i Rossell
b2653605c4
Setting myself as maintainer of netkit tftp, to get updates if it fails to build.
...
svn path=/nixpkgs/trunk/; revision=32869
2012-03-07 22:21:24 +00:00
Lluís Batlle i Rossell
906f400681
I think xburst needs pkgconfig
...
svn path=/nixpkgs/trunk/; revision=32858
2012-03-07 21:38:19 +00:00
Lluís Batlle i Rossell
ce482ec155
Adding a new url for netkit tftp, as the other is down.
...
svn path=/nixpkgs/trunk/; revision=32855
2012-03-07 18:13:03 +00:00
Eelco Dolstra
ed325cd1ae
* We accidentally lost xz support in rpm. This broke RPM builds
...
(http://hydra.nixos.org/build/2230623 ).
svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Lluís Batlle i Rossell
1981a57c13
Updating inadyn. The old sourceforge place did not work anymore.
...
svn path=/nixpkgs/trunk/; revision=32845
2012-03-07 08:37:07 +00:00
Eelco Dolstra
38615a16e9
* Fix the checkinstall build on Glibc 2.13.
...
svn path=/nixpkgs/trunk/; revision=32831
2012-03-06 19:06:33 +00:00
Eelco Dolstra
3c56e571af
* Final sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Eelco Dolstra
17fe5f329a
* man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads
...
the first file that exists, so this is necessary to allow the
builtin config to be overriden.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32812
2012-03-06 10:14:00 +00:00
Eelco Dolstra
b57e0d8829
* man: Work around a bug in substituteInPlace. It loses the final
...
newline, and man requires every line in man.conf to be terminated by
a newline. We should fix the bug eventually though.
* man updated to 1.6g.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32811
2012-03-06 10:10:56 +00:00
Lluís Batlle i Rossell
dbe98be6a1
Updating btar
...
svn path=/nixpkgs/trunk/; revision=32807
2012-03-05 21:23:22 +00:00
Yury G. Kudryashov
57fd764a39
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Eelco Dolstra
962b01f686
* Remove unnecessary copy on sed.
...
svn path=/nixpkgs/trunk/; revision=32773
2012-03-04 15:52:41 +00:00
Eelco Dolstra
27809f0ec4
* No longer needed.
...
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00
Yury G. Kudryashov
d4ffc7332c
Merge trunk right before reintegrating
...
svn path=/nixpkgs/branches/libpng15/; revision=32758
2012-03-04 09:09:21 +00:00
Lluís Batlle i Rossell
53e80e5316
Adding a manpage for tar, using help2man
...
svn path=/nixpkgs/trunk/; revision=32749
2012-03-03 09:52:55 +00:00
Eelco Dolstra
11d1104a88
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Lluís Batlle i Rossell
f20a947a5d
Updating lzop
...
svn path=/nixpkgs/trunk/; revision=32730
2012-03-01 22:03:34 +00:00
Eelco Dolstra
6a5ea980ab
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=32724
2012-03-01 20:18:33 +00:00
Yury G. Kudryashov
84fb9ca331
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32719
2012-03-01 15:05:27 +00:00
Eelco Dolstra
a75ccf7dca
* Don't set the nscd restart action here.
...
svn path=/nixpkgs/trunk/; revision=32717
2012-03-01 14:45:27 +00:00
Yury G. Kudryashov
0210e20b5a
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Peter Simons
57b612cb05
vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a garbage' bug
...
Further details are at:
http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22
svn path=/nixpkgs/trunk/; revision=32712
2012-02-29 22:50:33 +00:00
Evgeny Egorochkin
6e5a378f48
Vidalia: version bump
...
svn path=/nixpkgs/trunk/; revision=32696
2012-02-29 13:30:14 +00:00
Evgeny Egorochkin
bf667c9389
Vidalia: packaged
...
svn path=/nixpkgs/trunk/; revision=32694
2012-02-29 13:30:06 +00:00
Evgeny Egorochkin
0def4140f6
network-manager-applet: version bump
...
svn path=/nixpkgs/trunk/; revision=32693
2012-02-29 13:30:04 +00:00
Evgeny Egorochkin
b01a720d65
TOR: version bump
...
svn path=/nixpkgs/trunk/; revision=32692
2012-02-29 13:30:01 +00:00
Evgeny Egorochkin
cff68ececb
network-manager: version bump
...
svn path=/nixpkgs/trunk/; revision=32691
2012-02-29 13:29:59 +00:00
Peter Simons
9a5c6611d0
moderncv: updated sha hash
...
svn path=/nixpkgs/trunk/; revision=32681
2012-02-28 17:34:39 +00:00
Peter Simons
8bcba9e6d4
moderncv: upgraded to 0.19
...
svn path=/nixpkgs/trunk/; revision=32664
2012-02-28 00:09:52 +00:00
Florian Friesdorf
360ec296a6
Revert "adapted xpf to new libxml2Python"
...
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
2012-02-28 00:07:08 +00:00
Florian Friesdorf
ee15dc2327
Revert "fix bittorrent by using buildPythonPackage"
...
This reverts commit c029f9f7fe86867cfd94461996dc6a6415e0e8d0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32639
2012-02-28 00:06:36 +00:00
Florian Friesdorf
2eb54f5062
fix bittorrent by using buildPythonPackage
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32636
2012-02-27 22:53:44 +00:00
Lluís Batlle i Rossell
f00e2914e3
Removing grub 1.98. It was useful only when we only had 1.99rc1 to boot from raid md
...
devices. In 1.99, all worked.
svn path=/nixpkgs/trunk/; revision=32602
2012-02-26 21:06:55 +00:00
Florian Friesdorf
c0dcbb912c
adapted xpf to new libxml2Python
...
authored by: chaoflow, goibhniu
svn path=/nixpkgs/branches/stdenv-updates/; revision=32597
2012-02-26 17:23:54 +00:00
Shea Levy
584ccabaac
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
2012-02-25 20:52:15 +00:00
Eelco Dolstra
e4ff365eb4
* EC2 AMI tools updated to 1.4.0.5.
...
svn path=/nixpkgs/trunk/; revision=32568
2012-02-25 20:26:25 +00:00
Shea Levy
b4bee8caf5
nixUnstable: Run checkPhase after installPhase to work around a test suite bug
...
svn path=/nixpkgs/trunk/; revision=32567
2012-02-25 20:18:00 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
bfb0389d6c
Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on
...
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 .
svn path=/nixpkgs/trunk/; revision=32556
2012-02-25 15:54:57 +00:00
Peter Simons
4716f6735d
vpnc: install the README file into $out/share/doc
...
svn path=/nixpkgs/trunk/; revision=32544
2012-02-24 17:32:11 +00:00
Yury G. Kudryashov
3652c61aed
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32522
2012-02-23 20:35:33 +00:00
Yury G. Kudryashov
bf2579b4a3
Latest netpbm (builds with libpng-1.5)
...
svn path=/nixpkgs/trunk/; revision=32521
2012-02-23 20:24:00 +00:00
Yury G. Kudryashov
38e3d7bc86
svn merge ^/nixpkgs/trunk
...
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?
svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Peter Simons
4b8cceb571
wicd: emit ip-up and ip-down as well
...
svn path=/nixpkgs/trunk/; revision=32482
2012-02-22 20:29:15 +00:00
Eelco Dolstra
f71dd91a43
* Apply r32435 from the trunk (always build Python with SSL support).
...
Remove .ssl references from some packages missed in that commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
e64443baf1
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Peter Simons
da2159548a
nbd: avoid use of "install -D", which doesn't seem to work on FreeBSD
...
svn path=/nixpkgs/trunk/; revision=32459
2012-02-21 15:07:39 +00:00
Peter Simons
4e76d21c84
nbd: updated to version 3.0
...
svn path=/nixpkgs/trunk/; revision=32450
2012-02-21 10:58:15 +00:00
Arie Middelkoop
869543fa05
Updated the hash of texlive's 'moderncv.zip'.
...
Apparently the file gets updated once in a while. It does not have a version number either. Not very nice.
svn path=/nixpkgs/trunk/; revision=32444
2012-02-21 09:01:56 +00:00
Eelco Dolstra
45fed14272
* Revert r32435. We'll be doing a stdenv merge in a few days, so
...
let's put it in there rather than having the Nth near-complete
rebuild of the trunk in a few days.
svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons
95cbf4ed55
Modified the Python 2.7 expression so that the interpreter has unconditional
...
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.
svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Eelco Dolstra
fd41f11208
* dhcpcd: get the entry/exit hooks from /etc.
...
svn path=/nixpkgs/trunk/; revision=32429
2012-02-20 15:12:34 +00:00
Yury G. Kudryashov
d8454e538c
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Eelco Dolstra
ebe141d306
* Updated dhcpcd to 5.5.4.
...
svn path=/nixpkgs/trunk/; revision=32412
2012-02-20 01:14:57 +00:00
Eelco Dolstra
ea82288eec
* Remove the unused graphviz/2.24.nix file. Also remove the unused
...
attribute graphviz_2_24 (which was actually referring to Graphviz
2.0).
svn path=/nixpkgs/trunk/; revision=32406
2012-02-19 17:54:37 +00:00
Eelco Dolstra
5baef98dd9
* Cromfs updated to 1.5.10 (to get it to build with GCC 4.6).
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32400
2012-02-19 16:58:40 +00:00
Yury G. Kudryashov
313a029f16
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
14a5b4991c
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32360
2012-02-17 17:44:20 +00:00
Yury G. Kudryashov
615f0423e8
telnet.meta.platforms
...
svn path=/nixpkgs/trunk/; revision=32355
2012-02-17 16:22:07 +00:00
Yury G. Kudryashov
79d0d410cb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov
8b4f571491
kdiff3-0.9.96
...
svn path=/nixpkgs/trunk/; revision=32348
2012-02-17 13:29:34 +00:00
Yury G. Kudryashov
ed8caa2c7f
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32347
2012-02-17 13:10:05 +00:00
Eelco Dolstra
a3da139c73
* Remove ext3cow, it's dead.
...
svn path=/nixpkgs/trunk/; revision=32340
2012-02-16 19:30:41 +00:00
Yury G. Kudryashov
ee75764bdb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32338
2012-02-16 18:46:10 +00:00
Eelco Dolstra
148612239c
* Added openresolv, a program for managing /etc/resolv.conf.
...
svn path=/nixpkgs/trunk/; revision=32337
2012-02-16 18:40:05 +00:00
Yury G. Kudryashov
f8926aa0d7
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32335
2012-02-16 18:18:34 +00:00
Eelco Dolstra
9da1dd6c90
* dnsmasq updated to 2.59.
...
svn path=/nixpkgs/trunk/; revision=32334
2012-02-16 18:03:12 +00:00
Yury G. Kudryashov
e5027e5b36
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Yury G. Kudryashov
82aab32119
Remove knetworkmanager. Use networkmanagement instead
...
svn path=/nixpkgs/trunk/; revision=32329
2012-02-16 14:54:13 +00:00
Yury G. Kudryashov
a03eacdf22
kde4.networkmanagement needs pkg-config
...
svn path=/nixpkgs/trunk/; revision=32328
2012-02-16 14:53:51 +00:00
Yury G. Kudryashov
bedbebc2e4
enblend-enfuse: build with libpng-1.5
...
svn path=/nixpkgs/branches/libpng15/; revision=32322
2012-02-16 11:50:29 +00:00
Yury G. Kudryashov
070874c5f1
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32321
2012-02-16 11:23:36 +00:00
Shea Levy
dfda68af54
Fix tarball
...
I don't know what nbd is, I just followed the complaints in the log
svn path=/nixpkgs/trunk/; revision=32310
2012-02-16 02:21:17 +00:00
Eelco Dolstra
219b00faa2
* e2fsprogs updated to 1.42.
...
svn path=/nixpkgs/trunk/; revision=32293
2012-02-15 01:09:33 +00:00
Peter Simons
ac69747aa8
Regenerated all Haskell packages with the latest version of cabal2nix.
...
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
c81f618a34
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
96c20f97b7
unzip: fix typo in meta
...
svn path=/nixpkgs/trunk/; revision=32272
2012-02-14 14:29:25 +00:00
Yury G. Kudryashov
f7886ac78b
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Sander van der Burg
da6e4f95d4
Bumped revision of Disnix activation scripts
...
svn path=/nixpkgs/trunk/; revision=32234
2012-02-12 13:34:06 +00:00
Yury G. Kudryashov
fc21cca549
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
2012-02-12 09:33:54 +00:00
Eelco Dolstra
761785c4ab
* Fix ebook-tools. It broke because of the libzip update.
...
svn path=/nixpkgs/trunk/; revision=32215
2012-02-10 18:33:14 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
ff1bfcaefb
* Added fuse-zip, a FUSE filesystem for accessing zip files.
...
svn path=/nixpkgs/trunk/; revision=32143
2012-02-08 15:45:26 +00:00
Peter Simons
85f4a69a14
nbd: the test suite still doesn't work on Hydra
...
svn path=/nixpkgs/trunk/; revision=32132
2012-02-07 21:45:05 +00:00
Peter Simons
07a925d08a
nbd: re-enable the test suite to see what happens
...
svn path=/nixpkgs/trunk/; revision=32127
2012-02-07 19:54:31 +00:00
Peter Simons
1451109c95
nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore
...
svn path=/nixpkgs/trunk/; revision=32126
2012-02-07 19:54:28 +00:00
Peter Simons
a62fa4480a
nbd: updated to version 2.9.25
...
svn path=/nixpkgs/trunk/; revision=32125
2012-02-07 19:54:25 +00:00
Yury G. Kudryashov
c615cbae70
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=32099
2012-02-07 09:38:20 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00