commit 122e18dd70661462c0e9e325636a820367f0d893 · nekomimi.pet/wisp.place-monorepo

+1 -1

cli/Cargo.lock

···

       4913
       4913
        
       

     

       4914
       4914
        
       [[package]]

     

       4915
       4915
        
       name = "wisp-cli"

     

       4916
       4916
       -
       version = "0.1.0"

     

       4916
       4916
       +
       version = "0.2.0"

     

       4917
       4917
        
       dependencies = [

     

       4918
       4918
        
        "axum",

     

       4919
       4919
        
        "base64 0.22.1",

+1 -1

cli/Cargo.toml

···

       1
       1
        
       [package]

     

       2
       2
        
       name = "wisp-cli"

     

       3
       3
       -
       version = "0.1.0"

     

       3
       3
       +
       version = "0.2.0"

     

       4
       4
        
       edition = "2024"

     

       5
       5
        
       

     

       6
       6
        
       [features]

+28 -1

crates.nix

···

       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
       +
                 targets.aarch64-unknown-linux-gnu.latest.rust-std

     

       22
       23
        
               ];

     

       23
       24
        
           # configure crates

     

       24
       25
        
           nci.crates."wisp-cli" = {

     
···

       26
       27
        
               dev.runTests = false;

     

       27
       28
        
               release.runTests = false;

     

       28
       29
        
             };

     

       29
       29
       -
             targets."x86_64-unknown-linux-gnu" = {

     

       30
       30
       +
             targets."x86_64-unknown-linux-gnu" = let

     

       31
       31
       +
               targetPkgs = pkgs.pkgsCross.gnu64;

     

       32
       32
       +
               targetCC = targetPkgs.stdenv.cc;

     

       33
       33
       +
               targetCargoEnvVarTarget = targetPkgs.stdenv.hostPlatform.rust.cargoEnvVarTarget;

     

       34
       34
       +
             in rec {

     

       30
       35
        
               default = true;

     

       36
       36
       +
               depsDrvConfig.mkDerivation = {

     

       37
       37
       +
                 nativeBuildInputs = [targetCC];

     

       38
       38
       +
               };

     

       39
       39
       +
               depsDrvConfig.env = rec {

     

       40
       40
       +
                 TARGET_CC = "${targetCC.targetPrefix}cc";

     

       41
       41
       +
                 "CARGO_TARGET_${targetCargoEnvVarTarget}_LINKER" = TARGET_CC;

     

       42
       42
       +
               };

     

       43
       43
       +
               drvConfig = depsDrvConfig;

     

       31
       44
        
             };

     

       32
       45
        
             targets."x86_64-pc-windows-gnu" = let

     

       33
       46
        
               targetPkgs = pkgs.pkgsCross.mingwW64;

     
···

       46
       59
        
             };

     

       47
       60
        
             targets."aarch64-apple-darwin" = let

     

       48
       61
        
               targetPkgs = pkgs.pkgsCross.aarch64-darwin;

     

       62
       62
       +
               targetCC = targetPkgs.stdenv.cc;

     

       63
       63
       +
               targetCargoEnvVarTarget = targetPkgs.stdenv.hostPlatform.rust.cargoEnvVarTarget;

     

       64
       64
       +
             in rec {

     

       65
       65
       +
               depsDrvConfig.mkDerivation = {

     

       66
       66
       +
                 nativeBuildInputs = [targetCC];

     

       67
       67
       +
               };

     

       68
       68
       +
               depsDrvConfig.env = rec {

     

       69
       69
       +
                 TARGET_CC = "${targetCC.targetPrefix}cc";

     

       70
       70
       +
                 "CARGO_TARGET_${targetCargoEnvVarTarget}_LINKER" = TARGET_CC;

     

       71
       71
       +
               };

     

       72
       72
       +
               drvConfig = depsDrvConfig;

     

       73
       73
       +
             };

     

       74
       74
       +
             targets."aarch64-unknown-linux-gnu" = let

     

       75
       75
       +
               targetPkgs = pkgs.pkgsCross.aarch64-multiplatform;

     

       49
       76
        
               targetCC = targetPkgs.stdenv.cc;

     

       50
       77
        
               targetCargoEnvVarTarget = targetPkgs.stdenv.hostPlatform.rust.cargoEnvVarTarget;

     

       51
       78
        
             in rec {

+17 -2

flake.nix

···

       26
       26
        
               ...

     

       27
       27
        
             }: let

     

       28
       28
        
               crateOutputs = config.nci.outputs."wisp-cli";

     

       29
       29
       +
               mkRenamedPackage = name: pkg: pkgs.runCommand name {} ''

     

       30
       30
       +
                 mkdir -p $out/bin

     

       31
       31
       +
                 cp ${pkg}/bin/wisp-cli $out/bin/${name}

     

       32
       32
       +
               '';

     

       29
       33
        
             in {

     

       30
       34
        
               devShells.default = crateOutputs.devShell;

     

       31
       35
        
               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;

     

       36
       36
       +
               packages.wisp-cli-x86_64-linux = mkRenamedPackage "wisp-cli-x86_64-linux" crateOutputs.packages.release;

     

       37
       37
       +
               packages.wisp-cli-aarch64-linux = mkRenamedPackage "wisp-cli-aarch64-linux" crateOutputs.allTargets."aarch64-unknown-linux-gnu".packages.release;

     

       38
       38
       +
               packages.wisp-cli-x86_64-windows = mkRenamedPackage "wisp-cli-x86_64-windows.exe" crateOutputs.allTargets."x86_64-pc-windows-gnu".packages.release;

     

       39
       39
       +
               packages.wisp-cli-aarch64-darwin = mkRenamedPackage "wisp-cli-aarch64-darwin" crateOutputs.allTargets."aarch64-apple-darwin".packages.release;

     

       40
       40
       +
               packages.all = pkgs.symlinkJoin {

     

       41
       41
       +
                 name = "wisp-cli-all";

     

       42
       42
       +
                 paths = [

     

       43
       43
       +
                   config.packages.wisp-cli-x86_64-linux

     

       44
       44
       +
                   config.packages.wisp-cli-aarch64-linux

     

       45
       45
       +
                   config.packages.wisp-cli-x86_64-windows

     

       46
       46
       +
                   config.packages.wisp-cli-aarch64-darwin

     

       47
       47
       +
                 ];

     

       48
       48
       +
               };

     

       34
       49
        
             };

     

       35
       50
        
           };

     

       36
       51
        
       }