1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

17325 commits

Author SHA1 Message Date
Eelco Dolstra 1e886749b5 * Don't replace /opt if it's followed by something other than
whitespace or a /, otherwise strings such as /foo/opticaldrive.c
  will be broken.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31793
2012-01-23 13:16:51 +00:00
Eelco Dolstra 3cf71dcfd1 * Curl is used during the bootstrap, so don't rely on pattern
substitution being efficient.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31792
2012-01-23 13:06:01 +00:00
Eelco Dolstra 91b19832c9 * Fix the Darwin patch for OpenSSL.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31791
2012-01-23 12:59:18 +00:00
Eelco Dolstra 3ac44bde79 * Disable make check because it fails randomly due to a race.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
2012-01-23 12:34:07 +00:00
Lluís Batlle i Rossell 3b4528fd7c Reverting the pkgconfig update. Eelco says it does not work.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31755
2012-01-21 09:05:43 +00:00
Lluís Batlle i Rossell f5ddd22576 Updating pkgconfig.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31752
2012-01-21 00:47:03 +00:00
Eelco Dolstra c44e954bdc * Fix the squashfs build (it links against xz, so xz has
to be in the buildInputs).  While at it, update to 
  version 4.2.  "attr" is no longer needed as a dependency.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31744
2012-01-20 17:43:50 +00:00
Eelco Dolstra 94c7bec49d * Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux")
so that "nix-env -i stdenv" does the expected.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31742
2012-01-20 16:47:54 +00:00
Eelco Dolstra 25e0ae0f39 * Fix building Perl on FreeBSD. Its configure script was looking for
libraries in /usr/local/lib, but the linker doesn't look there by
  default, so linking against libgdbm failed.  So don't look in 
  /usr/local/lib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31741
2012-01-20 16:42:16 +00:00
Eelco Dolstra 22f3ff8f0d * OpenSSL updated to 1.0.0g.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31740
2012-01-20 16:41:11 +00:00
Eelco Dolstra bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Eelco Dolstra b786ce664d * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31738
2012-01-20 15:26:47 +00:00
Eelco Dolstra 1e7d074f1d * builderDefs: don't use param1-5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31737
2012-01-20 15:10:56 +00:00
Eelco Dolstra 28780d27d1 * cmake: don't use replace-literal.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
Sander van der Burg 2c3e921a4c Bumped MySQL 5.5.15 to 5.5.20
svn path=/nixpkgs/trunk/; revision=31735
2012-01-20 12:29:13 +00:00
Eelco Dolstra 14aab94aef * Oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31734
2012-01-20 10:55:45 +00:00
Andres Löh dd83243b8c Make statistics and criterion compile with ghc-6.12.3.
svn path=/nixpkgs/trunk/; revision=31733
2012-01-20 10:54:09 +00:00
Yury G. Kudryashov c2b80e225c directfb-1.5.3
svn path=/nixpkgs/trunk/; revision=31730
2012-01-20 00:45:22 +00:00
Ludovic Courtès 5cd82587aa overrideDerivation: Check whether hostDrv' and buildDrv' are present.
svn path=/nixpkgs/trunk/; revision=31727
2012-01-19 22:29:26 +00:00
Eelco Dolstra b27b5dfd75 * Doh.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31726
2012-01-19 22:18:34 +00:00
Peter Simons bf71d12fd4 texlive-moderncv: updated to version 2012.01.16
svn path=/nixpkgs/trunk/; revision=31725
2012-01-19 22:10:41 +00:00
Peter Simons 1bc803cb09 glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin
It appears that users of glibc expect to be able to link libintl via pkgconfig.
On Linux, this always works because that library comes with glibc, but on other
platforms gettext is required to fulfill the dependency.

I don't have access to Darwin, so I cannot actually test this change. If any
runs into problems because of this modification, please feel free to revert it!

svn path=/nixpkgs/trunk/; revision=31723
2012-01-19 21:43:17 +00:00
Peter Simons e2633477c0 haskell-hakyll: updated to version 3.2.4.1
svn path=/nixpkgs/trunk/; revision=31722
2012-01-19 21:43:14 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra 2ebf8df601 * Apply the latest Gentoo patches to Grub 1.
svn path=/nixpkgs/trunk/; revision=31720
2012-01-19 21:08:33 +00:00
Ludovic Courtès 723e46b6a7 GRUB 0.97: Use an old Automake.
svn path=/nixpkgs/trunk/; revision=31719
2012-01-19 21:07:02 +00:00
Peter Simons b94fef3cba all-packages.nix: added texLiveFull attribute, which is a working TexLive installation with all supported packages enabled
svn path=/nixpkgs/trunk/; revision=31717
2012-01-19 20:45:17 +00:00
Yury G. Kudryashov d0c8b530e9 leiningen: added package version 1.6.2
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00:00
Yury G. Kudryashov 185a3d13aa digikam-2.5.0
svn path=/nixpkgs/trunk/; revision=31715
2012-01-19 20:28:13 +00:00
Yury G. Kudryashov 8deba0e4f8 Revert digikam change
svn path=/nixpkgs/trunk/; revision=31714
2012-01-19 20:28:09 +00:00
Yury G. Kudryashov d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +00:00
Yury G. Kudryashov 8899e60693 Remove unused patches, fix pykde4 patch
svn path=/nixpkgs/trunk/; revision=31712
2012-01-19 20:27:59 +00:00
Rob Vermaas 087af1bfe7 add gwt 2.4.0, patch provided by TermNL
svn path=/nixpkgs/trunk/; revision=31711
2012-01-19 19:31:25 +00:00
Eelco Dolstra 3980444b2b * Reuse packages in the Darwin stdenv to prevent unnecessary rebuilds.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31710
2012-01-19 18:25:35 +00:00
Eelco Dolstra 0894d407ce * Add the latest readline patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31709
2012-01-19 17:37:21 +00:00
Eelco Dolstra 61d0c5d931 * Don't rely on tar knowing about .xz.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31708
2012-01-19 17:33:33 +00:00
Eelco Dolstra e1f901c117 * Build ‘xz’ during the stdenvNative bootstrap, since we really can't
rely on it being present.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31707
2012-01-19 16:50:09 +00:00
Ludovic Courtès 08439eb00a overrideDerivation: Override hostDrv' and buildDrv' too.
svn path=/nixpkgs/trunk/; revision=31706
2012-01-19 16:44:17 +00:00
Eelco Dolstra 6b8e8bfedb * "sed -i" isn't very portable, so don't use it here.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31705
2012-01-19 16:23:14 +00:00
Eelco Dolstra 698c4d296b * "test" -> "[ ... ]" (style cleanup).
svn path=/nixpkgs/branches/stdenv-updates/; revision=31704
2012-01-19 16:14:09 +00:00
Eelco Dolstra ee45e160b1 * Prepend the "prehook" rather than sourcing it.
* Don't call xargs with the -r flag in the Darwin bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31703
2012-01-19 15:56:17 +00:00
Eelco Dolstra 6208059079 * The postHook substitution is not used anywhere, so get rid of it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31702
2012-01-19 15:39:12 +00:00
Eelco Dolstra b31df26cea * Remove an unnecessary check.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31701
2012-01-19 15:31:56 +00:00
Eelco Dolstra 0d71e75222 * Get rid of params1-5, they're obsolete.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31700
2012-01-19 15:29:20 +00:00
Eelco Dolstra 26affd7238 * Doh!
svn path=/nixpkgs/branches/stdenv-updates/; revision=31699
2012-01-19 15:02:47 +00:00
Eelco Dolstra 0e353fdd5a * Don't use substite() here, because the bash binary in the bootstrap
tools (4.1.2) seems to have performance problems doing pattern
  substitutions on large strings (it takes several minutes on
  binutils' Makefile.in).  Bash 4.2 seems to be fine.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31698
2012-01-19 14:55:12 +00:00
Peter Simons f84e15f11c haskell-xml-conduit: updated to version 0.5.1.2
svn path=/nixpkgs/trunk/; revision=31697
2012-01-19 14:46:06 +00:00
Peter Simons f52d0d1634 haskell-web-routes: updated to version 0.26.2
svn path=/nixpkgs/trunk/; revision=31696
2012-01-19 14:46:04 +00:00
Peter Simons af2e5746af haskell-web-routes-quasi: updated to version 0.7.1.1
svn path=/nixpkgs/trunk/; revision=31695
2012-01-19 14:46:01 +00:00
Peter Simons 42105ddc82 haskell-vault: updated to version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31694
2012-01-19 14:45:59 +00:00