traxys/regalade
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dioxus cli

Browse source
This commit is contained in:
traxys 2023-08-05 11:39:21 +02:00
parent 4bb851db89
commit c36ce14b3b
2 changed files with 43 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flake.lock generated
View file

@ -1,31 +1,15 @@
{ {
"nodes": { "nodes": {
"dioxus": {
"flake": false,
"locked": {
"lastModified": 1688154505,
"narHash": "sha256-ZDh7HVVY7ZoHmvv+vRwXZNT/ebHUnQVf6dmt8AM64o8=",
"owner": "DioxusLabs",
"repo": "dioxus",
"rev": "6512c153dd0ded101eb818f35cda87af99f26a31",
"type": "github"
},
"original": {
"owner": "DioxusLabs",
"repo": "dioxus",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1689068808,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +41,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1679567394, "lastModified": 1690373729,
"narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", "narHash": "sha256-e136hTT7LqQ2QjOTZQMW+jnsevWwBpMj78u6FRUsH9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "88cd22380154a2c36799fe8098888f0f59861a15", "rev": "d9a33d69a9c421d64c8d925428864e93be895dcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +56,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684393889, "lastModified": 1691188534,
"narHash": "sha256-X4EP3TdpskELgOKGfm7UcLLGheqxYJZuNEEc0HkmrO0=", "narHash": "sha256-oXjS9GrZar+sB8j2KYzWw3dW62jYFhnjOsnO5+D+B3s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f7d9a55cc9960c029b006444e64e8dfa54a578e", "rev": "5767e7b931f2e6ee7f582d564b8665095c059f3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +70,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684393889, "lastModified": 1691188534,
"narHash": "sha256-X4EP3TdpskELgOKGfm7UcLLGheqxYJZuNEEc0HkmrO0=", "narHash": "sha256-oXjS9GrZar+sB8j2KYzWw3dW62jYFhnjOsnO5+D+B3s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f7d9a55cc9960c029b006444e64e8dfa54a578e", "rev": "5767e7b931f2e6ee7f582d564b8665095c059f3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,7 +102,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"dioxus": "dioxus",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
@ -132,11 +115,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1684376381, "lastModified": 1691201768,
"narHash": "sha256-XVFTXADfvBXKwo4boqfg80awUbT+JgQvlQ8uZ+Xgo1s=", "narHash": "sha256-h+QJMpawZoK1+8efF6UjQoY1EHZfHteXVa5OYnlqRWA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7c9a265c2eaa5783bc18593b1aec39a85653c076", "rev": "18ee2a71de24273e4ad4503b5604532f0b53f382",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +161,11 @@
"trunk": { "trunk": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1682443024, "lastModified": 1690639183,
"narHash": "sha256-TLBEUNCXHg6ArgQIlXPq9fGPDbSSkQ61Gn/CGH2S7CU=", "narHash": "sha256-/XVDjKK1Kv7Hk3RUf4v9PEGwarUGzjb+96mZoCKrUEw=",
"owner": "thedodd", "owner": "thedodd",
"repo": "trunk", "repo": "trunk",
"rev": "7769a17e517391b3b4077c21062725aa1600346d", "rev": "6a94c6b6df35d1a3618307afcfac69c66a6ae939",
"type": "github" "type": "github"
}, },
"original": { "original": {

38
flake.nix
View file

@ -8,10 +8,6 @@
url = "github:thedodd/trunk"; url = "github:thedodd/trunk";
flake = false; flake = false;
}; };
inputs.dioxus = {
url = "github:DioxusLabs/dioxus";
flake = false;
};
outputs = { outputs = {
self, self,
@ -20,7 +16,6 @@
naersk, naersk,
rust-overlay, rust-overlay,
trunk, trunk,
dioxus,
}: }:
(flake-utils.lib.eachDefaultSystem (system: let (flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -34,16 +29,11 @@
cargo = rust; cargo = rust;
rustc = rust; rustc = rust;
}; };
dioxus-cli = naersk'.buildPackage {
src = "${dioxus}/packages/cli";
buildInputs = [pkgs.openssl];
nativeBuildInputs = [pkgs.pkg-config];
};
in { in {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
rust rust
dioxus-cli self.packages.${system}.dioxus
(naersk'.buildPackage trunk) (naersk'.buildPackage trunk)
pkgs.httpie pkgs.httpie
pkgs.sea-orm-cli pkgs.sea-orm-cli
@ -53,6 +43,28 @@
}; };
packages = { packages = {
dioxus = pkgs.callPackage ({
rustPlatform,
pkg-config,
cacert,
openssl,
coreutils-full,
}:
rustPlatform.buildRustPackage rec {
pname = "dioxus-cli";
version = "0.4.0";
src = pkgs.fetchCrate {
inherit version pname;
hash = "sha256-4BIuD/rrA398hPEoNt5PwWylPAR0fA1UKc90xyH5Fd0=";
};
nativeBuildInputs = [pkg-config cacert coreutils-full];
buildInputs = [openssl];
OPENSSL_NO_VENDOR = 1;
cargoHash = "sha256-ok+fjvwz4k0/M5j7wut2A2AK6tuO3UfZtgoCXaCaHXY=";
}) {};
server = naersk'.buildPackage ./.; server = naersk'.buildPackage ./.;
frontend = let frontend = let
pkg = { pkg = {
@ -94,7 +106,7 @@
REGALADE_FRONTEND_DOMAIN = frontendRoot; REGALADE_FRONTEND_DOMAIN = frontendRoot;
nativeBuildInputs = [ nativeBuildInputs = [
dioxus-cli self.packages.${system}.dioxus
wasm-bindgen-cli wasm-bindgen-cli
rustPlatformWasm.cargoSetupHook rustPlatformWasm.cargoSetupHook
rustPlatformWasm.cargoBuildHook rustPlatformWasm.cargoBuildHook
@ -107,7 +119,7 @@
mkdir -p $XDG_DATA_HOME mkdir -p $XDG_DATA_HOME
cd app cd app
dioxus build --release dx build --release
runHook postBuild runHook postBuild
''; '';