Unverified Commit cc9c286c authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

mangayomi: 0.6.35 -> 0.6.70 (#439054)

parents 864200ae bcb90286

pkgs/by-name/ma/mangayomi/git-hashes.json

+10 −4
Original line number Diff line number Diff line 
{

  "desktop_webview_window": "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA=",

  "epubx": "sha256-Rf9zaabPvP7D4NgyJ+LpSB8zHjBvhq2wE0p9Sy7uOXM=",

  "flutter_discord_rpc_fork": "sha256-JXeYicEiEIFCDIgHNa3zqrwsy05qBeFvdihghi/3tRs=",

  "flutter_qjs": "sha256-uF3+lQyc6oXWjg9xm8PVXRNZ3AXrw7+FH/lPIQPzaJY=",

  "flutter_discord_rpc_fork": "sha256-jMvtKEBIxwZDc49pxC/YY4TuqFQNtlj4khp9+MUZNX0=",

  "flutter_qjs": "sha256-VCw6U0DTGGdC0ZV5c5l34NhBF+Bw/la9of0BZYcTlYo=",

  "flutter_web_auth_2": "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=",

  "media_kit_video": "sha256-t8lqS44lylLhMyvlY5G1k7EXfpDq8WshBVg8D/z0Hbc=",

  "re_editor": "sha256-alfzTs9lUHTsaZgXADb1X3T4ZB6KrhIEeGY0wuvZJtU="

  "media_kit": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_android_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_ios_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_linux": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_macos_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_libs_windows_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",

  "media_kit_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4="

}

pkgs/by-name/ma/mangayomi/package.nix

+8 −6
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  flutter332,

  flutter335,

  rustPlatform,

  fetchFromGitHub,

  copyDesktopItems,

  alsa-lib,

  mpv-unwrapped,

  webkitgtk_4_1,

  makeDesktopItem,
@@ -13,13 +14,13 @@ 


let

  pname = "mangayomi";

  version = "0.6.35";

  version = "0.6.70";



  src = fetchFromGitHub {

    owner = "kodjodevf";

    repo = "mangayomi";

    tag = "v${version}";

    hash = "sha256-XSXFo0+rLTUJ0p3F5+CvKD85OmrShb2xrpQK0F6fo2U=";

    hash = "sha256-XWa5jEIQWmApbXNu8AgKt6Af9S1ZrsyaFET07FVn7Rc=";

  };



  metaCommon = {
@@ -36,14 +37,14 @@ let 


    sourceRoot = "${src.name}/rust";



    cargoHash = "sha256-DDHBLQWscORg4+0CX5c2wmrhm2t7wOpotZFB+85w+EA=";

    cargoHash = "sha256-3q+fI0MHg+wSSkbEzqXxdoGkF0B/LhLMbB6VcX3xuwE=";



    passthru.libraryPath = "lib/librust_lib_mangayomi.so";



    meta = metaCommon;

  };

in

flutter332.buildFlutterApplication {

flutter335.buildFlutterApplication {

  inherit pname version src;



  pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -85,7 +86,7 @@ flutter332.buildFlutterApplication { 


          buildAndTestSubdir = "rust";



          cargoHash = "sha256-vYVg5ZALQDrolDtbbXm/epE5MmSKpRJbSU15VDiKh4U=";

          cargoHash = "sha256-oJOM/Tb4QrezdtU8YTyr57JZp5FkDewgwXrBqwp6cp8=";



          passthru.libraryPath = "lib/libflutter_discord_rpc_fork.so";

        };
@@ -122,6 +123,7 @@ flutter332.buildFlutterApplication { 
  nativeBuildInputs = [ copyDesktopItems ];



  buildInputs = [

    alsa-lib

    mpv-unwrapped

    webkitgtk_4_1

  ];

pkgs/by-name/ma/mangayomi/pubspec.lock.json

+354 −674

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/ma/mangayomi/update.sh

+4 −4
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p curl gnused jq yq nix bash nix-update

#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update



set -eou pipefail



PACKAGE_DIR=$(realpath "$(dirname "$0")")



latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/kodjodevf/mangayomi/releases/latest | jq --raw-output .tag_name)

latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/kodjodevf/mangayomi/releases/latest | jq --raw-output .tag_name)

latestVersion=$(echo "$latestTag" | sed 's/^v//')



currentVersion=$(nix eval --raw --file . mangayomi.version)
@@ -15,8 +15,8 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then 
    exit 0

fi



nix-update --subpackage rustDep mangayomi

nix-update --version $latestVersion --subpackage rustDep mangayomi



curl -sL https://raw.githubusercontent.com/kodjodevf/mangayomi/${latestTag}/pubspec.lock | yq . >$PACKAGE_DIR/pubspec.lock.json

curl --fail --silent https://raw.githubusercontent.com/kodjodevf/mangayomi/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json



$(nix eval --file . dart.fetchGitHashesScript) --input $PACKAGE_DIR/pubspec.lock.json --output $PACKAGE_DIR/git-hashes.json

pkgs/development/compilers/dart/package-source-builders/media_kit_libs_linux/default.nix

+15 −15
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  mimalloc,

}:



# Implementation notes



# The patch exploits the fact that the download part is enclosed with "# ---"

# To use this module you will need to pass the CMake variable MIMALLOC_LIB

# example: -DMIMALLOC_LIB=${pkgs.mimalloc}/lib/mimalloc.o



# Direct link for the original CMakeLists.txt: https://raw.githubusercontent.com/media-kit/media-kit/main/libs/linux/media_kit_libs_linux/linux/CMakeLists.txt



{ version, src, ... }:



stdenv.mkDerivation {
@@ -20,12 +13,19 @@ stdenv.mkDerivation { 


  dontBuild = true;



  postPatch =

    lib.optionalString (lib.versionAtLeast version "1.2.1") ''

      sed -i '/if(MIMALLOC_USE_STATIC_LIBS)/,/unset(MIMALLOC_USE_STATIC_LIBS CACHE)/d' linux/CMakeLists.txt

  # Remove mimalloc download

  # Direct link for the original CMakeLists.txt: https://raw.githubusercontent.com/media-kit/media-kit/main/libs/linux/media_kit_libs_linux/linux/CMakeLists.txt

  postPatch = ''

    pushd ${src.passthru.packageRoot}

  ''

  + lib.optionalString (lib.versionAtLeast version "1.2.1") ''

    sed -i '/if(MIMALLOC_USE_STATIC_LIBS)/,/unset(MIMALLOC_USE_STATIC_LIBS CACHE)/c\set(MIMALLOC_LIB "${lib.getLib mimalloc}/lib/mimalloc.o" CACHE INTERNAL "")' linux/CMakeLists.txt

  ''

  + lib.optionalString (lib.versionOlder version "1.2.1") ''

      awk -i inplace 'BEGIN {opened = 0}; /# --*[^$]*/ { print (opened ? "]===]" : "#[===["); opened = !opened }; {print $0}' linux/CMakeLists.txt

    sed -i '/# --\+/,/# --\+/c\set(MIMALLOC_LIB "${lib.getLib mimalloc}/lib/mimalloc.o")' linux/CMakeLists.txt

  ''

  + ''

    popd

  '';



  installPhase = ''