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
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
Ludovic Courtès
9d125d64bf
VM: Upgrade to Debian 5.0.10.
...
svn path=/nixpkgs/trunk/; revision=33008
2012-03-12 08:13:10 +00:00
Ludovic Courtès
0a433261c5
VM: Make sure `smbd' is in QEMU's $PATH.
...
svn path=/nixpkgs/trunk/; revision=32987
2012-03-11 14:23:32 +00:00
Ludovic Courtès
5d159f8a06
runInGenericVM: Use whatever the current system is.
...
svn path=/nixpkgs/trunk/; revision=32970
2012-03-10 11:44:47 +00:00
Ludovic Courtès
2f01e58e61
vmTools: Use stdenv's glibc in `initrd-utils'.
...
svn path=/nixpkgs/trunk/; revision=32878
2012-03-08 09:40:45 +00:00
Eelco Dolstra
ed325cd1ae
* We accidentally lost xz support in rpm. This broke RPM builds
...
(http://hydra.nixos.org/build/2230623 ).
svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Eelco Dolstra
5e4c7aa8f3
* This substitution causes bash to hang. Urgh. Bash's pattern
...
substitutions aren't very reliable.
svn path=/nixpkgs/trunk/; revision=32830
2012-03-06 18:49:44 +00:00
Yury G. Kudryashov
0210e20b5a
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Arie Middelkoop
d4960f72be
Added an optional parameter to "make-startupitem" to provide a prefix to the ".desktop" file.
...
svn path=/nixpkgs/trunk/; revision=32686
2012-02-29 12:50:17 +00:00
Ludovic Courtès
bd68cc6f5b
nix-build: Honor user-provided `failureHook'.
...
svn path=/nixpkgs/trunk/; revision=32680
2012-02-28 17:10:50 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Arie Middelkoop
70d56e0638
Fixed autoconfPhase so that it additionally tests if ./bootstrap is a file (and not a directory with executable permission) before executing it.
...
svn path=/nixpkgs/trunk/; revision=32530
2012-02-23 23:50:56 +00:00
Yury G. Kudryashov
d8454e538c
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Peter Simons
cecff49b34
Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal.
...
This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.
svn path=/nixpkgs/trunk/; revision=32401
2012-02-19 17:03:35 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
f680a3c175
* Put back the Ubuntu 10.10 images that I accidentally removed.
...
svn path=/nixpkgs/trunk/; revision=32141
2012-02-08 11:38:46 +00:00
Eelco Dolstra
c303784a89
* Debian 6.0.4.
...
svn path=/nixpkgs/trunk/; revision=32112
2012-02-07 13:19:03 +00:00
Eelco Dolstra
78ab1dd995
* Added Fedora 16 images.
...
svn path=/nixpkgs/trunk/; revision=32110
2012-02-07 13:14:25 +00:00
Eelco Dolstra
b22276deea
* Add disk images for Ubuntu 11.10.
...
svn path=/nixpkgs/trunk/; revision=32109
2012-02-07 12:38:32 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Rob Vermaas
d52b0c377f
rpmclosure, remove exit
...
svn path=/nixpkgs/trunk/; revision=31965
2012-02-02 09:54:16 +00:00
Rob Vermaas
6a3feaa3dc
rpmclosure, also take into account rel attribute when versions are the same
...
svn path=/nixpkgs/trunk/; revision=31964
2012-02-02 09:53:45 +00:00