From facfb5b12913d99307adceb9baab16d8b545b653 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 30 Nov 2021 16:48:01 -0800 Subject: deltachat-desktop: 1.22.2 -> 1.26.0 https://github.com/deltachat/deltachat-desktop/releases/tag/v1.26.0 --- .../deltachat-desktop/default.nix | 33 ++++++++++------------ .../deltachat-desktop/package.json | 16 +++++------ .../instant-messengers/deltachat-desktop/update.sh | 6 ++-- 3 files changed, 26 insertions(+), 29 deletions(-) (limited to 'pkgs/applications/networking/instant-messengers/deltachat-desktop') diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index cd29268bec68f..fa795a11c2aef 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -16,45 +16,41 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.60.0"; + version = "1.70.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + hash = "sha256-702XhFWvFG+g++3X97sy6C5DMNWogv1Xbr8QPR8QyLo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + hash = "sha256-MiSGJMXe8vouv4XEHXq274FHEvBMtd7IX6DyNJIWYeU="; }; - patches = [ - # https://github.com/deltachat/deltachat-core-rust/pull/2589 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; - sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; - }) - ./no-static-lib.patch - # https://github.com/deltachat/deltachat-core-rust/pull/2660 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; - sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; - }) - ]; }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; + esbuild' = esbuild.overrideAttrs (old: rec { + version = "0.12.29"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; + }; + }); in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.22.2"; + version = "1.26.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - sha256 = "0in6w2vl4ypgjb9gfhyh77vg05ni5p3z24lah7wvvhywcpv1jp2n"; + hash = "sha256-IDyGV2+/+wHp5N4G10y5OHvw2yoyVxWx394xszIYoj4="; }; nativeBuildInputs = [ @@ -72,6 +68,7 @@ in nodePackages.deltachat-desktop.override rec { ]; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + ESBUILD_BINARY_PATH = "${esbuild'}/bin/esbuild"; USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index 41bcdeca18646..fe9f024052c43 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,24 +1,24 @@ { "name": "deltachat-desktop", - "version": "1.22.2", + "version": "1.26.0", "dependencies": { "@blueprintjs/core": "^3.22.3", + "@deltachat/message_parser_wasm": "^0.1.0", "@mapbox/geojson-extent": "^1.0.0", "application-config": "^1.0.1", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.60.0", + "deltachat-node": "1.70.0", "emoji-js-clean": "^4.0.0", "emoji-mart": "^3.0.0", "emoji-regex": "^9.2.2", "error-stack-parser": "^2.0.6", - "filesize": "^6.1.0", + "filesize": "^8.0.6", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", "moment": "^2.27.0", "node-fetch": "^2.6.1", "path-browserify": "^1.0.1", - "punycode": "^2.1.1", "rc": "^1.2.8", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -28,15 +28,14 @@ "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", "react-window-infinite-loader": "^1.0.7", - "simple-markdown": "^0.7.1", "source-map-support": "^0.5.19", "tempy": "^0.3.0", - "url-parse": "^1.4.7", + "url-parse": "^1.5.3", "use-debounce": "^3.3.0", "@babel/core": "^7.7.7", - "@types/debounce": "^1.2.0", "@babel/preset-env": "^7.7.7", "@babel/preset-react": "^7.7.4", + "@types/debounce": "^1.2.0", "@types/emoji-mart": "^3.0.2", "@types/mapbox-gl": "^0.54.5", "@types/mime-types": "^2.1.0", @@ -50,9 +49,10 @@ "@types/react-window-infinite-loader": "^1.0.4", "@types/url-parse": "^1.4.3", "electron": "^13.1.6", + "esbuild": "^0.12.15", "glob-watcher": "^5.0.5", "sass": "^1.26.5", - "typescript": "^3.9.7", + "typescript": "^4.4.4", "xml-js": "^1.6.8" } } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index dbe249d56dae6..3f14f01b3604e 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -20,16 +20,16 @@ if [ "$ver" = "$old_ver" ]; then fi echo "$old_ver -> $ver" -sha256=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") +hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") tac default.nix \ | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ - -e "0,/sha256 = \".*\"/s//sha256 = \"$sha256\"/" \ + -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \ | tac \ | sponge default.nix src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","esbuild","electron-builder","electron-devtools-installer","electron-notarize","esbuild","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ +jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ "$src/package.json" > package.json.new if cmp --quiet package.json{.new,}; then -- cgit 1.4.1