Skip to content

Commit 0437ad5

Browse files
functorafunctora
committed
update everything
1 parent 2aa4283 commit 0437ad5

File tree

9 files changed

+469
-332
lines changed

9 files changed

+469
-332
lines changed

‎cabal.project‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
index-state: 2024-06-25T16:09:29Z
1+
index-state: 2024-09-20T16:09:29Z
22
allow-newer: base,
33
text,
44
template-haskell,
@@ -16,25 +16,36 @@ allow-newer: base,
1616
secp256k1,
1717
geojson:*,
1818
stopwatch:*,
19-
Cabal
2019

2120
package unix
2221
flags: +os-string
2322

2423
package directory
2524
flags: +os-string
2625

26+
package postgresql-libpq
27+
flags: +use-pkg-config
28+
2729
source-repository-package
2830
type: git
2931
location: https://github.com/dorchard/type-level-sets.git
3032
tag: d71becf49c092cd7697f39e4f4fb55b289af3d31
3133
--sha256: qr2x4XbY66pXK/8u5PcGrXWrupG6Rt3yXshgOqKCsBs=
3234

33-
source-repository-package
34-
type: git
35-
location: https://github.com/hamishmack/hs-memory.git
36-
tag: 8a4784839354826c5dcd27656f7fd83e4814048d
37-
--sha256: 2oOkNRGcDawzxDkX++8B4AOdXYclkhKlKH9StFmPs7Y=
35+
if impl(ghcjs) || arch(javascript) || arch(wasm32)
36+
package zip
37+
flags: +disable-bzip2 +disable-zstd
38+
package hexpat
39+
flags: +bundle
40+
package digest
41+
flags: -pkg-config
42+
package zlib
43+
flags: -pkg-config +bundled-c-zlib
44+
source-repository-package
45+
type: git
46+
location: https://github.com/hamishmack/hs-memory.git
47+
tag: 8a4784839354826c5dcd27656f7fd83e4814048d
48+
--sha256: 2oOkNRGcDawzxDkX++8B4AOdXYclkhKlKH9StFmPs7Y=
3849

3950
if impl(ghc >= 9)
4051
source-repository-package

‎ghcjs/delivery-calculator/delivery-calculator.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ common pkg
104104
, miso-components
105105
, miso-widgets
106106
, modern-uri
107-
, SpreadsheetML
108107
, syb
108+
, xlsx
109109

110110
if flag(ghcid)
111111
build-depends:

‎ghcjs/delivery-calculator/flake.lock‎

Lines changed: 57 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ghcjs/delivery-calculator/flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
doHoogle = false;
3737
}
3838
];
39-
compiler-nix-name = "ghc911";
39+
compiler-nix-name = "ghc9101";
4040
crossPlatforms = p: [p.ghcjs];
4141
shell.tools.cabal = "latest";
4242
shell.buildInputs =

‎ghcjs/delivery-calculator/src/App/Widgets/Menu.hs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ menu st =
9393
& IconButton.setOnClick
9494
( PushUpdate . Instant $ \next -> do
9595
Jsm.saveFile
96-
"delivery-calculator.xls"
97-
"application/vnd.ms-excel"
96+
-- "delivery-calculator.xls"
97+
-- "application/vnd.ms-excel"
98+
"delivery-calculator.xlsx"
99+
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
98100
Xlsx.newXlsx
99101
pure next
100102
)

‎ghcjs/delivery-calculator/src/App/Xlsx.hs‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,45 @@
11
module App.Xlsx (newXlsx) where
22

3+
import Codec.Xlsx
4+
import qualified Data.ByteString.Lazy as BL
35
import Functora.Miso.Prelude
4-
import Text.XML.SpreadsheetML.Builder
5-
import Text.XML.SpreadsheetML.Types
6-
import Text.XML.SpreadsheetML.Writer (showSpreadsheet)
6+
import Lens.Micro
7+
8+
-- import qualified Data.ByteString.Lazy as L
9+
-- import Text.XML.SpreadsheetML.Builder
10+
-- import Text.XML.SpreadsheetML.Types
11+
-- import Text.XML.SpreadsheetML.Writer (showSpreadsheet)
712

813
newXlsx :: ByteString
914
newXlsx =
10-
encodeUtf8 $ showSpreadsheet workbook
15+
from @BL.ByteString @ByteString
16+
. fromXlsx 0
17+
$ def
18+
& atSheet "List1" ?~ sheet
1119
where
12-
cells1 :: [[Cell]]
13-
cells1 =
14-
[ [string "Quantity \174", string "Multiplier \8480", string "Product"],
15-
[number 1, number 0.9, formula "=RC[-2]*RC[-1]"],
16-
[number 10, number 1.1, formula "=RC[-2]*RC[-1]"],
17-
[number 12, number 0.2, formula "=RC[-2]*RC[-1]"]
18-
]
19-
worksheet1 = mkWorksheet (Name "Quantity Product Sheet") (tableFromCells cells1)
20-
cells2 :: [[Cell]]
21-
cells2 =
22-
[ [string "Quantity1", string "Quantity2", string "Sum"],
23-
[number 1, number 100, formula "=RC[-2]+RC[-1]"],
24-
[number 10, number 201, formula "=RC[-2]+RC[-1]"],
25-
[number 12, number 45, formula "=RC[-2]+RC[-1]"]
26-
]
27-
worksheet2 = mkWorksheet (Name "Quantity Sum Sheet") (tableFromCells cells2)
28-
workbook = mkWorkbook [worksheet1, worksheet2]
20+
sheet =
21+
def
22+
& cellValueAt (1, 2) ?~ CellDouble 42.0
23+
& cellValueAt (3, 2) ?~ CellText "foo"
24+
25+
-- newXlsx :: ByteString
26+
-- newXlsx =
27+
-- encodeUtf8 $ showSpreadsheet workbook
28+
-- where
29+
-- cells1 :: [[Cell]]
30+
-- cells1 =
31+
-- [ [string "Quantity \174", string "Multiplier \8480", string "Product"],
32+
-- [number 1, number 0.9, formula "=RC[-2]*RC[-1]"],
33+
-- [number 10, number 1.1, formula "=RC[-2]*RC[-1]"],
34+
-- [number 12, number 0.2, formula "=RC[-2]*RC[-1]"]
35+
-- ]
36+
-- worksheet1 = mkWorksheet (Name "Quantity Product Sheet") (tableFromCells cells1)
37+
-- cells2 :: [[Cell]]
38+
-- cells2 =
39+
-- [ [string "Quantity1", string "Quantity2", string "Sum"],
40+
-- [number 1, number 100, formula "=RC[-2]+RC[-1]"],
41+
-- [number 10, number 201, formula "=RC[-2]+RC[-1]"],
42+
-- [number 12, number 45, formula "=RC[-2]+RC[-1]"]
43+
-- ]
44+
-- worksheet2 = mkWorksheet (Name "Quantity Sum Sheet") (tableFromCells cells2)
45+
-- workbook = mkWorkbook [worksheet1, worksheet2]

‎nix/sources.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "d9b13f9b8271699869f8569597a02b163b8a5845",
9-
"sha256": "0bl0g3gy5550fkvknf58bn6bj114k7szixlbprq0x1anvw6d8j1r",
8+
"rev": "83050d6d74da462c3b77237b52767c3bc446a1bc",
9+
"sha256": "0nnz7296m60mvzbkypdlhf2jkapi3yf0b0mj97l6jidv5hhpx6p4",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/d9b13f9b8271699869f8569597a02b163b8a5845.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/83050d6d74da462c3b77237b52767c3bc446a1bc.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"newpkgs": {
@@ -17,10 +17,10 @@
1717
"homepage": "",
1818
"owner": "NixOS",
1919
"repo": "nixpkgs",
20-
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
21-
"sha256": "0snj72i9dm99jlnnmk8id8ffjnfg1k81lr7aw8d01kz3hdiraqil",
20+
"rev": "fc8411a98ece27c0e6f2a68d757812fc8d6f892e",
21+
"sha256": "1i8j9m1lizk5228rn76rdywgwxjdladxk12rgza9vcm4swn0vxp9",
2222
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/194846768975b7ad2c4988bdb82572c00222c0d7.tar.gz",
23+
"url": "https://github.com/NixOS/nixpkgs/archive/fc8411a98ece27c0e6f2a68d757812fc8d6f892e.tar.gz",
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"nixpkgs": {
@@ -29,10 +29,10 @@
2929
"homepage": "",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
33-
"sha256": "0snj72i9dm99jlnnmk8id8ffjnfg1k81lr7aw8d01kz3hdiraqil",
32+
"rev": "fc8411a98ece27c0e6f2a68d757812fc8d6f892e",
33+
"sha256": "1i8j9m1lizk5228rn76rdywgwxjdladxk12rgza9vcm4swn0vxp9",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/194846768975b7ad2c4988bdb82572c00222c0d7.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/fc8411a98ece27c0e6f2a68d757812fc8d6f892e.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"nixpkgs-unstable": {
@@ -41,10 +41,10 @@
4141
"homepage": "",
4242
"owner": "NixOS",
4343
"repo": "nixpkgs",
44-
"rev": "b60793b86201040d9dee019a05089a9150d08b5b",
45-
"sha256": "1g1j4fg5jmd92dxzjzrbb8f63qkwqxgr8z339cxjzz2pfg4zyliy",
44+
"rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
45+
"sha256": "02ipaz5zmxf4mk4m9wpwmjigwcv4xcrnikhpxl2lahpjs5yyk4jp",
4646
"type": "tarball",
47-
"url": "https://github.com/NixOS/nixpkgs/archive/b60793b86201040d9dee019a05089a9150d08b5b.tar.gz",
47+
"url": "https://github.com/NixOS/nixpkgs/archive/a1d92660c6b3b7c26fb883500a80ea9d33321be2.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
}
5050
}

0 commit comments

Comments
 (0)