diff --git a/pkgs/zim.nix b/pkgs/zim.nix index 4ccf719..aabf5e1 100644 --- a/pkgs/zim.nix +++ b/pkgs/zim.nix @@ -17,11 +17,12 @@ let inherit (val) hash; url = "https://download.kiwix.org/zim/${type}/${val.name}.torrent"; backend = "transmission"; - postUnpack = "ls -lR"; + postUnpack = "mkdir -p $downloadedDirectory/tmp; mv $downloadedDirectory/*.zim $downloadedDirectory/tmp"; } ); phases = [ "installPhase" ]; installPhase = '' + set -x ls -lR ${finalAttrs.src} cp ${finalAttrs.src} $out ''; diff --git a/pkgs/zim/blobs.json b/pkgs/zim/blobs.json index 7558223..78825dc 100644 --- a/pkgs/zim/blobs.json +++ b/pkgs/zim/blobs.json @@ -1,76 +1,20 @@ { "en": { - "gutenberg": { - "name": "gutenberg_en_all_2023-08.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, "phet": { "name": "phet_en_all_2025-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikibooks": { - "name": "wikibooks_en_all_maxi_2021-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikipedia": { - "name": "wikipedia_en_all_maxi_2024-01.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikisource": { - "name": "wikisource_en_all_maxi_2022-09.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikiversity": { - "name": "wikiversity_en_all_maxi_2025-05.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wiktionary": { - "name": "wiktionary_en_all_nopic_2024-05.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" + "hash": "sha256-HT/gVNydkOitny6oUl2A+JvbFDGAIeb0h+xbMeQ2Rqs=" } }, "fr": { - "gutenberg": { - "name": "gutenberg_fr_all_2023-08.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, "phet": { "name": "phet_fr_all_2025-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikibooks": { - "name": "wikibooks_fr_all_maxi_2025-06.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikipedia": { - "name": "wikipedia_fr_all_maxi_2024-05.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikisource": { - "name": "wikisource_fr_all_maxi_2025-06.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikiversity": { - "name": "wikiversity_fr_all_maxi_2021-02.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wiktionary": { - "name": "wiktionary_fr_all_nopic_2025-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" + "hash": "sha256-K56i55WPu5EMQHIrnnqhgJ32WozZ6oYD9X3IBytGA0A=" } }, "ht": { "phet": { "name": "phet_ht_all_2025-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikipedia": { - "name": "wikipedia_ht_all_maxi_2025-05.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" - }, - "wikisource": { - "name": "wikisource_ht_all_maxi_2019-03.zim", - "hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" + "hash": "sha256-UjC0REJ5d5wIKccutZADX74IxvZuF+CD/caVzZfHg9s=" } } -} +} \ No newline at end of file diff --git a/pkgs/zim/updater.go b/pkgs/zim/updater.go index 864469a..074e096 100644 --- a/pkgs/zim/updater.go +++ b/pkgs/zim/updater.go @@ -20,11 +20,11 @@ const BASE = "https://download.kiwix.org/zim" func getTypes() []string { return []string{ "phet", - "wikipedia", - "wiktionary", - "wikiversity", - "wikisource", - "wikibooks", + // "wikipedia", + // "wiktionary", + // "wikiversity", + // "wikisource", + // "wikibooks", "gutenberg", "ted", } @@ -92,6 +92,7 @@ func getHash(ch chan result, file, category, language string) { url="%s/%s/%s.torrent"; hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; backend="transmission"; + postUnpack="mkdir -p $downloadedDirectory/tmp; mv $downloadedDirectory/*.zim $downloadedDirectory/tmp"; }`, BASE, category, file), ) out, err := cmd.Output()