diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/top-level/release.nix | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 56cc49abac63..fd94b405f6e4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -98,7 +98,6 @@ let drgeo = linux; ejabberd = linux; elinks = linux; - emacs23 = gtkSupported; enscript = all; eprover = linux; evince = linux; @@ -116,7 +115,6 @@ let gcc = linux; gcc33 = linux; gcc34 = linux; - gcc42 = linux; gcc44 = linux; gcj = linux; ghdl = linux; @@ -342,17 +340,6 @@ let zsh = linux; zsnes = ["i686-linux"]; - emacs23Packages = { - bbdb = linux; - cedet = linux; - emacsw3m = linux; - emms = linux; - jdee = linux; - }; - - firefox36Pkgs.firefox = linux; - firefoxPkgs.firefox = linux; - gnome = { gnome_panel = linux; metacity = linux; |