parent
a4258436a6
commit
e5979003b8
6090
Cargo.lock
generated
6090
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
67
Cargo.toml
67
Cargo.toml
@ -1,40 +1,37 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = [
|
members = [
|
||||||
"authdb",
|
# "authdb",
|
||||||
"bike-lights/core",
|
|
||||||
"bike-lights/simulator",
|
|
||||||
"changeset",
|
|
||||||
"config",
|
|
||||||
"config-derive",
|
|
||||||
"coordinates",
|
|
||||||
"cyber-slides",
|
|
||||||
"cyberpunk",
|
|
||||||
"cyberpunk-splash",
|
|
||||||
"dashboard",
|
|
||||||
"emseries",
|
|
||||||
"file-service",
|
|
||||||
"fitnesstrax/app",
|
|
||||||
"fitnesstrax/core",
|
|
||||||
"fluent-ergonomics",
|
|
||||||
"geo-types",
|
|
||||||
"gm-control-panel",
|
|
||||||
"gm-dash/server",
|
|
||||||
"hex-grid",
|
|
||||||
"icon-test",
|
|
||||||
"l10n-db",
|
|
||||||
"memorycache",
|
|
||||||
"nom-training",
|
|
||||||
"otg/core",
|
|
||||||
"otg/gtk",
|
|
||||||
"pico-st7789",
|
|
||||||
"result-extended",
|
|
||||||
"screenplay",
|
|
||||||
"sgf",
|
|
||||||
"timezone-testing",
|
|
||||||
"tree",
|
|
||||||
"visions/server",
|
|
||||||
"visions/types",
|
|
||||||
"visions/ui",
|
|
||||||
# "bike-lights/bike",
|
# "bike-lights/bike",
|
||||||
|
# "bike-lights/core",
|
||||||
|
# "bike-lights/simulator",
|
||||||
|
# "changeset",
|
||||||
|
# "config",
|
||||||
|
# "config-derive",
|
||||||
|
# "coordinates",
|
||||||
|
# "cyberpunk",
|
||||||
|
# "cyber-slides",
|
||||||
|
# "cyberpunk-splash",
|
||||||
|
# "dashboard",
|
||||||
|
# "emseries",
|
||||||
|
# "file-service",
|
||||||
|
# "fitnesstrax/core",
|
||||||
|
# "fitnesstrax/app",
|
||||||
|
# "fluent-ergonomics",
|
||||||
|
# "geo-types",
|
||||||
|
# "gm-control-panel",
|
||||||
|
# "hex-grid",
|
||||||
|
# "icon-test",
|
||||||
|
# "memorycache",
|
||||||
|
# "nom-training",
|
||||||
|
# "otg/core",
|
||||||
|
# "otg/gtk",
|
||||||
|
# "result-extended",
|
||||||
|
# "screenplay",
|
||||||
|
# "sgf",
|
||||||
|
# "timezone-testing",
|
||||||
|
# "tree",
|
||||||
|
# "visions/server",
|
||||||
|
# "gm-dash/server",
|
||||||
|
"l10n-db"
|
||||||
]
|
]
|
||||||
|
98
flake.nix
98
flake.nix
@ -8,8 +8,16 @@
|
|||||||
crane.url = "github:ipetkov/crane";
|
crane.url = "github:ipetkov/crane";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, unstable, typeshare, crane, ... }:
|
outputs =
|
||||||
let
|
{
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
unstable,
|
||||||
|
typeshare,
|
||||||
|
crane,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
version = builtins.string 0 8 self.lastModifiedDate;
|
version = builtins.string 0 8 self.lastModifiedDate;
|
||||||
supportedSystems = [ "x86_64-linux" ];
|
supportedSystems = [ "x86_64-linux" ];
|
||||||
in
|
in
|
||||||
@ -48,10 +56,11 @@
|
|||||||
pkgs.udev
|
pkgs.udev
|
||||||
pkgs.wasm-pack
|
pkgs.wasm-pack
|
||||||
pkgs.go-task
|
pkgs.go-task
|
||||||
|
pkgs.nixfmt-rfc-style
|
||||||
typeshare.packages."x86_64-linux".default
|
typeshare.packages."x86_64-linux".default
|
||||||
pkgs.nodePackages_latest.typescript-language-server
|
pkgs.nodePackages_latest.typescript-language-server
|
||||||
];
|
];
|
||||||
LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib";
|
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
|
||||||
ENV = "dev";
|
ENV = "dev";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -59,56 +68,59 @@
|
|||||||
let
|
let
|
||||||
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
||||||
craneLib = crane.mkLib pkgs;
|
craneLib = crane.mkLib pkgs;
|
||||||
src = craneLib.cleanCargoSource ./.;
|
|
||||||
|
|
||||||
gtkNativeInputs = [
|
# gtkNativeInputs = [
|
||||||
pkgs.pkg-config
|
# pkgs.pkg-config
|
||||||
pkgs.gtk4
|
# pkgs.gtk4
|
||||||
pkgs.libadwaita
|
# pkgs.libadwaita
|
||||||
pkgs.wrapGAppsHook4
|
# pkgs.wrapGAppsHook4
|
||||||
];
|
# ];
|
||||||
|
|
||||||
cargoOverrides = pkgs: pkgs.buildRustCrate.override {
|
# cargoOverrides =
|
||||||
defaultCrateOverrides = pkgs.defaultCrateOverrides // {
|
# pkgs:
|
||||||
gobject-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
# pkgs.buildRustCrate.override {
|
||||||
gio-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
# defaultCrateOverrides = pkgs.defaultCrateOverrides // {
|
||||||
gdk-pixbuf-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
# gobject-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
||||||
libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
# gio-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
||||||
|
# gdk-pixbuf-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
||||||
|
# libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
||||||
|
|
||||||
dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
# dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; };
|
||||||
fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; };
|
# fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; };
|
||||||
otg-gtk = import ./otg/gtk/override.nix { gtkNativeInputs = gtkNativeInputs; };
|
# otg-gtk = import ./otg/gtk/override.nix { gtkNativeInputs = gtkNativeInputs; };
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
|
|
||||||
cargo_nix = pkgs.callPackage ./Cargo.nix {
|
# cargo_nix = pkgs.callPackage ./Cargo.nix {
|
||||||
nixpkgs = nixpkgs;
|
# nixpkgs = nixpkgs;
|
||||||
buildRustCrateForPkgs = cargoOverrides;
|
# buildRustCrateForPkgs = cargoOverrides;
|
||||||
};
|
# };
|
||||||
|
|
||||||
in rec {
|
in
|
||||||
cyber-slides = cargo_nix.workspaceMembers.cyber-slides.build;
|
rec {
|
||||||
cyberpunk-splash = cargo_nix.workspaceMembers.cyberpunk-splash.build;
|
# cyber-slides = cargo_nix.workspaceMembers.cyber-slides.build;
|
||||||
dashboard = cargo_nix.workspaceMembers.dashboard.build;
|
# cyberpunk-splash = cargo_nix.workspaceMembers.cyberpunk-splash.build;
|
||||||
|
# dashboard = cargo_nix.workspaceMembers.dashboard.build;
|
||||||
# file-service = cargo_nix.workspaceMembers.file-service.build;
|
# file-service = cargo_nix.workspaceMembers.file-service.build;
|
||||||
fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
|
# fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
|
||||||
l10n-db = craneLib.buildPackage {
|
# otg-gtk = cargo_nix.workspaceMembers.otg-gtk.build;
|
||||||
pname = "l10n-db";
|
|
||||||
cargoExtraArgs = "-p l10n-db";
|
l10n-db =
|
||||||
src = ./.;
|
(import ./rust.nix {
|
||||||
};
|
pkgs = pkgs;
|
||||||
otg-gtk = cargo_nix.workspaceMembers.otg-gtk.build;
|
craneLib = craneLib;
|
||||||
|
}).l10n-db;
|
||||||
|
|
||||||
all = pkgs.symlinkJoin {
|
all = pkgs.symlinkJoin {
|
||||||
name = "all";
|
name = "all";
|
||||||
paths = [
|
paths = [
|
||||||
cyber-slides
|
# cyber-slides
|
||||||
cyberpunk-splash
|
# cyberpunk-splash
|
||||||
dashboard
|
# dashboard
|
||||||
# file-service
|
# file-service
|
||||||
fitnesstrax
|
# fitnesstrax
|
||||||
l10n-db
|
l10n-db
|
||||||
otg-gtk
|
# otg-gtk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4,15 +4,15 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { version = "0.4.39", features = ["serde"] }
|
chrono = { version = "0.4.39", features = ["serde"] }
|
||||||
clap = { version = "4.5.30", features = ["derive"] }
|
clap = { version = "4.5.30", features = ["derive"] }
|
||||||
icu_locid = { version = "1.5.0", features = ["serde"] }
|
icu_locid = { version = "1.5.0", features = ["serde"] }
|
||||||
serde = { version = "1.0.218", features = ["derive"] }
|
serde = { version = "1.0.218", features = ["derive"] }
|
||||||
serde_json = "1.0.139"
|
serde_json = { version = "1.0.139" }
|
||||||
tempfile = "3.17.1"
|
tempfile = { version = "3.17.1" }
|
||||||
thiserror = "2.0.11"
|
thiserror = { version = "2.0.11" }
|
||||||
toml = "0.8.20"
|
toml = { version = "0.8.20" }
|
||||||
xml-rs = "0.8.25"
|
xml-rs = { version = "0.8.25" }
|
||||||
|
|
||||||
# [lib]
|
# [lib]
|
||||||
# name = "l10n_db"
|
# name = "l10n_db"
|
||||||
|
49
rust.nix
Normal file
49
rust.nix
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
{ pkgs, craneLib }:
|
||||||
|
let
|
||||||
|
src = craneLib.cleanCargoSource ./.;
|
||||||
|
|
||||||
|
rustDeps = with pkgs; {
|
||||||
|
inherit src;
|
||||||
|
nativeBuildInputs = [
|
||||||
|
gtk4
|
||||||
|
pkg-config
|
||||||
|
pkgs.clang
|
||||||
|
wrapGAppsHook4
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libadwaita
|
||||||
|
openssl
|
||||||
|
pipewire
|
||||||
|
];
|
||||||
|
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoArtifacts = craneLib.buildDepsOnly rustDeps;
|
||||||
|
|
||||||
|
rustArgs = rustDeps // {
|
||||||
|
inherit cargoArtifacts;
|
||||||
|
doCheck = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSetForCrate =
|
||||||
|
crate:
|
||||||
|
pkgs.lib.fileset.toSource {
|
||||||
|
root = ./.;
|
||||||
|
fileset = pkgs.lib.fileset.unions [
|
||||||
|
./Cargo.toml
|
||||||
|
./Cargo.lock
|
||||||
|
(craneLib.fileset.commonCargoSources crate)
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
l10n-db = craneLib.buildPackage (
|
||||||
|
rustArgs
|
||||||
|
// {
|
||||||
|
inherit (craneLib.crateNameFromCargoToml { src = ./l10n-db; }) version;
|
||||||
|
pname = "l10n-db";
|
||||||
|
cargoExtraArgs = "-p l10n-db";
|
||||||
|
src = fileSetForCrate ./l10n-db;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user