Qyriad/dynix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename to dynix

Browse source
This commit is contained in:
Qyriad 2026-02-02 11:34:52 +01:00
parent 80ff0b36cb
commit 8477c73067
7 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -52,20 +52,6 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "append-override"
version = "0.1.0"
dependencies = [
"clap",
"command-error",
"fs-err",
"itertools",
"libc",
"serde",
"serde_json",
"tap",
]
[[package]]
name = "autocfg"
version = "1.5.0"
@ -154,6 +140,20 @@ version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
[[package]]
name = "dynix"
version = "0.1.0"
dependencies = [
"clap",
"command-error",
"fs-err",
"itertools",
"libc",
"serde",
"serde_json",
"tap",
]
[[package]]
name = "either"
version = "1.15.0"

6
Cargo.toml
View file

@ -1,14 +1,14 @@
[package]
name = "append-override"
name = "dynix"
version = "0.1.0"
edition = "2024"
[[bin]]
name = "append-override"
name = "dynix"
path = "src/main.rs"
[lib]
name = "append_override"
name = "dynix"
path = "src/lib.rs"
[dependencies]

10
default.nix
View file

@ -6,15 +6,15 @@
}: let
inherit (qpkgs) lib;
PKGNAME = qpkgs.callPackage ./package.nix { };
dynix = qpkgs.callPackage ./package.nix { };
byStdenv = lib.mapAttrs (stdenvName: stdenv: let
withStdenv = PKGNAME.override { inherit stdenv; };
PKGNAME' = withStdenv.overrideAttrs (prev: {
withStdenv = dynix.override { inherit stdenv; };
dynix' = withStdenv.overrideAttrs (prev: {
pname = "${prev.pname}-${stdenvName}";
});
in PKGNAME') qpkgs.validStdenvs;
in dynix') qpkgs.validStdenvs;
in PKGNAME.overrideAttrs (prev: lib.recursiveUpdate prev {
in dynix.overrideAttrs (prev: lib.recursiveUpdate prev {
passthru = { inherit byStdenv; };
})

16
flake.nix
View file

@ -21,21 +21,21 @@
qpkgs = import qyriad-nur { inherit pkgs; };
inherit (qpkgs) lib;
PKGNAME = import ./default.nix { inherit pkgs qpkgs; };
dynix = import ./default.nix { inherit pkgs qpkgs; };
extraVersions = lib.mapAttrs' (stdenvName: value: {
name = "${stdenvName}-PKGNAME";
name = "${stdenvName}-dynix";
inherit value;
}) PKGNAME.byStdenv;
}) dynix.byStdenv;
devShell = import ./shell.nix { inherit pkgs qpkgs PKGNAME; };
devShell = import ./shell.nix { inherit pkgs qpkgs dynix; };
extraDevShells = lib.mapAttrs' (stdenvName: value: {
name = "${stdenvName}-PKGNAME";
name = "${stdenvName}-dynix";
inherit value;
}) PKGNAME.byStdenv;
}) dynix.byStdenv;
in {
packages = extraVersions // {
default = PKGNAME;
inherit PKGNAME;
default = dynix;
inherit dynix;
};
devShells = extraDevShells // {

2
package.nix
View file

@ -81,6 +81,6 @@ in stdenv.mkDerivation (self: {
});
meta = {
mainProgram = "PKGNAME";
mainProgram = "dynix";
};
}))

8
shell.nix
View file

@ -3,14 +3,14 @@
qpkgs ? let
src = fetchTarball "https://github.com/Qyriad/nur-packages/archive/main.tar.gz";
in import src { inherit pkgs; },
PKGNAME ? import ./default.nix { inherit pkgs qpkgs; },
dynix ? import ./default.nix { inherit pkgs qpkgs; },
}: let
inherit (pkgs) lib;
mkDevShell = PKGNAME: qpkgs.callPackage PKGNAME.mkDevShell { };
devShell = mkDevShell PKGNAME;
mkDevShell = dynix: qpkgs.callPackage dynix.mkDevShell { };
devShell = mkDevShell dynix;
byStdenv = lib.mapAttrs (lib.const mkDevShell) PKGNAME.byStdenv;
byStdenv = lib.mapAttrs (lib.const mkDevShell) dynix.byStdenv;
in devShell.overrideAttrs (prev: lib.recursiveUpdate prev {
passthru = { inherit byStdenv; };

16
src/main.rs
View file

@ -5,17 +5,17 @@ use std::path::{Path, PathBuf};
use std::process::ExitCode;
use std::{error::Error as StdError, sync::Arc};
use append_override::source::SourceFile;
use dynix::source::SourceFile;
use clap::{ColorChoice, Parser as _};
use fs_err::File;
use fs_err::os::unix::fs::OpenOptionsExt;
fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
let args = append_override::Parser::parse();
let args = dynix::Parser::parse();
dbg!(&args);
let success = append_override::CLI_ENABLE_COLOR.set(match args.color {
let success = dynix::CLI_ENABLE_COLOR.set(match args.color {
ColorChoice::Always => true,
ColorChoice::Auto => io::stdin().is_terminal(),
ColorChoice::Never => false,
@ -34,7 +34,7 @@ fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
};
// Get what file that thing is defined in.
let def_path = append_override::get_where(&args.name, &filepath)?;
let def_path = dynix::get_where(&args.name, &filepath)?;
dbg!(&def_path);
let def_path = Arc::from(def_path);
let mut opts = File::options();
@ -44,10 +44,10 @@ fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
.custom_flags(libc::O_CLOEXEC);
let source_file = SourceFile::open_from(Arc::clone(&def_path), opts)?;
let pri = append_override::get_highest_prio(&args.name, source_file.clone())?;
let pri = dynix::get_highest_prio(&args.name, source_file.clone())?;
let new_pri = pri - 1;
let new_pri_line = append_override::get_next_prio_line(
let new_pri_line = dynix::get_next_prio_line(
source_file.clone(),
args.name.into(),
new_pri,
@ -56,7 +56,7 @@ fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
eprintln!("new_pri_line={new_pri_line}");
append_override::write_next_prio(source_file, new_pri_line)?;
dynix::write_next_prio(source_file, new_pri_line)?;
Ok(())
}
@ -65,7 +65,7 @@ fn main() -> ExitCode {
match main_wrapped() {
Ok(_) => ExitCode::SUCCESS,
Err(e) => {
eprintln!("append-override: error: {}", e);
eprintln!("dynix: error: {}", e);
ExitCode::FAILURE
}
}