Unverified Commit 948cfc0e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #253771 from rhysmdnz/micropad-update

micropad: 4.2.1 -> 4.3.0
parents 540a9798 31ef3887
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, fetchzip
, makeWrapper
, makeDesktopItem
@@ -14,23 +15,26 @@ let
in
  mkYarnPackage rec {
    pname = "micropad";
    version = "4.2.1";
    version = "4.3.0";

    src = fetchFromGitHub {
      owner = "MicroPad";
      repo = "Micropad-Electron";
      rev = "v${version}";
      sha256 = "sha256-XmnKhyb0JMWP0ZGzPvLPtpkgAemW/mdxunbFW9WV9lE=";
      hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0=";
    };

    micropad-core = fetchzip {
      url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
      sha256 = "0mzyd2p4mmnc19ffvd4sd75x7xwb1g5masdaqpn2n3h91687jmsf";
      hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c=";
    };

    packageJSON = ./package.json;
    yarnLock = ./yarn.lock;
    yarnNix = ./yarn.nix;

    offlineCache = fetchYarnDeps {
      yarnLock = "${src}/yarn.lock";
      hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY=";
    };

    nativeBuildInputs = [ copyDesktopItems makeWrapper ]
      ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
+6 −4
Original line number Diff line number Diff line
{
  "name": "micropad",
  "version": "4.2.1",
  "version": "4.3.0",
  "description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
  "main": "main.js",
  "scripts": {
@@ -25,9 +25,10 @@
  },
  "homepage": "https://getmicropad.com",
  "devDependencies": {
    "@types/mime": "^3.0.1",
    "@types/node": "^18.7.18",
    "electron": "^23.1.3",
    "electron-builder": "^23.6.0",
    "electron": "^25.5.0",
    "electron-builder": "^24.6.3",
    "typescript": "~4.9.5"
  },
  "dependencies": {
@@ -36,7 +37,8 @@
    "electron-context-menu": "^3.1.2",
    "electron-window-state": "^5.0.3",
    "localforage": "^1.10.0",
    "typo-js": "^1.2.1"
    "mime": "^3.0.0",
    "typo-js": "^1.2.3"
  },
  "build": {
    "appId": "com.getmicropad.micropad",
+6 −9
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier yarn2nix
#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier prefetch-yarn-deps

set -eu -o pipefail

latest_version=$(curl -s https://api.github.com/repos/MicroPad/Micropad-Electron/releases/latest | jq --raw-output '.tag_name[1:]')
old_core_hash=$(nix-instantiate --eval --strict -A "micropad.micropad-core.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')

{
    read new_core_hash
    read store_path
} < <(
    nix-prefetch-url --unpack --print-path "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz"
)
new_core_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz"))

nixFile=$(nix-instantiate --eval --strict -A "micropad.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
nixFolder=$(dirname "$nixFile")
@@ -22,6 +16,9 @@ curl -o "$nixFolder/package.json" -s "https://raw.githubusercontent.com/MicroPad
curl -o "$nixFolder/yarn.lock" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/yarn.lock"

prettier --write "$nixFolder/package.json"
yarn2nix --lockfile "$nixFolder/yarn.lock" >"$nixFolder/yarn.nix"
old_yarn_hash=$(nix-instantiate --eval --strict -A "micropad.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps "$nixFolder/yarn.lock"))
sed -i "$nixFile" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
rm "$nixFolder/yarn.lock"

update-source-version micropad "$latest_version"
+0 −1733

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −2013

File deleted.

Preview size limit exceeded, changes collapsed.

Loading