From b554cc7bb2c76c6aab021ebd2a3a91afa8f512a7 Mon Sep 17 00:00:00 2001 From: gmega Date: Wed, 25 Feb 2026 17:26:11 -0300 Subject: [PATCH] remove logos design system; modify description --- flake.lock | 53 +++++++++---------------------------------------- flake.nix | 15 +++++--------- nix/default.nix | 6 ++---- 3 files changed, 16 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 34b51c9..ac18b22 100644 --- a/flake.lock +++ b/flake.lock @@ -91,7 +91,7 @@ }, "logos-cpp-sdk_3": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1761230734, @@ -109,7 +109,7 @@ }, "logos-cpp-sdk_4": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1761230734, @@ -127,7 +127,7 @@ }, "logos-cpp-sdk_5": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1767724329, @@ -145,7 +145,7 @@ }, "logos-cpp-sdk_6": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1767724329, @@ -161,24 +161,6 @@ "type": "github" } }, - "logos-design-system": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1771237838, - "narHash": "sha256-UcdHiZ5IdfCSOy17WTz04ZV1n4qqycVfwYzI7BkXeuc=", - "owner": "logos-co", - "repo": "logos-design-system", - "rev": "596811cbb0a0644322267368e87fab80e34203d8", - "type": "github" - }, - "original": { - "owner": "logos-co", - "repo": "logos-design-system", - "type": "github" - } - }, "logos-liblogos": { "inputs": { "logos-cpp-sdk": "logos-cpp-sdk", @@ -308,7 +290,7 @@ }, "logos-storage": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1770982130, @@ -387,16 +369,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -450,22 +432,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -485,7 +451,6 @@ "inputs": { "logos-capability-module": "logos-capability-module", "logos-cpp-sdk": "logos-cpp-sdk_2", - "logos-design-system": "logos-design-system", "logos-liblogos": "logos-liblogos_2", "logos-storage-module": "logos-storage-module", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 787ea8f..122e27b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,19 @@ { - description = "Logos Storage UI - A Qt UI plugin for Logos Storage"; + description = "A Simple Skeleton for a Logos Storage App"; inputs = { # Follow the same nixpkgs as logos-liblogos to ensure compatibility nixpkgs.follows = "logos-liblogos/nixpkgs"; - # logos-cpp-sdk.url = "/home/arnaud/Work/logos/logos-cpp-sdk"; logos-cpp-sdk.url = "github:logos-co/logos-cpp-sdk?ref=feat/logos-result"; logos-liblogos.url = "github:logos-co/logos-liblogos?ref=fix/logos-cleanup-on-terminate"; logos-storage-module.url = "github:logos-co/logos-storage-module"; - #logos-storage-module.url = "path:/home/arnaud/Work/logos/logos-storage-module"; logos-capability-module.url = "github:logos-co/logos-capability-module"; - logos-design-system.url = "github:logos-co/logos-design-system"; logos-liblogos.inputs.logos-cpp-sdk.follows = "logos-cpp-sdk"; logos-storage-module.inputs.logos-cpp-sdk.follows = "logos-cpp-sdk"; logos-capability-module.inputs.logos-cpp-sdk.follows = "logos-cpp-sdk"; }; - outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-storage-module, logos-capability-module, logos-design-system }: + outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-storage-module, logos-capability-module }: let systems = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f { @@ -25,15 +22,14 @@ logosLiblogos = logos-liblogos.packages.${system}.default; logosStorageModule = logos-storage-module.packages.${system}.default; logosCapabilityModule = logos-capability-module.packages.${system}.default; - logosDesignSystem = logos-design-system.packages.${system}.default; }); in { - packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosCapabilityModule, logosDesignSystem }: + packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosCapabilityModule }: let # Common configuration common = import ./nix/default.nix { - inherit pkgs logosSdk logosLiblogos logosStorageModule logosDesignSystem; + inherit pkgs logosSdk logosLiblogos logosStorageModule; }; src = ./.; @@ -58,7 +54,7 @@ } ); - devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosCapabilityModule, logosDesignSystem }: { + devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosCapabilityModule }: { default = pkgs.mkShell { nativeBuildInputs = [ pkgs.cmake @@ -77,7 +73,6 @@ export LOGOS_CPP_SDK_ROOT="${logosSdk}" export LOGOS_LIBLOGOS_ROOT="${logosLiblogos}" export LOGOS_STORAGE_ROOT="${logosStorageModule}" - export LOGOS_DESIGN_SYSTEM_ROOT="${logosDesignSystem}" echo "Logos Storage UI development environment" echo "LOGOS_CPP_SDK_ROOT: $LOGOS_CPP_SDK_ROOT" echo "LOGOS_LIBLOGOS_ROOT: $LOGOS_LIBLOGOS_ROOT" diff --git a/nix/default.nix b/nix/default.nix index b299677..12cba47 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,5 +1,5 @@ # Common build configuration shared across all packages -{ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosDesignSystem }: +{ pkgs, logosSdk, logosLiblogos, logosStorageModule }: { pname = "logos-storage-ui"; @@ -28,7 +28,6 @@ "-DLOGOS_CPP_SDK_ROOT=${logosSdk}" "-DLOGOS_LIBLOGOS_ROOT=${logosLiblogos}" "-DLOGOS_STORAGE_ROOT=${logosStorageModule}" - "-DLOGOS_DESIGN_SYSTEM_ROOT=${logosDesignSystem}" ]; # Environment variables @@ -36,12 +35,11 @@ LOGOS_CPP_SDK_ROOT = "${logosSdk}"; LOGOS_LIBLOGOS_ROOT = "${logosLiblogos}"; LOGOS_STORAGE_ROOT = "${logosStorageModule}"; - LOGOS_DESIGN_SYSTEM_ROOT = "${logosDesignSystem}"; }; # Metadata meta = with pkgs.lib; { - description = "Logos Storage UI - A Qt UI app for Logos Storage Module"; + description = "A Simple Skeleton for a Logos Storage App"; platforms = platforms.unix; }; }