Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Eelco Dolstra
19ab71ff7a
releaseTools.nixBuild: Put hydra-build-products in each output
...
Putting a single hydra-build-products in $out can cause $out to have
unnecessary dependencies on other outputs.
2013-02-18 13:57:02 +01:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Peter Simons
dd13aa9c94
pkgs/build-support/cabal: add 'enableSplitObjs' field to enable/disable object splitting
...
This patch configures all Cabal builds with '--enable-split-objs' unless the
Nix expression explicitly sets "enableSplitObjs = false". The Cabal manual [1]
describes this option as follows:
| The GHC -split-objs reduces the final size of the executables that use the
| library by allowing them to link with only the bits that they use rather
| than the entire library. The downside is that building the library takes
| longer and uses considerably more memory.
One immediate benefit of this change is that the 'darcs' closure defined in the
top-level no longer refers to GHC. The same is probably true with other
executable packages.
[1] http://www.haskell.org/cabal/users-guide/installing-packages.html#setup-configure
2013-02-18 12:32:15 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Eelco Dolstra
a0a6f0edfd
releaseTools.nixBuild: Support builds with multiple outputs
2013-02-13 13:54:32 +01:00
Vladimír Čunát
9abff7a85e
Major Xfce refactoring, also adding versions 4.10.*
...
Please, comment on #296 .
2013-02-09 18:38:26 +01:00
Eelco Dolstra
04765da09a
fetchurl: Don't wait too long for the hashed mirrors
...
If the hashed mirror (nixos.org/tarballs) doesn't respond in 15
seconds, give up and try the original URL.
2013-02-06 15:15:28 +01:00
Eelco Dolstra
f337ab4430
fetchurl: Remove some compatibility hacks
2013-02-06 15:00:33 +01:00
Peter Simons
e5b51648b1
Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy.
2013-01-30 14:53:04 +01:00
Peter Simons
e460a3f37c
pkgs/build-support/native-darwin-x11-and-opengl: lift native X11 and OpenGL implementation from Darwin into the Nix store
2013-01-28 19:30:32 +01:00
Eelco Dolstra
d8f8a29758
gcc-upc: Remove
...
This version (4.0) is obsolete. And UPC will be merged in GCC 4.8
anyway.
2013-01-28 17:19:04 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Rob Vermaas
a049615e91
source-tarball.nix: try src.revCount when src.rev is not available.
2013-01-15 15:04:38 +01:00
Eelco Dolstra
7fd42a8380
Get rid of the "sf" alias for "sourceforge"
2013-01-14 12:00:32 +01:00
Shea Levy
553e1b16f0
replace-dependency: Eelco has ruled, lowerCamelCase > dash-case :(
2013-01-13 11:15:01 -05:00
Shea Levy
96a834d42a
replace-dependency: Better function names
2013-01-11 16:16:20 -05:00
Shea Levy
5dd1b8f204
replace-dependency: Don't strictly require that drv, old-dependency, and new-dependency be derivations
2013-01-11 16:13:58 -05:00
Shea Levy
779c74f795
Remove some artifacts of a failed attempt from replace-dependency
2013-01-11 16:09:07 -05:00
Shea Levy
d1662d7155
Add the replace-dependency build support function.
...
The use case is to do a deep replacement of a dependency without rebuilding the entire tree.
For example, suppose a security hole is found in glibc and a patch released. Ideally, you'd
just rebuild everything, but that takes time, space, and CPU that you might not have, so in
the mean time you could build a safe version of, say, firefox with:
firefox-safe = replace-dependency { drv = firefox; old-dependency = glibc; new-dependency = patched-glibc; };
Building firefox-safe will rebuild glibc, but only do a simple copy/string replacement on all other dependencies
of firefox. On my system (MBP 13" mid-2012), after a new glibc had been build building firefox took around 11 seconds.
See the comments in the file for more details.
2013-01-11 14:42:09 -05:00
Lluís Batlle i Rossell
eb0422e4c1
Merge branch 'stdenv-updates' into pi-stdenv-updates
2012-12-29 14:18:43 +00:00
Lluís Batlle i Rossell
29fdf278ce
Enabling support of ld-linux-armhf.so.3 ld.so, in ARM
...
I use wildcards.
2012-12-29 14:14:53 +00:00
Lluís Batlle i Rossell
b8c0279b9f
Unifying buildergo.sh and builder.sh into one.
2012-12-29 15:11:32 +01:00
Lluís Batlle i Rossell
a8dedfc1d0
Merge branch 'stdenv-updates' into pi-stdenv-updates
2012-12-29 09:05:13 +00:00
Eelco Dolstra
01acc493ca
Merge branch 'stdenv-updates' of github.com:NixOS/nixpkgs into stdenv-updates
2012-12-29 02:02:33 +01:00
Eelco Dolstra
080f1af51f
Remove savannah mirror that seems to hang
2012-12-29 01:55:00 +01:00
Lluís Batlle i Rossell
67aa9243f0
Merge branch 'stdenv-updates' into pi-stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial.
2012-12-28 23:30:53 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell
719ba63004
Merge branch 'stdenv-updates' into pi-stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.6/default.nix
pkgs/development/compilers/gcc/4.7/default.nix
The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
651734b619
gcc/gcc-cross-wrapper: making gcc47 work with uclibc
...
It wants pthreads, and libpthreads wants libdl, and this can
only be found with -rpath-link when cross building.
2012-12-26 22:00:33 +00:00
Michael Raskin
8630db2b55
More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.
2012-12-22 14:14:48 +04:00
Michael Raskin
248d160f7c
Update-walker should use basename of .upstream file for default basename of .nix
2012-12-22 13:59:02 +04:00
Eelco Dolstra
b643316a42
VM builds: Use BusyBox
...
http://hydra.nixos.org/build/3510928
2012-12-18 16:57:11 +01:00
Lluís Batlle i Rossell
62fa1b8782
Adding ext4 to vmTools. Otherwise, nixos build-vm fails with 'useBootLoader'.
2012-12-16 21:43:35 +01:00
Aristid Breitkreuz
e89aea5e42
add luite's mirror to cabal/hackage download expression (for when hackage.haskell.org is down)
2012-12-15 23:34:49 +01:00
Eelco Dolstra
f364619e22
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-12 17:01:20 +01:00
Eelco Dolstra
88dcdc9bed
postgresql: Update to latest versions
2012-12-11 14:08:41 +01:00
Michael Raskin
1c3434cc16
Update E prover
2012-12-09 00:36:38 +04:00
Michael Raskin
d3e5b8feee
Fix dummy pseudo-updates being found for some packages
2012-12-08 13:05:43 +04:00
Eelco Dolstra
7f115621ca
Add Ubuntu 12.10
2012-12-04 20:06:07 +01:00
Eelco Dolstra
85650db656
Update Debian Squeeze to 6.0.6
2012-12-04 19:58:21 +01:00
Eelco Dolstra
b29d424115
Get deb-closure.pl to work with the latest dpkg
2012-12-04 19:56:31 +01:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Michael Raskin
20b15673f4
Update Asymptote
2012-12-04 10:33:37 +04:00
Michael Raskin
363b1f9dc2
Fixing a typo and making steps more explicit
2012-12-04 09:56:38 +04:00
Michael Raskin
f8f54dc8d3
Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way
2012-11-25 23:57:49 +04:00