vlinkz/nix-software-center
1
1
Fork 0
mirror of https://github.com/vlinkz/nix-software-center.git synced 2024-07-07 10:06:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update all dependencies

Browse Source
This commit is contained in:
Victor Fuentes 2023-06-14 20:27:01 -04:00
parent 8c66618ebb
commit 322e565f90
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
12 changed files with 509 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

822
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

18
Cargo.toml
View File

@ -5,12 +5,12 @@ edition = "2021"
default-run = "nix-software-center"
[dependencies]
relm4 = { version = "0.5", features = ["libadwaita", "macros"] }
relm4-components = { package = "relm4-components", version = "0.5"}
adw = { package = "libadwaita", version = "0.2", features = ["v1_2", "gtk_v4_6"] }
gtk = { package = "gtk4", version = "0.5", features = ["v4_6"] }
sourceview5 = { version = "0.5", features = ["v5_4"] }
tokio = { version = "1.26", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] }
relm4 = { version = "0.6", features = ["libadwaita", "macros"] }
relm4-components = { package = "relm4-components", version = "0.6"}
adw = { package = "libadwaita", version = "0.4", features = ["v1_2", "gtk_v4_6"] }
gtk = { package = "gtk4", version = "0.6", features = ["v4_6"] }
sourceview5 = { version = "0.6", features = ["v5_4"] }
tokio = { version = "1.28", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] }
tracker = "0.2"
serde_json = "1.0"
@ -20,13 +20,13 @@ serde_yaml = "0.9"
nix-editor = "0.3.0"
nix-data = { git = "https://github.com/snowflakelinux/nix-data" }
sqlx = { version = "0.6.0", features = [ "runtime-tokio-native-tls" , "sqlite" ] }
sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" , "sqlite" ] }
html2pango = "0.5"
log = "0.4"
pretty_env_logger = "0.4"
pretty_env_logger = "0.5"
flate2 = "1.0"
quick-xml = { version = "0.28", features = ["serialize"] }
quick-xml = { version = "0.29", features = ["serialize"] }
rand = "0.8"
reqwest = { version = "0.11", features = ["blocking"] }
sha256 = "1.1"

32
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1680213900,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github"
},
"original": {
@ -22,13 +22,31 @@
"utils": "utils"
}
},
"utils": {
"systems": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {

2
src/main.rs
View File

@ -16,6 +16,6 @@ fn main() {
gtk::Window::set_default_icon_name(nix_software_center::config::APP_ID);
let app = adw::Application::new(Some(nix_software_center::config::APP_ID), gio::ApplicationFlags::empty());
app.set_resource_base_path(Some("/dev/vlinkz/NixSoftwareCenter"));
let app = RelmApp::with_app(app);
let app = RelmApp::from_app(app);
app.run::<AppModel>(());
}

2
src/ui/about.rs
View File

@ -42,7 +42,7 @@ impl SimpleComponent for AboutPageModel {
.application_icon(config::APP_ID)
.application_name("Nix Software Center")
.developer_name("Victor Fuentes")
.developers(vec!["Victor Fuentes https://github.com/vlinkz".into()])
.developers(vec!["Victor Fuentes https://github.com/vlinkz"])
.issue_url("https://github.com/vlinkz/nix-software-center/issues")
.license_type(gtk::License::Gpl30)
.modal(true)

2
src/ui/categories.rs
View File

@ -93,7 +93,7 @@ impl FactoryComponent for PkgGroup {
}
}
fn output_to_parent_input(output: Self::Output) -> Option<AppMsg> {
fn forward_to_parent(output: Self::Output) -> Option<AppMsg> {
Some(match output {
PkgCategoryMsg::Open(x) => AppMsg::OpenCategoryPage(x),
})

2
src/ui/categorytile.rs
View File

@ -175,7 +175,7 @@ impl FactoryComponent for CategoryTile {
}
}
fn output_to_parent_input(output: Self::Output) -> Option<CategoryPageMsg> {
fn forward_to_parent(output: Self::Output) -> Option<CategoryPageMsg> {
Some(match output {
CategoryTileMsg::Open(x) => CategoryPageMsg::OpenPkg(x),
})

2
src/ui/installedpage.rs
View File

@ -362,7 +362,7 @@ impl FactoryComponent for InstalledItemModel {
}
}
fn output_to_parent_input(output: Self::Output) -> Option<InstalledPageMsg> {
fn forward_to_parent(output: Self::Output) -> Option<InstalledPageMsg> {
Some(match output {
InstalledItemMsg::Delete(item) => InstalledPageMsg::Remove(item),
})

14
src/ui/pkgpage.rs
View File

@ -1056,7 +1056,7 @@ impl Component for PkgModel {
widgets.userinstallstack.set_hhomogeneous(false);
widgets.systeminstallstack.set_hhomogeneous(false);
let group = RelmActionGroup::<ModeActionGroup>::new();
let mut group = RelmActionGroup::<ModeActionGroup>::new();
let nixenv: RelmAction<NixEnvAction> = {
let sender = sender.clone();
RelmAction::new_stateless(move |_| {
@ -1078,16 +1078,16 @@ impl Component for PkgModel {
})
};
group.add_action(&nixenv);
group.add_action(&nixprofile);
group.add_action(&nixsystem);
group.add_action(nixenv);
group.add_action(nixprofile);
group.add_action(nixsystem);
let actions = group.into_action_group();
widgets
.pkg_window
.insert_action_group("mode", Some(&actions));
let rungroup = RelmActionGroup::<RunActionGroup>::new();
let mut rungroup = RelmActionGroup::<RunActionGroup>::new();
let launchaction: RelmAction<LaunchAction> = {
let sender = sender.clone();
RelmAction::new_stateless(move |_| {
@ -1102,8 +1102,8 @@ impl Component for PkgModel {
})
};
rungroup.add_action(&launchaction);
rungroup.add_action(&termaction);
rungroup.add_action(launchaction);
rungroup.add_action(termaction);
let runactions = rungroup.into_action_group();
widgets

2
src/ui/pkgtile.rs
View File

@ -170,7 +170,7 @@ impl FactoryComponent for PkgTile {
}
}
fn output_to_parent_input(output: Self::Output) -> Option<AppMsg> {
fn forward_to_parent(output: Self::Output) -> Option<AppMsg> {
Some(match output {
PkgTileMsg::Open(x) => AppMsg::OpenPkg(x),
})

4
src/ui/updatepage.rs
View File

@ -1,13 +1,13 @@
use crate::{APPINFO, ui::unavailabledialog::UnavailableDialogModel, parse::util};
use super::{pkgpage::InstallType, window::*, updateworker::{UpdateAsyncHandler, UpdateAsyncHandlerMsg, UpdateAsyncHandlerInit}, rebuild::RebuildMsg};
use super::{pkgpage::InstallType, window::*, updateworker::{UpdateAsyncHandler, UpdateAsyncHandlerMsg, UpdateAsyncHandlerInit}, rebuild::RebuildMsg, unavailabledialog::UnavailableDialogMsg};
use adw::prelude::*;
use nix_data::config::configfile::NixDataConfig;
use relm4::{factory::*, gtk::pango, *};
use std::{path::Path, convert::identity, collections::HashMap};
use log::*;
pub static UNAVAILABLE_BROKER: MessageBroker<UnavailableDialogModel> = MessageBroker::new();
pub static UNAVAILABLE_BROKER: MessageBroker<UnavailableDialogMsg> = MessageBroker::new();
#[tracker::track]
#[derive(Debug)]

8
src/ui/window.rs
View File

@ -48,7 +48,7 @@ use super::{
windowloading::{LoadErrorModel, LoadErrorMsg, WindowAsyncHandler, WindowAsyncHandlerMsg},
};
pub static REBUILD_BROKER: MessageBroker<RebuildModel> = MessageBroker::new();
pub static REBUILD_BROKER: MessageBroker<RebuildMsg> = MessageBroker::new();
#[derive(PartialEq)]
enum Page {
@ -596,7 +596,7 @@ impl Component for AppModel {
let widgets = view_output!();
let group = RelmActionGroup::<MenuActionGroup>::new();
let mut group = RelmActionGroup::<MenuActionGroup>::new();
let aboutpage: RelmAction<AboutAction> = {
let sender = model.aboutpage.sender().clone();
RelmAction::new_stateless(move |_| {
@ -614,8 +614,8 @@ impl Component for AppModel {
})
};
group.add_action(&aboutpage);
group.add_action(&prefernecespage);
group.add_action(aboutpage);
group.add_action(prefernecespage);
let actions = group.into_action_group();
widgets
.main_window