diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
| commit | 1e107443ad0867ca0c923556e13a2c9a92e9e98a (patch) | |
| tree | 4320b541e23ffcf683556ef49cdf10e9dd1eed05 /nixos | |
| parent | a5913ce2722b067fdc346a3c06e51ff5aaa1aef9 (diff) | |
| parent | 618ac29687a650d854c8bea7efd4490387589ce2 (diff) | |
| download | nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.gz nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.bz2 nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.lz nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.xz nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.zst nixpkgs-1e107443ad0867ca0c923556e13a2c9a92e9e98a.zip | |
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
Diffstat (limited to 'nixos')
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 0dd59e4fb44..54047a50caa 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -208,7 +208,7 @@ in { ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d48b78ae6d0..921be23f368 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -249,7 +249,7 @@ in { }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} - ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir} + ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir} ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d68f2b1c9b..7256013d5d8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -124,7 +124,7 @@ in { # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cdeff484594..8b3dc2d90eb 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -118,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} + dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = |