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
Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Michael Raskin
fe4b9beae7
Support for low-impact updaters; some SF.net boilerplate helper.
...
Added support code for comfortable writing of upstream data update
expressions that do not require change of layout of the updated
expressions (although they make assumptions about single assignment per
line). Also added a default for choosing file to update (it is supposed
to be default.nix in the same directory) and a one-liner for typical
sourceforge redirects (and sourceforge mirror:// handling).
2012-11-10 14:38:53 +04:00
Michael Raskin
a73aa0458a
Unify and make customizable output of obtained upstream data
2012-11-08 23:15:33 +04:00
Michael Raskin
8af08d0d36
Allow relative paths in upstream expressions
2012-11-08 23:15:33 +04:00
Michael Raskin
c7d2e34758
Add nspluginwrapper, a tool to execute browser plugins out-of-process
2012-11-08 11:38:34 +04:00
Michael Raskin
af2fd342cd
Updating SBCL to freshest release 1.1.1.
...
Replacing SBCL upstream tracking expression with a new version in a new
format.
Minuses: gave up on defining everything in Nix language (now update
expression is a series of actions to do when downloading fresh release,
it is actually interpreted by shell), now Nix expression contains
meaningful whitespace (the area to regenerate is determined by the
line with a specific comment and the closing brace on the otherwise
empty line).
Plusses: only one extra file which could even be moved out-of-tree if
desired, clean semantics for traversing multiple links (it is not found
in either Debian uscan or Gentoo euscan), the main expression is in one
file and is less different from usual style.
2012-11-04 23:52:19 +04:00
Rickard Nilsson
2c0ff9bf9b
Remove deprecated option --ephemeral from fetchdarcs
2012-10-22 15:02:33 +02:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Eelco Dolstra
e6077fbc46
Remove getConfig helper function
...
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Eelco Dolstra
2ab46949cf
Add universe repo for older Ubuntu releases
2012-09-13 17:15:58 -04:00
Eelco Dolstra
fc35bed470
Fix incorrect version of Ubuntu Maverick (10.10)
2012-09-13 17:15:58 -04:00
Peter Simons
77a21eed08
Clean up changes to the Cabal builder, which needed to be done in an awkward fashion to avoid a complete re-build of all Haskell packages.
2012-09-11 16:53:48 +02:00
Peter Simons
d5677fe6c7
stdenv-updates: merge updates from 'master' branch
2012-09-11 16:48:41 +02:00
Peter Simons
470ade254e
Add support for jailbreak-cabal utility to the Cabal builder.
...
Jailbreaks-cabal allows Nixpkgs maintainers to quick-fix builds of packages
that over-specify their version requirements by removing the version
restrictions of all dependencies from the Cabal file. Set
jailbreak = true
in the build expression to activate this feature.
2012-09-10 12:36:10 +02:00
Eelco Dolstra
20de8c8086
Make the "universe" repository available to the Ubuntu image generator
...
Also fix Ubuntu 12.04 name from "oneiric" to "precise".
2012-08-27 13:53:07 -04:00
Eelco Dolstra
bacc6ab790
Remove trailing whitespace
2012-08-27 13:53:07 -04:00
Eelco Dolstra
395718e927
Create /dev/random and /dev/urandom in VMs
...
WWW::Curl needs this to prevent "Fatal: no entropy gathering module
detected".
2012-08-27 13:53:07 -04:00
Lluis Batlle
ba47bf7258
fetchhg: removing the nix dependency
...
I don't think it's required for anything. I tried once without it, and it
worked equally fine.
2012-08-26 23:16:28 +02:00
Rob Vermaas
1d26619edf
use openjdk as default for ant-build.nix
2012-08-25 19:39:49 +02:00
Peter Simons
966b4c336d
mirrors.nix: use GNU mirrors before hitting the master site
...
Our first download URL of choice is http://ftpmirror.gnu.org/ , which is an
automatic re-director.
2012-08-22 14:28:50 +02:00
Eelco Dolstra
a54734e087
vmTools: Provide hook to add more Samba shares
2012-08-16 10:55:13 -04:00
Eelco Dolstra
1baf48f087
Do some let-floating to prevent repeated evaluation of impureEnvVars
2012-08-13 15:15:16 -04:00
Shea Levy
cff9e132e7
binary-tarball.nix: Forgot to source functions.sh
2012-08-09 07:12:20 -04:00
Lluís Batlle i Rossell
a375ffa53f
Adding gccgo for gcc4.7.
...
I tested hello world, and it works.
2012-08-03 19:49:53 +02:00
Eelco Dolstra
03f9026ac5
buildEnv: don't warn about collisions in propagated packages
...
This mimicks buildenv in Nix more closely.
2012-07-25 23:18:39 -04:00
Petr Rockai
ce77a5ceec
Factor out repeated scriptlets from build-support/release/*.nix.
2012-07-23 20:33:04 +02:00
Petr Rockai
1eb5450bd4
Add --nodeps to rpm when test-uninstalling after a rpmBuild.
2012-07-23 20:31:51 +02:00
Petr Rockai
e1c172ab6b
Call rpm -U instead of rpm -i to test package installation.
2012-07-23 20:31:35 +02:00
Shea Levy
c514ee974a
Merge remote-tracking branch 'upstream/master' into x-updates
...
mountall conflict was trivial
Conflicts:
pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Michael Raskin
77b03dbc71
update-upstream-data: Fix a small bug
2012-07-07 20:11:06 +04:00
Peter Simons
94fe7bed1d
Extend compiler wrapper scripts to allow compilation of "/dev/null" input.
...
This feature sounds crazy, but it is used in some configure scripts (e.g. xbmc).
This patch causes an almost complete rebuild of Nixpkgs.
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:15:21 +02:00
Kirill Elagin
1be62b87fe
Handle invalid references
2012-06-20 23:28:53 -04:00
Kirill Elagin
ba766ebcf4
Do not use old way of setting url
and rev
...
This was breaking `nix-prefetch-git --url smth --ref smth` (when
expected hash is not specified)
2012-06-20 23:28:52 -04:00
Michael Raskin
43bc3880f6
Process relative URLs
...
svn path=/nixpkgs/trunk/; revision=34367
2012-06-06 13:26:48 +00:00
Rob Vermaas
0cbfd8ff04
* update hashes for debian queeze
...
svn path=/nixpkgs/trunk/; revision=34316
2012-06-01 17:53:53 +00:00
Eelco Dolstra
c2fd3c184b
* Install/uninstall all RPMs in one operation. This is necessary if
...
the RPMs have dependencies between each other.
svn path=/nixpkgs/trunk/; revision=34303
2012-05-31 13:50:47 +00:00
Eelco Dolstra
ed2564f750
* Set the version number of generated Debian packages. Note that dpkg
...
apparently doesn't allows underscores in version strings, so we
replace them by dashes. This is the exact opposite of RPM, which
doesn't allow dashes.
svn path=/nixpkgs/trunk/; revision=34220
2012-05-24 15:07:38 +00:00
Eelco Dolstra
8336d55993
* Be less verbose generating initrds.
...
svn path=/nixpkgs/trunk/; revision=34199
2012-05-21 20:47:57 +00:00
Eelco Dolstra
41840af689
* Add a setup hook ‘autoreconfHook’ to simplify packages that need to
...
run autoreconf:
buildInputs = [ autoreconfHook ];
is essentially equivalent to
buildInputs = [ autoconf automake libtool ];
preConfigure = "autoreconf -i";
svn path=/nixpkgs/branches/x-updates/; revision=34181
2012-05-19 02:52:36 +00:00
Eelco Dolstra
b6917d3b73
* Added Ubuntu 12.04.
...
svn path=/nixpkgs/trunk/; revision=34055
2012-05-11 02:04:14 +00:00
Eelco Dolstra
40609ab6d5
* Add a hook for running a test after the RPMs have been installed.
...
svn path=/nixpkgs/trunk/; revision=33966
2012-05-01 20:31:01 +00:00
Peter Simons
5c1b0582d2
build-support/fetchurl/mirrors.nix: add funet.fi to more mirrors
...
Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.
svn path=/nixpkgs/trunk/; revision=33946
2012-04-29 18:17:50 +00:00
Eelco Dolstra
fa276c45dd
* Set preferLocalBuild on a few more trivial builders.
...
svn path=/nixpkgs/trunk/; revision=33935
2012-04-26 15:17:43 +00:00
Eelco Dolstra
e5fc65ed40
* writeTextFile: don't use the build hook. NixOS uses this function a
...
lot, and it causes a lot of unnecessary overhead on machines with
remote building enabled.
svn path=/nixpkgs/trunk/; revision=33934
2012-04-26 15:01:41 +00:00
Ludovic Courtès
04600bbec1
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
...
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.
svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Eelco Dolstra
9aa30ba705
* Pass -cpu kvm64 to keep GMP from barfing.
...
svn path=/nixpkgs/trunk/; revision=33848
2012-04-19 18:44:02 +00:00
Nicolas Pierron
82b308bf11
Add armv7l support.
...
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Eelco Dolstra
8b0bc7a745
* Add modules required by Linux 3.2.
...
svn path=/nixpkgs/trunk/; revision=33742
2012-04-11 07:45:12 +00:00
Eelco Dolstra
8fb94bace5
* Remove some obsolete kernel.org mirrors.
...
svn path=/nixpkgs/trunk/; revision=33609
2012-04-05 09:12:38 +00:00
Eelco Dolstra
8ecdd3a0aa
* Don't do a mkdir in the postHook.
...
svn path=/nixpkgs/trunk/; revision=33569
2012-04-04 16:05:08 +00:00
Lluís Batlle i Rossell
33e42bdd8e
Removing usernixos from nixpkgs trunk.
...
I placed a repository starting at this same svn content removed at:
http://viric.name/cgi-bin/usernixos
svn path=/nixpkgs/trunk/; revision=33459
2012-03-28 20:18:56 +00:00
Lluís Batlle i Rossell
68b5044cc0
Adding 'usernixos', where I start a modular kind-of-nixos that can go into
...
"nix-env -i" profiles, as a container for flexible configuration at the style
of nixos, to be defined in .nixpkgs/config.nix, with the main target of
generating an activation script.
svn path=/nixpkgs/trunk/; revision=33445
2012-03-27 20:33:49 +00:00
Eelco Dolstra
2938819d7e
* Remove an unnecessary function.
...
svn path=/nixpkgs/trunk/; revision=33271
2012-03-19 18:13:47 +00:00
Eelco Dolstra
c3072a8df8
* When doing coverage builds, set useTempPrefix (in case we're doing
...
an "installcheck").
svn path=/nixpkgs/trunk/; revision=33261
2012-03-19 16:05:29 +00:00
Eelco Dolstra
9f683a5aac
* After building an RPM, install and uninstall it.
...
svn path=/nixpkgs/trunk/; revision=33257
2012-03-19 13:40:57 +00:00
Eelco Dolstra
ebd19ec705
* For "nix-build --run-env" it's desirable that $stdenv/setup (and by
...
extension postHook) does nothing else than set up the environment.
It shouldn't touch $out because there may not be a $out. So move
the "imperative" bits of postHook into a separate phase.
svn path=/nixpkgs/trunk/; revision=33249
2012-03-19 03:45:36 +00:00
Eelco Dolstra
06d28ca8f1
* Support setting postPhases.
...
svn path=/nixpkgs/trunk/; revision=33247
2012-03-19 02:45:52 +00:00
Ludovic Courtès
adcc6d4102
gcc-cross-wrapper-libs: Gracefully deal with non-existent /TRIPLET/lib dir.
...
This fixes the cross-MinGW environment.
svn path=/nixpkgs/trunk/; revision=33010
2012-03-12 09:45:14 +00:00