From 83477b9e7047e9fe90c7938348f628455350fd4c Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 22 Jan 2025 10:50:36 +0000 Subject: [PATCH] zim packages: add a bunch more the khanacademy one is taking ages to download... --- .../zimPackages/alpinelinux_en_all_maxi.nix | 6 ++++++ pkgs/by-name/zimPackages/archlinux_en_all_maxi.nix | 6 ++++++ pkgs/by-name/zimPackages/bitcoin_en_all_maxi.nix | 6 ++++++ pkgs/by-name/zimPackages/devdocs_en_nix.nix | 6 ++++++ pkgs/by-name/zimPackages/gentoo_en_all_maxi.nix | 6 ++++++ pkgs/by-name/zimPackages/khanacademy_en_all.nix | 5 +++++ pkgs/by-name/zimPackages/mkVersionedHttpZim.nix | 1 + .../zimPackages/openstreetmap-wiki_en_all_maxi.nix | 6 ++++++ pkgs/by-name/zimPackages/package.nix | 14 ++++++++++++++ .../zimPackages/psychonautwiki_en_all_maxi.nix | 8 ++++++++ .../zimPackages/rationalwiki_en_all_maxi.nix | 6 ++++++ .../zimPackages/zimgit-food-preparation_en.nix | 6 ++++++ pkgs/by-name/zimPackages/zimgit-medicine_en.nix | 6 ++++++ .../zimPackages/zimgit-post-disaster_en.nix | 6 ++++++ pkgs/by-name/zimPackages/zimgit-water_en.nix | 6 ++++++ 15 files changed, 94 insertions(+) create mode 100644 pkgs/by-name/zimPackages/alpinelinux_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/archlinux_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/bitcoin_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/devdocs_en_nix.nix create mode 100644 pkgs/by-name/zimPackages/gentoo_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/khanacademy_en_all.nix create mode 100644 pkgs/by-name/zimPackages/openstreetmap-wiki_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/psychonautwiki_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/rationalwiki_en_all_maxi.nix create mode 100644 pkgs/by-name/zimPackages/zimgit-food-preparation_en.nix create mode 100644 pkgs/by-name/zimPackages/zimgit-medicine_en.nix create mode 100644 pkgs/by-name/zimPackages/zimgit-post-disaster_en.nix create mode 100644 pkgs/by-name/zimPackages/zimgit-water_en.nix diff --git a/pkgs/by-name/zimPackages/alpinelinux_en_all_maxi.nix b/pkgs/by-name/zimPackages/alpinelinux_en_all_maxi.nix new file mode 100644 index 000000000..aeb28ff8b --- /dev/null +++ b/pkgs/by-name/zimPackages/alpinelinux_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "alpinelinux_en_all_maxi"; + version = "2023-01"; + hash = "sha256-zNShZOPEF3iBnP2Fdmr+Dpu8mjMf+5FJl1f3px5+nPs="; +} diff --git a/pkgs/by-name/zimPackages/archlinux_en_all_maxi.nix b/pkgs/by-name/zimPackages/archlinux_en_all_maxi.nix new file mode 100644 index 000000000..037ca419c --- /dev/null +++ b/pkgs/by-name/zimPackages/archlinux_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "archlinux_en_all_maxi"; + version = "2022-12"; + hash = "sha256-Bj8AocoWTgDyjVlUSfDvNCMg6vKzOyJTFgY6qmRL7AY="; +} diff --git a/pkgs/by-name/zimPackages/bitcoin_en_all_maxi.nix b/pkgs/by-name/zimPackages/bitcoin_en_all_maxi.nix new file mode 100644 index 000000000..6fa0a5778 --- /dev/null +++ b/pkgs/by-name/zimPackages/bitcoin_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "bitcoin_en_all_maxi"; + version = "2021-03"; + hash = "sha256-W+GVrWfZ1bS+zKjPDnVeAM8t6XLMPIfF7qntT9jO5+8="; +} diff --git a/pkgs/by-name/zimPackages/devdocs_en_nix.nix b/pkgs/by-name/zimPackages/devdocs_en_nix.nix new file mode 100644 index 000000000..8e1d4c552 --- /dev/null +++ b/pkgs/by-name/zimPackages/devdocs_en_nix.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "devdocs"; + pname = "devdocs_en_nix"; + version = "2025-01"; + hash = "sha256-njenhXV+6fu6LPZXaqfWLipCcF89m0CZPqzVIxJXWTU="; +} diff --git a/pkgs/by-name/zimPackages/gentoo_en_all_maxi.nix b/pkgs/by-name/zimPackages/gentoo_en_all_maxi.nix new file mode 100644 index 000000000..c212d668f --- /dev/null +++ b/pkgs/by-name/zimPackages/gentoo_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "gentoo_en_all_maxi"; + version = "2021-03"; + hash = "sha256-8AuVOKt19LsmcEuVfo97csp+TbUCXE+6V/tJHzPc9AI="; +} diff --git a/pkgs/by-name/zimPackages/khanacademy_en_all.nix b/pkgs/by-name/zimPackages/khanacademy_en_all.nix new file mode 100644 index 000000000..45aedb633 --- /dev/null +++ b/pkgs/by-name/zimPackages/khanacademy_en_all.nix @@ -0,0 +1,5 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "khanacademy_en_all"; + version = "2023-03"; +} diff --git a/pkgs/by-name/zimPackages/mkVersionedHttpZim.nix b/pkgs/by-name/zimPackages/mkVersionedHttpZim.nix index 4db9b7132..7512e5151 100644 --- a/pkgs/by-name/zimPackages/mkVersionedHttpZim.nix +++ b/pkgs/by-name/zimPackages/mkVersionedHttpZim.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.kiwix.org/zim/${prefix}${tail}" "https://dumps.wikimedia.org/other/kiwix/zim/${prefix}${tail}" "https://mirror.accum.se/mirror/wikimedia.org/other/kiwix/zim/${prefix}${tail}" + "https://mirror.download.kiwix.org/zim/.hidden/${prefix}${tail}" ]; inherit hash; }; diff --git a/pkgs/by-name/zimPackages/openstreetmap-wiki_en_all_maxi.nix b/pkgs/by-name/zimPackages/openstreetmap-wiki_en_all_maxi.nix new file mode 100644 index 000000000..2af7884a1 --- /dev/null +++ b/pkgs/by-name/zimPackages/openstreetmap-wiki_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "openstreetmap-wiki_en_all_maxi"; + version = "2023-05"; + hash = "sha256-Wi1+33ZGvpMfOwMJqp9yFdvJrCFcSQBBxYhQfra13bI="; +} diff --git a/pkgs/by-name/zimPackages/package.nix b/pkgs/by-name/zimPackages/package.nix index 2ae41f55a..f277055ca 100644 --- a/pkgs/by-name/zimPackages/package.nix +++ b/pkgs/by-name/zimPackages/package.nix @@ -6,6 +6,7 @@ # - https://mirror.accum.se/mirror/wikimedia.org/other/kiwix/zim # - https://dumps.wikimedia.org/other/kiwix/zim # - https://download.kiwix.org/zim +# - https://mirror.download.kiwix.org/zim/.hidden/ { lib, newScope, @@ -13,7 +14,20 @@ lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; { mkVersionedHttpZim = callPackage ./mkVersionedHttpZim.nix { }; + alpinelinux_en_all_maxi = callPackage ./alpinelinux_en_all_maxi.nix { }; + archlinux_en_all_maxi = callPackage ./archlinux_en_all_maxi.nix { }; + bitcoin_en_all_maxi = callPackage ./bitcoin_en_all_maxi.nix { }; + devdocs_en_nix = callPackage ./devdocs_en_nix.nix { }; + gentoo_en_all_maxi = callPackage ./gentoo_en_all_maxi.nix { }; + khanacademy_en_all = callPackage ./khanacademy_en_all.nix { }; + openstreetmap-wiki_en_all_maxi = callPackage ./openstreetmap-wiki_en_all_maxi.nix { }; + psychonautwiki_en_all_maxi = callPackage ./psychonautwiki_en_all_maxi.nix { }; + rationalwiki_en_all_maxi = callPackage ./rationalwiki_en_all_maxi.nix { }; wikipedia_en_100 = callPackage ./wikipedia_en_100.nix { }; wikipedia_en_all_maxi = callPackage ./wikipedia_en_all_maxi.nix { }; wikipedia_en_all_mini = callPackage ./wikipedia_en_all_mini.nix { }; + zimgit-food-preparation_en = callPackage ./zimgit-food-preparation_en.nix { }; + zimgit-medicine_en = callPackage ./zimgit-medicine_en.nix { }; + zimgit-post-disaster_en = callPackage ./zimgit-post-disaster_en.nix { }; + zimgit-water_en = callPackage ./zimgit-water_en.nix { }; })) diff --git a/pkgs/by-name/zimPackages/psychonautwiki_en_all_maxi.nix b/pkgs/by-name/zimPackages/psychonautwiki_en_all_maxi.nix new file mode 100644 index 000000000..fa2ded6e1 --- /dev/null +++ b/pkgs/by-name/zimPackages/psychonautwiki_en_all_maxi.nix @@ -0,0 +1,8 @@ +# TODO: switch to non-dev once official package is published +# - +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "dev"; + pname = "psychonautwiki_en_all_maxi"; + version = "2024-12"; + hash = "sha256-1CfR/7QeAbzEnWwueoeUOukw05IYTimDPIaiTddUV4k="; +} diff --git a/pkgs/by-name/zimPackages/rationalwiki_en_all_maxi.nix b/pkgs/by-name/zimPackages/rationalwiki_en_all_maxi.nix new file mode 100644 index 000000000..fa8d24e90 --- /dev/null +++ b/pkgs/by-name/zimPackages/rationalwiki_en_all_maxi.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "rationalwiki_en_all_maxi"; + version = "2021-03"; + hash = "sha256-dVULy9qBvUWx6Okx4eF+4wKUb4KuiNoTLAOTo39a/G4="; +} diff --git a/pkgs/by-name/zimPackages/zimgit-food-preparation_en.nix b/pkgs/by-name/zimPackages/zimgit-food-preparation_en.nix new file mode 100644 index 000000000..07f97c497 --- /dev/null +++ b/pkgs/by-name/zimPackages/zimgit-food-preparation_en.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "zimgit-food-preparation_en"; + version = "2024-08"; + hash = "sha256-nGuBmmj+KnRWQq1DqbTh/nnYl28jmr2ErjjUwtJg7RQ="; +} diff --git a/pkgs/by-name/zimPackages/zimgit-medicine_en.nix b/pkgs/by-name/zimPackages/zimgit-medicine_en.nix new file mode 100644 index 000000000..9ddfb1885 --- /dev/null +++ b/pkgs/by-name/zimPackages/zimgit-medicine_en.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "zimgit-medicine_en"; + version = "2024-08"; + hash = "sha256-qGwxuT6YAKrizYEu8Yy/nAh6dTd4TGL7wlnbf5+dGMA="; +} diff --git a/pkgs/by-name/zimPackages/zimgit-post-disaster_en.nix b/pkgs/by-name/zimPackages/zimgit-post-disaster_en.nix new file mode 100644 index 000000000..35f57e60a --- /dev/null +++ b/pkgs/by-name/zimPackages/zimgit-post-disaster_en.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "zimgit-post-disaster_en"; + version = "2024-05"; + hash = "sha256-C6m7NYt2i5TrDXkgdS/jVr8JfeUU7mGEPzpNpszhdPg="; +} diff --git a/pkgs/by-name/zimPackages/zimgit-water_en.nix b/pkgs/by-name/zimPackages/zimgit-water_en.nix new file mode 100644 index 000000000..c0324c32f --- /dev/null +++ b/pkgs/by-name/zimPackages/zimgit-water_en.nix @@ -0,0 +1,6 @@ +{ mkVersionedHttpZim }: mkVersionedHttpZim { + owner = "other"; + pname = "zimgit-water_en"; + version = "2024-08"; + hash = "sha256-OSx7yXCkT93WHdF/bqvx9OIZNvLVwnyDCT4dxHXLVrY="; +}