From 052fce5bf2b1995fe45b88626e5342e61933d7cd Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 23 May 2024 13:22:50 +0200
Subject: refactor: use a single value for per-source import timeouts

---
 defaults.toml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'defaults.toml')

diff --git a/defaults.toml b/defaults.toml
index c651508..3822d02 100644
--- a/defaults.toml
+++ b/defaults.toml
@@ -83,10 +83,8 @@ URL = 'https://github.com/LnL7/nix-darwin/archive/master.tar.gz'
 Attribute = 'options'
 # (Fetcher=channel) Sub-path of imported channel which contains the attribute above, e.g. release.nix
 ImportPath = 'release.nix'
-# Abort fetch if it takes longer than this.
-FetchTimeout = '5m0s'
 # Abort import if it takes longer than this.
-ImportTimeout = '15m0s'
+Timeout = '5m0s'
 # (Fetcher=channel) Path under ./result symlink to folder containing {options,packages}.json.
 OutputPath = 'share/doc/darwin'
 
@@ -116,10 +114,8 @@ URL = 'https://github.com/nix-community/home-manager/archive/master.tar.gz'
 Attribute = 'docs.json'
 # (Fetcher=channel) Sub-path of imported channel which contains the attribute above, e.g. release.nix
 ImportPath = 'default.nix'
-# Abort fetch if it takes longer than this.
-FetchTimeout = '5m0s'
 # Abort import if it takes longer than this.
-ImportTimeout = '15m0s'
+Timeout = '5m0s'
 # (Fetcher=channel) Path under ./result symlink to folder containing {options,packages}.json.
 OutputPath = 'share/doc/home-manager'
 
@@ -149,10 +145,8 @@ URL = 'https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz'
 Attribute = 'options'
 # (Fetcher=channel) Sub-path of imported channel which contains the attribute above, e.g. release.nix
 ImportPath = 'nixos/release.nix'
-# Abort fetch if it takes longer than this.
-FetchTimeout = '5m0s'
 # Abort import if it takes longer than this.
-ImportTimeout = '15m0s'
+Timeout = '5m0s'
 # (Fetcher=channel) Path under ./result symlink to folder containing {options,packages}.json.
 OutputPath = 'share/doc/nixos'
 
@@ -182,10 +176,8 @@ URL = ''
 Attribute = ''
 # (Fetcher=channel) Sub-path of imported channel which contains the attribute above, e.g. release.nix
 ImportPath = ''
-# Abort fetch if it takes longer than this.
-FetchTimeout = '5m0s'
 # Abort import if it takes longer than this.
-ImportTimeout = '15m0s'
+Timeout = '5m0s'
 # (Fetcher=channel) Path under ./result symlink to folder containing {options,packages}.json.
 OutputPath = 'packages.json.br'
 
-- 
cgit 1.4.1