diff --git a/.github/workflows/linux-app.yml b/.github/workflows/linux-app.yml index bf9f5e92..0703abdf 100644 --- a/.github/workflows/linux-app.yml +++ b/.github/workflows/linux-app.yml @@ -34,10 +34,10 @@ jobs: wails doctor wails build -tags webkit2_40 cp build/bin/Paisa build/linux/usr/local/bin - cp -r build/linux paisa_0.6.9_amd64 - dpkg --build paisa_0.6.9_amd64 + cp -r build/linux paisa_0.7.0_amd64 + dpkg --build paisa_0.7.0_amd64 cd .. - mv desktop/paisa_0.6.9_amd64.deb paisa-app-linux-amd64.deb + mv desktop/paisa_0.7.0_amd64.deb paisa-app-linux-amd64.deb - name: Release uses: softprops/action-gh-release@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index f043f7da..f8822750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -### 0.6.9 (2024-08-26) +### 0.7.0 (2024-08-26) * Add [docker image variant](https://github.com/ananthakumaran/paisa/pull/274) for hledger and beancount * Bug fixes diff --git a/Dockerfile.all b/Dockerfile.all index d23a238f..34d3e24a 100644 --- a/Dockerfile.all +++ b/Dockerfile.all @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:v0.6.9 +FROM docker.io/ananthakumaran/paisa:v0.7.0 RUN apk --no-cache add hledger beancount diff --git a/Dockerfile.beancount b/Dockerfile.beancount index c682c550..dcaa0b6a 100644 --- a/Dockerfile.beancount +++ b/Dockerfile.beancount @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:v0.6.9 +FROM docker.io/ananthakumaran/paisa:v0.7.0 RUN apk --no-cache add beancount diff --git a/Dockerfile.hledger b/Dockerfile.hledger index dbc89c43..e733500c 100644 --- a/Dockerfile.hledger +++ b/Dockerfile.hledger @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:v0.6.9 +FROM docker.io/ananthakumaran/paisa:v0.7.0 RUN apk --no-cache add hledger diff --git a/cmd/version.go b/cmd/version.go index fbabbb69..d38c3b24 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -9,7 +9,7 @@ var versionCmd = &cobra.Command{ Use: "version", Short: "Print the version information", Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Version:", "0.6.9") + fmt.Println("Version:", "0.7.0") }, } diff --git a/desktop/build/linux/DEBIAN/control b/desktop/build/linux/DEBIAN/control index c84a7cda..b7315c34 100644 --- a/desktop/build/linux/DEBIAN/control +++ b/desktop/build/linux/DEBIAN/control @@ -1,5 +1,5 @@ Package: paisa -Version: 0.6.9 +Version: 0.7.0 Section: misc Priority: optional Architecture: amd64 diff --git a/desktop/main.go b/desktop/main.go index 1528e424..af60b2a1 100644 --- a/desktop/main.go +++ b/desktop/main.go @@ -61,7 +61,7 @@ func main() { Mac: &mac.Options{ About: &mac.AboutInfo{ Title: "Paisa", - Message: "Version 0.6.9 \nCopyright © 2022 - 2024 \nAnantha Kumaran", + Message: "Version 0.7.0 \nCopyright © 2022 - 2024 \nAnantha Kumaran", Icon: icon, }, }, diff --git a/desktop/wails.json b/desktop/wails.json index 6f91cd6e..81547bcb 100644 --- a/desktop/wails.json +++ b/desktop/wails.json @@ -11,7 +11,7 @@ "Info": { "companyName": "Paisa", "productName": "Paisa", - "productVersion": "0.6.9", + "productVersion": "0.7.0", "copyright": "Copyright © 2022 - 2024 Anantha Kumaran", "comments": "Personal finance manager" } diff --git a/flake.nix b/flake.nix index 6bfa44ed..a7edd144 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ packages.default = pkgs.buildGoModule { pname = "paisa-cli"; meta.mainProgram = "paisa"; - version = "0.6.9"; + version = "0.7.0"; src = ./.; diff --git a/ledger.rb b/ledger.rb index d5a97685..c9499ed8 100644 --- a/ledger.rb +++ b/ledger.rb @@ -1,34 +1,54 @@ class Ledger < Formula desc "Command-line, double-entry accounting tool" homepage "https://ledger-cli.org/" - url "https://github.com/ledger/ledger/archive/v3.3.2.tar.gz" - sha256 "555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035" license "BSD-3-Clause" - revision 1 + revision 6 head "https://github.com/ledger/ledger.git", branch: "master" + stable do + url "https://github.com/ledger/ledger/archive/refs/tags/v3.3.2.tar.gz" + sha256 "555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035" + + # Support building with mandoc + # Remove with v3.4.x + patch do + url "https://github.com/ledger/ledger/commit/f40cee6c3af4c9cec05adf520fc7077a45060434.patch?full_index=1" + sha256 "d5be89dbadff7e564a750c10cdb04b83e875452071a2115dd70aae6e7a8ee76c" + end + patch do + url "https://github.com/ledger/ledger/commit/14b90d8d952b40e0a474223e7f74a1e6505d5450.patch?full_index=1" + sha256 "d250557e385163e3ad3002117ebe985af040d915aab49ae1ea342db82398aeda" + end + + # Backport fix to build with `boost` 1.85.0 + patch do + url "https://github.com/ledger/ledger/commit/46207852174feb5c76c7ab894bc13b4f388bf501.patch?full_index=1" + sha256 "8aaf8daf4748f359946c64488c96345f4a4bdf928f6ec7a1003610174428599f" + end + end + livecheck do url :stable regex(/^v?(\d+(?:\.\d+)+)$/i) end - depends_on "boost" + depends_on "boost@1.85" depends_on "gmp" depends_on "mpfr" - depends_on "python@3.11" => :build + depends_on "python@3.12" => :build depends_on "cmake" => :build patch :DATA def install ENV.cxx11 - ENV.prepend_path "PATH", Formula["python@3.11"].opt_libexec/"bin" + ENV.prepend_path "PATH", Formula["python@3.12"].opt_libexec/"bin" args = %W[ --jobs=#{ENV.make_jobs} --output=build --prefix=#{prefix} - --boost=#{Formula["boost"].opt_prefix} + --boost=#{Formula["boost@1.85"].opt_prefix} -- -DCMAKE_FIND_LIBRARY_SUFFIXES=.a -DBUILD_SHARED_LIBS:BOOL=OFF @@ -39,9 +59,19 @@ def install -DBUILD_LIBRARY:BOOL=OFF -DBoost_USE_STATIC_LIBS:BOOL=ON ] + std_cmake_args - system "./acprep", "make", *args - system "./acprep", "make", "install", *args + system "./acprep", "opt", "make", *args + system "./acprep", "opt", "make", "install", *args + end + + test do + balance = testpath/"output" + system bin/"ledger", + "--args-only", + "--file", pkgshare/"examples/sample.dat", + "--output", balance, + "balance", "--collapse", "equity" + assert_equal " $-2,500.00 Equity", balance.read.chomp end end diff --git a/src/routes/(app)/more/about/+page.svelte b/src/routes/(app)/more/about/+page.svelte index 6abc8d69..57c7c467 100644 --- a/src/routes/(app)/more/about/+page.svelte +++ b/src/routes/(app)/more/about/+page.svelte @@ -43,7 +43,7 @@