Peter Simons
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
9ebb5ad7a6
release.nix, release-small.nix: build atlas library on Hydra
...
This puppy takes several hours to compile, being able to download that
package in binary form is really valuable.
2013-06-02 09:41:32 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Vladimír Čunát
7d9607f151
dbus: minor update, reorganize and polish the expression
2013-04-11 22:17:26 +02:00
Peter Simons
022f120a2c
Merge branch 'master' into stdenv-updates.
2013-04-07 23:37:12 +02:00
Peter Simons
d585ef3178
release-small.nix: drop the Emacs 23.x packages from this file
...
Most of these packages are very old and don't compile in 'master' to
begin with, so it's probably not necessary to use them for testing the
stdenv-updates branch.
2013-04-07 23:33:20 +02:00
Peter Simons
b8753c7d28
release-small.nix: switch Emacs 23 to 24
2013-04-07 23:33:19 +02:00
Peter Simons
a1a8458763
pkgs/top-level/release-small.nix: make 'supportedSystems' an argument to this expression
2013-04-05 11:26:03 +02:00
Peter Simons
62e37492b9
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-04 00:51:30 +02:00
Eelco Dolstra
d021eb6e12
Fix release-small.nix
2013-04-02 11:33:59 +02:00
Lluís Batlle i Rossell
b10ab7a19a
tinycc: updating it to 0.9.26
...
I simplified the expression a bit. And I renamed it to 'tcc'.
I think everyone calls it tcc.
2013-04-01 12:50:45 +02:00
Shea Levy
f2c79c4542
Remove some references to non-existent packages
2013-03-08 16:36:59 -05:00
Eelco Dolstra
e0afec2edc
pwdutils: Remove
...
This package no longer builds and is obsolete (use ‘shadow’ instead).
2013-01-28 17:58:43 +01:00
Eelco Dolstra
d2b76e68d0
gcc-4.1: Remove
...
No longer used and doesn't build.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
ea9d5e8e56
Remove references to some nonexistent packages
2012-12-13 15:28:07 +01:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Mathijs Kwik
ef51f327fe
nxml-mode: remove from release as well
2012-11-23 19:59:19 +01:00
Eelco Dolstra
886ed14f0d
Drop non-existent boostFull from release-small.nix
2012-09-24 17:43:47 -04:00
Peter Simons
d5677fe6c7
stdenv-updates: merge updates from 'master' branch
2012-09-11 16:48:41 +02:00
Lluís Batlle i Rossell
6bc378f584
release-small: make hydra evaluate fine for stdenv-updates
...
In my previous commit I didn't know it was using release-small, instead
of release.nix.
2012-08-20 19:12:38 +02:00
Ludovic Courtès
240d2e9cfa
automake: remove versions 1.7 and 1.9
2012-07-07 11:27:29 +02:00
Eelco Dolstra
069604730b
* Work around some problems in tarball checks. Nix wants to open the
...
DB even in read-only mode. Should probably fix that. Also, "or" no
longer works like this because it's a keyword now.
svn path=/nixpkgs/trunk/; revision=34079
2012-05-13 19:10:57 +00:00
Mathijs Kwik
bd068d386e
completely removed gw6c. use gogoclient.
...
svn path=/nixpkgs/trunk/; revision=32989
2012-03-11 14:35:36 +00:00
Peter Simons
a60193db6b
release-small.nix: updated name of "dbus" attribute
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29698
2011-10-06 13:21:07 +00:00
Peter Simons
d5d5ff5a78
release-small.nix: dropped obsolete 'aterm242fixes' package
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29686
2011-10-06 10:29:56 +00:00
Peter Simons
21887cf61e
we would like to test cups
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29604
2011-10-03 18:40:12 +00:00
Ludovic Courtès
3e68d94b22
Add `release-small.nix'.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=26578
2011-03-28 16:11:12 +00:00