diff options
author | Robert Schütz <nix@dotlambda.de> | 2022-04-21 20:13:49 +0000 |
---|---|---|
committer | Robert Schütz <github@dotlambda.de> | 2022-05-30 12:54:51 -0700 |
commit | e47fff26cc89000efc72fb66aabda84b75218657 (patch) | |
tree | b5d72939cc7e198da21b8dadde26acfffe4ea526 /pkgs/applications/networking/instant-messengers/deltachat-desktop | |
parent | 52ca0fa3aea20f64c41649bbdcc3a0855fd91d36 (diff) |
deltachat-desktop: 1.28.2 -> 1.30.0
https://github.com/deltachat/deltachat-desktop/blob/v1.30.0/CHANGELOG.md
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/deltachat-desktop')
4 files changed, 29 insertions, 83 deletions
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 009ece90b4c6..a8842b14a6de 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,13 +1,12 @@ { lib , copyDesktopItems -, electron_16 +, electron_18 , esbuild , fetchFromGitHub -, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper -, nodejs-14_x +, nodePackages , noto-fonts-emoji , pkg-config , roboto @@ -19,24 +18,23 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.76.0"; + version = "1.84.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; + hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; + hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs="; }; - patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches; }); electronExec = if stdenv.isDarwin then - "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron" + "${electron_18}/Applications/Electron.app/Contents/MacOS/Electron" else - "${electron_16}/bin/electron"; + "${electron_18}/bin/electron"; esbuild' = esbuild.overrideAttrs (old: rec { version = "0.12.29"; src = fetchFromGitHub { @@ -46,15 +44,15 @@ let hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; }; }); -in nodejs-14_x.pkgs.deltachat-desktop.override rec { +in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.28.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-jhtriDnt8Yl8eCmUTEyoPjccZV8RNAchMykkkiRpF60="; + hash = "sha256-vp6vqoQvkAe7QPy4210r/5c1GNaGWgYvG0LyLqtCAxw="; }; nativeBuildInputs = [ @@ -75,8 +73,13 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; + preRebuild = '' + substituteInPlace package.json \ + --replace "node ./bin/check-nodejs-version.js" true + ''; + postInstall = '' - rm -r node_modules/deltachat-node/{deltachat-core-rust,prebuilds,src} + rm -r node_modules/deltachat-node/node/prebuilds npm run build @@ -117,6 +120,7 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; + changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch deleted file mode 100644 index caa44a62a062..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ed8020c..44ca43e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) - project(deltachat LANGUAGES C) - include(GNUInstallDirs) - -+if(APPLE) -+ set(DYNAMIC_EXT "dylib") -+elseif(UNIX) -+ set(DYNAMIC_EXT "so") -+else() -+ set(DYNAMIC_EXT "dll") -+endif() -+ - find_program(CARGO cargo) - - add_custom_command( - OUTPUT - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND - PREFIX=${CMAKE_INSTALL_PREFIX} -@@ -32,11 +40,11 @@ add_custom_target( - ALL - DEPENDS - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py -index c8ed43e2..714c7e30 100755 ---- a/python/install_python_bindings.py -+++ b/python/install_python_bindings.py -@@ -24,7 +24,7 @@ - - print("running:", " ".join(cmd)) - subprocess.check_call(cmd) -- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) -+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) - - if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": - subprocess.check_call([ diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index 4455868fe0b0..f331bdf190ee 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,30 +1,28 @@ { "name": "deltachat-desktop", - "version": "1.28.2", + "version": "1.30.0", "dependencies": { - "@blueprintjs/core": "^3.22.3", - "@deltachat/message_parser_wasm": "^0.3.0", + "@blueprintjs/core": "^4.1.2", + "@deltachat/message_parser_wasm": "^0.4.0", + "@deltachat/react-qr-reader": "^4.0.0", "@mapbox/geojson-extent": "^1.0.0", "application-config": "^1.0.1", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.76.0", + "deltachat-node": "1.84.0", "emoji-js-clean": "^4.0.0", - "emoji-mart": "^3.0.0", + "emoji-mart": "^3.0.1", "emoji-regex": "^9.2.2", "error-stack-parser": "^2.0.7", "filesize": "^8.0.6", "immutable": "^4.0.0", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", - "moment": "^2.27.0", - "node-fetch": "^2.6.7", + "moment": "^2.29.2", "path-browserify": "^1.0.1", "rc": "^1.2.8", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-qr-reader": "^2.2.1", - "react-qr-svg": "^2.1.0", "react-string-replace": "^1.0.0", "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", @@ -32,26 +30,23 @@ "react-zoom-pan-pinch": "^2.1.3", "source-map-support": "^0.5.19", "stackframe": "^1.2.1", - "tempy": "^0.3.0", "url-parse": "^1.5.9", "use-debounce": "^3.3.0", "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", "@babel/preset-react": "^7.7.4", "@types/debounce": "^1.2.0", - "@types/emoji-mart": "^3.0.2", + "@types/emoji-mart": "^3.0.9", "@types/mapbox-gl": "^0.54.5", "@types/mime-types": "^2.1.0", "@types/node": "^14.14.20", - "@types/node-fetch": "^2.5.7", - "@types/prop-types": "^15.7.3", "@types/rc": "^1.1.0", - "@types/react": "^16.9.17", - "@types/react-dom": "^16.9.4", + "@types/react": "^17.0.2", + "@types/react-dom": "^17.0.2", "@types/react-window": "^1.8.4", "@types/react-window-infinite-loader": "^1.0.4", "@types/url-parse": "^1.4.3", - "electron": "^14.2.9", + "electron": "^18.0.3", "esbuild": "^0.12.29", "glob-watcher": "^5.0.5", "sass": "^1.26.5", diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index c3119a79afd8..a21a97b3b83c 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -29,7 +29,7 @@ tac default.nix \ src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ +jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ "$src/package.json" > package.json.new if cmp --quiet package.json{.new,}; then |