1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Commit graph

958 commits

Author SHA1 Message Date
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov a7f52f0fd0 xxdiff-4.0 beta (Qt4-based)
svn path=/nixpkgs/trunk/; revision=31422
2012-01-07 20:23:35 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell 54aa31cca3 Updating the cross-build of elfutils so the perf for 2.6.37 builds too. (again, nanonote)
svn path=/nixpkgs/trunk/; revision=31378
2012-01-06 21:10:19 +00:00
Yury G. Kudryashov 9d03e96caa Add itstool
svn path=/nixpkgs/trunk/; revision=31372
2012-01-06 20:09:39 +00:00
Lluís Batlle i Rossell cae619da08 Updating elfutils/perf to cross-build. I tested this for the nanonote.
I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov b00d19d775 elfutils-0.152, pass zlib, bzip2 and xz
svn path=/nixpkgs/trunk/; revision=31323
2012-01-05 23:15:48 +00:00
Yury G. Kudryashov d15e2f70d9 Add swig-2.x
svn path=/nixpkgs/trunk/; revision=31320
2012-01-05 23:15:24 +00:00
Yury G. Kudryashov 29d613ba0e Add a warning to cmake/default.nix
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Eelco Dolstra 5386b47ead * Revert. Cmake is still broken on i686-linux.
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov 71c6de7338 cmake-2.8.7
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Peter Simons 8755735a06 haskell-cabal2nix: updated to version 1.23
svn path=/nixpkgs/trunk/; revision=31077
2011-12-25 16:18:34 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons f0fccbb3f0 haskell-uuagc: updated to version 0.9.40.2
svn path=/nixpkgs/trunk/; revision=31040
2011-12-22 12:19:28 +00:00
Peter Simons 1a316e3ef2 haskell-uuagc-cabal: updated to version 1.0.2.0
svn path=/nixpkgs/trunk/; revision=31039
2011-12-22 12:19:24 +00:00
Peter Simons ee7bedf20c haskell-uuagc-bootstrap: updated to version 0.9.40.2
svn path=/nixpkgs/trunk/; revision=31038
2011-12-22 12:19:18 +00:00
Eelco Dolstra ff2f4827b4 * Test xz in stdenv.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30983
2011-12-20 13:05:51 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Marco Maggesi 82fabd6262 Update ocaml-findlib to version 1.2.7
svn path=/nixpkgs/trunk/; revision=30925
2011-12-16 09:22:31 +00:00
Eelco Dolstra cfde88976b * Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Shea Levy cffad35505 The GPL issue does not apply to this version of binutils
svn path=/nixpkgs/branches/stdenv-updates/; revision=30871
2011-12-13 18:13:45 +00:00
Eelco Dolstra 7bbb1ad569 * Revert to binutils 2.21.1. Binutils 2.22 changes the default
handling of dynamic libraries from --copy-dt-needed-entries to
  --no-copy-dt-needed-entries, which breaks stuff (e.g. GCC, see
  http://hydra.nixos.org/build/1608471).  So stick with 2.21.1 for
  now.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30870
2011-12-13 16:47:29 +00:00
Eelco Dolstra 8c23cd086f * binutils 2.22.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30855
2011-12-12 17:14:59 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons a9d9b9714e stay at older uuagc for now, newer breaks UHC
svn path=/nixpkgs/trunk/; revision=30837
2011-12-11 19:39:00 +00:00
Peter Simons 257a8deddd haskell-cabal2nix: updated to version 1.21
svn path=/nixpkgs/trunk/; revision=30825
2011-12-10 22:30:56 +00:00
Peter Simons b76db1c8ac haskell-SourceGraph: added version 0.7.0.1
svn path=/nixpkgs/trunk/; revision=30813
2011-12-09 18:07:29 +00:00
Ludovic Courtès d5951bfac1 LCOV: Add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=30775
2011-12-06 14:12:43 +00:00
Peter Simons 2d0b27df9d haskell-uuagc: updated to version 0.9.39.3
svn path=/nixpkgs/trunk/; revision=30765
2011-12-05 19:27:47 +00:00
Peter Simons c39d60bc0e haskell-uuagc-cabal: updated to version 1.0.0.10
svn path=/nixpkgs/trunk/; revision=30760
2011-12-05 16:22:59 +00:00
Peter Simons 0ebf4b42a1 haskell-uuagc-bootstrap: updated to version 0.9.39.3.0
svn path=/nixpkgs/trunk/; revision=30759
2011-12-05 16:22:56 +00:00
Peter Simons a392cab4d1 haskell-cabal2nix: updated to version 1.20
svn path=/nixpkgs/trunk/; revision=30758
2011-12-05 16:22:54 +00:00
Lluís Batlle i Rossell 8d746d0fd5 Updating valgrind
svn path=/nixpkgs/trunk/; revision=30723
2011-12-04 00:25:58 +00:00
Peter Simons fff3298d75 haskell-hlint: updated to version 1.8.20
svn path=/nixpkgs/trunk/; revision=30624
2011-11-29 15:32:52 +00:00
Peter Simons 5876576633 haskell-hlint: updated to version 1.8.19
svn path=/nixpkgs/trunk/; revision=30608
2011-11-28 18:12:33 +00:00
Marco Maggesi 8d4b5bcd0c Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor).
Keep the old version 5.15 to allow a smooth migration.


svn path=/nixpkgs/trunk/; revision=30575
2011-11-26 19:39:14 +00:00
Peter Simons ed494478f7 haskell-happy: added version 1.18.8
svn path=/nixpkgs/trunk/; revision=30559
2011-11-25 13:44:30 +00:00
Peter Simons 7779b6245e haskell-cabal2nix: updated to version 1.19
svn path=/nixpkgs/trunk/; revision=30518
2011-11-21 18:09:38 +00:00
Eelco Dolstra 5abed12234 * i386-sunos -> i686-solaris.
svn path=/nixpkgs/trunk/; revision=30507
2011-11-21 14:11:04 +00:00
Ludovic Courtès ef41b48dcb GDB: Check for `stdenv.system == "i686-gnu"'.
Reported by Shea Levy, thanks!

svn path=/nixpkgs/trunk/; revision=30484
2011-11-19 20:37:44 +00:00
Ludovic Courtès a148b889f1 GDB: Allow cross-compilation for GNU.
svn path=/nixpkgs/trunk/; revision=30481
2011-11-19 18:28:10 +00:00
Shea Levy 2be3b97cba Use the patchelf-0.6 release for patchelf06 in trunk
svn path=/nixpkgs/trunk/; revision=30359
2011-11-09 18:17:18 +00:00
Peter Simons 368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Eelco Dolstra 91ab98ce09 * Update patchelf.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30312
2011-11-08 01:30:02 +00:00
Eelco Dolstra 0880b96a3d * Apply the zlib/cmake updates from the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30309
2011-11-07 22:54:45 +00:00
Eelco Dolstra bb889c3605 * Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake
to build).  These are more appropriate to the stdenv branch.  I'll
  apply them there.

svn path=/nixpkgs/trunk/; revision=30308
2011-11-07 22:05:46 +00:00
David Guibert 29bdb369ab update cmake
svn path=/nixpkgs/trunk/; revision=30278
2011-11-06 20:03:00 +00:00