nix flake from @nil.ptr #2

-1

.gitignore

··· 16 16 17 17 # production 18 18 /build 19 19 - /result 20 19 21 20 # misc 22 21 .DS_Store

+2 -9

cli/Cargo.lock

··· 1583 1583 [[package]] 1584 1584 name = "jacquard" 1585 1585 version = "0.9.0" 1586 1586 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1587 1586 dependencies = [ 1588 1587 "bytes", 1589 1588 "getrandom 0.2.16", ··· 1611 1610 [[package]] 1612 1611 name = "jacquard-api" 1613 1612 version = "0.9.0" 1614 1614 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1615 1613 dependencies = [ 1616 1614 "bon", 1617 1615 "bytes", ··· 1629 1627 [[package]] 1630 1628 name = "jacquard-common" 1631 1629 version = "0.9.0" 1632 1632 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1633 1630 dependencies = [ 1634 1631 "base64 0.22.1", 1635 1632 "bon", ··· 1666 1663 [[package]] 1667 1664 name = "jacquard-derive" 1668 1665 version = "0.9.0" 1669 1669 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1670 1666 dependencies = [ 1671 1667 "heck 0.5.0", 1672 1668 "jacquard-lexicon", ··· 1677 1673 1678 1674 [[package]] 1679 1675 name = "jacquard-identity" 1680 1680 - version = "0.9.1" 1681 1681 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1676 1676 + version = "0.9.0" 1682 1677 dependencies = [ 1683 1678 "bon", 1684 1679 "bytes", ··· 1703 1698 1704 1699 [[package]] 1705 1700 name = "jacquard-lexicon" 1706 1706 - version = "0.9.1" 1707 1707 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1701 1701 + version = "0.9.0" 1708 1702 dependencies = [ 1709 1703 "cid", 1710 1704 "dashmap", ··· 1730 1724 [[package]] 1731 1725 name = "jacquard-oauth" 1732 1726 version = "0.9.0" 1733 1733 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#b5cc9b35e38e24e1890ae55e700dcfad0d6d433a" 1734 1727 dependencies = [ 1735 1728 "base64 0.22.1", 1736 1729 "bytes",

+7 -7

cli/Cargo.toml

··· 8 8 place_wisp = [] 9 9 10 10 [dependencies] 11 11 - jacquard = { git = "https://tangled.org/@nonbinary.computer/jacquard", features = ["loopback"] } 12 12 - jacquard-oauth = { git = "https://tangled.org/@nonbinary.computer/jacquard" } 13 13 - jacquard-api = { git = "https://tangled.org/@nonbinary.computer/jacquard" } 14 14 - jacquard-common = { git = "https://tangled.org/@nonbinary.computer/jacquard" } 15 15 - jacquard-identity = { git = "https://tangled.org/@nonbinary.computer/jacquard", features = ["dns"] } 16 16 - jacquard-derive = { git = "https://tangled.org/@nonbinary.computer/jacquard" } 17 17 - jacquard-lexicon = { git = "https://tangled.org/@nonbinary.computer/jacquard" } 11 11 + jacquard = { path = "jacquard/crates/jacquard", features = ["loopback"] } 12 12 + jacquard-oauth = { path = "jacquard/crates/jacquard-oauth" } 13 13 + jacquard-api = { path = "jacquard/crates/jacquard-api" } 14 14 + jacquard-common = { path = "jacquard/crates/jacquard-common" } 15 15 + jacquard-identity = { path = "jacquard/crates/jacquard-identity", features = ["dns"] } 16 16 + jacquard-derive = { path = "jacquard/crates/jacquard-derive" } 17 17 + jacquard-lexicon = { path = "jacquard/crates/jacquard-lexicon" } 18 18 clap = { version = "4.5.51", features = ["derive"] } 19 19 tokio = { version = "1.48", features = ["full"] } 20 20 miette = { version = "7.6.0", features = ["fancy"] }

-63

crates.nix

··· 1 1 - {...}: { 2 2 - perSystem = { 3 3 - pkgs, 4 4 - config, 5 5 - lib, 6 6 - inputs', 7 7 - ... 8 8 - }: { 9 9 - # declare projects 10 10 - nci.projects."wisp-place-cli" = { 11 11 - path = ./cli; 12 12 - export = false; 13 13 - }; 14 14 - nci.toolchains.mkBuild = _: 15 15 - with inputs'.fenix.packages; 16 16 - combine [ 17 17 - minimal.rustc 18 18 - minimal.cargo 19 19 - targets.x86_64-pc-windows-gnu.latest.rust-std 20 20 - targets.x86_64-unknown-linux-gnu.latest.rust-std 21 21 - targets.aarch64-apple-darwin.latest.rust-std 22 22 - ]; 23 23 - # configure crates 24 24 - nci.crates."wisp-cli" = { 25 25 - profiles = { 26 26 - dev.runTests = false; 27 27 - release.runTests = false; 28 28 - }; 29 29 - targets."x86_64-unknown-linux-gnu" = { 30 30 - default = true; 31 31 - }; 32 32 - targets."x86_64-pc-windows-gnu" = let 33 33 - targetPkgs = pkgs.pkgsCross.mingwW64; 34 34 - targetCC = targetPkgs.stdenv.cc; 35 35 - targetCargoEnvVarTarget = targetPkgs.stdenv.hostPlatform.rust.cargoEnvVarTarget; 36 36 - in rec { 37 37 - depsDrvConfig.mkDerivation = { 38 38 - nativeBuildInputs = [targetCC]; 39 39 - buildInputs = with targetPkgs; [windows.pthreads]; 40 40 - }; 41 41 - depsDrvConfig.env = rec { 42 42 - TARGET_CC = "${targetCC.targetPrefix}cc"; 43 43 - "CARGO_TARGET_${targetCargoEnvVarTarget}_LINKER" = TARGET_CC; 44 44 - }; 45 45 - drvConfig = depsDrvConfig; 46 46 - }; 47 47 - targets."aarch64-apple-darwin" = let 48 48 - targetPkgs = pkgs.pkgsCross.aarch64-darwin; 49 49 - targetCC = targetPkgs.stdenv.cc; 50 50 - targetCargoEnvVarTarget = targetPkgs.stdenv.hostPlatform.rust.cargoEnvVarTarget; 51 51 - in rec { 52 52 - depsDrvConfig.mkDerivation = { 53 53 - nativeBuildInputs = [targetCC]; 54 54 - }; 55 55 - depsDrvConfig.env = rec { 56 56 - TARGET_CC = "${targetCC.targetPrefix}cc"; 57 57 - "CARGO_TARGET_${targetCargoEnvVarTarget}_LINKER" = TARGET_CC; 58 58 - }; 59 59 - drvConfig = depsDrvConfig; 60 60 - }; 61 61 - }; 62 62 - }; 63 63 - }

-318

flake.lock

··· 1 1 - { 2 2 - "nodes": { 3 3 - "crane": { 4 4 - "flake": false, 5 5 - "locked": { 6 6 - "lastModified": 1758758545, 7 7 - "narHash": "sha256-NU5WaEdfwF6i8faJ2Yh+jcK9vVFrofLcwlD/mP65JrI=", 8 8 - "owner": "ipetkov", 9 9 - "repo": "crane", 10 10 - "rev": "95d528a5f54eaba0d12102249ce42f4d01f4e364", 11 11 - "type": "github" 12 12 - }, 13 13 - "original": { 14 14 - "owner": "ipetkov", 15 15 - "ref": "v0.21.1", 16 16 - "repo": "crane", 17 17 - "type": "github" 18 18 - } 19 19 - }, 20 20 - "dream2nix": { 21 21 - "inputs": { 22 22 - "nixpkgs": [ 23 23 - "nci", 24 24 - "nixpkgs" 25 25 - ], 26 26 - "purescript-overlay": "purescript-overlay", 27 27 - "pyproject-nix": "pyproject-nix" 28 28 - }, 29 29 - "locked": { 30 30 - "lastModified": 1754978539, 31 31 - "narHash": "sha256-nrDovydywSKRbWim9Ynmgj8SBm8LK3DI2WuhIqzOHYI=", 32 32 - "owner": "nix-community", 33 33 - "repo": "dream2nix", 34 34 - "rev": "fbec3263cb4895ac86ee9506cdc4e6919a1a2214", 35 35 - "type": "github" 36 36 - }, 37 37 - "original": { 38 38 - "owner": "nix-community", 39 39 - "repo": "dream2nix", 40 40 - "type": "github" 41 41 - } 42 42 - }, 43 43 - "fenix": { 44 44 - "inputs": { 45 45 - "nixpkgs": [ 46 46 - "nixpkgs" 47 47 - ], 48 48 - "rust-analyzer-src": "rust-analyzer-src" 49 49 - }, 50 50 - "locked": { 51 51 - "lastModified": 1762584108, 52 52 - "narHash": "sha256-wZUW7dlXMXaRdvNbaADqhF8gg9bAfFiMV+iyFQiDv+Y=", 53 53 - "owner": "nix-community", 54 54 - "repo": "fenix", 55 55 - "rev": "32f3ad3b6c690061173e1ac16708874975ec6056", 56 56 - "type": "github" 57 57 - }, 58 58 - "original": { 59 59 - "owner": "nix-community", 60 60 - "repo": "fenix", 61 61 - "type": "github" 62 62 - } 63 63 - }, 64 64 - "flake-compat": { 65 65 - "flake": false, 66 66 - "locked": { 67 67 - "lastModified": 1696426674, 68 68 - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", 69 69 - "owner": "edolstra", 70 70 - "repo": "flake-compat", 71 71 - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", 72 72 - "type": "github" 73 73 - }, 74 74 - "original": { 75 75 - "owner": "edolstra", 76 76 - "repo": "flake-compat", 77 77 - "type": "github" 78 78 - } 79 79 - }, 80 80 - "mk-naked-shell": { 81 81 - "flake": false, 82 82 - "locked": { 83 83 - "lastModified": 1681286841, 84 84 - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", 85 85 - "owner": "90-008", 86 86 - "repo": "mk-naked-shell", 87 87 - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", 88 88 - "type": "github" 89 89 - }, 90 90 - "original": { 91 91 - "owner": "90-008", 92 92 - "repo": "mk-naked-shell", 93 93 - "type": "github" 94 94 - } 95 95 - }, 96 96 - "nci": { 97 97 - "inputs": { 98 98 - "crane": "crane", 99 99 - "dream2nix": "dream2nix", 100 100 - "mk-naked-shell": "mk-naked-shell", 101 101 - "nixpkgs": [ 102 102 - "nixpkgs" 103 103 - ], 104 104 - "parts": "parts", 105 105 - "rust-overlay": "rust-overlay", 106 106 - "treefmt": "treefmt" 107 107 - }, 108 108 - "locked": { 109 109 - "lastModified": 1762582646, 110 110 - "narHash": "sha256-MMzE4xccG+8qbLhdaZoeFDUKWUOn3B4lhp5dZmgukmM=", 111 111 - "owner": "90-008", 112 112 - "repo": "nix-cargo-integration", 113 113 - "rev": "0993c449377049fa8868a664e8290ac6658e0b9a", 114 114 - "type": "github" 115 115 - }, 116 116 - "original": { 117 117 - "owner": "90-008", 118 118 - "repo": "nix-cargo-integration", 119 119 - "type": "github" 120 120 - } 121 121 - }, 122 122 - "nixpkgs": { 123 123 - "locked": { 124 124 - "lastModified": 1762361079, 125 125 - "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", 126 126 - "owner": "nixos", 127 127 - "repo": "nixpkgs", 128 128 - "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", 129 129 - "type": "github" 130 130 - }, 131 131 - "original": { 132 132 - "owner": "nixos", 133 133 - "ref": "nixpkgs-unstable", 134 134 - "repo": "nixpkgs", 135 135 - "type": "github" 136 136 - } 137 137 - }, 138 138 - "parts": { 139 139 - "inputs": { 140 140 - "nixpkgs-lib": [ 141 141 - "nci", 142 142 - "nixpkgs" 143 143 - ] 144 144 - }, 145 145 - "locked": { 146 146 - "lastModified": 1762440070, 147 147 - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", 148 148 - "owner": "hercules-ci", 149 149 - "repo": "flake-parts", 150 150 - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", 151 151 - "type": "github" 152 152 - }, 153 153 - "original": { 154 154 - "owner": "hercules-ci", 155 155 - "repo": "flake-parts", 156 156 - "type": "github" 157 157 - } 158 158 - }, 159 159 - "parts_2": { 160 160 - "inputs": { 161 161 - "nixpkgs-lib": [ 162 162 - "nixpkgs" 163 163 - ] 164 164 - }, 165 165 - "locked": { 166 166 - "lastModified": 1762440070, 167 167 - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", 168 168 - "owner": "hercules-ci", 169 169 - "repo": "flake-parts", 170 170 - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", 171 171 - "type": "github" 172 172 - }, 173 173 - "original": { 174 174 - "owner": "hercules-ci", 175 175 - "repo": "flake-parts", 176 176 - "type": "github" 177 177 - } 178 178 - }, 179 179 - "purescript-overlay": { 180 180 - "inputs": { 181 181 - "flake-compat": "flake-compat", 182 182 - "nixpkgs": [ 183 183 - "nci", 184 184 - "dream2nix", 185 185 - "nixpkgs" 186 186 - ], 187 187 - "slimlock": "slimlock" 188 188 - }, 189 189 - "locked": { 190 190 - "lastModified": 1728546539, 191 191 - "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", 192 192 - "owner": "thomashoneyman", 193 193 - "repo": "purescript-overlay", 194 194 - "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", 195 195 - "type": "github" 196 196 - }, 197 197 - "original": { 198 198 - "owner": "thomashoneyman", 199 199 - "repo": "purescript-overlay", 200 200 - "type": "github" 201 201 - } 202 202 - }, 203 203 - "pyproject-nix": { 204 204 - "inputs": { 205 205 - "nixpkgs": [ 206 206 - "nci", 207 207 - "dream2nix", 208 208 - "nixpkgs" 209 209 - ] 210 210 - }, 211 211 - "locked": { 212 212 - "lastModified": 1752481895, 213 213 - "narHash": "sha256-luVj97hIMpCbwhx3hWiRwjP2YvljWy8FM+4W9njDhLA=", 214 214 - "owner": "pyproject-nix", 215 215 - "repo": "pyproject.nix", 216 216 - "rev": "16ee295c25107a94e59a7fc7f2e5322851781162", 217 217 - "type": "github" 218 218 - }, 219 219 - "original": { 220 220 - "owner": "pyproject-nix", 221 221 - "repo": "pyproject.nix", 222 222 - "type": "github" 223 223 - } 224 224 - }, 225 225 - "root": { 226 226 - "inputs": { 227 227 - "fenix": "fenix", 228 228 - "nci": "nci", 229 229 - "nixpkgs": "nixpkgs", 230 230 - "parts": "parts_2" 231 231 - } 232 232 - }, 233 233 - "rust-analyzer-src": { 234 234 - "flake": false, 235 235 - "locked": { 236 236 - "lastModified": 1762438844, 237 237 - "narHash": "sha256-ApIKJf6CcMsV2nYBXhGF95BmZMO/QXPhgfSnkA/rVUo=", 238 238 - "owner": "rust-lang", 239 239 - "repo": "rust-analyzer", 240 240 - "rev": "4bf516ee5a960c1e2eee9fedd9b1c9e976a19c86", 241 241 - "type": "github" 242 242 - }, 243 243 - "original": { 244 244 - "owner": "rust-lang", 245 245 - "ref": "nightly", 246 246 - "repo": "rust-analyzer", 247 247 - "type": "github" 248 248 - } 249 249 - }, 250 250 - "rust-overlay": { 251 251 - "inputs": { 252 252 - "nixpkgs": [ 253 253 - "nci", 254 254 - "nixpkgs" 255 255 - ] 256 256 - }, 257 257 - "locked": { 258 258 - "lastModified": 1762569282, 259 259 - "narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", 260 260 - "owner": "oxalica", 261 261 - "repo": "rust-overlay", 262 262 - "rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", 263 263 - "type": "github" 264 264 - }, 265 265 - "original": { 266 266 - "owner": "oxalica", 267 267 - "repo": "rust-overlay", 268 268 - "type": "github" 269 269 - } 270 270 - }, 271 271 - "slimlock": { 272 272 - "inputs": { 273 273 - "nixpkgs": [ 274 274 - "nci", 275 275 - "dream2nix", 276 276 - "purescript-overlay", 277 277 - "nixpkgs" 278 278 - ] 279 279 - }, 280 280 - "locked": { 281 281 - "lastModified": 1688756706, 282 282 - "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", 283 283 - "owner": "thomashoneyman", 284 284 - "repo": "slimlock", 285 285 - "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", 286 286 - "type": "github" 287 287 - }, 288 288 - "original": { 289 289 - "owner": "thomashoneyman", 290 290 - "repo": "slimlock", 291 291 - "type": "github" 292 292 - } 293 293 - }, 294 294 - "treefmt": { 295 295 - "inputs": { 296 296 - "nixpkgs": [ 297 297 - "nci", 298 298 - "nixpkgs" 299 299 - ] 300 300 - }, 301 301 - "locked": { 302 302 - "lastModified": 1762410071, 303 303 - "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", 304 304 - "owner": "numtide", 305 305 - "repo": "treefmt-nix", 306 306 - "rev": "97a30861b13c3731a84e09405414398fbf3e109f", 307 307 - "type": "github" 308 308 - }, 309 309 - "original": { 310 310 - "owner": "numtide", 311 311 - "repo": "treefmt-nix", 312 312 - "type": "github" 313 313 - } 314 314 - } 315 315 - }, 316 316 - "root": "root", 317 317 - "version": 7 318 318 - }

-36

flake.nix

··· 1 1 - { 2 2 - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; 3 3 - inputs.nci.url = "github:90-008/nix-cargo-integration"; 4 4 - inputs.nci.inputs.nixpkgs.follows = "nixpkgs"; 5 5 - inputs.parts.url = "github:hercules-ci/flake-parts"; 6 6 - inputs.parts.inputs.nixpkgs-lib.follows = "nixpkgs"; 7 7 - inputs.fenix = { 8 8 - url = "github:nix-community/fenix"; 9 9 - inputs.nixpkgs.follows = "nixpkgs"; 10 10 - }; 11 11 - 12 12 - outputs = inputs @ { 13 13 - parts, 14 14 - nci, 15 15 - ... 16 16 - }: 17 17 - parts.lib.mkFlake {inherit inputs;} { 18 18 - systems = ["x86_64-linux" "aarch64-darwin"]; 19 19 - imports = [ 20 20 - nci.flakeModule 21 21 - ./crates.nix 22 22 - ]; 23 23 - perSystem = { 24 24 - pkgs, 25 25 - config, 26 26 - ... 27 27 - }: let 28 28 - crateOutputs = config.nci.outputs."wisp-cli"; 29 29 - in { 30 30 - devShells.default = crateOutputs.devShell; 31 31 - packages.default = crateOutputs.packages.release; 32 32 - packages.wisp-cli-windows = crateOutputs.allTargets."x86_64-pc-windows-gnu".packages.release; 33 33 - packages.wisp-cli-darwin = crateOutputs.allTargets."aarch64-apple-darwin".packages.release; 34 34 - }; 35 35 - }; 36 36 - }