13 Commits

Author SHA1 Message Date
32463ad6aa Updated shell.nix 2023-09-21 20:52:35 -07:00
413c34c440 Merge branch 'dev' of github.com:rm-dr/daisy into dev 2023-09-21 20:47:39 -07:00
a1d190b06e Updated TODO 2023-09-21 19:54:37 -07:00
178708a4ac Updated TODO 2023-09-21 19:52:48 -07:00
5bb8e2c4ce Merge 1.0.2 (#7)
* Fixed page scrolling

* Updated TODO

* Fixed a link

* Minor edits

* Version bump
2023-09-21 19:50:52 -07:00
49b88af2bb Version bump 2023-09-21 19:49:31 -07:00
a0fe0a9385 Minor edits 2023-09-21 19:49:12 -07:00
7215afcc7e Fixed a link 2023-09-21 19:43:40 -07:00
3ab559b240 Updated TODO 2023-09-21 19:43:00 -07:00
810e2a1267 Fixed page scrolling 2023-09-21 19:42:53 -07:00
798c9ceae9 Merge pull request #6 from rm-dr/dev
Merge v1.1.1
2023-09-21 19:37:34 -07:00
bab305e11d Merge pull request #4 from rm-dr/dev
Merge 1.1.0
2023-09-20 11:19:34 -07:00
a6c3ffa68d Merge v1.0.1 2023-08-17 10:30:26 -07:00
6 changed files with 19 additions and 6 deletions

2
Cargo.lock generated
View File

@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "daisycalc"
version = "1.1.1"
version = "1.1.2"
dependencies = [
"cfg-if",
"num",

View File

@ -1,6 +1,6 @@
[package]
name = "daisycalc"
version = "1.1.1"
version = "1.1.2"
edition = "2021"
build = "buildscript/main.rs"
license = "GPL-3.0-only"

View File

@ -4,7 +4,7 @@ A high-precision scientific calculator with support for units, derivatives, and
Many features are missing, this is still under development.
**Web demo: [here](daisy.betalupi.com)**
**Web demo: [here](https://daisy.betalupi.com) (won't work on mobile)**
# 📦 Installation
- **Cargo:** `cargo install daisycalc`

View File

@ -6,9 +6,12 @@
- push
- merge
- git tag -a v1.0.0 -m "Version 1.0.0" on merge commit
- delete branch?
- cargo publish
- Update packages
- Build wasm & push changes
- Squash merge
- Update AUR package
## Pre-release

View File

@ -1,11 +1,22 @@
{ nixpkgs ? import <nixpkgs> { }}:
let
pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f155f0cf4ea43c4e3c8918d2d327d44777b6cad4.tar.gz") {};
# If you set hash to an empty string, you'll get
# an error with the correct hash.
pinnedPkgs = nixpkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "4ecab3273592f27479a583fb6d975d4aba3486fe";
sha256 = "btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=";
};
pkgs = import pinnedPkgs {};
in pkgs.mkShell {
buildInputs = with pkgs; [
cargo
rustc
rustfmt
m4
rust-analyzer
wasm-pack
];
}

View File

@ -22,7 +22,6 @@
margin: 0;
padding: 0;
overflow: hidden;
height: 100vh;
}