maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix-daemon): upgrade to 2024 edition

Browse source 
Part of #114
This edition change doesn't affect this crate except for formatting.

Change-Id: I8e2650f6de776658a14ee5a11bc7a63ad57fae89
Reviewed-on: https://cl.snix.dev/c/snix/+/30591
Reviewed-by: Florian Klink <flokli@flokli.de>
Autosubmit: Bence Nemes <nemes.bence1@gmail.com>
Tested-by: besadii
This commit is contained in:
Starnick4444 2025-06-30 22:19:02 +02:00 • committed by clbot
parent 5602582a9e
commit d829261a09
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snix/Cargo.nix
View file

@ -8495,7 +8495,7 @@ rec {
"nix-daemon" = rec { "nix-daemon" = rec {
crateName = "nix-daemon"; crateName = "nix-daemon";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2024";
crateBin = [ crateBin = [
{ {
name = "nix-daemon"; name = "nix-daemon";

2
snix/nix-daemon/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "nix-daemon" name = "nix-daemon"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
[dependencies] [dependencies]
async-trait = "0.1.83" async-trait = "0.1.83"

2
snix/nix-daemon/rustfmt.toml Normal file
View file

@ -0,0 +1,2 @@
# FUTUREWORK: move to .. once all crates are migrated (#114)
edition = "2024"

2
snix/nix-daemon/src/bin/nix-daemon.rs
View file

@ -2,7 +2,7 @@ use clap::Parser;
use mimalloc::MiMalloc; use mimalloc::MiMalloc;
use nix_compat::nix_daemon::handler::NixDaemon; use nix_compat::nix_daemon::handler::NixDaemon;
use nix_daemon::SnixDaemon; use nix_daemon::SnixDaemon;
use snix_store::utils::{construct_services, ServiceUrlsGrpc}; use snix_store::utils::{ServiceUrlsGrpc, construct_services};
use std::{error::Error, sync::Arc}; use std::{error::Error, sync::Arc};
use tokio_listener::SystemOptions; use tokio_listener::SystemOptions;
use tracing::error; use tracing::error;

4
snix/nix-daemon/src/lib.rs
View file

@ -5,11 +5,11 @@ use std::{
use nix_compat::{ use nix_compat::{
nix_daemon::{ nix_daemon::{
types::{AddToStoreNarRequest, UnkeyedValidPathInfo},
NixDaemonIO, NixDaemonIO,
types::{AddToStoreNarRequest, UnkeyedValidPathInfo},
}, },
nixbase32, nixbase32,
store_path::{build_ca_path, StorePath}, store_path::{StorePath, build_ca_path},
}; };
use snix_castore::{blobservice::BlobService, directoryservice::DirectoryService}; use snix_castore::{blobservice::BlobService, directoryservice::DirectoryService};
use snix_store::{nar::ingest_nar_and_hash, path_info::PathInfo, pathinfoservice::PathInfoService}; use snix_store::{nar::ingest_nar_and_hash, path_info::PathInfo, pathinfoservice::PathInfoService};