Commit graph

2185 commits

Author SHA1 Message Date
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
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
Eelco Dolstra
a3da139c73 * Remove ext3cow, it's dead.
svn path=/nixpkgs/trunk/; revision=32340
2012-02-16 19:30:41 +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
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
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
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
Peter Simons
febe726020 duplicity: updated to version 0.6.17
svn path=/nixpkgs/trunk/; revision=32086
2012-02-06 19:45:18 +00:00
Michael Raskin
bc851612c9 A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build
svn path=/nixpkgs/trunk/; revision=32046
2012-02-06 05:49:27 +00:00
Yury G. Kudryashov
33f14fc3cf enblend-enfuse-4.0
svn path=/nixpkgs/trunk/; revision=32037
2012-02-05 09:26:06 +00:00
Arie Middelkoop
3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11.
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
2012-02-05 00:51:35 +00:00
Peter Simons
60c8201514 analog: install images directory, too
svn path=/nixpkgs/trunk/; revision=32030
2012-02-04 10:48:48 +00:00
Peter Simons
282449afe8 analog: added version 6.0
svn path=/nixpkgs/trunk/; revision=32029
2012-02-04 10:32:07 +00:00
Peter Simons
b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy.
svn path=/nixpkgs/trunk/; revision=32028
2012-02-04 09:31:07 +00:00
Peter Simons
dbafd99a0a Moved python debugger into development/tools hierarchy.
svn path=/nixpkgs/trunk/; revision=32027
2012-02-04 09:30:53 +00:00
Yury G. Kudryashov
75262bcbed zip, unzip: add NLS support
svn path=/nixpkgs/trunk/; revision=31961
2012-02-01 22:32:16 +00:00
Florian Friesdorf
bf95f7fa3c Revert "sudo upgrade to 1.8.3p2 (security fix included)"
before was 1.7.2, which is not affected

svn path=/nixpkgs/trunk/; revision=31944
2012-01-31 14:09:54 +00:00
Florian Friesdorf
8565aba2cd sudo upgrade to 1.8.3p2 (security fix included)
svn path=/nixpkgs/trunk/; revision=31943
2012-01-31 13:49:53 +00:00
Eelco Dolstra
4fe11e8438 * OpenSSH updated to 5.9p1.
svn path=/nixpkgs/trunk/; revision=31939
2012-01-31 11:01:12 +00:00