Commit graph

2288 commits

Author SHA1 Message Date
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Shea Levy 7f5520bfba Update btrfsProgs
svn path=/nixpkgs/trunk/; revision=33497
2012-03-31 14:51:36 +00:00
Michael Raskin a6b434974b Fixing how bzip2 is passed to nixCustom
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
2012-03-30 10:18:25 +00:00
Michael Raskin d388527f21 Update ripmime; builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33484
2012-03-30 05:30:09 +00:00
Eelco Dolstra 5fd376da83 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=33480
2012-03-29 22:10:24 +00:00
Shea Levy 742894471d Add rEFInd
svn path=/nixpkgs/trunk/; revision=33474
2012-03-29 14:54:17 +00:00
Rob Vermaas 076946d277 add fortune
svn path=/nixpkgs/trunk/; revision=33462
2012-03-29 07:15:40 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Joachim Schiele 37e67f9888 wgetpaste is a handy shell utility getting things pasted on pasting services online
svn path=/nixpkgs/trunk/; revision=33450
2012-03-28 13:21:42 +00:00
Eelco Dolstra a0f057e805 * Updated jdiskreport.
svn path=/nixpkgs/trunk/; revision=33440
2012-03-27 11:31:25 +00:00
Peter Simons 31507bc274 nbd: don't try to link -lrt and -lpthread on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=33412
2012-03-25 19:40:04 +00:00
Peter Simons 41081c4eb0 nbd: re-introduced linking with -lrt, and added an additional -lpthread on top of it
Linking these libraries makes sure that they can be found at run-time,
because a proper rpath into the Nix store is added to the generated
executable. Without that rpath, nbd-server will try to load the system's
libpthread.so.0, which may not be what we want.

svn path=/nixpkgs/trunk/; revision=33408
2012-03-25 18:10:30 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Yury G. Kudryashov eeb95637ac Add ksshaskpass
Patch supplied by Kirill Elagin, edited by Yury Kudryashov.

svn path=/nixpkgs/trunk/; revision=33386
2012-03-23 18:56:35 +00:00
Eelco Dolstra c977a57394 * Add dhcpcd to the channel.
svn path=/nixpkgs/trunk/; revision=33334
2012-03-21 16:48:36 +00:00
Shea Levy 3b48b8ffc4 graphviz: Hard-code lefty's path in dotty
svn path=/nixpkgs/trunk/; revision=33317
2012-03-20 23:27:12 +00:00
Yury G. Kudryashov 0d90c06ba1 Remove some packages with Qt3 dependency
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
2012-03-19 18:31:02 +00:00
Yury G. Kudryashov 066896556f polkit-gnome-0.105
Depends on gtk-3, install .desktop file.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33251
2012-03-19 04:36:35 +00:00
Lluís Batlle i Rossell 5521faad65 Updating socat. I thought it could have improvements in performance for nixos
build-vm in my computer, but does not.


svn path=/nixpkgs/trunk/; revision=33239
2012-03-18 18:33:10 +00:00
Yury G. Kudryashov 776bedbb5f Remove some files not reachable from all-packages.nix
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
2012-03-17 17:20:30 +00:00
Shea Levy d30947aef3 Move NixosBootPkg into NixOS
svn path=/nixpkgs/trunk/; revision=33149
2012-03-16 11:53:50 +00:00
Shea Levy b3e248d0f7 Whoops, sloppy copy
svn path=/nixpkgs/trunk/; revision=33136
2012-03-16 02:41:12 +00:00
Shea Levy d7533209a1 Add NixosBootPkg
You almost certainly don't want to use this. It's a very stupid,
overspecialized application that's only needed by the efiBootStub NixOS
module in corner cases.

svn path=/nixpkgs/trunk/; revision=33134
2012-03-16 02:05:38 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Sander van der Burg a315685cd8 Added pgfplots package
svn path=/nixpkgs/trunk/; revision=33067
2012-03-14 17:05:21 +00:00
Shea Levy afd3664d9f cdrkit: Bump version, apply efi-boot patch from fedora to enable creating efi-bootable cdrs
svn path=/nixpkgs/trunk/; revision=33055
2012-03-14 00:44:14 +00:00
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