Merge remote-tracking branch 'upstream/master' into master.upstream

2015-11-14 12:33:53 -08:00 · 2015-11-14 12:33:53 -08:00 · 4ead61ca39
commit 4ead61ca39
parent 6602f49495 fb864b8898
2 changed files with 1 additions and 1 deletions
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@ -44,7 +44,6 @@ let
    "mod_flv_streaming"
    "mod_magnet"
    "mod_mysql_vhost"
-    "mod_rewrite"
    "mod_scgi"
    "mod_setenv"
    "mod_trigger_b4_dl"
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
    description = "A tool to handle hotkeys on Apple laptop keyboards";
    homepage = http://www.technologeek.org/projects/pommed/index.html;
    license = stdenv.lib.licenses.gpl2;
+    broken = true; # hash changed, and it's quite suspicious
  };
 }