New release v1.8.5-sc1

Currently translated at 100.0% (29 of 29 strings)

Translation: SchildiChat/matrix-react-sdk
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/

.gitignore

@@ -1 +1,4 @@
 release.mk
+/release
+/local-pkgbuild
+bom.lock

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Makefile

@@ -1,39 +1,172 @@
-.PHONY: all web desktop desktop-common linux windows clean
+.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
+.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
+.PHONY: clean
 
 CFGDIR ?= configs/sc
 
-all: desktop
+all: web
 
 YARN ?= yarnpkg
 
+VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
+WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+DESKTOP_APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+PRODUCT_NAME :=  $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
+
+WEB_OUT := element-web/dist
+WEB_OUT_DIST_VERSION := $(VERSION)
+OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz
+
+DESKTOP_OUT := element-desktop/dist
+OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb
+OUT_RPM64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).x86_64.rpm
+OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman
+OUT_APPIMAGE64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).AppImage
+OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz
+OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe
+OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe
+OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe
+OUT_WIN64_UNPACKED_BETTER_NAME := $(PRODUCT_NAME)_win-unpacked_v$(VERSION).zip
+OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
+OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
+OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
+
+RELEASE_DIR := release
+CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
+
+# macOS Codesigning
+CSC_IDENTITY_AUTO_DISCOVERY ?= false
+NOTARIZE_APPLE_ID ?=
+CSC_NAME ?=
 
 -include release.mk
 
+setup:
+	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
 
-web:
+element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
+
+element-desktop/build/icon.icns: element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset
+	iconutil -c icns -o $@ $<
+
+element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset/*)
+
+element-desktop/build/dmg.icns: element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset
+	iconutil -c icns -o $@ $<
+
+icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns
+
+regenerate-i18n: setup
+	./regenerate_i18n.sh
+
+reskindex: setup
+	$(YARN) --cwd matrix-react-sdk reskindex
+	$(YARN) --cwd element-web reskindex
+
+web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
+web: setup reskindex
 	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
+	echo "$(VERSION)" > element-web/webapp/version
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
 	$(YARN) --cwd element-desktop run build:native
 
-desktop: windows linux
+macos-common: web icns
+	$(YARN) --cwd element-desktop run fetch --cfgdir ''
+	$(YARN) --cwd element-desktop run build:native:universal
 
 linux: desktop-common
-	$(YARN) --cwd element-desktop run build64linux
+	$(YARN) --cwd element-desktop run build:64 --linux deb pacman tar.xz
 
 debian: desktop-common
-	$(YARN) --cwd element-desktop run build64deb
+	$(YARN) --cwd element-desktop run build:64 --linux deb
+
+rpm: desktop-common
+	$(YARN) --cwd element-desktop run build:64 --linux rpm
 
 pacman: desktop-common
-	$(YARN) --cwd element-desktop run build64pacman
+	$(YARN) --cwd element-desktop run build:64 --linux pacman
+
+appimage: desktop-common
+	$(YARN) --cwd element-desktop run build:64 --linux AppImage
 
 windows: desktop-common
-	$(YARN) --cwd element-desktop run build64windows
+	$(YARN) --cwd element-desktop run build:64 --windows nsis
+
+windows-portable: desktop-common
+	$(YARN) --cwd element-desktop run build:64 --windows portable
+
+macos: macos-common
+	export CSC_IDENTITY_AUTO_DISCOVERY
+	export NOTARIZE_APPLE_ID
+	export CSC_NAME
+	$(YARN) --cwd element-desktop run build:universal --mac dmg
+
+macos-mas: macos-common
+	export NOTARIZE_APPLE_ID
+	export CSC_NAME
+	$(YARN) --cwd element-desktop run build:universal --mac mas
+
+local-pkgbuild: debian
+	./create_local_pkgbuild.sh $(VERSION) $(DESKTOP_APP_NAME) $(PRODUCT_NAME) $(OUT_DEB64)
+
+local-pkgbuild-install: local-pkgbuild
+	cd local-pkgbuild; makepkg --install
+
+web-release: web
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)
+
+debian-release: debian
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_DEB64) $(CURRENT_RELEASE_DIR)
+
+rpm-release: rpm
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_RPM64) $(CURRENT_RELEASE_DIR)
+
+pacman-release: pacman
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR)
+
+appimage-release: appimage
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_APPIMAGE64) $(CURRENT_RELEASE_DIR)
+
+windows-setup-release: windows
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME)
+
+windows-unpacked-release: windows
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cd element-desktop/dist/win-unpacked && zip -r ../../../$(CURRENT_RELEASE_DIR)/$(OUT_WIN64_UNPACKED_BETTER_NAME) *
+
+windows-portable-release: windows-portable
+	./windowsportable.sh $(OUT_WIN64_PORTABLE) $(OUT_WIN64_PORTABLE_BETTER_NAME) $(CURRENT_RELEASE_DIR) $(VERSION)
+
+windows-release: windows-setup-release windows-unpacked-release windows-portable-release
+
+macos-release: macos
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_MACOS) $(CURRENT_RELEASE_DIR)
+
+macos-mas-release: macos-mas
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
+
+bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
+	./build-bom.sh
+bom: bom.lock
 
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
 	$(YARN) --cwd element-web clean
 	$(YARN) --cwd element-desktop clean
+	rm -f element-desktop/webapp
+	rm -rf element-web/dist
+	rm -rf local-pkgbuild
+	rm -f bom.lock

README.md

@@ -1,37 +1,42 @@
-# SchildiChat-Desktop
+# SchildiChat Web/Desktop
 
-SchildiChat-Desktop is a fork of [Element-Web](https://github.com/vector-im/element-web)/[-Desktop](https://github.com/vector-im/element-desktop).
+SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
 
-The most important changes of SchildiChat-Desktop compared to Element are:
-
-- A unifed chat list for both direct and group chats
+The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
+- A unified chat list for both direct and group chats
 - Message bubbles
 - Bigger items in the room list
+- … and more!
 
-While SchildiChat-Desktop should be already usable as is, it's still better seen as a
-proof-of-concept rather than a finished product, as there are still a few UX bugs
-remaining, and no ways to configure Schildi's features.
-Furthermore, I don't know how much more work I'm going to put into this, but
-if anybody wants to help improving it, contributions are welcome!
-
-Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
-Hosted web variant: https://schildiweb.spiritcroc.de/
+Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
+Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/)
 
 Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
 
 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
 
-# Building SchildiChat-Desktop
+## Building SchildiChat Web/Desktop
 
-This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
+This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.
 
+The `master` branch contains the latest release.  
+Development happens in the `sc` branch, which might be **broken at any time**!
 
-## Debian compilation dependencies
+<pre><code><b>schildichat-desktop</b> <i>&lt;-- this repo</i> (recommended starting point to build SchildiChat for Web <b>and</b> Desktop)
+|-- <a href="https://github.com/SchildiChat/element-desktop">element-desktop</a> (electron wrapper)
+|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> ("skin" for matrix-react-sdk)
+|-- <a href="https://github.com/SchildiChat/matrix-react-sdk">matrix-react-sdk</a> (most of the development happens here)
+`-- <a href="https://github.com/SchildiChat/matrix-js-sdk">matrix-js-sdk</a> (Matrix client js sdk)
+</code></pre>
 
-Since Debian is usually slow to update packages on its stable releases, some dependencies
-might not be recent enough to building Schildi.
-Here are the dependencies which I had to install for compilation on Debian 10:
+### Install dependencies
+
+#### Debian build dependencies
+
+Since Debian is usually slow to update packages on its stable releases,
+some dependencies might not be recent enough to build SchildiChat.  
+The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10:
 
 ```
 # apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
@@ -49,18 +54,70 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc
 $ source .bashrc
 ```
 
-## Initial setup
+#### macOS build dependencies
+
+##### Install brew package manager
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+
+##### Install packages
 
 ```
-git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
+brew install tcl rust node gpg vim curl git yarn git make gcc
+```
+
+#### Signed macOS builds
+
+To sign a macOS build set the environment or make variable `CSC_IDENTITY_AUTO_DISCOVERY` to true
+or set `CSC_NAME` to your certificate name or id.
+
+To notarize a build with Apple set `NOTARIZE_APPLE_ID` to your AppleID and set the keychain item
+`NOTARIZE_CREDS` to an App specific AppleID password.  
+
+
+### Initial setup
+
+As already noted above, **`master` contains the latest release** and **`sc` is the development branch**!
+
+```
+git clone -b master --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
 cd schildichat-desktop
-./setup.sh
+make setup # optional step if using the other make targets
 ```
 
-## Build
+### Create release builds
 
-`make`
+```
+# The single make targets are explained below
+make {web|debian|windows-setup|windows-portable|macos|...}-release
+```
 
-## Install
+After that these packages which belong to their respective make target should appear in release/\<version\>/.
 
-Installable packages should appear in element-desktop/dist/.
+#### Builds distributed via GitHub releases
+- `web`: _schildichat-web-\<version\>.tar.gz_: Archive that can be unpacked and served by a **web** server (copy `config.sample.json` to `config.json` and adjust the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) to your likings)
+- `debian`: File ready for installation on a **Debian Linux** (based) system via `dpkg -i schildichat-desktop_<version>_amd64.deb`
+- `windows-setup`: _SchildiChat_Setup_v\<version\>.exe_: File ready for **installation** on a **Windows** system
+- `windows-portable`: _SchildiChat_win-portable_v\<version\>.zip_: **Portable** version for a **Windows** system – take SchildiChat together with your login data around with you (the archive contains a readme with **instructions** and **notes**)
+- `macos`: Build a *.dmg for **macOS**
+
+#### Additional `{...}-release` targets not used for GitHub releases
+- `pacman`: File ready for installation on an **Arch Linux** (based) system via `pacman -U schildichat-desktop-<version>.pacman`
+- `rpm`: Build a *.rpm for Linux
+- `windows-unpacked`: _SchildiChat_win-unpacked_v\<version\>.zip_: **unpacked** archive for a **Windows** system
+- `macos-mas`: Build a *.pkg for release in the Mac App Store
+
+### Build SchildiChat Web and deploy it directly to your web server
+
+Put the `config.json` with the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) you want for your hosted instance in a subfolder of the `configs` folder.  
+Then create a file named `release.mk` and fill it similar to that:
+```
+.PHONY: your-deploy-web
+
+YOUR_CFGDIR := configs/your_subfolder
+your-deploy-%: CFGDIR := $(YOUR_CFGDIR)
+
+your-deploy-web: web
+	rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/
+```

alternative_package.sh

@@ -50,22 +50,31 @@ logo_alternative() {
 # Analog to SchildiChat-Android's alternative_package.sh
 case "$package_add" in
 "a")
-    # cyan
-    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
+    # blue
+    logo_alternative "#2196F3" "#0D47A1" "#BBDEFB"
     ;;
 "b")
     # orange: 900 color recuded in value
     logo_alternative "#FB8C00" "#7f2c00" "#FFE0B2"
     ;;
 "c")
-    # purple
-    logo_alternative "#5E35B1" "#311B92" "#D1C4E9"
-    ;;
-"d")
     # red: 900 color reduced in value
     logo_alternative "#E53935" "#4c0b0b" "#FFCDD2"
     ;;
+"d")
+    # purple
+    logo_alternative "#5E35B1" "#311B92" "#D1C4E9"
+    ;;
+"e")
+    # pink
+    logo_alternative "#D81B60" "#880E4F" "#F8BBD0"
+    ;;
 "x")
+    # cyan
+    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
+    ;;
+"z")
+    # white
     logo_alternative "#ffffff" "#000000" "#eeeeee"
     ;;
 esac

build-bom.sh

@@ -0,0 +1,46 @@
+# /usr/bin/env bash
+cat element-desktop/yarn.lock > bom.lock
+echo "" >> bom.lock
+cat element-web/yarn.lock >> bom.lock
+echo "" >> bom.lock
+cat matrix-js-sdk/yarn.lock >> bom.lock
+echo "" >> bom.lock
+cat matrix-react-sdk/yarn.lock >> bom.lock
+echo "" >> bom.lock
+
+# matrix-seshat
+cat << EOF >> bom.lock
+matrix-seshat@2.3.0:
+  version "2.3.0"
+  resolved "https://github.com/matrix-org/seshat/archive/refs/heads/master.tar.gz"
+  integrity sha512-y4xtZViRX/h0zczl5hiqWyFNK7np0vVujQ/l47g1Mm7B7mDTHAneSSy/d5GADeUIsezZyvT3qKhSCwSSyqS8Xw==
+  dependencies:
+    sqlcipher "~m1"
+    openssl "~1.1.1f"
+
+sqlcipher@m1:
+  version "m1"
+  resolved "https://github.com/SchildiChat/sqlcipher/archive/refs/heads/m1.tar.gz"
+  integrity sha512-1Nk7J0dQyVedFLqnxUJQWrf/VBsUsfC5vAYaHDH3LRbWarfKDGYduZrhdBuzgAF+kMA237HaDt9Tq+CcXV0EJA==
+
+openssl@1.1.1f:
+  version "1.1.1f"
+  resolved "https://www.openssl.org/source/openssl-1.1.1f.tar.gz"
+  integrity sha512-sAvZta1SmPvO7sa7GcGrDBBspc+zEXhJfFi/fg4M8w/MGcIPhOI68xzBJr8kR9Pk+EYduXuvp7149pVhky8ADA==
+EOF
+echo "" >> bom.lock
+
+# keytar
+cat << EOF >> bom.lock
+keytar@^5.6.0:
+  version "5.6.0"
+  resolved "https://github.com/atom/node-keytar/archive/refs/tags/v5.6.0.tar.gz"
+  integrity sha512-dPdXLrm8AlqooT0ZS7y/mYif0DmQXoGGrqomwfl6ugIEHlpL1D+hJYhjyMC00TK924vOGD1a6OhDS2+RKEffXA==
+  dependencies:
+    libsecret "~0.20.3"
+
+libsecret@0.20.3:
+  version "0.20.3"
+  resolved "https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.20.3/libsecret-0.20.3.tar.gz"
+  integrity sha512-tbD1jNKEEW9bPWuyd5YZ68eQjHhXOsy5PseVwleWYMEXgrrPPGnGGrLzSFUXRzNulFceLMeUG49Qr1rnyvfa1A==
+EOF

configs/sc/config.json

@@ -11,30 +11,27 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"
         ]
     },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://element.io/cookie-policy"
-    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
     "terms_and_conditions_links": [
         {
-            "url": "https://element.io/privacy",
+            "url": "https://schildi.chat/desktop/privacy",
             "text": "Privacy Policy"
-        },
-        {
-            "url": "https://element.io/cookie-policy",
-            "text": "Cookie Policy"
         }
-    ]
+    ],
+    "sc_update_announcement_room": {
+        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
+        "via_servers": [
+            "supercable.onl",
+            "spiritcroc.de"
+        ]
+    }
 }

create_local_pkgbuild.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+cd "$mydir"
+
+version="$1"
+appName="$2"
+productName="$3"
+debOut="$4"
+
+template_dir="local-pkgbuild-template"
+out_dir="local-pkgbuild"
+
+if [ -z "$version" ] || [ -z "$appName" ] || [ -z "$productName" ] || [ -z "$debOut" ]; then
+    echo "Usage: $0 version appName productName debOut"
+    exit 1
+fi
+
+debName="$(basename "$debOut")"
+
+rm -rf "$out_dir"
+mkdir "$out_dir"
+
+setup_file() {
+    local file="$1"
+    local outfile="$2"
+    if [ -z "$outfile" ]; then
+        local outfile="$file"
+    fi
+    cat "$template_dir/$file" \
+        | sed "s|---version---|$version|g" \
+        | sed "s|---appName---|$appName|g" \
+        | sed "s|---productName---|$productName|g" \
+        | sed "s|---debName---|$debName|g" \
+        > "$out_dir/$outfile"
+}
+
+setup_file PKGBUILD
+setup_file schildichat-desktop.sh "$appName.sh"
+ln -r -s "$debOut" "$out_dir/$debName"

deploy/.gitignore

@@ -0,0 +1 @@
+repos/*

deploy/create-github-release.sh

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+#
+# Based upon https://hinty.io/ivictbor/publish-and-upload-release-to-github-with-bash-and-curl/
+# and https://gist.github.com/stefanbuck/ce788fee19ab6eb0b4447a85fc99f447
+#
+
+set -e
+# set -x
+
+version="$1"
+releasepath="$2"
+
+github_api_token=`cat ~/githubtoken`
+release_notes_file="/tmp/scrn.md"
+
+owner=SchildiChat
+repo=schildichat-desktop
+target=master
+
+# Define variables
+GH_API="https://api.github.com"
+GH_REPO="$GH_API/repos/$owner/$repo"
+AUTH="Authorization: token $github_api_token"
+
+# Validate token
+curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!";  exit 1; }
+
+# Get release notes
+$EDITOR "$release_notes_file"
+release_notes=`cat "$release_notes_file"`
+
+# Create draft release
+echo "Create GitHub draft release ..."
+json_string=`jq -n --arg tag "v$version" --arg target "$target" --arg body "$release_notes" '{
+  tag_name: $tag,
+  target_commitish: $target,
+  name: $tag,
+  body: $body,
+  draft: true,
+  prerelease: false
+}'`
+# echo "$json_string"
+res=`echo "$json_string" | curl -sH "$AUTH" $GH_REPO/releases -d @-`
+# echo "$res" | jq "."
+
+# Get release id
+id=`echo $res | jq ".id"`
+# echo "id: $id"
+
+# Upload assets
+find "$releasepath" -type f | while read filename; do
+    echo ""
+    echo "Uploading $filename ..."
+
+    # Construct url
+    GH_ASSET="https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"
+
+    # Upload
+    res=`curl --progress-bar --data-binary @"$filename" -H "$AUTH" -H "Content-Type: application/octet-stream" $GH_ASSET`
+    state=`echo $res | jq ".state"`
+    if [ "$state" == "\"uploaded\"" ]; then
+        echo "Success!"
+    else
+        echo "Error:"
+        echo $res | jq "."
+        exit -1
+    fi
+done
+
+# Publish draft
+res=`curl -sH "$AUTH" $GH_REPO/releases/$id -d '{"draft": false}'`
+draft=`echo $res | jq ".draft"`
+echo ""
+if [ "$draft" == "false" ]; then
+    echo "Release v$version published on GitHub!"
+else
+    echo "Error:"
+    echo $res | jq "."
+    exit -1
+fi

deploy/update-aur-bin.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+# set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/aur-bin"
+repourl="ssh://aur@aur.archlinux.org/schildichat-desktop-bin.git"
+
+sha256sum=($(sha256sum $debpath))
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
+sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
+
+makepkg --printsrcinfo > .SRCINFO
+
+git add .SRCINFO PKGBUILD
+git commit -m "Bump version to v$version"
+
+git push
+
+popd > /dev/null
+
+echo "Release v$version published on AUR!"

deploy/update-flathub.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+# set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/flathub"
+repourl="git@github.com:flathub/chat.schildi.desktop.git"
+
+downloadurl="https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/schildichat-desktop_${version}_amd64.deb"
+sha256sum=($(sha256sum $debpath))
+debdate=$(date +%Y-%m-%d -r $debpath)
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+yamlFile="chat.schildi.desktop.yaml"
+xmlFile="chat.schildi.desktop.metainfo.xml"
+
+sed -i "s|url: .* #SC:url|url: $downloadurl #SC:url|" "$yamlFile"
+sed -i "s|sha256: .* #SC:sha256|sha256: $sha256sum #SC:sha256|" "$yamlFile"
+
+sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=\"$debdate\"/>|" "$xmlFile"
+
+git add $yamlFile $xmlFile
+git commit -m "Bump version to v$version"
+
+git push
+
+popd > /dev/null
+
+echo "Release v$version published on flathub!"

flake.lock

@@ -0,0 +1,26 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1631731047,
+        "narHash": "sha256-qXEH1hyrlyghNzD0vOqwVD55OzKIfeJnluXXfYrD568=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5fe7b30633fcdc5cca2b7a1f5459b71c66ca6b88",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,44 @@
+{
+  description = "The SchildiChat Matrix client";
+
+  inputs.nixpkgs.url = github:NixOS/nixpkgs;
+
+  outputs = { self, nixpkgs }: let
+    systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+
+    overlay = import ./nix/overlay.nix;
+
+    # Memoize nixpkgs for different platforms for efficiency.
+    nixpkgsFor = forAllSystems (system:
+      import nixpkgs {
+        inherit system;
+        overlays = [ overlay ];
+      });
+  in {
+    inherit overlay;
+
+    packages = builtins.mapAttrs (system: pkgs: {
+      inherit (pkgs)
+        schildichat-web
+        schildichat-desktop
+        schildichat-desktop-wayland
+      ;
+    }) nixpkgsFor;
+
+    defaultPackage = forAllSystems (system: self.packages.${system}.schildichat-desktop);
+
+    apps = forAllSystems(system: {
+      schildichat-desktop = {
+        type = "app";
+        program = "${self.packages.${system}.schildichat-desktop}/bin/schildichat-desktop";
+      };
+      schildichat-desktop-wayland = {
+        type = "app";
+        program = "${self.packages.${system}.schildichat-desktop-wayland}/bin/schildichat-desktop";
+      };
+    });
+
+    defaultApp = forAllSystems (system: self.apps.${system}.schildichat-desktop);
+  };
+}

i18n-helper/.gitignore

@@ -0,0 +1,3 @@
+yarn.lock
+yarn-error.log
+node_modules/

i18n-helper/index.js

@@ -0,0 +1,52 @@
+const fs = require('fs');
+const path = require('path');
+const globby = require('globby');
+
+function readStrings(p) {
+	return JSON.parse(fs.readFileSync(p).toString());
+}
+
+function writeStrings(p, strings) {
+	fs.writeFileSync(p, JSON.stringify(strings, null, 4) + "\n");
+}
+
+(async () => {
+	console.log(process.argv.length);
+	console.log(process.argv[0]);
+	console.log(process.argv[1]);
+	console.log(process.argv[2]);
+	console.log(process.argv[3]);
+	if (process.argv.length < 3) {
+		console.log("No path with the original strings given!");
+		process.exit(-1);
+	}
+	originalPath = process.argv[2];
+
+	overlayPath = null;
+	if (process.argv.length > 3) {
+		overlayPath = process.argv[3];
+	} else {
+		console.log("Continue without overlays ...")
+	}
+
+	const paths = await globby(path.join(originalPath, "*.json"));
+
+	paths.forEach(p => {
+		let strings = readStrings(p);
+
+		for (const key of Object.keys(strings)) {
+			strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
+		}
+
+		if (overlayPath) {
+			op = path.join(overlayPath, path.basename(p)); 
+			
+			if (fs.existsSync(op)) {
+				overlayStrings = readStrings(op);
+				Object.assign(strings, overlayStrings);
+			}
+		}
+
+		writeStrings(p, strings);
+	});
+})();

i18n-helper/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "i18n-helper",
+  "version": "0.0.1",
+  "main": "index.js",
+  "dependencies": {
+    "globby": "^11.0.3"
+  }
+}

i18n-overlays/element-desktop/cs.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Zobrazit"
+}

i18n-overlays/element-desktop/de.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Anzeigen"
+}

i18n-overlays/element-desktop/en_EN.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Show"
+}

i18n-overlays/element-desktop/es.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Mostrar"
+}

i18n-overlays/element-desktop/et.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Näita"
+}

i18n-overlays/element-desktop/eu.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-desktop/fa.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-desktop/fr.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Afficher"
+}

i18n-overlays/element-desktop/hu.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-desktop/it.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Visualizza"
+}

i18n-overlays/element-desktop/lt.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Rodyti"
+}

i18n-overlays/element-desktop/nb_NO.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Vis"
+}

i18n-overlays/element-desktop/nl.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Tonen"
+}

i18n-overlays/element-desktop/pl.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Pokaż"
+}

i18n-overlays/element-desktop/pt_BR.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-desktop/ro.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Arată"
+}

i18n-overlays/element-desktop/ru.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Показать"
+}

i18n-overlays/element-desktop/sk.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-desktop/sv.json

@@ -0,0 +1,3 @@
+{
+    "Show": "Visa"
+}

i18n-overlays/element-web/cs.json

@@ -0,0 +1,5 @@
+{
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurace SchildiChatu obsahuje neplatný JSON. Opravte problém a načtěte stránku znovu.",
+    "Download Completed": "Stahování dokončeno",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používá pokročilé funkce prohlížeče, které váš prohlížeč nepodporuje."
+}

i18n-overlays/element-web/de_DE.json

@@ -0,0 +1,5 @@
+{
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine SchildiChat-Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
+    "Download Completed": "Download abgeschlossen",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem aktuellen Browser nicht unterstützt werden."
+}

i18n-overlays/element-web/en_EN.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/es.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/et.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/eu.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/fa.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/fr.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/hu.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/it.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/lt.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/nb_NO.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/nl.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/pl.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/pt_BR.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/ro.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/ru.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/sk.json

@@ -0,0 +1 @@
+{}

i18n-overlays/element-web/sv.json

@@ -0,0 +1 @@
+{}

i18n-overlays/matrix-react-sdk/cs.json

@@ -0,0 +1,18 @@
+{
+    "Enable layout with message bubbles": "Povolit bubliny zpráv",
+    "Show message bubbles on one side only": "Bubliny zpráv zobrazit pouze na jedné straně",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Bubliny zpráv zobrazit v závislosti na šířce stránky buď na obou stranách, nebo pouze na jedné straně",
+    "Message bubbles": "Bubliny zpráv",
+    "Normal priority": "Normální priorita",
+    "Message layout": "Vzhled zpráv",
+    "Modern": "Moderní",
+    "Show people and rooms in a combined list": "Zobrazit lidi a místnosti v kombinovaném seznamu",
+    "Update notifications": "Aktualizace oznámení",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Chcete se připojit k místnosti, která vás bude informovat o nových verzích? To je užitečné zejména v případě, že vaše platforma nepodporuje automatické aktualizace SchildiChatu (např. Windows a macOS).",
+    "Don't ask again": "Neptat se znovu",
+    "System": "Systém",
+    "Light theme": "Světlý motiv",
+    "Dark theme": "Tmavý motiv",
+    "Add custom theme": "Přidat vlastní motiv",
+    "Theme in use": "Používaný motiv"
+}

i18n-overlays/matrix-react-sdk/de_DE.json

@@ -0,0 +1,133 @@
+{
+    "Normal priority": "Normale Priorität",
+    "Deops user with given id": "Setzt das Berechtigungslevel des Benutzers mit der angegebenen ID zurück",
+    "No users have specific privileges in this room": "Keine Benutzer haben in diesem Raum privilegierte Berechtigungen",
+    "Only people who have been invited": "Nur Personen, die eingeladen wurden",
+    "Upload file": "Datei hochladen",
+    "You cannot place VoIP calls in this browser.": "VoIP-Gespräche werden von diesem Browser nicht unterstützt.",
+    "Failed to mute user": "Stummschalten des Benutzers fehlgeschlagen",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dieselbe Berechtigungsstufe wie du selbst erhalten wird.",
+    "Incorrect username and/or password.": "Inkorrekter Benutzername und/oder Passwort.",
+    "Create new room": "Neuen Raum erstellen",
+    "Define the power level of a user": "Berechtigungsstufe eines Benutzers setzen",
+    "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntaxhervorhebung aktivieren",
+    "To get started, please pick a username!": "Um zu starten, wähle bitte einen Benutzernamen!",
+    "Ignores a user, hiding their messages from you": "Benutzer blockieren und dessen Nachrichten ausblenden",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Benutzer mit Berechtigungen bist, wird es unmöglich sein, die Privilegien zurückzubekommen.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Benutzer- oder Gruppen-ID enthält, werden diese Daten entfernt, bevor sie an den Server gesendet werden.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen, um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs, Aliase, die du besucht hast, und Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Änderungen am <bold1>Namen</bold1> und <bold2>Bild</bold2> deiner Community werden evtl. erst nach 30 Minuten von anderen Benutzern gesehen werden.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs und Aliase, die du besucht hast, sowie Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
+    "Enable widget screenshots on supported widgets": "Bildschirmfotos bei unterstützten Widgets aktivieren",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen, heißt das, dass diese nicht mit neuen oder nicht registrierten Benutzern geteilt werden, aber registrierte Benutzer, die bereits zugriff haben, den Zugriff auf ihre Kopie behalten.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Konto deaktiviert wird. (<b>Warnung:</b> Zukünftige Benutzer werden eine unvollständige Konversation sehen)",
+    "Share Link to User": "Link zum Benutzer teilen",
+    "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Benutzern erreicht.",
+    "This homeserver has exceeded one of its resource limits.": "Dieser Heimserver hat eines seiner Ressourcen-Limits überschritten.",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Benutzern verbieten in dem Raum mit der alten Version zu schreiben und eine Nachricht senden, die den Benutzern rät in den neuen Raum zu wechseln",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Protokolldateien übermittelst, musst du <a>auf GitHub ein \"Issue\" erstellen</a> um dein Problem zu beschreiben.",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Benutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
+    "Custom user status messages": "Angepasste Benutzerstatusnachrichten",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Warnen, bevor du Einladungen zu möglicherweise ungültigen Matrix-IDs sendest",
+    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
+    "For help with using %(brand)s, click <a>here</a>.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a>.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
+    "User %(userId)s is already in the room": "Benutzer %(userId)s ist bereits im Raum",
+    "The user must be unbanned before they can be invited.": "Die Verbannung des Benutzers muss aufgehoben werden, bevor er eingeladen werden kann.",
+    "Could not load user profile": "Konnte Benutzerprofil nicht laden",
+    "Unbans user with given ID": "Hebt die Verbannung des Benutzers mit der angegebenen ID auf",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Die Verwendung eines Identitätsserver ist optional. Solltest du dich dazu entschließen, keinen Identitätsserver zu verwenden, kannst du von anderen Benutzern nicht gefunden werden und andere nicht per E-Mail oder Telefonnummer einladen.",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzern und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
+    "Show info about bridges in room settings": "Information über Brücken in den Raumeinstellungen anzeigen",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem</verify> Benutzer mit ID %(deviceId)s",
+    "User rules": "Benutzerregeln",
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Benutzer gedacht.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch die primäre Eingabemethode ist",
+    "Your user agent": "Dein User-Agent",
+    "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Benutzers nicht beenden können.",
+    "Encryption upgrade available": "Verschlüsselungsupgrade verfügbar",
+    "Unknown (user, session) pair:": "Unbekanntes Benutzer-/Sitzungspaar:",
+    "You have verified this user. This user has verified all of their sessions.": "Du hast diesen Benutzer verifiziert. Dieser Benutzer hat alle seine Sitzungen verifiziert.",
+    "Displays information about a user": "Zeigt Informationen über einen Benutzer an",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Benutzer, die aufgrund %(reason)s %(glob)s entsprechen",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Räume, die %(glob)s aufgrund von %(reason)s entsprechen",
+    "Reject & Ignore user": "Ablehnen und Benutzer blockieren",
+    "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
+    "Ask this user to verify their session, or manually verify it below.": "Bitte diesen Benutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
+    "Error adding ignored user/server": "Fehler beim Blockieren eines Benutzers/Servers",
+    "None": "Keine",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer und Server hinzu, die du blockieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot:*</code> alle Benutzer ignorieren, die auf einem Server den Namen 'bot' haben.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Das Blockieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die darin aufgeführten Benutzer und Server ausgeblendet.",
+    "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste zu abonnieren bedeutet ihr beizutreten!",
+    "Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden <b>nicht von dieser Sitzung gesichert</b>.",
+    "You have not verified this user.": "Du hast diesen Benutzer nicht verifiziert.",
+    "Send a reply…": "Antwort senden …",
+    "Send a message…": "Nachricht senden …",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger können sie lesen.",
+    "Verify User": "Benutzer verifizieren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit verifiziere diesen Benutzer durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
+    "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der zu verifizierende Benutzer angemeldet ist",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
+    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum, um die vollständige Sicherheit zu gewährleisten.",
+    "Your user ID": "Deine Benutzer-ID",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Benutzer fehlgeschlagen: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Beim Einladen der Benutzer lief etwas schief.",
+    "Failed to find the following users": "Folgende Benutzer konnten nicht gefunden werden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Benutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
+    "Automatically invite users": "Benutzer automatisch einladen",
+    "User Status": "Benutzerstatus",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst, werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Benutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
+    "User Autocomplete": "Benutzer-Auto-Vervollständigung",
+    "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
+    "Message bubbles": "Sprechblasen",
+    "Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren",
+    "Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
+    "Enable layout with message bubbles": "Layout mit Sprechblasen aktivieren",
+    "Show message bubbles on one side only": "Sprechblasen nur auf einer Seite anzeigen",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Sprechblasen abhänging von der Breite auf beiden Seiten oder nur einer Seite anzeigen",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kann verschlüsselte Nachrichten nicht sicher während der Ausführung im Browser durchsuchen. Benutze <desktopLink>%(brand)s Desktop</desktopLink>, um verschlüsselte Nachrichten in den Suchergebnissen angezeigt zu bekommen.",
+    "Use default": "Standardeinstellungen benutzen",
+    "Your firewall or anti-virus is blocking the request.": "Deine Firewall oder dein Antivirenprogramm blockiert die Anfrage.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Betreten nur für Benutzer von %(serverName)s erlauben.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Starte ein Gespräch mit jemandem unter Verwendung seines/ihres Namens, Benutzernamens (wie <userId/>) oder E-Mail-Adresse. Dadurch werden sie nicht zu %(communityName)s eingeladen. Klicke hier <a>hier</a>, um jemanden zu %(communityName)s einzuladen.",
+    "User settings": "Benutzer-Einstellungen",
+    "Community and user menu": "Community- und Benutzer-Menü",
+    "Render LaTeX maths in messages": "LaTeX-Matheformeln in Nachrichten anzeigen",
+    "Use email to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse, um von Benutzern gefunden werden zu können.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse oder Telefonnummer, um von Benutzern gefunden werden zu können.",
+    "Host account on": "Benutzerkonto betreiben auf",
+    "A call can only be transferred to a single user.": "Ein Anruf kann nur auf einen einzelnen Benutzer übertragen werden.",
+    "Change which room, message, or user you're viewing": "Ändere, welchen Raum, welche Nachricht oder welchen Benutzer du siehst",
+    "Unable to look up phone number": "Telefonnummer kann nicht gefunden werden",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Benutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
+    "Abort": "Abbrechen",
+    "Add existing room": "Existierenden Raum hinzufügen",
+    "Message layout": "Nachrichtenlayout",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Personen und Räume in einer gemeinsamen Liste anzeigen",
+    "Update notifications": "Updatebenachrichtigungen",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Möchtest du einem Raum beitreten, der dich über neue Updates informiert? Das ist besonders nützlich, wenn deine Plattform keine automatischen Updates für SchildiChat unterstützt (z. B. Windows und macOS).",
+    "Don't ask again": "Nicht erneut fragen",
+    "Light theme": "Helles Design",
+    "Dark theme": "Dunkles Design",
+    "System": "System",
+    "Add custom theme": "Benutzerdefiniertes Design hinzufügen",
+    "Theme in use": "Design in Verwendung",
+    "Uniform": "Einfarbig",
+    "PowerLevel": "Berechtigungslevel",
+    "MXID": "MXID",
+    "In direct chats": "In direkten Chats",
+    "In group chats": "In Gruppenchats",
+    "Show all rooms in Home": "Alle Räume auf der Startseite zeigen",
+    "Show notification badges for People in Spaces": "Benachrichtigungssymbol für Personen in Spaces zeigen",
+    "Return to the room previously opened in a space": "In den zuvor geöffneten Raum in einem Space zurückkehren",
+    "If disabled, the space overview will be shown when switching to another space.": "Wenn deaktiviert, wird die Space-Übersicht beim Wechsel zu einem anderen Space angezeigt.",
+    "User name color mode": "Farbmodus der Benutzernamen",
+    "In public rooms": "In öffentlichen Räumen",
+    "All rooms you're in will appear in Home.": "Alle Räume, in denen du dich befindest, werden auf der Startseite angezeigt.",
+    "Show people in spaces": "Personen in Spaces anzeigen",
+    "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Falls deaktiviert, kannst du trotzdem Direktnachrichten in privaten Spaces hinzufügen. Falls aktiviert, wirst du alle Mitglieder des Spaces sehen.",
+    "For people": "Für Personen"
+}

i18n-overlays/matrix-react-sdk/en_EN.json

@@ -0,0 +1,31 @@
+{
+    "Show message bubbles on one side only": "Show message bubbles on one side only",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Show message bubbles depending on the width either on both sides or only on one side",
+    "Message bubbles": "Message bubbles",
+    "Normal priority": "Normal priority",
+    "Message layout": "Message layout",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Show people and rooms in a combined list",
+    "Update notifications": "Update notifications",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).",
+    "Don't ask again": "Don't ask again",
+    "System": "System",
+    "Add custom theme": "Add custom theme",
+    "Theme in use": "Theme in use",
+    "Light theme": "Light theme",
+    "Dark theme": "Dark theme",
+    "User name color mode": "User name color mode",
+    "Uniform": "Uniform",
+    "PowerLevel": "PowerLevel",
+    "MXID": "MXID",
+    "For people": "For people",
+    "In group chats": "In group chats",
+    "In public rooms": "In public rooms",
+    "Show all rooms in Home": "Show all rooms in Home",
+    "All rooms you're in will appear in Home.": "All rooms you're in will appear in Home.",
+    "Show people in spaces": "Show people in spaces",
+    "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.",
+    "Show notification badges for People in Spaces": "Show notification badges for People in Spaces",
+    "Return to the room previously opened in a space": "Return to the room previously opened in a space",
+    "If disabled, the space overview will be shown when switching to another space.": "If disabled, the space overview will be shown when switching to another space."
+}

i18n-overlays/matrix-react-sdk/es.json

@@ -0,0 +1,7 @@
+{
+    "Show message bubbles on one side only": "mostrar las burbujas de mensajes en un solo lado",
+    "Message bubbles": "Burbujas de mensajes",
+    "Normal priority": "Prioridad normal",
+    "Enable layout with message bubbles": "Activar diseño con mensajes de burbujas",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Mostrar mensajes de burbuja dependiendo del tamaño tanto en ambos lados o solo en un lado"
+}

i18n-overlays/matrix-react-sdk/et.json

@@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Sõnumimullidega paigutuse lubamine",
+    "Show message bubbles on one side only": "Näita sõnumimulle ainult ühel poolel",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Näita sõnumimullid sõltuvalt laiusest kas mõlemal või ainult ühel küljel",
+    "Normal priority": "Tavaline prioriteet",
+    "Message bubbles": "Sõnumimullid"
+}

i18n-overlays/matrix-react-sdk/eu.json

@@ -0,0 +1,7 @@
+{
+    "Show message bubbles on one side only": "Erakutsi mezu burbuilak alde batetik bakarrik",
+    "Message bubbles": "Mezu burbuilak",
+    "Normal priority": "Normala lehentasuna",
+    "Enable layout with message bubbles": "Gaitu diseinua batera mezua burbuilak",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Erakutsi mezu burbuilak arabera zabalera bai, bi aldeetatik edo alde batetik bakarrik"
+}

i18n-overlays/matrix-react-sdk/fa.json

@@ -0,0 +1 @@
+{}

i18n-overlays/matrix-react-sdk/fr.json

@@ -0,0 +1,9 @@
+{
+    "Show message bubbles on one side only": "Afficher les bulles de message sur un seul côté",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Afficher les bulles de message selon la largeur soit sur un seul côté, soit sur les deux",
+    "Message bubbles": "Bulles de message",
+    "Normal priority": "Priorité normale",
+    "Message layout": "Disposition des messages",
+    "Modern": "Moderne",
+    "Show people and rooms in a combined list": "Afficher les personnes et les salons dans une liste combinée"
+}

i18n-overlays/matrix-react-sdk/hu.json

@@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Üzenetbuborékos elrendezés engedélyezése",
+    "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
+    "Message bubbles": "Üzenet buborékok",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
+    "Normal priority": "Normál prioritás"
+}

i18n-overlays/matrix-react-sdk/it.json

@@ -0,0 +1,13 @@
+{
+    "Modern": "Moderno",
+    "Show people and rooms in a combined list": "Visualizza persone e stanze in una lista combinata",
+    "Update notifications": "Aggiorna notifiche",
+    "Don't ask again": "Non chiedere di nuovo",
+    "System": "Sistema",
+    "Add custom theme": "Aggiungi tema personalizzato",
+    "Theme in use": "Tema in uso",
+    "Light theme": "Tema chiaro",
+    "Dark theme": "Tema scuro",
+    "Normal priority": "Priorità normale",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
+}

i18n-overlays/matrix-react-sdk/lt.json

@@ -0,0 +1,7 @@
+{
+    "Normal priority": "Normalaus prioriteto",
+    "Modern": "Modernus",
+    "Message bubbles": "Žinučių burbulai",
+    "Message layout": "Žinučių išdėstymas",
+    "Show people and rooms in a combined list": "Asmenų ir kambarių rodymas bendrame sąraše"
+}

i18n-overlays/matrix-react-sdk/nb_NO.json

@@ -0,0 +1,12 @@
+{
+    "Message bubbles": "Meldingsbobler",
+    "Normal priority": "Normal prioritet",
+    "Message layout": "Meldingsvisning",
+    "Modern": "Moderne",
+    "Show people and rooms in a combined list": "Vis folk og rom i kombinert liste",
+    "Update notifications": "Oppdater merknader",
+    "Show message bubbles on one side only": "Vis meldingsbobler kun på én side",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side",
+    "Don't ask again": "Ikke spør igjen",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS)."
+}

i18n-overlays/matrix-react-sdk/nl.json

@@ -0,0 +1,13 @@
+{
+    "Show message bubbles on one side only": "Boodschappenbubbels slechts aan één kant tonen",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Toon berichtbubbels, afhankelijk van de breedte, aan beide zijden of slechts aan één zijde",
+    "Message bubbles": "Boodschap bellen",
+    "Normal priority": "Normale prioriteit",
+    "Enable layout with message bubbles": "Schakel lay-out in met tekstballonnen",
+    "Update notifications": "Update meldingen",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Wilt u lid worden van een kamer waarin u wordt geïnformeerd over nieuwe releases? Dit is vooral handig als uw platform geen automatische updates voor SchildiChat ondersteunt (bijv. Windows en macOS).",
+    "Don't ask again": "Niet nogmaals vragen",
+    "Modern": "Modern",
+    "Message layout": "Berichtlayout",
+    "Show people and rooms in a combined list": "Toon personen en kamers in een gecombineerde lijst"
+}

i18n-overlays/matrix-react-sdk/pl.json

@@ -0,0 +1 @@
+{}

i18n-overlays/matrix-react-sdk/pt_BR.json

@@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Habilitar layout com bolhas de mensagem",
+    "Message bubbles": "Bolhas de mensagens",
+    "Normal priority": "Prioridade normal",
+    "Show message bubbles on one side only": "Mostrar bolhas de mensagem em apenas um lado",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Mostrar bolhas de mensagem dependendo da largura de ambos os lados ou somente de um lado"
+}

i18n-overlays/matrix-react-sdk/ro.json

@@ -0,0 +1,10 @@
+{
+    "Show message bubbles on one side only": "Arata bulele mesajelor pe o singură parte",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Arată bulele mesajelor bazat fie pe lățimea ambelor părți sau o singură parte",
+    "Message bubbles": "Bulele mesajelor",
+    "Normal priority": "Prioritate normală",
+    "Message layout": "Așezarea mesajului",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Arată persoanele și camerele într-o listă combinată",
+    "Update notifications": "Actualizează notificările"
+}

i18n-overlays/matrix-react-sdk/ru.json

@@ -0,0 +1,13 @@
+{
+    "Message bubbles": "Пузырьки сообщений",
+    "Normal priority": "Нормальный приоритет",
+    "Enable layout with message bubbles": "Включение макета с пузырьками сообщений",
+    "Show message bubbles on one side only": "Показывайте пузырьки с сообщениями только на одной стороне",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Показывать пузырьки сообщений в зависимости от ширины либо с обеих сторон, либо только с одной стороны",
+    "Modern": "Современное",
+    "Message layout": "Оформление сообщений",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Вы хотите присоединиться к комнате, уведомляющей вас о новых релизах? Это особенно полезно, если ваша платформа не поддерживает автоматические обновления для SchildiChat (например, Windows и macOS).",
+    "Show people and rooms in a combined list": "Показать людей и комнаты в объединенном списке",
+    "Update notifications": "Уведомления об обновлениях",
+    "Don't ask again": "Не спрашивать больше"
+}

i18n-overlays/matrix-react-sdk/sk.json

@@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Povolenie rozloženia s bublinami správ",
+    "Show message bubbles on one side only": "Zobrazenie bublín správ len na jednej strane",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Zobrazenie bublín správ v závislosti od šírky buď na oboch stranách, alebo len na jednej strane",
+    "Message bubbles": "Bubliny správ",
+    "Normal priority": "Normálna priorita"
+}

i18n-overlays/matrix-react-sdk/sv.json

@@ -0,0 +1,17 @@
+{
+    "Message bubbles": "Meddelandebubblor",
+    "Normal priority": "Normal prioritet",
+    "Message layout": "Meddelande layout",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Visa personer och rum i en kombinerad lista",
+    "Update notifications": "Uppdatera meddelanden",
+    "Don't ask again": "Fråga inte igen",
+    "System": "System",
+    "Add custom theme": "Lägg till anpassat tema",
+    "Theme in use": "Tema i bruk",
+    "Light theme": "Ljus tema",
+    "Dark theme": "Mörkt tema",
+    "Show message bubbles on one side only": "Visa meddelandebubblor bara på ena sidan",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Visa meddelandebubblor beroende på bredden antingen på båda sidor eller bara på ena sidan",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vill du gå med i ett rum som informerar dig om nya utgåvor? Detta är särskilt användbart om din plattform inte stöder automatiska uppdateringar för SchildiChat (t.ex.Windows och macOS)."
+}

local-pkgbuild-template/PKGBUILD

@@ -0,0 +1,25 @@
+# Maintainer: su-ex <codeworks@supercable.onl>
+# Maintainer: SpiritCroc <aur@spiritcroc.de>
+# Contributor: David Mehren <david.mehren@udo.edu>
+
+pkgname=---appName----git
+_pkgver=---version---
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional instant messaging experience."
+arch=('x86_64')
+url="https://schildi.chat"
+license=('Apache')
+depends=('sqlcipher')
+provides=('---appName---')
+conflicts=('---appName---')
+source=("---debName---"
+        "---appName---.sh")
+sha256sums=('SKIP'
+            'SKIP')
+
+package() {
+  msg2 "Extracting the data.tar.xz..."
+  bsdtar -xf data.tar.xz -C "$pkgdir/"
+  install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
+}

local-pkgbuild-template/schildichat-desktop.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec "/opt/---productName---/---appName---" "$@"

merge_helpers.sh

@@ -2,6 +2,12 @@
 
 SCHILDI_ROOT="$(dirname "$(realpath "$0")")"
 
+i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js"
+i18n_path="src/i18n/strings"
+i18n_overlay_path="$SCHILDI_ROOT/i18n-overlays"
+
+yarn=yarnpkg
+
 add_upstream() {
     if git remote | grep -q upstream; then
         echo "Remote named upstream already exists!"
@@ -37,3 +43,84 @@ forall_repos() {
     "$@"
     popd
 }
+
+ensure_yes() {
+    read -e -p "$1 [y/N] " choice
+    
+    if [[ "$choice" != [Yy]* ]]; then
+        exit 1
+    fi
+}
+
+check_branch() {
+    if [[ $(git branch --show-current) != "$1" ]]; then
+        repo_name=$(basename `git rev-parse --show-toplevel`)
+        ensure_yes "$repo_name not in branch $1. Continue?"
+    fi
+}
+
+check_clean_git() {
+    # Require clean git state
+    uncommitted=`git status --porcelain`
+    if [ ! -z "$uncommitted" ]; then
+        echo "Uncommitted changes are present, please commit first!"
+        exit 1
+    fi
+}
+
+revert_i18n_changes() {
+    local i18n_path="$1"
+    local skip_commit="$2"
+
+    git checkout upstream/master -- "$i18n_path"
+
+    if [[ "$skip_commit" != [Yy]* ]]; then
+        git commit -m "Automatic i18n reversion" || true
+    fi
+}
+
+apply_i18n_changes() {
+    local i18n_path="$1"
+
+    git add "$i18n_path"
+    git commit -m "Automatic i18n adjustment" || true
+}
+
+automatic_i18n_reversion() {
+    local skip_commit="$1"
+
+    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+
+    pushd "$SCHILDI_ROOT/element-web" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+
+    pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+}
+
+automatic_i18n_adjustment() {
+    # matrix-react-sdk
+    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+
+    # element-web
+    pushd "$SCHILDI_ROOT/element-web" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-web/$i18n_path" "$i18n_overlay_path/element-web"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+
+    # element-desktop
+    pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-desktop/$i18n_path" "$i18n_overlay_path/element-desktop"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+}

merge_upstream.sh

@@ -3,13 +3,36 @@
 set -e
 
 mydir="$(dirname "$(realpath "$0")")"
+branch=${BRANCH:-"sc"}
 
 pushd "$mydir" > /dev/null
 
 source ./merge_helpers.sh
 
+# Check branch
+check_branch $branch
+forall_repos check_branch $branch
 
+# Ensure clean git state
+forall_repos check_clean_git
+
+# Automatic i18n reversion
+automatic_i18n_reversion
+
+# Merge
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
+# Refresh environment
+make clean
+make setup
+
+# Automatic i18n adjustment
+automatic_i18n_adjustment
+
+# Automatic theme update
+pushd "matrix-react-sdk" > /dev/null
+./theme.sh
+popd > /dev/null
+
 popd > /dev/null

nix/overlay.nix

@@ -0,0 +1,22 @@
+final: prev: {
+  yarn2nix-sc = final.callPackage ./yarn2nix { };
+  cleanSchildichatDesktopSource = src: with final.lib; cleanSourceWith {
+    filter = name: type: cleanSourceFilter name type
+      && !(hasInfix "/node_modules/" name)
+      && !(hasInfix "/nix/" name && hasSuffix ".nix" name)
+    ;
+    inherit src;
+  };
+  schildichat-web = final.callPackage ./schildichat-web.nix {
+    inherit (final.yarn2nix-sc) mkYarnModules;
+  };
+  schildichat-desktop = final.callPackage ./schildichat-desktop.nix {
+    inherit (final.yarn2nix-sc) mkYarnPackage;
+    inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
+  };
+  schildichat-desktop-wayland = final.callPackage ./schildichat-desktop.nix {
+    inherit (final.yarn2nix-sc) mkYarnPackage;
+    inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
+    useWayland = true;
+  };
+}

nix/schildichat-desktop.nix

@@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, makeDesktopItem
+, mkYarnPackage
+, electron
+, element-desktop # for native modules
+, schildichat-web
+, callPackage
+, Security
+, AppKit
+, CoreServices
+
+, useWayland ? false
+
+, cleanSchildichatDesktopSource
+, schildichat-desktop-src ? ../.
+}:
+
+let
+  packageJSON = schildichat-desktop-src + "/element-desktop/package.json";
+  yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock";
+
+  package = builtins.fromJSON (builtins.readFile packageJSON);
+
+  pname = "schildichat-desktop";
+  version = package.version;
+
+  executableName = pname;
+
+  electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
+
+in mkYarnPackage rec {
+  inherit pname version packageJSON;
+
+  src = cleanSchildichatDesktopSource (schildichat-desktop-src + "/element-desktop");
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  inherit (element-desktop) seshat keytar;
+
+  buildPhase = ''
+    runHook preBuild
+
+    export HOME=$(mktemp -d)
+    pushd deps/schildichat-desktop/
+    npx tsc
+    yarn run i18n
+    node ./scripts/copy-res.js
+    popd
+    rm -rf node_modules/matrix-seshat node_modules/keytar
+    ln -s $keytar node_modules/keytar
+    ln -s $seshat node_modules/matrix-seshat
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # resources
+    mkdir -p "$out/share/element"
+    ln -s '${schildichat-web}' "$out/share/element/webapp"
+    cp -r './deps/schildichat-desktop' "$out/share/element/electron"
+    cp -r './deps/schildichat-desktop/res/img' "$out/share/element"
+    rm "$out/share/element/electron/node_modules"
+    cp -r './node_modules' "$out/share/element/electron"
+    cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
+    ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
+
+    # icons
+    for icon in $out/share/element/electron/build/icons/*.png; do
+      mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
+      ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
+    done
+
+    # desktop item
+    mkdir -p "$out/share"
+    ln -s "${desktopItem}/share/applications" "$out/share/applications"
+
+    # executable wrapper
+    makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
+      --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
+
+    runHook postInstall
+  '';
+
+  # Do not attempt generating a tarball for element-web again.
+  # note: `doDist = false;` does not work.
+  distPhase = ''
+    true
+  '';
+
+  # The desktop item properties should be kept in sync with data from upstream:
+  # https://github.com/vector-im/element-desktop/blob/develop/package.json
+  desktopItem = makeDesktopItem {
+    name = "schildichat-desktop";
+    exec = "${executableName} %u";
+    icon = "schildichat";
+    desktopName = "SchildiChat";
+    genericName = "Matrix Client";
+    categories = "Network;InstantMessaging;Chat;";
+    extraEntries = ''
+      StartupWMClass=schildichat
+      MimeType=x-scheme-handler/element;
+    '';
+  };
+}

nix/schildichat-web.nix

@@ -0,0 +1,75 @@
+{ stdenv
+, mkYarnModules
+, nodejs
+, cleanSchildichatDesktopSource
+, schildichat-desktop-src ? ../.
+, ...
+}:
+
+let
+  packageJSON = schildichat-desktop-src + "/element-web/package.json";
+  yarnLock = schildichat-desktop-src + "/element-web/yarn.lock";
+
+  package = builtins.fromJSON (builtins.readFile packageJSON);
+
+  pname = "schildichat-web";
+  version = package.version;
+
+  modules = mkYarnModules {
+    name = "${pname}-modules-${version}";
+    inherit pname version packageJSON yarnLock;
+  };
+
+in stdenv.mkDerivation {
+  inherit pname version;
+
+  src = cleanSchildichatDesktopSource schildichat-desktop-src;
+
+  buildInputs = [ nodejs ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp configs/sc/config.json element-web/
+    cp -r ${modules}/node_modules node_modules
+    chmod u+rwX -R node_modules
+    rm -rf node_modules/matrix-react-sdk
+    ln -s $PWD/matrix-react-sdk node_modules/
+    ln -s $PWD/node_modules matrix-react-sdk/
+    ln -s $PWD/node_modules element-web/
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd matrix-react-sdk
+    node_modules/.bin/reskindex -h ../element-web/src/header
+    popd
+
+    pushd element-web
+    node scripts/copy-res.js
+    node_modules/.bin/reskindex -h ../element-web/src/header
+    node_modules/.bin/webpack --progress --mode production
+    popd
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r element-web/webapp $out
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit modules;
+  };
+}

nix/yarn2nix/LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

nix/yarn2nix/bin/yarn2nix.js

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+const fs = require('fs')
+const lockfile = require('@yarnpkg/lockfile')
+const { docopt } = require('docopt')
+const deepEqual = require('deep-equal')
+const R = require('ramda')
+
+const fixPkgAddMissingSha1 = require('../lib/fixPkgAddMissingSha1')
+const mapObjIndexedReturnArray = require('../lib/mapObjIndexedReturnArray')
+const generateNix = require('../lib/generateNix')
+
+const USAGE = `
+Usage: yarn2nix [options]
+
+Options:
+  -h --help           Shows this help.
+  --no-nix            Hide the nix output
+  --no-patch          Don't patch the lockfile if hashes are missing
+  --lockfile=FILE     Specify path to the lockfile [default: ./yarn.lock].
+  --builtin-fetchgit  Use builtin fetchGit for git dependencies to support on-the-fly generation of yarn.nix without an internet connection
+`
+
+const options = docopt(USAGE)
+
+const data = fs.readFileSync(options['--lockfile'], 'utf8')
+
+// json example:
+
+// {
+//   type:'success',
+//   object:{
+//     'abbrev@1':{
+//       version:'1.0.9',
+//       resolved:'https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135'
+//     },
+//     'shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify':{
+//       version:'1.6.0',
+//       resolved:'git+https://github.com/srghma/node-shell-quote.git#0aa381896e0cd7409ead15fd444f225807a61e0a'
+//     },
+//     '@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git':{
+//       version:'1.6.0',
+//       resolved:'git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit'
+//     },
+//   }
+// }
+
+const json = lockfile.parse(data)
+
+if (json.type !== 'success') {
+  throw new Error('yarn.lock parse error')
+}
+
+// Check for missing hashes in the yarn.lock and patch if necessary
+
+let pkgs = R.pipe(
+  mapObjIndexedReturnArray((value, key) => ({
+    ...value,
+    nameWithVersion: key,
+  })),
+  R.uniqBy(R.prop('resolved')),
+)(json.object)
+
+;(async () => {
+  if (!options['--no-patch']) {
+    pkgs = await R.map(fixPkgAddMissingSha1, pkgs)
+  }
+
+  const origJson = lockfile.parse(data)
+
+  if (!deepEqual(origJson, json)) {
+    console.error('found changes in the lockfile', options['--lockfile'])
+
+    if (options['--no-patch']) {
+      console.error('...aborting')
+      process.exit(1)
+    }
+
+    fs.writeFileSync(options['--lockfile'], lockfile.stringify(json.object))
+  }
+
+  if (!options['--no-nix']) {
+    // print to stdout
+    console.log(generateNix(pkgs, options['--builtin-fetchgit']))
+  }
+})().catch(error => {
+  console.error(error)
+
+  process.exit(1)
+})

nix/yarn2nix/default.nix

@@ -0,0 +1,429 @@
+{ pkgs ? import <nixpkgs> {}
+, nodejs ? pkgs.nodejs
+, yarn ? pkgs.yarn
+}:
+
+let
+  inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal;
+
+  compose = f: g: x: f (g x);
+  id = x: x;
+  composeAll = builtins.foldl' compose id;
+in rec {
+  # Export yarn again to make it easier to find out which yarn was used.
+  inherit yarn;
+
+  # Re-export pkgs
+  inherit pkgs;
+
+  unlessNull = item: alt:
+    if item == null then alt else item;
+
+  reformatPackageName = pname:
+    let
+      # regex adapted from `validate-npm-package-name`
+      # will produce 3 parts e.g.
+      # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ]
+      # "somepackage" -> [ null null "somepackage" ]
+      parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname);
+      # if there is no organisation we need to filter out null values.
+      non-null = builtins.filter (x: x != null) parts;
+    in builtins.concatStringsSep "-" non-null;
+
+  # https://docs.npmjs.com/files/package.json#license
+  # TODO: support expression syntax (OR, AND, etc)
+  spdxLicense = licstr:
+    if licstr == "UNLICENSED" then
+      lib.licenses.unfree
+    else
+      lib.findFirst
+        (l: l ? spdxId && l.spdxId == licstr)
+        { shortName = licstr; }
+        (builtins.attrValues lib.licenses);
+
+  # Generates the yarn.nix from the yarn.lock file
+  mkYarnNix = { yarnLock, flags ? [] }:
+    pkgs.runCommand "yarn.nix" {}
+    "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch --builtin-fetchgit ${lib.escapeShellArgs flags} > $out";
+
+  # Loads the generated offline cache. This will be used by yarn as
+  # the package source.
+  importOfflineCache = yarnNix:
+    let
+      pkg = callPackage yarnNix { };
+    in
+      pkg.offline_cache;
+
+  defaultYarnFlags = [
+    "--offline"
+    "--frozen-lockfile"
+    "--ignore-engines"
+    "--ignore-scripts"
+  ];
+
+  mkYarnModules = {
+    name ? "${pname}-${version}", # safe name and version, e.g. testcompany-one-modules-1.0.0
+    pname, # original name, e.g @testcompany/one
+    version,
+    packageJSON,
+    yarnLock,
+    yarnNix ? mkYarnNix { inherit yarnLock; },
+    yarnFlags ? defaultYarnFlags,
+    pkgConfig ? {},
+    preBuild ? "",
+    postBuild ? "",
+    workspaceDependencies ? [], # List of yarn packages
+  }:
+    let
+      offlineCache = importOfflineCache yarnNix;
+
+      extraBuildInputs = (lib.flatten (builtins.map (key:
+        pkgConfig.${key}.buildInputs or []
+      ) (builtins.attrNames pkgConfig)));
+
+      postInstall = (builtins.map (key:
+        if (pkgConfig.${key} ? postInstall) then
+          ''
+            for f in $(find -L -path '*/node_modules/${key}' -type d); do
+              (cd "$f" && (${pkgConfig.${key}.postInstall}))
+            done
+          ''
+        else
+          ""
+      ) (builtins.attrNames pkgConfig));
+
+      workspaceJSON = pkgs.writeText
+        "${name}-workspace-package.json"
+        (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat
+
+      workspaceDependencyLinks = lib.concatMapStringsSep "\n"
+        (dep: ''
+          mkdir -p "deps/${dep.pname}"
+          ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json"
+        '')
+        workspaceDependencies;
+
+    in stdenv.mkDerivation {
+      inherit preBuild postBuild name;
+      dontUnpack = true;
+      dontInstall = true;
+      buildInputs = [ yarn nodejs git ] ++ extraBuildInputs;
+
+      configurePhase = ''
+        # Yarn writes cache directories etc to $HOME.
+        export HOME=$PWD/yarn_home
+      '';
+
+      buildPhase = ''
+        runHook preBuild
+
+        mkdir -p "deps/${pname}"
+        cp ${packageJSON} "deps/${pname}/package.json"
+        cp ${workspaceJSON} ./package.json
+        cp ${yarnLock} ./yarn.lock
+        chmod +w ./yarn.lock
+
+        yarn config --offline set yarn-offline-mirror ${offlineCache}
+
+        # Do not look up in the registry, but in the offline cache.
+        ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
+
+        ${workspaceDependencyLinks}
+
+        yarn install ${lib.escapeShellArgs yarnFlags}
+
+        ${lib.concatStringsSep "\n" postInstall}
+
+        mkdir $out
+        mv node_modules $out/
+        mv deps $out/
+        patchShebangs $out
+
+        runHook postBuild
+      '';
+    };
+
+  # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
+  # the shell-hook environment.
+  linkNodeModulesHook = ''
+    if [[ -d node_modules || -L node_modules ]]; then
+      echo "./node_modules is present. Replacing."
+      rm -rf node_modules
+    fi
+
+    ln -s "$node_modules" node_modules
+  '';
+
+  mkYarnWorkspace = {
+    src,
+    packageJSON ? src + "/package.json",
+    yarnLock ? src + "/yarn.lock",
+    packageOverrides ? {},
+    ...
+  }@attrs:
+  let
+    package = lib.importJSON packageJSON;
+
+    packageGlobs = package.workspaces;
+
+    globElemToRegex = lib.replaceStrings ["*"] [".*"];
+
+    # PathGlob -> [PathGlobElem]
+    splitGlob = lib.splitString "/";
+
+    # Path -> [PathGlobElem] -> [Path]
+    # Note: Only directories are included, everything else is filtered out
+    expandGlobList = base: globElems:
+      let
+        elemRegex = globElemToRegex (lib.head globElems);
+        rest = lib.tail globElems;
+        children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base));
+        matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children;
+      in if globElems == []
+        then [ base ]
+        else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren;
+
+    # Path -> PathGlob -> [Path]
+    expandGlob = base: glob: expandGlobList base (splitGlob glob);
+
+    packagePaths = lib.concatMap (expandGlob src) packageGlobs;
+
+    packages = lib.listToAttrs (map (src:
+      let
+        packageJSON = src + "/package.json";
+
+        package = lib.importJSON packageJSON;
+
+        allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]);
+
+        # { [name: String] : { pname : String, packageJSON : String, ... } } -> { [pname: String] : version } -> [{ pname : String, packageJSON : String, ... }]
+        getWorkspaceDependencies = packages: allDependencies:
+          let
+            packageList = lib.attrValues packages;
+          in
+            composeAll [
+              (lib.filter (x: x != null))
+              (lib.mapAttrsToList (pname: _version: lib.findFirst (package: package.pname == pname) null packageList))
+            ] allDependencies;
+
+        workspaceDependencies = getWorkspaceDependencies packages allDependencies;
+
+        name = reformatPackageName package.name;
+      in {
+        inherit name;
+        value = mkYarnPackage (
+          builtins.removeAttrs attrs ["packageOverrides"]
+          // { inherit src packageJSON yarnLock workspaceDependencies; }
+          // lib.attrByPath [name] {} packageOverrides
+        );
+      })
+      packagePaths
+    );
+  in packages;
+
+  mkYarnPackage = {
+    name ? null,
+    src,
+    packageJSON ? src + "/package.json",
+    yarnLock ? src + "/yarn.lock",
+    yarnNix ? mkYarnNix { inherit yarnLock; },
+    yarnFlags ? defaultYarnFlags,
+    yarnPreBuild ? "",
+    yarnPostBuild ? "",
+    pkgConfig ? {},
+    extraBuildInputs ? [],
+    publishBinsFor ? null,
+    workspaceDependencies ? [], # List of yarnPackages
+    ...
+  }@attrs:
+    let
+      package = lib.importJSON packageJSON;
+      pname = package.name;
+      safeName = reformatPackageName pname;
+      version = attrs.version or package.version;
+      baseName = unlessNull name "${safeName}-${version}";
+
+      workspaceDependenciesTransitive = lib.unique (
+        (lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies))
+        ++ workspaceDependencies
+      );
+
+      deps = mkYarnModules {
+        name = "${safeName}-modules-${version}";
+        preBuild = yarnPreBuild;
+        postBuild = yarnPostBuild;
+        workspaceDependencies = workspaceDependenciesTransitive;
+        inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig;
+      };
+
+      publishBinsFor_ = unlessNull publishBinsFor [pname];
+
+      linkDirFunction = ''
+        linkDirToDirLinks() {
+          target=$1
+          if [ ! -f "$target" ]; then
+            mkdir -p "$target"
+          elif [ -L "$target" ]; then
+            local new=$(mktemp -d)
+            trueSource=$(realpath "$target")
+            if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then
+              ln -s $trueSource/* $new/
+            fi
+            rm -r "$target"
+            mv "$new" "$target"
+          fi
+        }
+      '';
+
+      workspaceDependencyCopy = lib.concatMapStringsSep "\n"
+        (dep: ''
+          # ensure any existing scope directory is not a symlink
+          linkDirToDirLinks "$(dirname node_modules/${dep.pname})"
+          mkdir -p "deps/${dep.pname}"
+          tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1
+          if [ ! -e "deps/${dep.pname}/node_modules" ]; then
+            ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules"
+          fi
+        '')
+        workspaceDependenciesTransitive;
+
+    in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // {
+      inherit src pname;
+
+      name = baseName;
+
+      buildInputs = [ yarn nodejs rsync ] ++ extraBuildInputs;
+
+      node_modules = deps + "/node_modules";
+
+      configurePhase = attrs.configurePhase or ''
+        runHook preConfigure
+
+        for localDir in npm-packages-offline-cache node_modules; do
+          if [[ -d $localDir || -L $localDir ]]; then
+            echo "$localDir dir present. Removing."
+            rm -rf $localDir
+          fi
+        done
+
+        # move convent of . to ./deps/${pname}
+        mv $PWD $NIX_BUILD_TOP/temp
+        mkdir -p "$PWD/deps/${pname}"
+        rm -fd "$PWD/deps/${pname}"
+        mv $NIX_BUILD_TOP/temp "$PWD/deps/${pname}"
+        cd $PWD
+
+        ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules"
+
+        cp -r $node_modules node_modules
+        chmod -R +w node_modules
+
+        ${linkDirFunction}
+
+        linkDirToDirLinks "$(dirname node_modules/${pname})"
+        ln -s "deps/${pname}" "node_modules/${pname}"
+
+        ${workspaceDependencyCopy}
+
+        # Help yarn commands run in other phases find the package
+        echo "--cwd deps/${pname}" > .yarnrc
+        runHook postConfigure
+      '';
+
+      # Replace this phase on frontend packages where only the generated
+      # files are an interesting output.
+      installPhase = attrs.installPhase or ''
+        runHook preInstall
+
+        mkdir -p $out/{bin,libexec/${pname}}
+        mv node_modules $out/libexec/${pname}/node_modules
+        mv deps $out/libexec/${pname}/deps
+
+        node ${./internal/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_}
+
+        runHook postInstall
+      '';
+
+      doDist = true;
+
+      distPhase = attrs.distPhase or ''
+        # pack command ignores cwd option
+        rm -f .yarnrc
+        cd $out/libexec/${pname}/deps/${pname}
+        mkdir -p $out/tarballs/
+        yarn pack --offline --ignore-scripts --filename $out/tarballs/${baseName}.tgz
+      '';
+
+      passthru = {
+        inherit pname package packageJSON deps;
+        workspaceDependencies = workspaceDependenciesTransitive;
+      } // (attrs.passthru or {});
+
+      meta = {
+        inherit (nodejs.meta) platforms;
+        description = packageJSON.description or "";
+        homepage = packageJSON.homepage or "";
+        version = packageJSON.version or "";
+        license = if packageJSON ? license then spdxLicense packageJSON.license else "";
+      } // (attrs.meta or {});
+    });
+
+  yarn2nix = mkYarnPackage {
+    src =
+      let
+        src = ./.;
+
+        mkFilter = { dirsToInclude, filesToInclude, root }: path: type:
+          let
+            inherit (pkgs.lib) any flip elem hasSuffix hasPrefix elemAt splitString;
+
+            subpath = elemAt (splitString "${toString root}/" path) 1;
+            spdir = elemAt (splitString "/" subpath) 0;
+          in elem spdir dirsToInclude ||
+            (type == "regular" && elem subpath filesToInclude);
+      in builtins.filterSource
+          (mkFilter {
+            dirsToInclude = ["bin" "lib"];
+            filesToInclude = ["package.json" "yarn.lock"];
+            root = src;
+          })
+          src;
+
+    # yarn2nix is the only package that requires the yarnNix option.
+    # All the other projects can auto-generate that file.
+    yarnNix = ./yarn.nix;
+
+    # Using the filter above and importing package.json from the filtered
+    # source results in an error in restricted mode. To circumvent this,
+    # we import package.json from the unfiltered source
+    packageJSON = ./package.json;
+
+    yarnFlags = defaultYarnFlags ++ ["--production=true"];
+
+    buildPhase = ''
+      source ${./nix/expectShFunctions.sh}
+
+      expectFilePresent ./node_modules/.yarn-integrity
+
+      # check dependencies are installed
+      expectFilePresent ./node_modules/@yarnpkg/lockfile/package.json
+
+      # check devDependencies are not installed
+      expectFileOrDirAbsent ./node_modules/.bin/eslint
+      expectFileOrDirAbsent ./node_modules/eslint/package.json
+    '';
+  };
+
+  fixup_yarn_lock = runCommandLocal "fixup_yarn_lock"
+    {
+      buildInputs = [ nodejs ];
+    } ''
+    mkdir -p $out/lib
+    mkdir -p $out/bin
+
+    cp ${./lib/urlToName.js} $out/lib/urlToName.js
+    cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock
+
+    patchShebangs $out
+  '';
+}

nix/yarn2nix/internal/fixup_bin.js

@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+
+/* Usage:
+ * node fixup_bin.js <bin_dir> <modules_dir> [<bin_pkg_1>, <bin_pkg_2> ... ]
+ */
+
+const fs = require('fs')
+const path = require('path')
+
+const derivationBinPath = process.argv[2]
+const nodeModules = process.argv[3]
+const packagesToPublishBin = process.argv.slice(4)
+
+function processPackage(name) {
+  console.log('fixup_bin: Processing ', name)
+
+  const packagePath = `${nodeModules}/${name}`
+  const packageJsonPath = `${packagePath}/package.json`
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
+
+  if (!packageJson.bin) {
+    console.log('fixup_bin: No binaries provided')
+    return
+  }
+
+  // There are two alternative syntaxes for `bin`
+  // a) just a plain string, in which case the name of the package is the name of the binary.
+  // b) an object, where key is the name of the eventual binary, and the value the path to that binary.
+  if (typeof packageJson.bin === 'string') {
+    const binName = packageJson.bin
+    packageJson.bin = {}
+    packageJson.bin[packageJson.name] = binName
+  }
+
+  // eslint-disable-next-line no-restricted-syntax, guard-for-in
+  for (const binName in packageJson.bin) {
+    const binPath = packageJson.bin[binName]
+    const normalizedBinName = binName.replace('@', '').replace('/', '-')
+
+    const targetPath = path.normalize(`${packagePath}/${binPath}`)
+    const createdPath = `${derivationBinPath}/${normalizedBinName}`
+
+    console.log(
+      `fixup_bin: creating link ${createdPath} that points to ${targetPath}`,
+    )
+
+    fs.symlinkSync(targetPath, createdPath)
+  }
+}
+
+packagesToPublishBin.forEach(pkg => {
+  processPackage(pkg)
+})

nix/yarn2nix/internal/fixup_yarn_lock.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+/* Usage:
+ * node fixup_yarn_lock.js yarn.lock
+ */
+
+const fs = require('fs')
+const readline = require('readline')
+
+const urlToName = require('../lib/urlToName')
+
+const yarnLockPath = process.argv[2]
+
+const readFile = readline.createInterface({
+  input: fs.createReadStream(yarnLockPath, { encoding: 'utf8' }),
+
+  // Note: we use the crlfDelay option to recognize all instances of CR LF
+  // ('\r\n') in input.txt as a single line break.
+  crlfDelay: Infinity,
+
+  terminal: false, // input and output should be treated like a TTY
+})
+
+const result = []
+
+readFile
+  .on('line', line => {
+    const arr = line.match(/^ {2}resolved "([^#]+)#([^"]+)"$/)
+
+    if (arr !== null) {
+      const [_, url, shaOrRev] = arr
+
+      const fileName = urlToName(url)
+
+      result.push(`  resolved "${fileName}#${shaOrRev}"`)
+    } else {
+      result.push(line)
+    }
+  })
+  .on('close', () => {
+    fs.writeFile(yarnLockPath, result.join('\n'), 'utf8', err => {
+      if (err) {
+        console.error(
+          'fixup_yarn_lock: fatal error when trying to write to yarn.lock',
+          err,
+        )
+      }
+    })
+  })

nix/yarn2nix/lib/fixPkgAddMissingSha1.js

@@ -0,0 +1,66 @@
+const https = require('https')
+const crypto = require('crypto')
+
+// TODO:
+// make test case where getSha1 function is used, i.e. the case when resolved is without sha1?
+// consider using https://github.com/request/request-promise-native
+
+function getSha1(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, res => {
+      const { statusCode } = res
+      const hash = crypto.createHash('sha1')
+
+      if (statusCode !== 200) {
+        const err = new Error(`Request Failed.\nStatus Code: ${statusCode}`)
+
+        // consume response data to free up memory
+        res.resume()
+
+        reject(err)
+      }
+
+      res.on('data', chunk => {
+        hash.update(chunk)
+      })
+
+      res.on('end', () => {
+        resolve(hash.digest('hex'))
+      })
+
+      res.on('error', reject)
+    })
+  })
+}
+
+// Object -> Object
+async function fixPkgAddMissingSha1(pkg) {
+  // local dependency
+
+  if (!pkg.resolved) {
+    console.error(
+      `yarn2nix: can't find "resolved" field for package ${
+        pkg.nameWithVersion
+      }, you probably required it using "file:...", this feature is not supported, ignoring`,
+    )
+    return pkg
+  }
+
+  const [url, sha1] = pkg.resolved.split('#', 2)
+
+  if (sha1) {
+    return pkg
+  }
+
+  // if there is no sha1 in resolved url
+  // (this could happen if yarn.lock was generated by older version of yarn)
+  // - request it from registry by https and add it to pkg
+  const newSha1 = await getSha1(url)
+
+  return {
+    ...pkg,
+    resolved: `${url}#${newSha1}`,
+  }
+}
+
+module.exports = fixPkgAddMissingSha1

nix/yarn2nix/lib/generateNix.js

@@ -0,0 +1,129 @@
+const R = require('ramda')
+
+const urlToName = require('./urlToName')
+const { execFileSync } = require('child_process')
+
+// fetchgit transforms
+//
+// "shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify":
+//   version "1.6.0"
+//   resolved "git+https://github.com/srghma/node-shell-quote.git#1234commit"
+//
+// to
+//
+// builtins.fetchGit {
+//   url = "https://github.com/srghma/node-shell-quote.git";
+//   ref = "without_unlicenced_jsonify";
+//   rev = "1234commit";
+// }
+//
+// and transforms
+//
+// "@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git":
+//   version "0.6.0"
+//   resolved "git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit"
+//
+// to
+//
+// builtins.fetchGit {
+//   url = "https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git";
+//   ref = "master";
+//   rev = "1234commit";
+// }
+
+function prefetchgit(url, rev) {
+  return JSON.parse(
+    execFileSync("nix-prefetch-git", ["--rev", rev, url], {
+      stdio: [ "ignore", "pipe", "ignore" ],
+      timeout: 60000,
+    })
+  ).sha256
+}
+
+function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
+  return `    {
+    name = "${fileName}";
+    path =
+      let${builtinFetchGit ? `
+        repo = builtins.fetchGit {
+          url = "${url}";
+          ref = "${branch}";
+          rev = "${rev}";
+        };
+      ` : `
+        repo = fetchgit {
+          url = "${url}";
+          rev = "${rev}";
+          sha256 = "${prefetchgit(url, rev)}";
+        };
+      `}in
+        runCommand "${fileName}" { buildInputs = [gnutar]; } ''
+          # Set u+w because tar-fs can't unpack archives with read-only dirs
+          # https://github.com/mafintosh/tar-fs/issues/79
+          tar cf $out --mode u+w -C \${repo} .
+        '';
+  }`
+}
+
+function fetchLockedDep(builtinFetchGit) {
+  return function (pkg) {
+    let { nameWithVersion, resolved } = pkg
+
+    if (!resolved) {
+      console.error(
+        `yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
+      )
+      return ''
+    }
+
+    const fileName = urlToName(resolved.split('#')[0])
+
+    if (resolved.startsWith('https://codeload.github.com/')) {
+      let s = resolved.split('/')
+      resolved = `git+https://github.com/${s[3]}/${s[4]}.git#${s[6]}`
+    }
+
+    const [url, sha1OrRev] = resolved.split('#')
+
+    if (url.startsWith('git+') || url.startsWith("git:")) {
+      const rev = sha1OrRev
+
+      const [_, branch] = nameWithVersion.split('#')
+
+      const urlForGit = url.replace(/^git\+/, '')
+
+      return fetchgit(fileName, urlForGit, rev, branch || 'master', builtinFetchGit)
+    }
+
+    const sha = sha1OrRev
+
+    return `    {
+      name = "${fileName}";
+      path = fetchurl {
+        name = "${fileName}";
+        url  = "${url}";
+        sha1 = "${sha}";
+      };
+    }`
+  }
+}
+
+const HEAD = `
+{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+`.trim()
+
+// Object -> String
+function generateNix(pkgs, builtinFetchGit) {
+  const nameWithVersionAndPackageNix = R.map(fetchLockedDep(builtinFetchGit), pkgs)
+
+  const packagesDefinition = R.join(
+    '\n',
+    R.values(nameWithVersionAndPackageNix),
+  )
+
+  return R.join('\n', [HEAD, packagesDefinition, '  ];', '}'])
+}
+
+module.exports = generateNix

nix/yarn2nix/lib/mapObjIndexedReturnArray.js

@@ -0,0 +1,21 @@
+const _curry2 = require('ramda/src/internal/_curry2')
+const _map = require('ramda/src/internal/_map')
+const keys = require('ramda/src/keys')
+
+// mapObjIndexed: ((v, k, {k: v}) → v') → {k: v} → {k: v'}
+// mapObjIndexedReturnArray: ((v, k, {k: v}) → v') → {k: v} → [v']
+
+/*
+ * @example
+ *
+ *      const xyz = { x: 1, y: 2, z: 3 };
+ *      const prependKeyAndDouble = (num, key, obj) => key + (num * 2);
+ *
+ *      mapObjIndexedReturnArray(prependKeyAndDouble, xyz); //=> ['x2', 'y4', 'z6']
+ */
+
+const mapObjIndexedReturnArray = _curry2((fn, obj) =>
+  _map(key => fn(obj[key], key, obj), keys(obj)),
+)
+
+module.exports = mapObjIndexedReturnArray

nix/yarn2nix/lib/urlToName.js

@@ -0,0 +1,29 @@
+const path = require('path')
+
+// String -> String
+
+// @url examples:
+// - https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
+// - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
+// - git+https://github.com/srghma/node-shell-quote.git
+// - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git
+// - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf
+
+function urlToName(url) {
+
+  // Yarn generates `codeload.github.com` tarball URLs, where the final
+  // path component (file name) is the git hash. See #111.
+  // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26
+  let isCodeloadGitTarballUrl =
+    url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')
+
+  if (url.startsWith('git+') || isCodeloadGitTarballUrl) {
+    return path.basename(url)
+  }
+
+  return url
+    .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names
+    .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore
+}
+
+module.exports = urlToName

nix/yarn2nix/nix/expectShFunctions.sh

@@ -0,0 +1,30 @@
+expectFilePresent () {
+  if [ -f "$1" ]; then
+    echo "Test passed: file is present - $1"
+  else
+    echo "Test failed: file is absent - $1"
+    exit 1
+  fi
+}
+
+expectFileOrDirAbsent () {
+  if [ ! -e "$1" ];
+  then
+    echo "Test passed: file or dir is absent - $1"
+  else
+    echo "Test failed: file or dir is present - $1"
+    exit 1
+  fi
+}
+
+expectEqual () {
+  if [ "$1" == "$2" ];
+  then
+    echo "Test passed: output is equal to expected_output"
+  else
+    echo "Test failed: output is not equal to expected_output:"
+    echo "  output - $1"
+    echo "  expected_output - $2"
+    exit 1
+  fi
+}

nix/yarn2nix/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "yarn2nix",
+  "version": "1.0.0",
+  "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies",
+  "main": "index.js",
+  "repository": ".",
+  "author": "Maarten Hoogendoorn <maarten@moretea.nl>",
+  "license": "MIT",
+  "scripts": {
+    "yarn2nix": "bin/yarn2nix.js",
+    "format": "prettier-eslint --write './**/*.{js,jsx,json}'",
+    "lint": "eslint ."
+  },
+  "bin": {
+    "yarn2nix": "bin/yarn2nix.js"
+  },
+  "engines" : {
+    "node" : ">=8.0.0"
+  },
+  "dependencies": {
+    "@yarnpkg/lockfile": "^1.1.0",
+    "deep-equal": "^1.0.1",
+    "docopt": "^0.6.2",
+    "ramda": "^0.26.1"
+  },
+  "devDependencies": {
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.11.1",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-config-prettier": "^3.3.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-react": "^7.12.2",
+    "eslint-plugin-standard": "^4.0.0",
+    "husky": "^1.3.1",
+    "lint-staged": "^8.1.0",
+    "prettier-eslint-cli": "^4.7.1"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  }
+}

regenerate_i18n.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+branch=${BRANCH:-"sc"}
+
+pushd "$mydir" > /dev/null
+
+source ./merge_helpers.sh
+
+# Fetch to get latest strings for current version
+# ToDo: Find out actual versions in case it's not yet merged
+forall_repos git fetch upstream
+
+# Check branch
+check_branch $branch
+forall_repos check_branch $branch
+
+# Ensure clean git state
+forall_repos check_clean_git
+
+# Automatic i18n reversion
+automatic_i18n_reversion y
+
+# Automatic i18n adjustment
+automatic_i18n_adjustment
+
+popd > /dev/null