philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

177 commits

Author SHA1 Message Date
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Eelco Dolstra 1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Eelco Dolstra adef38370c nix: Update to 1.5 2013-02-28 01:20:39 +01:00
Eelco Dolstra 5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Eelco Dolstra 26dd2dc425 nixUnstable: Update to 1.4pre3056_79a3ba7 2013-02-11 15:27:18 +01:00
Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates 
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
 2013-01-27 11:32:12 +01:00
Eelco Dolstra abf2ea216a nix: Update to 1.4pre3048_99ed558 2013-01-23 14:16:00 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra bcc0c1dc59 Update nixUnstable 2013-01-20 17:26:07 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Eelco Dolstra e2d6154fff nix: Update to 1.3 
Also, use /etc/nix as the default configuration directory.  This way
$NIX_CONF_DIR no longer needs to be set in most cases.
 2013-01-05 18:57:33 +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
Eelco Dolstra 1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Eelco Dolstra 4b48d05c58 Remove nixCustomFun 
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
 2012-11-29 13:47:40 +01:00
Eelco Dolstra 144b06f107 nix: Update to 1.2pre2980 2012-11-20 12:12:24 +01:00
Eelco Dolstra ae7044a001 nix: Update to 1.2pre2950_ac238d6 2012-10-16 17:11:54 -04:00
Eelco Dolstra 4606b60dbf nixUnstable: Update to 1.2pre2910_b674665 2012-09-14 12:32:44 -04:00
Eelco Dolstra c557db2d5c nix: Update to 1.2pre2793_d950cfe 
Necessary for systemd.
 2012-08-21 08:42:44 -04:00
Eelco Dolstra 006e3fbf46 nix: Update to latest unstable version 2012-08-18 17:54:22 -04:00
Eelco Dolstra d077a98e77 nix: Update to 1.1 2012-07-18 21:50:41 -04:00
Eelco Dolstra eeb09aa1bc nix: Update to 1.1pre2749_ccc52ad 2012-07-18 17:03:55 +02:00
Eelco Dolstra be4a92ad33 nix: Update to 1.1pre2742_a7a43ad 2012-07-16 11:22:28 -04:00
Eelco Dolstra 562259efc1 nix: Update to 1.1pre2723_1aba0bf 2012-07-05 14:05:02 -04:00
Rob Vermaas 484c13cce1 nixUnstable: Updated to 1.1pre2718_8da6772 
This version brings better isolation in chroot builds (private network and SysV IPC namespace).
 2012-06-25 11:40:17 +02:00
Eelco Dolstra d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413 
This version brings systemd support and automatic log compression.
 2012-06-22 10:34:08 -04:00
Eelco Dolstra 8a5d68220a * Nix 1.0. 
svn path=/nixpkgs/trunk/; revision=34068
 2012-05-12 04:20:26 +00:00
Eelco Dolstra 5bdea119d4 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
 2012-05-02 13:19:07 +00:00
Eelco Dolstra be901fa8be * Add an installCheckPhase. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
 2012-05-01 21:00:30 +00:00
Eelco Dolstra 83f7c6988e * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33954
 2012-04-30 15:33:59 +00:00
Eelco Dolstra 12130aea67 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33915
 2012-04-25 12:24:16 +00:00
Eelco Dolstra 62765a92a8 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33817
 2012-04-17 15:56:14 +00:00
Eelco Dolstra b3980b78f8 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33628
 2012-04-05 16:38:03 +00:00
Eelco Dolstra a78b508f8e * Latest nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33599
 2012-04-04 22:59:16 +00:00
Ludovic Courtès 1a38734345 nixUnstable: Fix cross-compilation native/cross mismatch with bzip2. 
See <http://hydra.nixos.org/build/2345751> for the original symptom.

svn path=/nixpkgs/trunk/; revision=33515
 2012-04-01 12:08:44 +00:00
Ludovic Courtès 3363c587a4 nixUnstable: Use `postInstall' instead of a custom phase. 
svn path=/nixpkgs/trunk/; revision=33514
 2012-04-01 12:08:39 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Michael Raskin a6b434974b Fixing how bzip2 is passed to nixCustom 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
 2012-03-30 10:18:25 +00:00
Eelco Dolstra 5fd376da83 * Update nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33480
 2012-03-29 22:10:24 +00:00
Eelco Dolstra d1cbcc3971 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32965
 2012-03-09 19:57:33 +00:00
Eelco Dolstra 11d1104a88 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
 2012-03-01 22:22:24 +00:00
Shea Levy 584ccabaac svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
 2012-02-25 20:52:15 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +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
Eelco Dolstra b786ce664d * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31738
 2012-01-20 15:26:47 +00:00
Michael Raskin faedda84ef A more correct condition for adding scripts to install 
svn path=/nixpkgs/trunk/; revision=31638
 2012-01-18 17:23:41 +00:00
Eelco Dolstra bbe40d00f4 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31619
 2012-01-18 12:23:42 +00:00
Eelco Dolstra cddfcd7bcc * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31043
 2011-12-22 12:30:59 +00:00
Eelco Dolstra 8ed604d4b8 * Bump. 
svn path=/nixpkgs/trunk/; revision=30740
 2011-12-05 12:12:20 +00:00