3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14717 commits

Author SHA1 Message Date
Peter Simons a2092b82bd haskell-filestore: updated to version 0.4.0.4
svn path=/nixpkgs/trunk/; revision=28242
2011-08-07 18:23:08 +00:00
Peter Simons 92d878414b haskell-packages.nix: added regex-pcre-builtin
svn path=/nixpkgs/trunk/; revision=28241
2011-08-07 18:23:04 +00:00
Peter Simons 18daa8fc26 ghc-paths: added version 0.1.0.8
Also renamed the default version to 0.1.0.6.nix for consistency.

svn path=/nixpkgs/trunk/; revision=28240
2011-08-07 18:22:58 +00:00
Peter Simons 937fa0ed87 haskell-packages.nix: added double-conversion
This package is required by the latest version of blaze-textual.

svn path=/nixpkgs/trunk/; revision=28239
2011-08-07 18:22:54 +00:00
Peter Simons 981db91136 tagsoup: updated to version 0.12.2
svn path=/nixpkgs/trunk/; revision=28238
2011-08-07 18:22:43 +00:00
Peter Simons 6855d8181f haskell-packages.nix: added regexecPcre alias for regexecPCRE
The new name seems to be more in-line with our coding conventions.

svn path=/nixpkgs/trunk/; revision=28237
2011-08-07 18:22:39 +00:00
Peter Simons 0874d03f1a hmatrix: updated to version 0.11.1.0
svn path=/nixpkgs/trunk/; revision=28236
2011-08-07 18:22:36 +00:00
Peter Simons e067db327a storable-complex: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=28235
2011-08-07 18:22:32 +00:00
Peter Simons 8569a4b220 pandoc: updated to version 1.8.2.1
svn path=/nixpkgs/trunk/; revision=28234
2011-08-07 18:22:28 +00:00
Peter Simons 332e97cc9d pandoc-types: updated to version 1.8.2
svn path=/nixpkgs/trunk/; revision=28233
2011-08-07 18:22:24 +00:00
Peter Simons 626dbcd104 haskell-packages.nix: added base64-bytestring 0.1.0.3
svn path=/nixpkgs/trunk/; revision=28232
2011-08-07 18:22:19 +00:00
Peter Simons e29935f9b3 hlint: updated to version 1.8.13
svn path=/nixpkgs/trunk/; revision=28231
2011-08-07 18:22:13 +00:00
Peter Simons eb573762e8 haskell-src-meta: updated to version 0.4.0.1
svn path=/nixpkgs/trunk/; revision=28230
2011-08-07 18:22:09 +00:00
Peter Simons 4e70b93661 haskell-th-lift: added new package, version 0.5.3
This library is required for building the latest version of haskell-src-meta.

svn path=/nixpkgs/trunk/; revision=28229
2011-08-07 18:22:05 +00:00
Peter Simons 3623617019 derive: updated to version 2.5.2
svn path=/nixpkgs/trunk/; revision=28228
2011-08-07 18:22:01 +00:00
Peter Simons 73e6d0c2d5 hscolour: updated to version 1.19
svn path=/nixpkgs/trunk/; revision=28227
2011-08-07 18:21:57 +00:00
Peter Simons 5b25af4f80 haskell-src-exts: updated to version 1.11.1.nix
The older version, 1.9.6.nix, is still around because Agda won't accept
the latest one.

svn path=/nixpkgs/trunk/; revision=28226
2011-08-07 18:21:52 +00:00
Peter Simons eb462dcf47 cabal2nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=28225
2011-08-07 18:21:44 +00:00
Karn Kallio d0fa51f709 Fi wrapper kde47 runtime.nix
svn path=/nixpkgs/trunk/; revision=28224
2011-08-07 17:50:45 +00:00
Karn Kallio b2a20db522 Copy kde45 wrap of nepomukservicestub with virtuoso.
svn path=/nixpkgs/trunk/; revision=28223
2011-08-07 17:50:32 +00:00
Peter Simons 455a83d836 cabal2nix: import changes from kosmikus
svn path=/nixpkgs/trunk/; revision=28222
2011-08-07 11:20:05 +00:00
Peter Simons b5cfebc23e cabal2nix: disable hydra builds for the time being, it seems that fetchgit doesn't work there
svn path=/nixpkgs/trunk/; revision=28221
2011-08-07 11:14:30 +00:00
Peter Simons 9754b7d0d7 cabal2nix: fetch source code from the Git repository
I don't want to upload a plethora of trivial releases to Hackage every
time I'd like to test a new version.

svn path=/nixpkgs/trunk/; revision=28220
2011-08-07 09:56:44 +00:00
Karn Kallio cda8010b96 Get krename to build with kde45 and kde47.
svn path=/nixpkgs/trunk/; revision=28219
2011-08-07 02:36:31 +00:00
Karn Kallio f74cc3c8d6 Get semnotes to build with kde45 and kde47.
svn path=/nixpkgs/trunk/; revision=28218
2011-08-07 02:09:46 +00:00
Karn Kallio a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps.
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Karn Kallio 875b65ca0e Backwards compatibility on kdebase breaks detection.
svn path=/nixpkgs/trunk/; revision=28216
2011-08-07 01:27:23 +00:00
Karn Kallio cc160e2dc6 Extend kde47 backwards compatibility to include kdebase.
svn path=/nixpkgs/trunk/; revision=28215
2011-08-07 01:14:34 +00:00
Karn Kallio 278cc6dc0b First few programs of kde 4.7 kdeedu.
svn path=/nixpkgs/trunk/; revision=28213
2011-08-07 00:38:11 +00:00
Karn Kallio 37c45263c6 Repair kruler build (phonon is required).
svn path=/nixpkgs/trunk/; revision=28212
2011-08-07 00:37:49 +00:00
Karn Kallio d587e3720b Forgot to move kruler.nix
svn path=/nixpkgs/trunk/; revision=28211
2011-08-07 00:37:32 +00:00
Karn Kallio 7648a6cf65 Set up kdegraphics section in kde 4.7
svn path=/nixpkgs/trunk/; revision=28210
2011-08-07 00:37:14 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26.
svn path=/nixpkgs/trunk/; revision=28209
2011-08-06 23:26:38 +00:00
Andres Löh 159611d423 Updating repa.
svn path=/nixpkgs/trunk/; revision=28208
2011-08-06 20:59:04 +00:00
Shea Levy be1bd9e6bf virtualbox: Bump to 4.1.0
svn path=/nixpkgs/trunk/; revision=28207
2011-08-06 20:52:11 +00:00
Andres Löh 3047b3145d Updating uu-parsinglib.
svn path=/nixpkgs/trunk/; revision=28206
2011-08-06 20:27:20 +00:00
Andres Löh bfb4f329d4 Updated multirec and zipper.
svn path=/nixpkgs/trunk/; revision=28205
2011-08-06 20:19:37 +00:00
Shea Levy 5b197147cb linuxPackages_3_0: Bumped to 3.0.1
svn path=/nixpkgs/trunk/; revision=28203
2011-08-06 19:14:13 +00:00
Karn Kallio 6a2f1f3d72 Remove kdebase as input to kdiff3.
Seems not to be needed and gives evaluation error when with kde4.7

svn path=/nixpkgs/trunk/; revision=28197
2011-08-06 18:01:56 +00:00
Eelco Dolstra 18509c88b3 * KTorrent updated to 4.1.1.
svn path=/nixpkgs/trunk/; revision=28193
2011-08-06 14:28:15 +00:00
Cillian de Roiste a751ada1ce Updating oxygen-gtk to 1.1.1
svn path=/nixpkgs/trunk/; revision=28191
2011-08-06 10:33:52 +00:00
Andres Löh 3ca394eee5 text library works with 7.2.1rc2.
svn path=/nixpkgs/trunk/; revision=28190
2011-08-06 10:31:16 +00:00
Andres Löh 9d98555410 Update release.nix w.r.t. ghc versions.
svn path=/nixpkgs/trunk/; revision=28189
2011-08-06 10:28:24 +00:00
Peter Simons 981d6e6a7f gitit: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=28188
2011-08-06 07:46:16 +00:00
Peter Simons a6020a75d4 hsemail: added version 1.7.1 parallel to version 1.6
SMTPClient cannot be built with the latest version of hsemail because its Cabal
files enforces 1.6 by an upper version bound. I've asked upstream to release an
update that fixes this, but until that happens we need to keep version 1.6
around to make sure Gitit compiles.

svn path=/nixpkgs/trunk/; revision=28187
2011-08-06 07:41:44 +00:00
Peter Simons 8a5c6ef1cc hsdns: add andres to the list of maintainers again
I removed that address by accident earlier. I'm sorry.

svn path=/nixpkgs/trunk/; revision=28186
2011-08-06 07:19:47 +00:00
Andres Löh 1e5a711f96 Updating ghc-7.2.1 to rc2.
svn path=/nixpkgs/trunk/; revision=28185
2011-08-05 22:11:30 +00:00
Andres Löh 8676c4c42a Revert "hsemail: updated build instructions with cabal2nix"
This is to fix gitit, hopefully.

svn path=/nixpkgs/trunk/; revision=28184
2011-08-05 22:05:01 +00:00
Peter Simons 24979c3495 cabal2nix: updated to version 1.7
The new version can read Cabal files via HTTP, and it can also determine
the hash automatically. Hence, generating a build expression is now a
matter of running:

  cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.7/cabal2nix.cabal

svn path=/nixpkgs/trunk/; revision=28183
2011-08-05 19:41:54 +00:00
Lluís Batlle i Rossell c10bdc23cd Simple packaging of bacula.
svn path=/nixpkgs/trunk/; revision=28182
2011-08-05 19:18:02 +00:00
Michael Raskin 946cd2431f Update LEO-II
svn path=/nixpkgs/trunk/; revision=28180
2011-08-05 18:22:40 +00:00
Peter Simons b72b88fc08 haskell-packages.nix: added new packages async, hsyslog, and streamproc
svn path=/nixpkgs/trunk/; revision=28179
2011-08-05 18:02:20 +00:00
Peter Simons 358a38fea4 async: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28178
2011-08-05 18:02:16 +00:00
Peter Simons ed264f4d09 hsyslog: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28177
2011-08-05 18:02:12 +00:00
Peter Simons c6ba9c4d96 streamproc: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28176
2011-08-05 18:02:08 +00:00
Peter Simons dae0b84c95 hsemail: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28175
2011-08-05 18:02:04 +00:00
Peter Simons bb26c3d183 hsdns: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28174
2011-08-05 18:02:00 +00:00
Peter Simons f55fc207e7 funcmp: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28173
2011-08-05 18:01:56 +00:00
Peter Simons 3a20cd8208 hopenssl: updated build instructions with cabal2nix
svn path=/nixpkgs/trunk/; revision=28172
2011-08-05 18:01:51 +00:00
Michael Raskin b799e4e6ff Update Evince - and make it build again
svn path=/nixpkgs/trunk/; revision=28171
2011-08-05 17:45:49 +00:00
Peter Simons a650832b2c haskell-packages: added cabal2nix, a utility to convert Cabal files into Nix build instructions
Naturally, the tool generated its own build expression. :-)

svn path=/nixpkgs/trunk/; revision=28170
2011-08-05 17:03:14 +00:00
Michael Raskin a12937570c Fixing libdecodeqr build by using previous OpenCV
svn path=/nixpkgs/trunk/; revision=28169
2011-08-05 16:13:20 +00:00
Andres Löh 55fa5b5d1d Tested platform packages with ghc-7.2 and ghc-7.3.
svn path=/nixpkgs/trunk/; revision=28168
2011-08-05 14:02:57 +00:00
Andres Löh 043cba30a0 Fix version of text library.
svn path=/nixpkgs/trunk/; revision=28167
2011-08-05 13:36:57 +00:00
Andres Löh 25e212ac0e Bumping the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=28166
2011-08-05 13:30:42 +00:00
Andres Löh 7f71e44d8e Fix sha256 sums for ghc-6.12.1 binaries.
svn path=/nixpkgs/trunk/; revision=28165
2011-08-05 11:03:16 +00:00
Andres Löh dcffa6f0b1 Fixed broken haskell-packages.nix.
svn path=/nixpkgs/trunk/; revision=28164
2011-08-05 10:10:58 +00:00
Andres Löh 8fdb3c9e63 Make ghc-7.0.4 the default. Add experimental ghc-7.2.1rc1.
svn path=/nixpkgs/trunk/; revision=28163
2011-08-05 08:52:35 +00:00
Karn Kallio b01cd125d4 Advance racket to version 5.1.2
svn path=/nixpkgs/trunk/; revision=28162
2011-08-05 04:22:03 +00:00
Karn Kallio 393e46f0b2 Advance version of mlt; prior version no longer builds.
svn path=/nixpkgs/trunk/; revision=28161
2011-08-04 21:48:48 +00:00
Karn Kallio 514407c726 Repair kadu to get it building again.
svn path=/nixpkgs/trunk/; revision=28160
2011-08-04 21:04:19 +00:00
Peter Simons 331af2c876 numeric-prelude: add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=28159
2011-08-04 19:40:11 +00:00
Michael Raskin 9671e806af Fixing Redstore build
svn path=/nixpkgs/trunk/; revision=28158
2011-08-04 17:42:45 +00:00
Michael Raskin e3a809a9bb Fix Veracity build
svn path=/nixpkgs/trunk/; revision=28157
2011-08-04 16:01:50 +00:00
Peter Simons 7d651a8ec3 syslog-ng: the build doesn't find "glib" on platforms other than Linux
Glib is a buildInput, and it does work fine on Linux, but on other
platforms Hydra reports a build failure:

 | checking for GLIB - version >= 2.10.1... no
 | *** Could not run GLIB test program, checking why...
 | *** The test program failed to compile or link. See the file config.log for the
 | *** exact error that occured. This usually means GLIB is incorrectly installed.
 | configure: error: Cannot find GLIB version >= 2.10.1: is pkg-config in path?

I can't debug that problem, so opted to just disable those builds that
fail anyway.

svn path=/nixpkgs/trunk/; revision=28156
2011-08-04 15:59:21 +00:00
Peter Simons 9f834cb8bd syslog-ng: moved package from tools/misc to tools/system
svn path=/nixpkgs/trunk/; revision=28155
2011-08-04 15:59:14 +00:00
Peter Simons fbf36403ef haskell-packages.nix: updated HaXml to version 1.22.3
svn path=/nixpkgs/trunk/; revision=28154
2011-08-04 15:59:03 +00:00
Michael Raskin 3e8a39ea61 Updating Maxima
svn path=/nixpkgs/trunk/; revision=28152
2011-08-04 15:13:15 +00:00
Sander van der Burg d8051477b5 Upgraded MySQL JDBC driver to 5.1.17
svn path=/nixpkgs/trunk/; revision=28151
2011-08-04 14:02:52 +00:00
Eelco Dolstra fda7c24c2b * Added aws-mturk-clt, the Amazon Mechanical Turk command-line tools.
svn path=/nixpkgs/trunk/; revision=28150
2011-08-04 12:13:53 +00:00
Sander van der Burg a0c03edcd9 Removed test stuff from MySQL + add to releases
svn path=/nixpkgs/trunk/; revision=28149
2011-08-04 11:58:49 +00:00
Andres Löh 62c04c542b Version bump for HDBC.
svn path=/nixpkgs/trunk/; revision=28148
2011-08-04 10:16:30 +00:00
Eelco Dolstra 237b2b8a30 * Merged the KDE 4.7 branch.
This adds KDE 4.7 (and updates many dependencies), but KDE 4.5 is
  still the default.  To use 4.7, set the following in
  configuration.nix:

    nixpkgs.config.packageOverrides = pkgs: {
      kde4 = pkgs.kde47;
    };
  

svn path=/nixpkgs/trunk/; revision=28147
2011-08-04 00:08:22 +00:00
Eelco Dolstra 7c0ca0d565 svn path=/nixpkgs/branches/kde-4.7/; revision=28146 2011-08-03 22:36:20 +00:00
Sander van der Burg d9572cfb6b Added MySQL 5.5. It's still a bit experimental though
svn path=/nixpkgs/trunk/; revision=28145
2011-08-03 22:10:06 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
2011-08-03 22:00:49 +00:00
Piotr Pietraszkiewicz 8d546fbdb8 upgraded kadu to v0.9.2 + fixed typos in description
svn path=/nixpkgs/trunk/; revision=28143
2011-08-03 18:36:56 +00:00
Peter Simons cf58813fb0 haskell-packages.nix: added tabular library
svn path=/nixpkgs/trunk/; revision=28142
2011-08-03 16:51:19 +00:00
Eelco Dolstra cc2b24254a * Added vnc2flv.
svn path=/nixpkgs/trunk/; revision=28141
2011-08-03 13:39:49 +00:00
Eelco Dolstra 5a04f8450d * Hack to fix D-Bus X11 autolaunch support in D-Bus >= 1.4.8.
svn path=/nixpkgs/branches/kde-4.7/; revision=28140
2011-08-03 11:45:57 +00:00
Lluís Batlle i Rossell c5a60206e7 Fixing the nvidia x86_64 driver url
svn path=/nixpkgs/trunk/; revision=28139
2011-08-03 09:47:03 +00:00
Lluís Batlle i Rossell 4f20b609fb Updating the nvidia drivers (I experience hangs from time to time, maybe this will solve that)
svn path=/nixpkgs/trunk/; revision=28138
2011-08-03 09:47:00 +00:00
Lluís Batlle i Rossell 8ec17cf0a0 Updating dwm.
svn path=/nixpkgs/trunk/; revision=28137
2011-08-03 09:46:56 +00:00
Peter Simons ee74a7e379 all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=28136
2011-08-03 08:43:56 +00:00
Peter Simons bc913e2508 all-packages.nix: disable 'xracer' attribute to fix evaluation errors on Hydra
svn path=/nixpkgs/trunk/; revision=28135
2011-08-03 08:43:52 +00:00
Peter Simons dd9121ccff all-packages.nix: disable 'rust' attribute to fix evaluation errors on Hydra
svn path=/nixpkgs/trunk/; revision=28134
2011-08-03 08:43:47 +00:00
Michael Raskin 5fbf32b737 Missing files
svn path=/nixpkgs/trunk/; revision=28133
2011-08-03 08:38:34 +00:00
Peter Simons 21b8ff7aee haskell-packages.nix: added bnfc version 2.4
svn path=/nixpkgs/trunk/; revision=28132
2011-08-03 07:49:21 +00:00
Peter Simons 857d2673ae haskell-packages.nix: added numtype and dimensional libraries
svn path=/nixpkgs/trunk/; revision=28131
2011-08-02 22:14:18 +00:00
Michael Raskin 451f7818a5 Adding The Sleuth Kit
svn path=/nixpkgs/trunk/; revision=28130
2011-08-02 20:06:09 +00:00
Michael Raskin 87554657c1 Adding afflib
svn path=/nixpkgs/trunk/; revision=28129
2011-08-02 19:46:28 +00:00
Michael Raskin 9d04057b11 Update libewf. Actually buildable now
svn path=/nixpkgs/trunk/; revision=28128
2011-08-02 19:40:07 +00:00
Michael Raskin 58c022ab56 Update Veracity
svn path=/nixpkgs/trunk/; revision=28127
2011-08-02 18:58:59 +00:00
Michael Raskin 6e2572440a Update Wine
svn path=/nixpkgs/trunk/; revision=28126
2011-08-02 18:58:42 +00:00
Michael Raskin 77c65a1a3b Update SBCL
svn path=/nixpkgs/trunk/; revision=28125
2011-08-02 18:52:00 +00:00
Rob Vermaas bf68854ff4 make gcc 4.1 compile
svn path=/nixpkgs/trunk/; revision=28124
2011-08-02 16:02:53 +00:00
Eelco Dolstra 23e9cfac65 * Build Skype with PulseAudio support. This is needed on 64-bit
NixOS because it doesn't provide a 32-bit ALSA/Pulse module.

svn path=/nixpkgs/trunk/; revision=28123
2011-08-02 15:55:55 +00:00
Lluís Batlle i Rossell 71dc3b87eb Adding mairix
svn path=/nixpkgs/trunk/; revision=28122
2011-08-02 14:26:47 +00:00
Shea Levy 7233051b2c rdesktop: Bump to 1.7.0
svn path=/nixpkgs/trunk/; revision=28119
2011-08-02 00:19:29 +00:00
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
Rob Vermaas ba497f837a to compile glibc-2.5 use older headers
svn path=/nixpkgs/trunk/; revision=28116
2011-08-01 18:05:09 +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 e33ef05c26 * Add rtkit to the channel.
svn path=/nixpkgs/branches/kde-4.7/; revision=28111
2011-08-01 13:26:00 +00:00
Eelco Dolstra 06a0d9d95c * More packages that require the old ffmpeg. BTW, maybe this should be the old-ABI ffmpeg (0.7.2).
svn path=/nixpkgs/branches/kde-4.7/; revision=28110
2011-08-01 12:03:16 +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
Eelco Dolstra 4e321d8bd8 * Zathura updated to 0.0.8.4 (to fix http://hydra.nixos.org/build/1191958).
svn path=/nixpkgs/branches/kde-4.7/; revision=28108
2011-08-01 11:58:11 +00:00
Eelco Dolstra d9ed123038 * Audacity: use an older ffmpeg (http://hydra.nixos.org/build/1187243).
svn path=/nixpkgs/branches/kde-4.7/; revision=28107
2011-08-01 11:57:46 +00:00
Sander van der Burg 034fb4fa11 Bumped midnight commander to version 4.7.5.3
svn path=/nixpkgs/trunk/; revision=28106
2011-08-01 10:24:14 +00:00
Eelco Dolstra 0cb6cfb7a1 * Update vlc to 1.1.11.
svn path=/nixpkgs/branches/kde-4.7/; revision=28104
2011-08-01 09:23:10 +00:00
Eelco Dolstra 99ff06be3e * KDE 4.5 needs an older version of shared-desktop-ontologies.
svn path=/nixpkgs/branches/kde-4.7/; revision=28103
2011-08-01 09:08:57 +00:00
Eelco Dolstra 08b9b370a4 * KDE 4.5: use an old ffmpeg.
svn path=/nixpkgs/branches/kde-4.7/; revision=28102
2011-08-01 08:32:20 +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 6e06060c33 zip: Make it actually install something
svn path=/nixpkgs/trunk/; revision=28050
2011-08-01 01:11:01 +00:00
Shea Levy 3a74fd3f3b zip: Bump to 3.0
svn path=/nixpkgs/trunk/; revision=28049
2011-08-01 01:10:52 +00:00
Shea Levy 92e792f17b zip: Change formatting
svn path=/nixpkgs/trunk/; revision=28048
2011-08-01 01:10:44 +00:00
Shea Levy 6a34912bfb zip: Folded builder into derivation
svn path=/nixpkgs/trunk/; revision=28047
2011-08-01 01:10:36 +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
Shea Levy 7a3e4c40ec Add openjdk to all-packages.nix
svn path=/nixpkgs/trunk/; revision=28027
2011-08-01 01:07:47 +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
Eelco Dolstra 483bedccda * Disable kdebindings in the old KDE 4.5. It doesn't build anymore
due to changes in Phonon and other packages.  It's not really
  important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
2011-07-31 19:12:10 +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