koreader-from-src: 2023.06 -> unstable-2023-10-18

pkgs/additional/koreader-from-src/default.nix

@@ -52,17 +52,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "koreader-from-src";
-  version = "2023.06";
+  version = "unstable-2023-10-18";
   srcs = [
     (fetchFromGitHub {
       owner = "koreader";
       repo = "koreader";
+      name = "koreader";  # needed because `srcs = ` in the outer derivation is a list
       fetchSubmodules = true;
-      rev = "d350418367ddf39d752d05e0587e562d7d4af2c4";  # master
-      hash = "sha256-ri5ckf21xDKf/X0p2c9wePTa6jh5u0BoUwpVdgpYpZw=";
       # rev = "v${version}";
-      # hash = "sha256-gdf7AUTpIJ6T4H915YqRG1WzxYHrGmzX6X4dMriWzRA=";
+      rev = "f3520effd679eb24a352e7dec600c5b378c3d376";  # master
-      name = "koreader";
+      hash = "sha256-cPftNXKL9khQKH/DKXyl9YZAEa27T/n3ATErPZy8irY=";
     })
   ] ++ (lib.mapAttrsToList
     (name: src: fetchgit (

pkgs/additional/koreader-from-src/sources.nix

@@ -1,3 +1,18 @@
+# to update:
+# - inside `koreader-base` repo:
+#   - note the git rev as `old-rev`
+#   - `git pull` in koreader-base
+#   - `git diff old-rev.. thirdparty`
+# - update `source.rev` everywhere here that changed upstream
+#   - zero the hashes here and correct them based on build errors
+# - tweak ./vendor-external-projects.patch until it applies
+#   - usually just upstream changed a URL or something minor
+#
+# a full rebuild takes approximately 10 minutes on a mid-range desktop
+#
+# the following build output may look like an error, but is safe to ignore:
+# - "awk: fatal: cannot open file `3.9' for reading: No such file or directory"
+#   - this number comes from the luarocks version
 {
   thirdparty = {
     curl = {
@@ -17,13 +32,13 @@
     };
     fbink = {
       source.url = "https://github.com/NiLuJe/FBInk.git";
-      source.rev = "f562bc15a606524694a6d885bed5d83d03c7eb23";
+      source.rev = "ae9dd275de369b1b34e1b566bca29573f06f38a2";
-      source.hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8=";
+      source.hash = "sha256-wkyl9xtw9ocjGGArvfGa1qjamwgywPktnZJNfdychB0=";
     };
     freetype2 = {
       source.url = "https://gitlab.com/koreader/freetype2.git";
-      source.rev = "VER-2-13-1";
+      source.rev = "VER-2-13-2";
-      source.hash = "sha256-rQN+hRzrs+KGgp8+n1VJzOOwtKUcRuSE/s/r8/xOUdI=";
+      source.hash = "sha256-yylSmVM3D5xnbFx9qEEHFIP/K0x/WDXZr0MA4C7ng7k=";
     };
     fribidi = {
       source.url = "https://github.com/fribidi/fribidi.git";
@@ -42,13 +57,13 @@
     };
     harfbuzz = {
       source.url = "https://github.com/harfbuzz/harfbuzz.git";
-      source.rev = "8.0.1";
+      source.rev = "8.2.1";
-      source.hash = "sha256-qh04AsZlymNcUtZ3fytA9+Jk5PjPYm8UH75kBqZNsw4=";
+      source.hash = "sha256-1JgOXpObptt/IOkYj3Q9K170Yd5DIoBa20eoqY/iY6M=";
     };
     kobo-usbms = {
       source.url = "https://github.com/koreader/KoboUSBMS.git";
-      source.rev = "tags/v1.3.8";
+      source.rev = "3daab316d3aff2b43ced9c0b18e6ecdeec953e4a";
-      source.hash = "sha256-HZNcjLqkZk2YSnt0ynbUN9grJlBnF0zEwiN7fajNdrg=";
+      source.hash = "sha256-iBbbKCpi0/velkX91Qju0oXLZtRYGesbra1huKnGQFE=";
     };
     leptonica = {
       source.url = "https://github.com/DanBloomberg/leptonica.git";
@@ -77,8 +92,8 @@
     };
     libwebp = {
       source.url = "https://github.com/webmproject/libwebp.git";
-      source.rev = "v1.3.1";
+      source.rev = "v1.3.2";
-      source.hash = "sha256-ddDL/nnBikbm6YznlyCcBgmq2Qzo0MjIwMzN4/kzWqk=";
+      source.hash = "sha256-gfwUlJ44biO1lB/3SKfMkM/YBiYcz6RqeMOw+0o6Z/Q=";
     };
     libzmq = {
       source.url = "https://github.com/zeromq/libzmq";
@@ -103,8 +118,8 @@
     };
     luajit = {
       source.url = "https://github.com/LuaJIT/LuaJIT";
-      source.rev = "8635cbabf3094c4d8bd00578c7d812bea87bb2d3";
+      source.rev = "656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48";
-      source.hash = "sha256-pfMNQFulW6AEwAVPxn9wUdbRg3ViHbGVCCke5NSIgTo=";
+      source.hash = "sha256-KPZ1jaU9qu7CUg2eHxBNu2mrHD54+lNOCQB4sb1DPok=";
     };
     lua-rapidjson = {
       source.url = "https://github.com/xpol/lua-rapidjson";
@@ -170,8 +185,9 @@
     # sdcv = {
     #   # upstream is (temporarily?) acquiring this via `download_project` machinery
     #   source.url = "https://github.com/Dushistov/sdcv.git";
-    #   source.rev = "6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad";
+    #   source.rev = "v0.5.5"
-    #   source.hash = "sha256-pPaT9tB39dd+VyE21KSjMpON99KjOxQ8Hi8+ZgFsuUY=";
+    #   # source.rev = "6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad";
+    #   # source.hash = "sha256-pPaT9tB39dd+VyE21KSjMpON99KjOxQ8Hi8+ZgFsuUY=";
     # };
     tesseract = {
       source.url = "https://github.com/tesseract-ocr/tesseract.git";
@@ -224,23 +240,23 @@
     sdcv = {
       # TODO: if this form of substitution works, i could optionally patch in *all* deps
       # using the `file://@foo@` ExternalProject_Add syntax
-      url = "https://github.com/Dushistov/sdcv/archive/6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad.tar.gz";
+      url = "https://github.com/Dushistov/sdcv/archive/v0.5.5.tar.gz";
-      hash = "sha256-bzCpzassIDY/g7NO71PoWNayLAyEaz1haY9vMFk4hqU=";
+      hash = "sha256-TSUZ6PhHm5MB3JHpzaPh7v7xmXDs4OjAXwx7et5dyUs=";
     };
     sdl2 = {
       url = "https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz";
       hash = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0=";
     };
     sqlite = {
-      url = "https://www.sqlite.org/2023/sqlite-autoconf-3420000.tar.gz";
+      url = "https://www.sqlite.org/2023/sqlite-autoconf-3430200.tar.gz";
-      hash = "sha256-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY=";
+      hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA=";
     };
     tar = {
       url = "http://ftpmirror.gnu.org/tar/tar-1.34.tar.gz";
       hash = "sha256-A9kIz1doz+a3rViMkhxu0hrKv7K3m3iNEzBFNQdkeu0=";
     };
     zlib = {
-      url = "http://gentoo.osuosl.org/distfiles/zlib-1.2.13.tar.xz";
+      url = "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.xz";
       hash = "sha256-0Uw44xOvw1qah2Da3yYEL1HqD10VSwYwox2gVAEH+5g=";
     };
   };

pkgs/additional/koreader-from-src/vendor-external-projects.patch

@@ -103,7 +103,7 @@ index 0353b145..9de56105 100644
      DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
 -    URL https://www.sqlite.org/2023/sqlite-autoconf-${SQLITE_VER}.tar.gz
 +    URL file://@sqlite@
-     URL_MD5 0c5a92bc51cf07cae45b4a1e94653dea
+     URL_MD5 94fb06bfebc437762e489c355ae63716
      BUILD_IN_SOURCE 1
      CONFIGURE_COMMAND ${CFG_CMD}
 diff --git a/base/thirdparty/tar/CMakeLists.txt b/base/thirdparty/tar/CMakeLists.txt
@@ -127,7 +127,7 @@ index 2350186d..0ea1394d 100644
  ExternalProject_Add(
      ${PROJECT_NAME}
      DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
--    URL http://gentoo.osuosl.org/distfiles/zlib-${ZLIB_VER}.tar.xz
+-    URL https://github.com/madler/zlib/releases/download/v${ZLIB_VER}/zlib-${ZLIB_VER}.tar.xz
 +    URL file://@zlib@
      URL_MD5 ${ZLIB_MD5}
      BUILD_IN_SOURCE 1