Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

October 2023 Development #36

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

October 2023 Development #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35742c1
chore(genesis-shell): update
RossComputerGuy Oct 5, 2023
1de2182
chore: update genesis shell and gokai
RossComputerGuy Oct 9, 2023
3daa466
chore: create networkmanager dispatcher directory
RossComputerGuy Oct 13, 2023
468eab2
chore: add ssl certificates
RossComputerGuy Oct 13, 2023
b0011bc
chore: update flake
RossComputerGuy Oct 15, 2023
9f3dd99
fix: make buildable on apple silicon
RossComputerGuy Oct 16, 2023
f467bea
fix(efipart): kernel file
RossComputerGuy Oct 16, 2023
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
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
};

trivial = prev.trivial.extend (f: p: {
revision = "${self.rev or "diry"}";
revision = "${self.rev or "dirty"}";
});
});
});
Expand Down
7 changes: 4 additions & 3 deletions pkgs/desktops/genesis-shell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, runCommand, flutter, pkg-config, expidus }@pkgs:
let
rev = "924750b6cbe96476dc2470e43e32f6dd1324d6e6";
rev = "cc0df545568a68265a44643ce7a568966a99a55d";
in
flutter.buildFlutterApplication {
pname = "genesis-shell";
Expand All @@ -10,11 +10,11 @@ flutter.buildFlutterApplication {
owner = "ExpidusOS";
repo = "genesis";
inherit rev;
sha256 = "sha256-zu6OABmcsathAr0RpQHuLoE5eOFT2qEVzxQnUrcM96o=";
sha256 = "sha256-JE3RYL7zAkQSSDkBQxVKuwtVDHqURzN0RcyqQP3Kb58=";
};

depsListFile = ./deps.json;
vendorHash = "sha256-MFiWD7KGrjMga4SxGUNmUIh986xtXM1QjGRK83ENgmI=";
vendorHash = "sha256-1x4683cdTslj6udQKloqwGSs76fCoMSTQ4+aMDnMtPM=";

nativeBuildInputs = [
pkg-config
Expand All @@ -23,6 +23,7 @@ flutter.buildFlutterApplication {
flutterBuildFlags = [
"--local-engine=${expidus.gokai.flutter-engine}/out/host_release"
"--local-engine-src-path=${expidus.gokai.flutter-engine}"
"--dart-define=COMMIT_HASH=${rev}"
];

buildInputs = [
Expand Down
223 changes: 127 additions & 96 deletions pkgs/desktops/genesis-shell/deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,27 @@
"xdg_directories",
"flutter_adaptive_scaffold",
"provider",
"shared_preferences_platform_interface",
"file",
"path",
"package_info_plus",
"flutter_test",
"flutter_lints",
"file"
"win32"
]
},
{
"name": "file",
"version": "7.0.0",
"name": "win32",
"version": "5.0.9",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"meta",
"path"
"ffi"
]
},
{
"name": "path",
"version": "1.8.3",
"kind": "transitive",
"source": "hosted",
"dependencies": []
},
{
"name": "meta",
"version": "1.9.1",
"name": "ffi",
"version": "2.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": []
Expand Down Expand Up @@ -121,6 +117,13 @@
"term_glyph"
]
},
{
"name": "path",
"version": "1.8.3",
"kind": "direct",
"source": "hosted",
"dependencies": []
},
{
"name": "collection",
"version": "1.17.2",
Expand All @@ -147,6 +150,13 @@
"meta"
]
},
{
"name": "meta",
"version": "1.9.1",
"kind": "transitive",
"source": "hosted",
"dependencies": []
},
{
"name": "material_color_utilities",
"version": "0.5.0",
Expand Down Expand Up @@ -258,6 +268,109 @@
"source": "sdk",
"dependencies": []
},
{
"name": "package_info_plus",
"version": "4.1.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
"ffi",
"flutter",
"flutter_web_plugins",
"http",
"meta",
"path",
"package_info_plus_platform_interface",
"win32"
]
},
{
"name": "package_info_plus_platform_interface",
"version": "2.0.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"meta",
"plugin_platform_interface"
]
},
{
"name": "plugin_platform_interface",
"version": "2.1.4",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"meta"
]
},
{
"name": "http",
"version": "1.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"async",
"http_parser",
"meta"
]
},
{
"name": "http_parser",
"version": "4.0.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"collection",
"source_span",
"string_scanner",
"typed_data"
]
},
{
"name": "typed_data",
"version": "1.3.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"collection"
]
},
{
"name": "flutter_web_plugins",
"version": "0.0.0",
"kind": "transitive",
"source": "sdk",
"dependencies": [
"flutter",
"characters",
"collection",
"material_color_utilities",
"meta",
"vector_math",
"web"
]
},
{
"name": "file",
"version": "7.0.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
"meta",
"path"
]
},
{
"name": "shared_preferences_platform_interface",
"version": "2.3.1",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "provider",
"version": "6.0.5",
Expand Down Expand Up @@ -329,13 +442,6 @@
"meta"
]
},
{
"name": "ffi",
"version": "2.0.2",
"kind": "transitive",
"source": "hosted",
"dependencies": []
},
{
"name": "args",
"version": "2.4.2",
Expand Down Expand Up @@ -379,30 +485,6 @@
"flutter"
]
},
{
"name": "plugin_platform_interface",
"version": "2.1.4",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"meta"
]
},
{
"name": "flutter_web_plugins",
"version": "0.0.0",
"kind": "transitive",
"source": "sdk",
"dependencies": [
"flutter",
"characters",
"collection",
"material_color_utilities",
"meta",
"vector_math",
"web"
]
},
{
"name": "event",
"version": "2.1.2",
Expand Down Expand Up @@ -461,15 +543,6 @@
"typed_data"
]
},
{
"name": "typed_data",
"version": "1.3.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"collection"
]
},
{
"name": "path_provider",
"version": "2.0.15",
Expand Down Expand Up @@ -497,15 +570,6 @@
"win32"
]
},
{
"name": "win32",
"version": "3.1.4",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"ffi"
]
},
{
"name": "path_provider_platform_interface",
"version": "2.0.6",
Expand Down Expand Up @@ -557,29 +621,6 @@
"path_provider_platform_interface"
]
},
{
"name": "http",
"version": "1.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"async",
"http_parser",
"meta"
]
},
{
"name": "http_parser",
"version": "4.0.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"collection",
"source_span",
"string_scanner",
"typed_data"
]
},
{
"name": "url_launcher",
"version": "6.1.12",
Expand Down Expand Up @@ -748,16 +789,6 @@
"shared_preferences_platform_interface"
]
},
{
"name": "shared_preferences_platform_interface",
"version": "2.3.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "shared_preferences_web",
"version": "2.2.0",
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/expidus/gokai/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
flutter-engine
}@pkgs:
let
rev = "37dd43cf87d0976af784257051686a9aad28574b";
rev = "27227fcccd5c3186f8dc47321cecab9ed1026dfc";
in
stdenv.mkDerivation rec {
pname = "gokai";
Expand All @@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
owner = "ExpidusOS";
repo = "gokai";
inherit rev;
sha256 = "sha256-0bSldPyFyj2n4hIal5aEUkTj9KX3fvhm+6kVJ0ylZY0=";
sha256 = "sha256-RXYNrqAGC2dcDbzh8TXafUJfEmBSefJYp6+xUL2Gs9g=";
};

passthru = {
Expand Down
Loading