1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Commit graph

10174 commits

Author SHA1 Message Date
Yury G. Kudryashov 796ffd9f71 Move "fetchurl restricted" code to requireFile.
This reverts r21474 and r21467.
Also migrate wtk (r21472) to new API.

svn path=/nixpkgs/trunk/; revision=21575
2010-05-03 09:13:17 +00:00
Yury G. Kudryashov 2d9ba975e7 digikam: use external lensfun and lqr-1
svn path=/nixpkgs/trunk/; revision=21561
2010-05-03 03:45:58 +00:00
Yury G. Kudryashov 83f4846c49 Add lensfun library
svn path=/nixpkgs/trunk/; revision=21560
2010-05-03 03:45:52 +00:00
Yury G. Kudryashov 19cc1226d4 Add liblqr-1
svn path=/nixpkgs/trunk/; revision=21559
2010-05-03 03:45:47 +00:00
Yury G. Kudryashov d8c07cc4d6 Add catdoc
svn path=/nixpkgs/trunk/; revision=21558
2010-05-03 03:45:40 +00:00
Ludovic Courtès 17a3bcd4d6 Add GNU FreeDink.
svn path=/nixpkgs/trunk/; revision=21555
2010-05-02 09:27:51 +00:00
Ludovic Courtès 61ec7e828d Add SDL_gfx.
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21554
2010-05-02 09:27:45 +00:00
Ludovic Courtès 8da4605505 GCC 4.5: Remove redundant `--disable-multilib'.
svn path=/nixpkgs/trunk/; revision=21553
2010-05-02 09:27:39 +00:00
Ludovic Courtès 8298738364 Add GNU Parallel.
svn path=/nixpkgs/trunk/; revision=21552
2010-05-02 09:27:32 +00:00
Lluís Batlle i Rossell 357e3ce108 Breaking a dependency of zefc on ghc. Trying to get tahoelafs built on armv5tel-linux
svn path=/nixpkgs/trunk/; revision=21550
2010-05-01 20:54:27 +00:00
Andres Löh 3c6f04e08e Commented on the current decision on recurseIntoAttrs for haskellPackages.
svn path=/nixpkgs/trunk/; revision=21478
2010-05-01 11:23:39 +00:00
Lluís Batlle i Rossell 103f51c4da Making the latest haskell expressions appear on 'nix-env -qa'.
More than one person had trouble not finding ghc 6.12 on 'nix-env -qa '*''

svn path=/nixpkgs/trunk/; revision=21477
2010-05-01 10:55:05 +00:00
Lluís Batlle i Rossell b14e71be03 Updating irssi
svn path=/nixpkgs/trunk/; revision=21476
2010-05-01 10:33:00 +00:00
Yury G. Kudryashov 0b11f22f49 Trying to fix virtuoso build on freebsd
svn path=/nixpkgs/trunk/; revision=21475
2010-05-01 07:41:40 +00:00
Yury G. Kudryashov 3e1e56e10c fetchurl restricted: list nix-prefetch-url as well
svn path=/nixpkgs/trunk/; revision=21474
2010-05-01 07:07:36 +00:00
Yury G. Kudryashov bf92619681 Upgrade virtuoso to 6.1.1
svn path=/nixpkgs/trunk/; revision=21473
2010-05-01 07:07:31 +00:00
Yury G. Kudryashov c43dbd671e Migrate wtk to new "restricted downloads" feature of fetchurl
svn path=/nixpkgs/trunk/; revision=21472
2010-05-01 07:07:25 +00:00
Lluís Batlle i Rossell 1ae5a63425 Fixing the yasm 'name'
svn path=/nixpkgs/trunk/; revision=21471
2010-04-30 22:25:25 +00:00
Lluís Batlle i Rossell 1215f3a7a4 Adding yasm, and making x264 and xvid codecs be compiled with their assembly code
svn path=/nixpkgs/trunk/; revision=21470
2010-04-30 21:58:47 +00:00
Lluís Batlle i Rossell b3870f0148 Adding xvid, to ffmpeg and mplayer.
svn path=/nixpkgs/trunk/; revision=21469
2010-04-30 21:47:09 +00:00
Lluís Batlle i Rossell fe7945b7fb Adding rtmpdump
svn path=/nixpkgs/trunk/; revision=21468
2010-04-30 21:46:55 +00:00
Yury G. Kudryashov 404c314412 Add support for restricted downloads
svn path=/nixpkgs/trunk/; revision=21467
2010-04-30 20:40:42 +00:00
Yury G. Kudryashov cc0b0b1c69 Add openssl1 back (but don't remove 0.9.8n)
svn path=/nixpkgs/trunk/; revision=21466
2010-04-30 20:40:33 +00:00
Yury G. Kudryashov 4ba1c06c89 Support nepomuk and marble in digikam.
Also stop passing lib.

svn path=/nixpkgs/trunk/; revision=21465
2010-04-30 20:40:11 +00:00
Yury G. Kudryashov 8137966874 Upgrade samba
Also add symlink for CUPS

svn path=/nixpkgs/trunk/; revision=21464
2010-04-30 20:39:54 +00:00
Lluís Batlle i Rossell fa6c22b5c6 Adding the expressions for gcc 4.5 for cross building.
Although I still have set gcc 4.4 for that, I tested with the 4.5 expression
and it cross built perfectly bison for the sheevaplug.

svn path=/nixpkgs/trunk/; revision=21463
2010-04-30 19:12:59 +00:00
Peter Simons 52884c145f pkgs/tools/misc/most/default.nix: added license tag (GPLv2)
svn path=/nixpkgs/trunk/; revision=21461
2010-04-30 16:06:01 +00:00
Peter Simons d4221fa80a pkgs/tools/misc/most/default.nix: cosmetic changes
svn path=/nixpkgs/trunk/; revision=21460
2010-04-30 16:05:55 +00:00
Lluís Batlle i Rossell 32b7ecf0d9 Adding more dependencies to mlt (for more features)
svn path=/nixpkgs/trunk/; revision=21459
2010-04-30 13:12:12 +00:00
Lluís Batlle i Rossell a386398be6 Adding kdenlive, and as a side effect, mlt.
Kdenlive looks for some binaries in PATH, so some dependencies may be fulfilled
not by kdenlive nix expression.

svn path=/nixpkgs/trunk/; revision=21458
2010-04-30 13:12:07 +00:00
Peter Simons 2cd7033243 pkgs/tools/text/source-highlight: added GNU source highlight version 3.1.3
svn path=/nixpkgs/trunk/; revision=21457
2010-04-30 12:23:26 +00:00
Peter Simons 06f51c6e05 pkgs/applications/misc/ikiwiki: added build input PerlMagick
Without ImageMagick support, Ikiwiki cannot handle images.

svn path=/nixpkgs/trunk/; revision=21456
2010-04-30 10:49:43 +00:00
Peter Simons ccf9a368b3 pkgs/top-level/perl-packages.nix: added PerlMagick, a perl API to ImageMagick
Unfortunately, the test suite had to be disabled because it assumes that
ImageMagick has been built with any and all extensions, i.e. WMF support
and whatnot else, and if it isn't, then the suite reports that as a
failure.

svn path=/nixpkgs/trunk/; revision=21455
2010-04-30 10:49:39 +00:00
Peter Simons 5139e564fa pkgs/applications/graphics/ImageMagick: added build input jasper for jpeg-2000 support
While I was at it, I also rewrote the expression to get along without
using the deprecated "args: with args;" style.

svn path=/nixpkgs/trunk/; revision=21454
2010-04-30 10:49:33 +00:00
Lluís Batlle i Rossell 376895d34c Fixing the nixpkgs tarball build: I used 'stdenv.bash', where I should use 'stdenv.shell'.
svn path=/nixpkgs/trunk/; revision=21453
2010-04-30 10:47:53 +00:00
Peter Simons c82a9c8e10 pkgs/tools/misc/most: added version 5.0.0
Build instructions courtesy of Tim Horton <tmhorton@gmail.com>.

svn path=/nixpkgs/trunk/; revision=21452
2010-04-30 09:21:18 +00:00
Lluís Batlle i Rossell 7b6ce0f9df Updating x264, and adding x264 support to mplayer and ffmpeg.
svn path=/nixpkgs/trunk/; revision=21451
2010-04-30 08:33:47 +00:00
Peter Simons 9b48c69f85 pkgs/top-level/release.nix: enable haskellPlatform2010100 on Darwin
svn path=/nixpkgs/trunk/; revision=21447
2010-04-29 21:41:38 +00:00
Peter Simons 290bdb470a pkgs/top-level/release.nix: drop trailing white space
svn path=/nixpkgs/trunk/; revision=21446
2010-04-29 21:41:33 +00:00
Peter Simons 995a603ec9 pkgs/top-level/release.nix: enable haskellPackages_ghc6104.haskellPlatform on Darwin
I'm pretty sure that the OpenGL/Mesa errors on Darwin have been fixed. I didn't
personally verify that this particular haskellPlatform version builds, though, I
just built the very latest version with GHC 6.12.2, albeit successfully. If it
so happens that this change reveals any further unexpected problems on MacOS X,
please let me know about it.

svn path=/nixpkgs/trunk/; revision=21445
2010-04-29 21:41:28 +00:00
Lluís Batlle i Rossell fa2177ed5c Making filelight built by hydra (I added the platforms meta attribute)
svn path=/nixpkgs/trunk/; revision=21444
2010-04-29 21:32:01 +00:00
Lluís Batlle i Rossell f85992530f Adding meta information to kdiff3 so it gets built by hydra
svn path=/nixpkgs/trunk/; revision=21443
2010-04-29 21:31:35 +00:00
Yury G. Kudryashov 54224374cc Delete unused builder.sh
svn path=/nixpkgs/trunk/; revision=21441
2010-04-29 19:09:33 +00:00
Lluís Batlle i Rossell cf5343a07d Adding the logrotate I found in the freebsd ports.
I think that is what debian, fedora and freebsd call 'logrotate'.

svn path=/nixpkgs/trunk/; revision=21437
2010-04-29 17:55:06 +00:00
Lluís Batlle i Rossell 060714f287 Adding mtdutils
svn path=/nixpkgs/trunk/; revision=21436
2010-04-29 17:54:51 +00:00
Andres Löh b3224edee3 Updated the expression for EHC/UHC.
This is not yet properly tested, but it should be an improvement over
what was there before ...

svn path=/nixpkgs/trunk/; revision=21435
2010-04-29 17:35:09 +00:00
Andres Löh 7d2ae46bce Add missing binaries to the GHC wrapper.
svn path=/nixpkgs/trunk/; revision=21434
2010-04-29 17:35:05 +00:00
Peter Simons 170b98be32 pkgs/top-level/haskell-packages.nix: drop trailing white space
svn path=/nixpkgs/trunk/; revision=21433
2010-04-29 15:08:28 +00:00
Peter Simons 0a87f7f706 pkgs/top-level/all-packages.nix: disable libdrm on Darwin platforms
libdrm doesn't build on Darwin and, according to the Xorg developers, isn't
supposed to be built.

This change fixes the build of haskell-platform-ghc6.12.2-2010.1.0.0 on Darwin.

svn path=/nixpkgs/trunk/; revision=21432
2010-04-29 14:57:23 +00:00
Peter Simons 5d63995485 pkgs/development/libraries/freeglut/default.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21431
2010-04-29 14:57:17 +00:00
Peter Simons 7d0cd3dbb7 pkgs/development/libraries/freeglut: disable building with "-Wall -Werror" on Darwin
The build generates warnings on MacOS X because of unused variables, and we
don't want those trivial problems to lead to a build failure.

svn path=/nixpkgs/trunk/; revision=21430
2010-04-29 14:57:13 +00:00
Peter Simons 8ccc115606 pkgs/development/libraries/mesa: disable build of egl library on Darwin
The egl library doesn't seem to work, i.e. the included demo program has
undefined symbols after linking with it.

svn path=/nixpkgs/trunk/; revision=21429
2010-04-29 14:57:07 +00:00
Peter Simons 5c43115185 pkgs/development/libraries/mesa/default.nix: drop trailing white space
svn path=/nixpkgs/trunk/; revision=21428
2010-04-29 14:57:02 +00:00
Peter Simons 56ce7f2ae6 pkgs/development/libraries/mesa: pass lipo utility to this build on Darwin
svn path=/nixpkgs/trunk/; revision=21427
2010-04-29 14:56:52 +00:00
Peter Simons 85b7c134cb pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility
svn path=/nixpkgs/trunk/; revision=21426
2010-04-29 14:56:44 +00:00
Peter Simons 5e8a97a831 pkgs/top-level/all-packages.nix: added RPC-XML support to ikiwiki
This is required for the 'rst' plugin and for non-perl plugin support in
general.

svn path=/nixpkgs/trunk/; revision=21421
2010-04-29 09:35:20 +00:00
Peter Simons d2160c4ad0 pkgs/top-level/perl-packages.nix: added RPC-XML-0.73
svn path=/nixpkgs/trunk/; revision=21420
2010-04-29 09:35:16 +00:00
Peter Simons 325efe1b5e pkgs/top-level/perl-packages.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21419
2010-04-29 09:35:12 +00:00
Peter Simons a20694d004 pkgs/applications/misc/ikiwiki: renamed package from ikiwiki_3.20100427 to ikiwiki-3.20100427 to make it conform with Nix conventions
svn path=/nixpkgs/trunk/; revision=21418
2010-04-29 09:35:09 +00:00
Peter Simons 411b6600ba pkgs/applications/misc/ikiwiki: dropped unnecessary empty line in shell code
svn path=/nixpkgs/trunk/; revision=21417
2010-04-29 09:35:05 +00:00
Peter Simons 68d6efe22c pkgs/top-level/all-packages.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21416
2010-04-29 08:54:02 +00:00
Peter Simons d22b66cffc pkgs/top-level/all-packages.nix: added ikiwiki.{git,monotone} options to $NIXPKGS_CONFIG
Set "ikiwiki = { git = true; monotone = true; };" in $NIXPKGS_CONFIG to
enable support for git and monotone in ikiwiki. If left unconfigured,
the default is to include support for git, but not for monotone.

svn path=/nixpkgs/trunk/; revision=21415
2010-04-29 08:53:58 +00:00
Peter Simons 74e8f87d00 pkgs/applications/misc/ikiwiki: bumped to version 3.20100427
svn path=/nixpkgs/trunk/; revision=21414
2010-04-29 08:53:52 +00:00
Peter Simons 410536177b pkgs/applications/misc/ikiwiki: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21413
2010-04-29 08:53:43 +00:00
Rob Vermaas 69bfabd328 re-enabled darwin patch, gcc-darwin does not support -arch flag
svn path=/nixpkgs/trunk/; revision=21412
2010-04-29 08:19:13 +00:00
Marc Weber 8a79919093 fix flash player debug build
svn path=/nixpkgs/trunk/; revision=21411
2010-04-28 20:02:40 +00:00
Lluís Batlle i Rossell e5ce3e5c8c Revert "OpenSSL-1.0.0" changes, due to the new API breaking too much packages, which still have
not released new versions compatible with openssl 1.0.0

I downgraded to 0.9.8n, that also has the security hole fix.

svn path=/nixpkgs/trunk/; revision=21408
2010-04-28 15:01:06 +00:00
Lluís Batlle i Rossell 6b8de64183 Revert "Install libraries to $out/lib instead of $out/lib64"
This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2.

svn path=/nixpkgs/trunk/; revision=21407
2010-04-28 15:01:02 +00:00
Ludovic Courtès 5929f9d3bd GCC 4.5.0.
svn path=/nixpkgs/trunk/; revision=21403
2010-04-28 12:37:11 +00:00
Ludovic Courtès 0df57866a6 pam_login: Really apply `sys-stat-h.patch'.
svn path=/nixpkgs/trunk/; revision=21402
2010-04-28 12:37:06 +00:00
Ludovic Courtès 689914a5b2 update-gcc.sh: Add support for Ada.
svn path=/nixpkgs/trunk/; revision=21401
2010-04-28 12:37:02 +00:00
Ludovic Courtès a2bd7f82d7 Add libelf.
svn path=/nixpkgs/trunk/; revision=21400
2010-04-28 12:36:58 +00:00
Ludovic Courtès 7c038cdc06 Add MPC.
svn path=/nixpkgs/trunk/; revision=21399
2010-04-28 12:36:53 +00:00
Lluís Batlle i Rossell 3fe67eca31 Updating wxGTK 2.8
svn path=/nixpkgs/trunk/; revision=21398
2010-04-28 10:09:40 +00:00
Yury G. Kudryashov 8a1dd10d81 samba: make kerberos optional
svn path=/nixpkgs/trunk/; revision=21397
2010-04-28 09:39:01 +00:00
Yury G. Kudryashov 0089b865e9 Upgrade to heimdal-1.3.2
svn path=/nixpkgs/trunk/; revision=21396
2010-04-28 09:38:55 +00:00
Yury G. Kudryashov 882c847590 enable neon version check in svn
svn path=/nixpkgs/trunk/; revision=21395
2010-04-28 09:38:46 +00:00
Yury G. Kudryashov b7151c4e2c Add neon-0.29.x, make it default
Also stop using "default" neon in all-packages.nix.
Minor versions are not source-compatible, so a package should state needed version explicitly.

svn path=/nixpkgs/trunk/; revision=21394
2010-04-28 08:40:19 +00:00
Yury G. Kudryashov d5601ee60e Install libraries to $out/lib instead of $out/lib64
This should fix a lot of builds

svn path=/nixpkgs/trunk/; revision=21393
2010-04-28 08:40:12 +00:00
Yury G. Kudryashov 415f0fdc9f Also fix neon-0.26 build
svn path=/nixpkgs/trunk/; revision=21392
2010-04-27 22:05:00 +00:00
Yury G. Kudryashov 293cde6747 Fix neon build
Use pkg-config to find openssl

svn path=/nixpkgs/trunk/; revision=21391
2010-04-27 21:54:38 +00:00
Andres Löh f892a8efaa Darcs updated to 2.4.1; now ghc-6.12-compatible.
svn path=/nixpkgs/trunk/; revision=21355
2010-04-27 19:51:37 +00:00
Yury G. Kudryashov 375900a6e7 Add comment, use the patch for darwin
svn path=/nixpkgs/trunk/; revision=21354
2010-04-27 19:05:43 +00:00
Marc Weber ae8d4501b6 adding maybeEnv. This will replace from-env.nix in nixos and will be reused in copySystemConfiguration
svn path=/nixpkgs/trunk/; revision=21353
2010-04-27 18:44:23 +00:00
Yury G. Kudryashov d2b3e548a1 OpenSSL-1.0.0
Big rebuild (though not stdenv-update). Security update, do not revert, please.

svn path=/nixpkgs/trunk/; revision=21352
2010-04-27 18:39:00 +00:00
Andres Löh 932b3d3b79 Some cleanup regarding GHC and profiling support.
svn path=/nixpkgs/trunk/; revision=21351
2010-04-27 18:21:07 +00:00
Andres Löh 8a036d8eb1 Library profiling for cabal packages can now be enabled via a config option.
svn path=/nixpkgs/trunk/; revision=21350
2010-04-27 16:35:01 +00:00
Andres Löh 1db4053fcc Added profiling option to cabal generic builder.
svn path=/nixpkgs/trunk/; revision=21349
2010-04-27 16:34:56 +00:00
Andres Löh 5623a59669 Haskell Platform 2010.1.0.0 low priority until ghc-6.12 becomes default.
svn path=/nixpkgs/trunk/; revision=21348
2010-04-27 14:55:31 +00:00
Armijn Hemel 311dc9299e update to 8.99
svn path=/nixpkgs/trunk/; revision=21347
2010-04-27 14:42:49 +00:00
Eelco Dolstra 18849f0f24 * `--exec-prefix=$out/bin' causes programs to be installed in
$out/bin/bin and $out/bin/sbin, which breaks NixOS (see
  e.g. http://hydra.nixos.org/build/380092).

svn path=/nixpkgs/trunk/; revision=21339
2010-04-27 10:46:41 +00:00
Eelco Dolstra 68d9e26bcb * Linux 2.6.32.12, 2.6.33.3.
svn path=/nixpkgs/trunk/; revision=21338
2010-04-27 09:52:36 +00:00
Ludovic Courtès 76b699eb22 pam_login: Fix build on recent glibc.
svn path=/nixpkgs/trunk/; revision=21337
2010-04-27 09:43:26 +00:00
Ludovic Courtès 7802763b45 Linux nfs-utils 1.2.2.
svn path=/nixpkgs/trunk/; revision=21336
2010-04-27 09:43:22 +00:00
Marc Weber 9ae4b8b11c wpa_supplicant: enable qt gui, deprecate old broken derivation building gui
svn path=/nixpkgs/trunk/; revision=21332
2010-04-27 04:38:41 +00:00
Andres Löh 8bf3f76256 Let GHC wrapper inherit meta from the wrapped expression.
svn path=/nixpkgs/trunk/; revision=21330
2010-04-26 20:39:51 +00:00
Yury G. Kudryashov a4842e0987 Really add policykit support to kdebase-workspace
svn path=/nixpkgs/trunk/; revision=21329
2010-04-26 20:39:08 +00:00
Armijn Hemel de5c9fd9bc update to 1.0.6
svn path=/nixpkgs/trunk/; revision=21328
2010-04-26 20:06:00 +00:00
Eelco Dolstra a011b43d1f * Reverted r21314 because it causes all of Nixpkgs on Linux to be
rebuilt.  Not sure why though.  Maybe "isLinux" is not set in the
  bootstrap stdenv.

svn path=/nixpkgs/trunk/; revision=21327
2010-04-26 18:36:53 +00:00
Ludovic Courtès fff97995f3 pwdutils: Fix compilation with recent glibc.
svn path=/nixpkgs/trunk/; revision=21318
2010-04-26 09:30:53 +00:00