summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-22 23:23:53 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-22 23:23:53 +0100
commit0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch)
tree6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/top-level/release.nix
parent3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff)
parent296cd6600943d5a349cda55a36137331f8c3eec8 (diff)
downloadnixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst
nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index af21e3ac1ad3..7a4a770ff2de 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -47,7 +47,6 @@ with (import ./release-lib.nix);
   chatzilla = linux;
   cksfv = all;
   classpath = linux;
-  consolekit = linux;
   coreutils = all;
   cpio = all;
   cron = linux;
@@ -349,7 +348,6 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox17Pkgs.firefox = linux;
   firefox18Pkgs.firefox = linux;
 
   gnome = {