diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:33:53 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:33:53 -0800 |
| commit | 4ead61ca39206de1b6f696426df6c7a33b5808fb (patch) | |
| tree | 39d75165517741aff507cc6787c95074f17e31b9 | |
| parent | 6602f49495c94e8533c8b482698bcf570a8d8933 (diff) | |
| parent | fb864b8898394bd3b59e34e4fef6835d805c2761 (diff) | |
| download | nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar.gz nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar.bz2 nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar.lz nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar.xz nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.tar.zst nixlib-4ead61ca39206de1b6f696426df6c7a33b5808fb.zip | |
Merge remote-tracking branch 'upstream/master' into master.upstream
| -rw-r--r-- | nixos/modules/services/web-servers/lighttpd/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pommed/default.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 2c662c0aead9..171503db4eec 100644 --- 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" diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index b4b4569def4b..6318654742ee 100644 --- 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 }; } |