Skip to content

Commit

Permalink
Merge branch 'mistress' into github-page
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanilla-extracts
vanilla-extracts committed Apr 13, 2024
2 parents 3afcee9 + f642f9f commit f45e24d
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 128 deletions.
23 changes: 22 additions & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ or install it via cargo
cargo install mini-calc
```

<<<<<<< HEAD
=======
### using Nix

Alternatively, you can use [nix](https://nixos.org) to build or run this project.
Expand All @@ -43,7 +41,6 @@ nix run github:coco33920/calc
## Website
The website (powered by oranda) is available for more informations [the website](https://calc.nwa2coco.fr) for more informations.
>>>>>>> origin/mistress

## Manual

Expand All @@ -55,12 +52,10 @@ If you prefer a PDF, there is a [manual](https://calc.nwa2coco.fr/assets/manual.
|-------------------------------------------------------------------------------------------------------------------------------------------------|:--------|:-------------------------|:--------------------------------------------|
| [<img src="https://avatars.githubusercontent.com/u/17108449?v=4" style="border-radius: 50%;height:90pt;width:auto">](https://github.com/coco33920) |Charlotte THOMAS | Main developer/Maintener | [Main page](https://me.nwa2coco.fr) |
| [<img src="https://avatars.githubusercontent.com/u/87855546?v=4" style="border-radius: 50%;height:90pt;width:auto">](https://github.com/leana8959) |Léana 江 | Help, cleanup | [Website/Blog](https://earth2077.fr) |
<<<<<<< HEAD
=======
| [<img src="https://avatars.githubusercontent.com/u/53050011?v=4" style="border-radius:50%;height:90pt;width:auto">](https://github.com/Sigmaficient) |Sigmaficient | Nixify | [Website](https://sigmanificient.github.io/)|


## TODO List

The TODO list is completed so I collapsed it
<details>
<summary>TODO List</summary>
Expand Down Expand Up @@ -414,4 +409,3 @@ As of 2.11.3 matrices are pretty printed !
As of 2.12.0 non interactive use was added

![](docs/assets/non_interactive_use.png)
>>>>>>> origin/mistress
2 changes: 1 addition & 1 deletion public/artifacts.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"0.6.0","tag":"2.12.2","formatted_date":"Feb 3 2024 at 13:15 UTC","platforms_with_downloads":[{"target":["aarch64-apple-darwin"],"display_name":"macOS Apple Silicon","installers":[0,5,1]},{"target":["x86_64-apple-darwin"],"display_name":"macOS Intel","installers":[0,5,2]},{"target":["x86_64-pc-windows-msvc"],"display_name":"Windows x64","installers":[5,3]},{"target":["x86_64-unknown-linux-gnu"],"display_name":"Linux x64","installers":[0,5,4]}],"downloadable_files":[[1,{"name":"mini-calc-aarch64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-aarch64-apple-darwin.tar.xz","view_path":null,"checksum_file":2},["macOS Apple Silicon"]],[4,{"name":"mini-calc-x86_64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-apple-darwin.tar.xz","view_path":null,"checksum_file":5},["macOS Intel"]],[6,{"name":"mini-calc-x86_64-pc-windows-msvc.zip","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-pc-windows-msvc.zip","view_path":null,"checksum_file":7},["Windows x64"]],[8,{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-unknown-linux-gnu.tar.xz","view_path":null,"checksum_file":9},["Linux x64"]]],"release":{"artifacts":{"files":[{"name":"dist-manifest.json","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/dist-manifest.json","view_path":null,"checksum_file":null},{"name":"mini-calc-aarch64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-aarch64-apple-darwin.tar.xz","view_path":null,"checksum_file":2},{"name":"mini-calc-aarch64-apple-darwin.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-aarch64-apple-darwin.tar.xz.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-installer.sh","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-installer.sh","view_path":"mini-calc-installer.sh.txt","checksum_file":null},{"name":"mini-calc-x86_64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-apple-darwin.tar.xz","view_path":null,"checksum_file":5},{"name":"mini-calc-x86_64-apple-darwin.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-apple-darwin.tar.xz.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-x86_64-pc-windows-msvc.zip","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-pc-windows-msvc.zip","view_path":null,"checksum_file":7},{"name":"mini-calc-x86_64-pc-windows-msvc.zip.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-pc-windows-msvc.zip.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-unknown-linux-gnu.tar.xz","view_path":null,"checksum_file":9},{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256","view_path":null,"checksum_file":null}],"installers":[{"label":"shell","description":"Install prebuilt binaries via shell script","app_name":null,"method":{"type":"Run","file":3,"run_hint":"curl --proto '=https' --tlsv1.2 -LsSf https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-installer.sh | sh"}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":1}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":4}},{"label":"zip","description":"","app_name":null,"method":{"type":"Download","file":6}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":8}},{"label":"cargo","description":"","app_name":null,"method":{"type":"Run","file":null,"run_hint":"cargo install mini-calc"}}],"targets":{"aarch64-apple-darwin":[0,5,1],"aarch64-pc-windows-msvc":[5],"aarch64-unknown-linux-gnu":[5],"aarch64-unknown-linux-musl":[5],"i686-apple-darwin":[5],"i686-pc-windows-msvc":[5],"i686-unknown-linux-gnu":[5],"i686-unknown-linux-musl":[5],"x86_64-apple-darwin":[0,5,2],"x86_64-pc-windows-msvc":[5,3],"x86_64-unknown-linux-gnu":[0,5,4],"x86_64-unknown-linux-musl":[5]}}},"os_script":"/artifacts.js","has_checksum_files":true}
{"format_version":"0.6.0","tag":"2.12.3","formatted_date":"Apr 12 2024 at 21:22 UTC","platforms_with_downloads":[{"target":["aarch64-apple-darwin"],"display_name":"macOS Apple Silicon","installers":[0,5,1]},{"target":["x86_64-apple-darwin"],"display_name":"macOS Intel","installers":[0,5,2]},{"target":["x86_64-pc-windows-msvc"],"display_name":"Windows x64","installers":[5,3]},{"target":["x86_64-unknown-linux-gnu"],"display_name":"Linux x64","installers":[0,5,4]}],"downloadable_files":[[1,{"name":"mini-calc-aarch64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-aarch64-apple-darwin.tar.xz","view_path":null,"checksum_file":2},["macOS Apple Silicon"]],[4,{"name":"mini-calc-x86_64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-apple-darwin.tar.xz","view_path":null,"checksum_file":5},["macOS Intel"]],[6,{"name":"mini-calc-x86_64-pc-windows-msvc.zip","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-pc-windows-msvc.zip","view_path":null,"checksum_file":7},["Windows x64"]],[8,{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-unknown-linux-gnu.tar.xz","view_path":null,"checksum_file":9},["Linux x64"]]],"release":{"artifacts":{"files":[{"name":"dist-manifest.json","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/dist-manifest.json","view_path":null,"checksum_file":null},{"name":"mini-calc-aarch64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-aarch64-apple-darwin.tar.xz","view_path":null,"checksum_file":2},{"name":"mini-calc-aarch64-apple-darwin.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-aarch64-apple-darwin.tar.xz.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-installer.sh","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-installer.sh","view_path":"mini-calc-installer.sh.txt","checksum_file":null},{"name":"mini-calc-x86_64-apple-darwin.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-apple-darwin.tar.xz","view_path":null,"checksum_file":5},{"name":"mini-calc-x86_64-apple-darwin.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-apple-darwin.tar.xz.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-x86_64-pc-windows-msvc.zip","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-pc-windows-msvc.zip","view_path":null,"checksum_file":7},{"name":"mini-calc-x86_64-pc-windows-msvc.zip.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-pc-windows-msvc.zip.sha256","view_path":null,"checksum_file":null},{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-unknown-linux-gnu.tar.xz","view_path":null,"checksum_file":9},{"name":"mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256","download_url":"https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256","view_path":null,"checksum_file":null}],"installers":[{"label":"shell","description":"Install prebuilt binaries via shell script","app_name":null,"method":{"type":"Run","file":3,"run_hint":"curl --proto '=https' --tlsv1.2 -LsSf https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-installer.sh | sh"}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":1}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":4}},{"label":"zip","description":"","app_name":null,"method":{"type":"Download","file":6}},{"label":"tarball","description":"","app_name":null,"method":{"type":"Download","file":8}},{"label":"cargo","description":"","app_name":null,"method":{"type":"Run","file":null,"run_hint":"cargo install mini-calc"}}],"targets":{"aarch64-apple-darwin":[0,5,1],"aarch64-pc-windows-msvc":[5],"aarch64-unknown-linux-gnu":[5],"aarch64-unknown-linux-musl":[5],"i686-apple-darwin":[5],"i686-pc-windows-msvc":[5],"i686-unknown-linux-gnu":[5],"i686-unknown-linux-musl":[5],"x86_64-apple-darwin":[0,5,2],"x86_64-pc-windows-msvc":[5,3],"x86_64-unknown-linux-gnu":[0,5,4],"x86_64-unknown-linux-musl":[5]}}},"os_script":"/artifacts.js","has_checksum_files":true}
20 changes: 10 additions & 10 deletions public/artifacts/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ <h3>cargo</h3>
<h3>shell</h3>
<div class="install-code-wrapper">
<pre style="background-color:#263238;">
<span style="color:#82aaff;">curl</span><span style="color:#89ddff;"> --</span><span style="color:#f78c6c;">proto </span><span style="color:#89ddff;">&#39;</span><span style="color:#c3e88d;">=https</span><span style="color:#89ddff;">&#39; --</span><span style="color:#f78c6c;">tlsv1</span><span style="color:#82aaff;">.2</span><span style="color:#89ddff;"> -</span><span style="color:#f78c6c;">LsSf</span><span style="color:#82aaff;"> https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-installer.sh </span><span style="color:#89ddff;">| </span><span style="color:#82aaff;">sh</span></pre>
<span style="color:#82aaff;">curl</span><span style="color:#89ddff;"> --</span><span style="color:#f78c6c;">proto </span><span style="color:#89ddff;">&#39;</span><span style="color:#c3e88d;">=https</span><span style="color:#89ddff;">&#39; --</span><span style="color:#f78c6c;">tlsv1</span><span style="color:#82aaff;">.2</span><span style="color:#89ddff;"> -</span><span style="color:#f78c6c;">LsSf</span><span style="color:#82aaff;"> https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-installer.sh </span><span style="color:#89ddff;">| </span><span style="color:#82aaff;">sh</span></pre>

<button class="button copy-clipboard-button primary" data-copy="curl --proto '=https' --tlsv1.2 -LsSf https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-installer.sh | sh">
<button class="button copy-clipboard-button primary" data-copy="curl --proto '=https' --tlsv1.2 -LsSf https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-installer.sh | sh">
<svg stroke='currentColor' fill='currentColor' stroke-width='0' viewBox='0 0 20 20' height='1em' width='1em' xmlns='http://www.w3.org/2000/svg'><path d='M8 2a1 1 0 000 2h2a1 1 0 100-2H8z'></path><path d='M3 5a2 2 0 012-2 3 3 0 003 3h2a3 3 0 003-3 2 2 0 012 2v6h-4.586l1.293-1.293a1 1 0 00-1.414-1.414l-3 3a1 1 0 000 1.414l3 3a1 1 0 001.414-1.414L10.414 13H15v3a2 2 0 01-2 2H5a2 2 0 01-2-2V5zM15 11h2a1 1 0 110 2h-2v-2z'></path></svg>
</button>

Expand Down Expand Up @@ -133,7 +133,7 @@ <h3>Downloads</h3>


<tr>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-aarch64-apple-darwin.tar.xz">mini-calc-aarch64-apple-darwin.tar.xz</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-aarch64-apple-darwin.tar.xz">mini-calc-aarch64-apple-darwin.tar.xz</a></td>
<td>


Expand All @@ -144,15 +144,15 @@ <h3>Downloads</h3>



<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-aarch64-apple-darwin.tar.xz.sha256">checksum</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-aarch64-apple-darwin.tar.xz.sha256">checksum</a></td>


</tr>



<tr>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-apple-darwin.tar.xz">mini-calc-x86_64-apple-darwin.tar.xz</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-apple-darwin.tar.xz">mini-calc-x86_64-apple-darwin.tar.xz</a></td>
<td>


Expand All @@ -163,15 +163,15 @@ <h3>Downloads</h3>



<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-apple-darwin.tar.xz.sha256">checksum</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-apple-darwin.tar.xz.sha256">checksum</a></td>


</tr>



<tr>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-pc-windows-msvc.zip">mini-calc-x86_64-pc-windows-msvc.zip</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-pc-windows-msvc.zip">mini-calc-x86_64-pc-windows-msvc.zip</a></td>
<td>


Expand All @@ -182,15 +182,15 @@ <h3>Downloads</h3>



<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-pc-windows-msvc.zip.sha256">checksum</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-pc-windows-msvc.zip.sha256">checksum</a></td>


</tr>



<tr>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-unknown-linux-gnu.tar.xz">mini-calc-x86_64-unknown-linux-gnu.tar.xz</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-unknown-linux-gnu.tar.xz">mini-calc-x86_64-unknown-linux-gnu.tar.xz</a></td>
<td>


Expand All @@ -201,7 +201,7 @@ <h3>Downloads</h3>



<td><a href="https://github.com/coco33920/calc/releases/download/2.12.2/mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256">checksum</a></td>
<td><a href="https://github.com/coco33920/calc/releases/download/2.12.3/mini-calc-x86_64-unknown-linux-gnu.tar.xz.sha256">checksum</a></td>


</tr>
Expand Down
Loading

0 comments on commit f45e24d

Please sign in to comment.