diff options
| author | Peter Simons <simons@cryp.to> | 2012-09-11 16:48:41 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-09-11 16:48:41 +0200 |
| commit | d5677fe6c75ae3c54477d7f597b9d61d3c782351 (patch) | |
| tree | 306c3fc22341e05eb90907f7593ac0730d82d77b /pkgs/top-level/release.nix | |
| parent | 6bc378f5842d343b07a7b25abf25b0f79de92b74 (diff) | |
| parent | 504e2ad1287435c0d0ca2a181cfbf222693c9fc0 (diff) | |
| download | nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar.gz nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar.bz2 nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar.lz nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar.xz nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.tar.zst nixlib-d5677fe6c75ae3c54477d7f597b9d61d3c782351.zip | |
stdenv-updates: merge updates from 'master' branch
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5e0aeea2da68..390c8855e568 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -26,7 +26,6 @@ with (import ./release-lib.nix); autoconf = all; automake110x = all; automake111x = all; - automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; @@ -103,7 +102,7 @@ with (import ./release-lib.nix); ghdl = linux; ghostscript = linux; ghostscriptX = linux; - gimp = linux; + gimp_2_8 = linux; git = linux; gitFull = linux; glibc = linux; @@ -360,6 +359,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; firefox13Pkgs.firefox = linux; + firefox15Pkgs.firefox = linux; gnome = { gnome_panel = linux; @@ -447,7 +447,7 @@ with (import ./release-lib.nix); xlsclients = linux; xmessage = linux; xorgserver = linux; - xprop = linux; + xprop = linux; xrandr = linux; xrdb = linux; xset = linux; @@ -473,4 +473,3 @@ with (import ./release-lib.nix); }; } )) - |