philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

4699 commits

Author SHA1 Message Date
Shea Levy c497c19c46 openjre: Call the derivation openjre instead of openjdk 
svn path=/nixpkgs/trunk/; revision=28118
 2011-08-01 18:48:10 +00:00
Shea Levy 02083734d1 Add openjre 
svn path=/nixpkgs/trunk/; revision=28117
 2011-08-01 18:48:01 +00:00
Shea Levy 9023f52855 openjdk: Don't delete src.zip, it comes with the binary distribution too 
svn path=/nixpkgs/trunk/; revision=28115
 2011-08-01 17:51:59 +00:00
Eelco Dolstra c64cd58c95 * D-Bus updated to 1.4.14. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28114
 2011-08-01 14:35:31 +00:00
Eelco Dolstra 444263db25 * ffmpeg updated to 0.8.1 (including security fixes). 
svn path=/nixpkgs/branches/kde-4.7/; revision=28109
 2011-08-01 12:01:09 +00:00
Shea Levy 6a74987ad4 openjdk: Fix mistakenly erased square bracket 
Not sure how that happend...

svn path=/nixpkgs/trunk/; revision=28100
 2011-08-01 02:59:22 +00:00
Shea Levy 84529a1370 openjdk: Add meta attributes 
svn path=/nixpkgs/trunk/; revision=28099
 2011-08-01 01:17:42 +00:00
Shea Levy 31b09ab695 openjdk: Install build results to $out 
svn path=/nixpkgs/trunk/; revision=28098
 2011-08-01 01:17:33 +00:00
Shea Levy 572edb6f68 openjdk: Add patch to fix 'printf: --: invalid option' error 
Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix

svn path=/nixpkgs/trunk/; revision=28097
 2011-08-01 01:17:25 +00:00
Shea Levy 43cb8fb149 openjdk: Add cpio to buildInputs 
svn path=/nixpkgs/trunk/; revision=28096
 2011-08-01 01:17:16 +00:00
Shea Levy ec41a120fb openjdk: Add patch to avoid an empty -I flag 
svn path=/nixpkgs/trunk/; revision=28095
 2011-08-01 01:17:08 +00:00
Shea Levy 0e9cda68fc openjdk: Fix an Xrender.h include 
svn path=/nixpkgs/trunk/; revision=28094
 2011-08-01 01:16:59 +00:00
Shea Levy c6cf3e563e Add libXi to buildInputs 
svn path=/nixpkgs/trunk/; revision=28093
 2011-08-01 01:16:50 +00:00
Shea Levy 09567b5caf Add libXtst to buildInputs 
svn path=/nixpkgs/trunk/; revision=28092
 2011-08-01 01:16:42 +00:00
Shea Levy e2f7b2087c Add libXrender to buildInputs 
svn path=/nixpkgs/trunk/; revision=28091
 2011-08-01 01:16:35 +00:00
Shea Levy fb896f62dd Add libXext to buildInputs 
svn path=/nixpkgs/trunk/; revision=28090
 2011-08-01 01:16:27 +00:00
Shea Levy 6ce3f32da2 Add libXt to buildInputs 
svn path=/nixpkgs/trunk/; revision=28089
 2011-08-01 01:16:19 +00:00
Shea Levy 2e0252011d Add libX11 to buildInputs 
svn path=/nixpkgs/trunk/; revision=28088
 2011-08-01 01:16:10 +00:00
Shea Levy 9e06eb71d6 Add alsaLib to buildInputs 
svn path=/nixpkgs/trunk/; revision=28087
 2011-08-01 01:16:02 +00:00
Shea Levy e052a36daf openjdk: Use the /bin/echo sed on the corba makefiles too 
svn path=/nixpkgs/trunk/; revision=28086
 2011-08-01 01:15:53 +00:00
Shea Levy 635dd9aac5 openjdk: Combine two seds into one 
svn path=/nixpkgs/trunk/; revision=28085
 2011-08-01 01:15:45 +00:00
Shea Levy f70d3b72df openjdk: We need ECHO to be echo -e, so replace the override with a sed 
svn path=/nixpkgs/trunk/; revision=28084
 2011-08-01 01:15:37 +00:00
Shea Levy 5fca670490 openjdk: Use makeFlags properly 
svn path=/nixpkgs/trunk/; revision=28083
 2011-08-01 01:15:29 +00:00
Shea Levy 58d64db27d openjdk: Override hardcoded sort. It doesn't use any of the _PATH variables on linux 
svn path=/nixpkgs/trunk/; revision=28082
 2011-08-01 01:15:21 +00:00
Shea Levy 465a320b20 openjdk: Remove unneeded explicit dependencies 
svn path=/nixpkgs/trunk/; revision=28081
 2011-08-01 01:15:13 +00:00
Shea Levy d0fe9fa2e8 openjdk: Remove all hardcoded binary overrides except echo 
svn path=/nixpkgs/trunk/; revision=28080
 2011-08-01 01:15:05 +00:00
Shea Levy a0022251d9 openjdk: Override hardcoded echo again. It doesn't use any of the _PATH variables on linux 
svn path=/nixpkgs/trunk/; revision=28079
 2011-08-01 01:14:57 +00:00
Shea Levy cdc12ac64a openjdk: Add nettools to buildInputs 
svn path=/nixpkgs/trunk/; revision=28078
 2011-08-01 01:14:49 +00:00
Shea Levy 29c72c4499 openjdk: Override UNIXCOMMAND_PATH so those binaries are found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec 
svn path=/nixpkgs/trunk/; revision=28077
 2011-08-01 01:14:41 +00:00
Shea Levy 0f257e1d5d openjdk: Remove all coreutils overrides so they can be found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec 
svn path=/nixpkgs/trunk/; revision=28076
 2011-08-01 01:14:33 +00:00
Shea Levy 693dc6536b openjdk: Replace dummy paths with empty path so the build uses the binaries in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec 
svn path=/nixpkgs/trunk/; revision=28075
 2011-08-01 01:14:25 +00:00
Shea Levy 49be6e4ed6 openjdk: Override hardcode to ln 
svn path=/nixpkgs/trunk/; revision=28074
 2011-08-01 01:14:17 +00:00
Shea Levy b65c19f18b openjdk: Override hardcode to readelf 
svn path=/nixpkgs/trunk/; revision=28073
 2011-08-01 01:14:09 +00:00
Shea Levy 8cf5de2fd4 openjdk: Override hardcodes to nm and ldd 
svn path=/nixpkgs/trunk/; revision=28072
 2011-08-01 01:14:00 +00:00
Shea Levy dff2d2b06f openjdk: Override hardcode to mv 
svn path=/nixpkgs/trunk/; revision=28071
 2011-08-01 01:13:52 +00:00
Shea Levy 1eb55ce743 openjdk: Fix hardcode to /bin/ls 
svn path=/nixpkgs/trunk/; revision=28070
 2011-08-01 01:13:44 +00:00
Shea Levy ddd7cc3fd2 openjdk: Fix hardcode to /usr/bin/test 
svn path=/nixpkgs/trunk/; revision=28069
 2011-08-01 01:13:36 +00:00
Shea Levy 0603a5d356 openjdk: Allow downloads of source 'drops' during build 
svn path=/nixpkgs/trunk/; revision=28068
 2011-08-01 01:13:27 +00:00
Shea Levy 482daa3afd openjdk: Add zip to buildInputs 
svn path=/nixpkgs/trunk/; revision=28067
 2011-08-01 01:13:19 +00:00
Shea Levy 2731048017 openjdk: Override hardcoded chmod 
svn path=/nixpkgs/trunk/; revision=28066
 2011-08-01 01:13:11 +00:00
Shea Levy b722db6adb openjdk: Override hardcoded cp 
svn path=/nixpkgs/trunk/; revision=28065
 2011-08-01 01:13:02 +00:00
Shea Levy 735366584a openjdk: Override hardcoded touch 
svn path=/nixpkgs/trunk/; revision=28064
 2011-08-01 01:12:54 +00:00
Shea Levy 5054c8e8bb openjdk: Override hardcoded find 
svn path=/nixpkgs/trunk/; revision=28063
 2011-08-01 01:12:44 +00:00
Shea Levy 40d1bd9950 openjdk: Replace substitutions with env vars 
svn path=/nixpkgs/trunk/; revision=28062
 2011-08-01 01:12:36 +00:00
Shea Levy b1b5b09557 openjdk: Add bootstrap JDK 
svn path=/nixpkgs/trunk/; revision=28061
 2011-08-01 01:12:28 +00:00
Shea Levy 75918e6537 openjdk: add 'which' to buildInputs 
svn path=/nixpkgs/trunk/; revision=28060
 2011-08-01 01:12:19 +00:00
Shea Levy 82d11e742c openjdk: Override hardcoded printf 
svn path=/nixpkgs/trunk/; revision=28059
 2011-08-01 01:12:12 +00:00
Shea Levy 706a7ff59d openjdk: Override hardcoded gawk 
svn path=/nixpkgs/trunk/; revision=28058
 2011-08-01 01:12:04 +00:00
Shea Levy 374eb5688e openjdk: Set dummy /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec variables 
svn path=/nixpkgs/trunk/; revision=28057
 2011-08-01 01:11:56 +00:00
Shea Levy a156ccd763 openjdk: Fix ALSA_INCLUDE variable 
svn path=/nixpkgs/trunk/; revision=28056
 2011-08-01 01:11:48 +00:00
Shea Levy ac6fb72ab1 openjdk: Override hardcoded cups headers path 
svn path=/nixpkgs/trunk/; revision=28055
 2011-08-01 01:11:40 +00:00
Shea Levy fa80adbe2a openjdk: Use proper milestone and build_number strings 
svn path=/nixpkgs/trunk/; revision=28054
 2011-08-01 01:11:32 +00:00
Shea Levy 08fe49fbb4 openjdk: Override hardcoded cat 
svn path=/nixpkgs/trunk/; revision=28053
 2011-08-01 01:11:24 +00:00
Shea Levy ed9837c37c openjdk: Override hardcoded freetype library path 
svn path=/nixpkgs/trunk/; revision=28052
 2011-08-01 01:11:17 +00:00
Shea Levy d5eec4cd11 openjdk: Override hardcoded freetype headers 
svn path=/nixpkgs/trunk/; revision=28051
 2011-08-01 01:11:09 +00:00
Shea Levy 38c1179f56 openjdk: Override hardcoded zip 
svn path=/nixpkgs/trunk/; revision=28046
 2011-08-01 01:10:28 +00:00
Shea Levy 6795da6837 Rearrange program inputs 
svn path=/nixpkgs/trunk/; revision=28045
 2011-08-01 01:10:16 +00:00
Shea Levy 52582a9b45 openjdk: Add ant to buildInputs 
svn path=/nixpkgs/trunk/; revision=28044
 2011-08-01 01:10:08 +00:00
Shea Levy 17c2fb730e openjdk: Override hardcoded head 
svn path=/nixpkgs/trunk/; revision=28043
 2011-08-01 01:10:01 +00:00
Shea Levy 27112e7233 openjdk: Override hardcoded alsa headers 
svn path=/nixpkgs/trunk/; revision=28042
 2011-08-01 01:09:53 +00:00
Shea Levy e3ebf2024a openjdk: Fix hardcoded sed 
svn path=/nixpkgs/trunk/; revision=28041
 2011-08-01 01:09:45 +00:00
Shea Levy 0734d0315e openjdk: Override hardcoded egrep 
svn path=/nixpkgs/trunk/; revision=28040
 2011-08-01 01:09:38 +00:00
Shea Levy 8286d4df8d openjdk: Override hardcoded tr 
svn path=/nixpkgs/trunk/; revision=28039
 2011-08-01 01:09:30 +00:00
Shea Levy 027595d6b0 openjdk: Override hardcoded pwd 
svn path=/nixpkgs/trunk/; revision=28038
 2011-08-01 01:09:22 +00:00
Shea Levy 39bea03827 openjdk: Override hardcoded date 
svn path=/nixpkgs/trunk/; revision=28037
 2011-08-01 01:09:14 +00:00
Shea Levy eceec04a44 openjdk: Override hardcoded grep 
svn path=/nixpkgs/trunk/; revision=28036
 2011-08-01 01:09:06 +00:00
Shea Levy b3ab977d90 openjdk: Factor path overrides out into makeFlags 
svn path=/nixpkgs/trunk/; revision=28035
 2011-08-01 01:08:58 +00:00
Shea Levy 146d6875b3 openjdk: Fix hardcoded gcc 
svn path=/nixpkgs/trunk/; revision=28034
 2011-08-01 01:08:49 +00:00
Shea Levy 057e36e2f7 openjdk: Override hard-coded mkdir 
svn path=/nixpkgs/trunk/; revision=28033
 2011-08-01 01:08:40 +00:00
Shea Levy 3439ac32bf openjdk: Fix some formatting 
svn path=/nixpkgs/trunk/; revision=28032
 2011-08-01 01:08:32 +00:00
Shea Levy d46390e7d2 openjdk: Add sanity check 
svn path=/nixpkgs/trunk/; revision=28031
 2011-08-01 01:08:23 +00:00
Shea Levy 686476b7bb openjdk: Fix hard-code to echo 
svn path=/nixpkgs/trunk/; revision=28030
 2011-08-01 01:08:15 +00:00
Shea Levy 11f0ca9320 openjdk: Add 'free' to $PATH for the build 
svn path=/nixpkgs/trunk/; revision=28029
 2011-08-01 01:08:07 +00:00
Shea Levy 23e378a3c4 *openjdk: Get source to unpack 
svn path=/nixpkgs/trunk/; revision=28028
 2011-08-01 01:07:58 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc. 
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Peter Simons fc5ea05cfd Keep polyparse 1.4 around because haskell-graphviz depends on the older version. 
I've asked upstream to update their cabal file, but until then we'll
need both versions. :-(

svn path=/nixpkgs/trunk/; revision=28021
 2011-07-31 15:33:55 +00:00
Cillian de Roiste 4cc923b4bb Fixing the download url 
svn path=/nixpkgs/trunk/; revision=28015
 2011-07-31 08:56:09 +00:00
Cillian de Roiste 0942a5b164 Updating node to 0.5.2 
svn path=/nixpkgs/trunk/; revision=28014
 2011-07-31 08:49:03 +00:00
Peter Simons 10f65d1148 HaXml: added version 1.22.2 
It's not the default, though, because it breaks API compatibility
with earlier versions.

svn path=/nixpkgs/trunk/; revision=28013
 2011-07-30 21:43:47 +00:00
Peter Simons 4aca0cf217 haskell-polyparse: updated to version 1.7 
svn path=/nixpkgs/trunk/; revision=28012
 2011-07-30 21:43:39 +00:00
Eelco Dolstra f966079e30 * Eigen updated to 2.0.16 
svn path=/nixpkgs/branches/kde-4.7/; revision=28004
 2011-07-29 16:05:25 +00:00
Eelco Dolstra 4c05eb6e2e svn path=/nixpkgs/branches/kde-4.7/; revision=27996 2011-07-29 08:45:58 +00:00
Shea Levy 2c17fb436b Copy openjdk-darwin as a starting point for openjdk7 
svn path=/nixpkgs/trunk/; revision=27992
 2011-07-28 18:53:12 +00:00
Eelco Dolstra 35781b1bf3 * Cmake 2.8.5 doesn't build on i686-linux 
(http://hydra.nixos.org/build/1181148), so revert to 2.8.4 for now.

svn path=/nixpkgs/branches/kde-4.7/; revision=27990
 2011-07-28 14:09:16 +00:00
Eelco Dolstra bf229fc985 * Move Phonon out of KDE. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27988
 2011-07-28 12:20:12 +00:00
Ludovic Courtès eaa82cb4ef glibc: Update Hurd snapshot. 
svn path=/nixpkgs/trunk/; revision=27986
 2011-07-28 12:08:11 +00:00
Nicolas Pierron 0690f20ea8 ffmpeg: Add previous version to fix fuppes. 
svn path=/nixpkgs/trunk/; revision=27980
 2011-07-27 21:00:09 +00:00
Eelco Dolstra 3fac08a565 * Audacious updated to 3.0. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27959
 2011-07-26 02:14:19 +00:00
Eelco Dolstra fabc00a176 * Added gst-plugins-ugly and gst-plugins-bad. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27952
 2011-07-25 20:10:45 +00:00
Eelco Dolstra ac9579626f * Updated gst-plugins-good and gst-ffmpeg. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27951
 2011-07-25 20:10:13 +00:00
Eelco Dolstra 0deb1fa33d * Updated libraw1394 and libavc1394. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27950
 2011-07-25 19:08:00 +00:00
Eelco Dolstra 929160b86d * mpeg2dec -> libmpeg2, and updated to 0.5.1. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27949
 2011-07-25 19:07:36 +00:00
Eelco Dolstra a656221873 * xine-lib: get it to build with the latest ffmpeg. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27946
 2011-07-25 15:08:16 +00:00
Eelco Dolstra fca12d0cf6 * ffmpeg: Add zlib and bzip2 to the build inputs to enable a few more 
codecs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27945
 2011-07-25 14:46:04 +00:00
Eelco Dolstra 4c2a6992d3 * Obsolete. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27944
 2011-07-25 14:38:23 +00:00
Eelco Dolstra 2ef93dae71 * ffmpeg updated to 0.8. Disable libvorbis and libxvidcore support by 
default because ffmpeg (libavcodec) has native support for those
  formats.

svn path=/nixpkgs/branches/kde-4.7/; revision=27943
 2011-07-25 14:35:54 +00:00
Eelco Dolstra b7556bdf10 * Now do it right. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27942
 2011-07-25 14:34:05 +00:00
Eelco Dolstra 6c6968cf07 * x264 updated to the latest snapshot. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27941
 2011-07-25 14:33:38 +00:00
Eelco Dolstra 5981e2c723 * libmusicbrainz updated to 3.0.3. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27940
 2011-07-25 14:20:56 +00:00
Eelco Dolstra f709d6c233 * xvidcore updated to 1.3.2. Also create a libxvidcore.so symlink and 
get rid of the static library.

svn path=/nixpkgs/branches/kde-4.7/; revision=27939
 2011-07-25 14:19:10 +00:00