diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-04 17:21:22 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-04 17:21:22 +0200 |
| commit | aa63b803a0506bba15ade168776a88a7bbc9042f (patch) | |
| tree | e0649f07d7d480ab965a5979de4a93187291d783 | |
| parent | b338c2e73c30368d5288b0b1e222c0113cb55b0c (diff) | |
| parent | d3af8d37f8e3d806ca3744b7086f8d5e30f72875 (diff) | |
Merge remote-tracking branch 'gum/master'
| -rw-r--r-- | makefu/2configs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x230.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index bcd998826..0b4ef8909 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,7 +22,7 @@ with import <stockholm/lib>; user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; - ref = "7a7c39c"; # unstable @ 2017-05-09 + graceful requests2 + logstash5 + ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa) in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then { diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix index 2de32dd94..c705b52a7 100644 --- a/makefu/2configs/hw/tp-x230.nix +++ b/makefu/2configs/hw/tp-x230.nix @@ -44,8 +44,7 @@ with import <stockholm/lib>; ''; # enable HDMI output switching with pulseaudio - hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" '' - ${builtins.readFile "${config.hardware.pulseaudio.package.out}/etc/pulse/default.pa"} + hardware.pulseaudio.extraConfig = '' load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI" ''; |