Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add VM memory manager #19

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ SPDX-PackageDownloadLocation = "https://github.com/tiiuae/ghaf"

[[annotations]]
SPDX-License-Identifier = "Apache-2.0"
SPDX-FileCopyrightText = "2022-2024 TII (SSRC) and the Ghaf contributors"
SPDX-FileCopyrightText = "2022-2025 TII (SSRC) and the Ghaf contributors"
precedence = "closest"
path = [
"flake.lock",
"packages/ghaf-mem-manager/Cargo.lock",
"packages/ghaf-artwork/**/*.png",
"packages/ghaf-artwork/**/*.jpg",
"packages/ghaf-artwork/**/*.svg",
Expand Down
16 changes: 16 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};

# Rust / Cargo building
crane = {
url = "github:ipetkov/crane";
};

pre-commit-hooks-nix = {
url = "github:cachix/pre-commit-hooks.nix";
inputs = {
Expand Down
3 changes: 3 additions & 0 deletions nix/treefmt.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@

# C++
clang-format.enable = true;

# Rust
rustfmt.enable = true;
};

settings.global.excludes = [
Expand Down
4 changes: 2 additions & 2 deletions packages/flake-module.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Copyright 2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
_:
{ inputs, ... }:
let
ghafpkgs =
pkgs:
let
callPackage = pkgs.lib.callPackageWith pkgs;
in
{

ghaf-artwork = callPackage ./ghaf-artwork { };
ghaf-audio-control = callPackage ./ghaf-audio-control { };
ghaf-mem-manager = callPackage ./ghaf-mem-manager { inherit (inputs) crane; };
ghaf-theme = callPackage ./ghaf-theme { };
};
in
Expand Down
Loading
Loading