Skip to content

chore: dependency maintanance and nixos 26.05 #746

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.

Sign up for GitHub

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

Merged
Conni2461 merged 3 commits into from
Jul 28, 2026
Merged

chore: dependency maintanance and nixos 26.05 #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e2784f
chore: nixpkgs 25.11 -> 26.05
Conni2461 Jun 29, 2026
b84b12c
chore: bump all dependencies
Conni2461 Jun 29, 2026
884d3d1
chore: drop unused dependency: log, either, mime
Conni2461 Apr 22, 2026
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
1,160 changes: 339 additions & 821 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 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.

4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
};

outputs =
Expand All @@ -16,7 +16,7 @@
"x86_64-linux"
"aarch64-linux"
];
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems f;
in
{
devShell = forAllSystems (system: inputs.self.devShells.${system}.default);
Expand Down
2 changes: 1 addition & 1 deletion ofborg-simple-build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2024"
[dependencies]
ofborg = { path = "../ofborg" }

log = "0.4.25"
tracing = "0.1.41"
6 changes: 2 additions & 4 deletions ofborg-simple-build/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate log;

use std::env;
use std::fs::File;
use std::io::Read;
Expand All @@ -11,11 +9,11 @@ use ofborg::nix;
fn main() {
ofborg::setup_log();

log::info!("Loading config...");
tracing::info!("Loading config...");
let cfg = config::load(env::args().nth(1).unwrap().as_ref());
let nix = cfg.nix();

log::info!("Running build...");
tracing::info!("Running build...");
match nix.safely_build_attrs(
Path::new("./"),
nix::File::DefaultNixpkgs,
Expand Down
2 changes: 0 additions & 2 deletions ofborg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ chrono = { version = "0.4.38", default-features = false, features = [
"clock",
"std",
] }
either = "1.13.0"
fs2 = "0.4.3"
futures = "0.3.31"
futures-util = "0.3.31"
Expand All @@ -28,7 +27,6 @@ hyper-util = { version = "0.1", features = ["server", "tokio", "http1"] }
lapin = "4.3.0"
lru-cache = "0.1.2"
md5 = "0.8.0"
mime = "0.3"
nom = "8"
parking_lot = "0.12.4"
regex = "1.11.1"
Expand Down
18 changes: 9 additions & 9 deletions ofborg/src/nix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ impl Operation {
"--no-out-link",
"--keep-going",
"--option",
"extra-experimental-features",
"no-url-literals",
"lint-url-literals",
"fatal",
]);
}
Operation::QueryPackagesJson => {
Expand All @@ -70,8 +70,8 @@ impl Operation {
"--available",
"--json",
"--option",
"extra-experimental-features",
"no-url-literals",
"lint-url-literals",
"fatal",
]);
}
Operation::QueryPackagesOutputs => {
Expand All @@ -82,8 +82,8 @@ impl Operation {
"--attr-path",
"--out-path",
"--option",
"extra-experimental-features",
"no-url-literals",
"lint-url-literals",
"fatal",
]);
}
Operation::NoOp { ref operation } => {
Expand All @@ -95,12 +95,12 @@ impl Operation {
"--strict",
"--json",
"--option",
"extra-experimental-features",
"no-url-literals",
"lint-url-literals",
"fatal",
]);
}
Operation::Instantiate => {
command.args(["--option", "extra-experimental-features", "no-url-literals"]);
command.args(["--option", "lint-url-literals", "fatal"]);
}
_ => (),
};
Expand Down
1 change: 0 additions & 1 deletion ofborg/src/tasks/githubcommentfilter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ impl worker::SimpleWorker for GitHubCommentWorker {
job: msg,
architectures: build_destinations
.iter()
.cloned()
.map(|arch| arch.to_string())
.collect(),
},
Expand Down
Loading