From ff098c1f97df41f2e4f3db8fa109a51a0536b6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 11 Jan 2022 23:18:43 +0100 Subject: [PATCH] feat: stable htmlq --- configs/lb.nix | 7 ++----- configs/packages.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configs/lb.nix b/configs/lb.nix index f99acc8..c1a8b51 100644 --- a/configs/lb.nix +++ b/configs/lb.nix @@ -1,7 +1,4 @@ { lib, pkgs, ... }: -let - nixpkgs-unstable = import {}; -in { systemd.services.lb-subscription = { enable = true; @@ -15,10 +12,10 @@ in first_year=2019 for year in $(${pkgs.coreutils}/bin/seq "$first_year" "$(date +%Y)"); do ${pkgs.curl}/bin/curl -sSL "https://www.literarische-blaetter.de/jahrgang-$year/" \ - | ${nixpkgs-unstable.htmlq}/bin/htmlq --attribute href 'ul.slides a' \ + | ${pkgs.htmlq}/bin/htmlq --attribute href 'ul.slides a' \ | while read -r month; do ${pkgs.curl}/bin/curl -sSL "$month" \ - | ${nixpkgs-unstable.htmlq}/bin/htmlq --attribute src iframe \ + | ${pkgs.htmlq}/bin/htmlq --attribute src iframe \ | ${pkgs.gnused}/bin/sed 's/.*?pdf=//;s/?wp-hosted.*//' done done | ${pkgs.findutils}/bin/xargs ${pkgs.wget}/bin/wget --no-clobber diff --git a/configs/packages.nix b/configs/packages.nix index d78fb7c..3c66bbe 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -93,7 +93,7 @@ in { python3Packages.jsonschema # json validation jq # json toolkit pup # html toolkit - nixpkgs-unstable.htmlq + htmlq xsv # csv toolkit xmlstarlet # xml toolkit manpages