diff options
Diffstat (limited to 'overlays')
-rwxr-xr-x | overlays/worktime/worktime/__main__.py | 10 | ||||
-rw-r--r-- | overlays/yt-dlp.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index 3e7aeb9f..016690f0 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py | |||
@@ -375,10 +375,7 @@ class Worktime(object): | |||
375 | parse_datestr(stripped_line) | 375 | parse_datestr(stripped_line) |
376 | 376 | ||
377 | for day in [fromDay + timedelta(days = x) for x in range(0, (toDay - fromDay).days + 1)]: | 377 | for day in [fromDay + timedelta(days = x) for x in range(0, (toDay - fromDay).days + 1)]: |
378 | # if self.end_date.date() < day or day < self.start_date.date(): | 378 | if self.would_be_workday(day) and self.start_date.date() <= day and day <= self.end_date.date(): |
379 | # continue | ||
380 | |||
381 | if self.would_be_workday(day): | ||
382 | if excused_kind == 'leave': | 379 | if excused_kind == 'leave': |
383 | self.leave_days.add(day) | 380 | self.leave_days.add(day) |
384 | elif time is not None and time >= self.time_per_day(day): | 381 | elif time is not None and time >= self.time_per_day(day): |
@@ -444,8 +441,9 @@ class Worktime(object): | |||
444 | if e.errno != 2: | 441 | if e.errno != 2: |
445 | raise e | 442 | raise e |
446 | 443 | ||
447 | for year in range(self.end_date.year + 1, max(self.pull_forward.keys()).year + 1): | 444 | if self.pull_forward: |
448 | holidays |= {k: v * timedelta(hours = hours_per_week(k)) / len(self.workdays) for k, v in Worktime.holidays(year).items()} | 445 | for year in range(self.end_date.year + 1, max(self.pull_forward.keys()).year + 1): |
446 | holidays |= {k: v * timedelta(hours = hours_per_week(k)) / len(self.workdays) for k, v in Worktime.holidays(year).items()} | ||
449 | 447 | ||
450 | self.days_to_work = dict() | 448 | self.days_to_work = dict() |
451 | 449 | ||
diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix index 94ab1fdd..9a54a32b 100644 --- a/overlays/yt-dlp.nix +++ b/overlays/yt-dlp.nix | |||
@@ -1,5 +1,7 @@ | |||
1 | { prev, sources, ... }: { | 1 | { prev, sources, ... }: { |
2 | yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: { | 2 | yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: { |
3 | inherit (sources.yt-dlp) pname version src; | 3 | inherit (sources.yt-dlp) pname version src; |
4 | |||
5 | postPatch = ""; | ||
4 | }); | 6 | }); |
5 | } | 7 | } |