greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Commit the progress made (so far) on fixing the zims downloader

Browse Source
This commit is contained in:
Greg Hellings
2025-10-16 10:46:02 -05:00
parent 6744f6ac34
commit 0b6f269d35
3 changed files with 12 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/zim.nix
+2 -1
View File
@@ -17,11 +17,12 @@ let
inherit (val) hash; inherit (val) hash;
url = "https://download.kiwix.org/zim/${type}/${val.name}.torrent"; url = "https://download.kiwix.org/zim/${type}/${val.name}.torrent";
backend = "transmission"; backend = "transmission";
postUnpack = "ls -lR"; postUnpack = "mkdir -p $downloadedDirectory/tmp; mv $downloadedDirectory/*.zim $downloadedDirectory/tmp";
} }
); );
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
set -x
ls -lR ${finalAttrs.src} ls -lR ${finalAttrs.src}
cp ${finalAttrs.src} $out cp ${finalAttrs.src} $out
''; '';
pkgs/zim/blobs.json
+4 -60
View File
@@ -1,76 +1,20 @@
{ {
"en": { "en": {
"gutenberg": {
"name": "gutenberg_en_all_2023-08.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
},
"phet": { "phet": {
"name": "phet_en_all_2025-03.zim", "name": "phet_en_all_2025-03.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" "hash": "sha256-HT/gVNydkOitny6oUl2A+JvbFDGAIeb0h+xbMeQ2Rqs="
},
"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="
} }
}, },
"fr": { "fr": {
"gutenberg": {
"name": "gutenberg_fr_all_2023-08.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
},
"phet": { "phet": {
"name": "phet_fr_all_2025-03.zim", "name": "phet_fr_all_2025-03.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" "hash": "sha256-K56i55WPu5EMQHIrnnqhgJ32WozZ6oYD9X3IBytGA0A="
},
"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="
} }
}, },
"ht": { "ht": {
"phet": { "phet": {
"name": "phet_ht_all_2025-03.zim", "name": "phet_ht_all_2025-03.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=" "hash": "sha256-UjC0REJ5d5wIKccutZADX74IxvZuF+CD/caVzZfHg9s="
},
"wikipedia": {
"name": "wikipedia_ht_all_maxi_2025-05.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
},
"wikisource": {
"name": "wikisource_ht_all_maxi_2019-03.zim",
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
} }
} }
} }
pkgs/zim/updater.go
+6 -5
View File
@@ -20,11 +20,11 @@ const BASE = "https://download.kiwix.org/zim"
func getTypes() []string { func getTypes() []string {
return []string{ return []string{
"phet", "phet",
"wikipedia", // "wikipedia",
"wiktionary", // "wiktionary",
"wikiversity", // "wikiversity",
"wikisource", // "wikisource",
"wikibooks", // "wikibooks",
"gutenberg", "gutenberg",
"ted", "ted",
} }
@@ -92,6 +92,7 @@ func getHash(ch chan result, file, category, language string) {
url="%s/%s/%s.torrent"; url="%s/%s/%s.torrent";
hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
backend="transmission"; backend="transmission";
postUnpack="mkdir -p $downloadedDirectory/tmp; mv $downloadedDirectory/*.zim $downloadedDirectory/tmp";
}`, BASE, category, file), }`, BASE, category, file),
) )
out, err := cmd.Output() out, err := cmd.Output()