Commit Graph

277 Commits

Author SHA1 Message Date
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Eelco Dolstra
03d828a976 nixUnstable: Update to 1.8pre3890_8cfe939 2014-11-14 16:00:00 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Shea Levy
2ac3c2e462 nixUnstable: Bump 2014-10-23 09:21:12 -04:00
Shea Levy
eff15260d4 nixUnstable: bump
Some memory and speed improvements
2014-10-17 21:56:13 -04:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Shea Levy
aa847f4772 Update nixUnstable 2014-10-04 16:11:27 -04:00
Eelco Dolstra
ee7a54df0c nix: Revert meta attribute removal 2014-09-24 19:00:35 +02:00
Eelco Dolstra
d3d889eaef nixUnstable: Update to 1.8pre3823_53b044c 2014-09-23 10:56:22 +02:00
Joel Taylor
fa9b1f9cda build nix head successfully 2014-09-09 13:54:57 -07:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
f3f6acc9f8 mark nixUnstable as broken on darwin 2014-09-09 13:54:25 -07:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Eelco Dolstra
364bdc2a95 nixUnstable: Update to 1.8pre3782_d2d5543 2014-09-05 16:05:50 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
07e1301085 nixUnstable: Update to 1.8pre3766_809ca33 2014-08-21 18:04:56 +02:00
Rickard Nilsson
c5c1a243fa nixUnstable: Update to nix-1.8pre3748_02843ba 2014-08-18 16:44:51 +02:00
Eelco Dolstra
b8866772d8 nixUnstable: Update to 1.8pre3746_c160ead 2014-08-17 21:50:22 +02:00
Eelco Dolstra
a9a4cdd3d0 nixUnstable: Update to 1.8pre3718_51485dc 2014-08-04 14:00:41 +02:00
Eelco Dolstra
6a5b365689 nixUnstable: Update to 1.8pre3711_45f9a91 2014-07-30 13:18:33 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
7acfec9e47 nixUnstable: Update to 1.8pre3705_71a20d4 2014-07-25 14:51:50 +02:00
Eelco Dolstra
2b2ba8bdf4 nixUnstable: Update to 1.8pre3679_f609eec 2014-07-18 00:22:08 +02:00
Eelco Dolstra
c49afcc84a nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:34:40 +02:00
Shea Levy
662ecd277a nix: propagate boehmgc 2014-06-27 18:15:05 -04:00
Shea Levy
52aa2afdcd nixUnstable: bump 2014-06-16 10:44:02 -04:00
Eelco Dolstra
2da09363bf nix: Update to 1.7 2014-04-11 12:24:48 +02:00
Eelco Dolstra
95272dc61a nixUnstable: Update to 1.7pre3576_2b6c8ef 2014-04-08 18:14:46 +02:00
Vladimír Čunát
5d26659bb9 nixUnstable: update to avoid the funny --c||es bug :-) 2014-03-29 18:38:46 +01:00
Eelco Dolstra
5605b256a7 nixUnstable: Update to 1.7pre3522_f7e077a 2014-03-05 15:23:30 +01:00
Eelco Dolstra
19350fac66 nixUnstable: Update to 1.7pre3520_1017bd6 2014-02-28 11:05:47 +01:00
Eelco Dolstra
8ad41b92cf nixUnstable: Update to 1.7pre3327_0e2ca26
Also fixes disappeared tarball.
2014-01-21 09:59:50 +01:00
Eelco Dolstra
9afd64fba8 nixUnstable: Update to 1.7pre3319_f4013b6 2014-01-09 13:20:08 +01:00
Eelco Dolstra
b9dbfe7feb nix: Backport bug fix to check NAR integrity 2014-01-09 13:07:57 +01:00
Eelco Dolstra
60f1afe199 nix: Update to 1.6.1 2013-10-29 11:30:36 +01:00
Eelco Dolstra
6f911ede89 nix: Update to 1.7pre3267_2d9bb56 2013-10-24 20:20:13 +02:00
Eelco Dolstra
ee330eaedf nixUnstable: Update to 1.7pre3252_792fd51 2013-10-17 16:06:58 +02:00
Eelco Dolstra
095fc0ebaa nix-repl: Add 2013-09-17 11:26:12 +02:00
Eelco Dolstra
b73deae714 nix: Update to 1.6 2013-09-10 17:53:29 +02:00
Eelco Dolstra
64d648e92e Update nixUnstable 2013-09-10 13:57:32 +02:00
Eelco Dolstra
692dfb6af9 Update nixUnstable 2013-09-06 11:42:11 +02:00
Eelco Dolstra
36622f5964 nixUnstable: Update to 1.6pre3187_3fb7ae0 2013-08-12 14:22:16 +02:00
Eelco Dolstra
3c35daeebe nixUnstable: Update to 1.6pre3166_15e5ac8 2013-07-19 15:19:38 +02:00
Eelco Dolstra
5bc8275075 nix: Update to 1.5.3 2013-06-18 00:56:00 +02:00
Eelco Dolstra
a0c5ff6571 nixUnstable: Update to 1.5.3pre3141_1b6ee8f 2013-06-14 13:38:36 +02:00
Eelco Dolstra
eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +02:00
Eelco Dolstra
fdd06dc094 nix: Update to 1.5.2 2013-05-14 00:01:38 +02:00
Eelco Dolstra
ef6fc4a345 nixUnstable: Update to 1.5.2pre3091_772b709 2013-04-30 00:17:18 +02:00
Eelco Dolstra
5262980561 nixUnstable: Bump 2013-03-26 16:00:47 +01:00
Eelco Dolstra
93a963f347 nixUnstable: Update to the latest
This is mostly to get rid of those annoying Perl warnings in NixOS...
2013-03-18 22:35:33 +01:00
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