diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-05 12:36:16 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-05 12:59:47 +0200 |
commit | 7af694700c4032e9addc9784c2afab09a148ff8c (patch) | |
tree | 7e5534dfc853b244a980ed8c3aab1e9ea6989435 /pkgs/top-level/release-small.nix | |
parent | 0bed8c15e3d68832f9f6380744375e7efb870d21 (diff) | |
parent | 6cacb34fec15df3b1a98061b12528e48df0b940b (diff) | |
download | nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar.gz nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar.bz2 nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar.lz nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar.xz nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.tar.zst nixpkgs-7af694700c4032e9addc9784c2afab09a148ff8c.zip |
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).
Diffstat (limited to 'pkgs/top-level/release-small.nix')
-rw-r--r-- | pkgs/top-level/release-small.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index cde219eafe6..7743f4d0d27 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,6 +19,7 @@ with (import ./release-lib.nix); aspell = all; at = linux; + atlas = linux; aterm25 = all; aterm28 = all; autoconf = all; |