rename to dynix
This commit is contained in:
parent
80ff0b36cb
commit
8477c73067
7 changed files with 43 additions and 43 deletions
28
Cargo.lock
generated
28
Cargo.lock
generated
|
|
@ -52,20 +52,6 @@ dependencies = [
|
||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "append-override"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"clap",
|
|
||||||
"command-error",
|
|
||||||
"fs-err",
|
|
||||||
"itertools",
|
|
||||||
"libc",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"tap",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
|
|
@ -154,6 +140,20 @@ version = "1.0.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
|
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dynix"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"clap",
|
||||||
|
"command-error",
|
||||||
|
"fs-err",
|
||||||
|
"itertools",
|
||||||
|
"libc",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"tap",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.15.0"
|
version = "1.15.0"
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
[package]
|
[package]
|
||||||
name = "append-override"
|
name = "dynix"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "append-override"
|
name = "dynix"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "append_override"
|
name = "dynix"
|
||||||
path = "src/lib.rs"
|
path = "src/lib.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
|
||||||
10
default.nix
10
default.nix
|
|
@ -6,15 +6,15 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (qpkgs) lib;
|
inherit (qpkgs) lib;
|
||||||
|
|
||||||
PKGNAME = qpkgs.callPackage ./package.nix { };
|
dynix = qpkgs.callPackage ./package.nix { };
|
||||||
|
|
||||||
byStdenv = lib.mapAttrs (stdenvName: stdenv: let
|
byStdenv = lib.mapAttrs (stdenvName: stdenv: let
|
||||||
withStdenv = PKGNAME.override { inherit stdenv; };
|
withStdenv = dynix.override { inherit stdenv; };
|
||||||
PKGNAME' = withStdenv.overrideAttrs (prev: {
|
dynix' = withStdenv.overrideAttrs (prev: {
|
||||||
pname = "${prev.pname}-${stdenvName}";
|
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; };
|
passthru = { inherit byStdenv; };
|
||||||
})
|
})
|
||||||
|
|
|
||||||
16
flake.nix
16
flake.nix
|
|
@ -21,21 +21,21 @@
|
||||||
qpkgs = import qyriad-nur { inherit pkgs; };
|
qpkgs = import qyriad-nur { inherit pkgs; };
|
||||||
inherit (qpkgs) lib;
|
inherit (qpkgs) lib;
|
||||||
|
|
||||||
PKGNAME = import ./default.nix { inherit pkgs qpkgs; };
|
dynix = import ./default.nix { inherit pkgs qpkgs; };
|
||||||
extraVersions = lib.mapAttrs' (stdenvName: value: {
|
extraVersions = lib.mapAttrs' (stdenvName: value: {
|
||||||
name = "${stdenvName}-PKGNAME";
|
name = "${stdenvName}-dynix";
|
||||||
inherit value;
|
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: {
|
extraDevShells = lib.mapAttrs' (stdenvName: value: {
|
||||||
name = "${stdenvName}-PKGNAME";
|
name = "${stdenvName}-dynix";
|
||||||
inherit value;
|
inherit value;
|
||||||
}) PKGNAME.byStdenv;
|
}) dynix.byStdenv;
|
||||||
in {
|
in {
|
||||||
packages = extraVersions // {
|
packages = extraVersions // {
|
||||||
default = PKGNAME;
|
default = dynix;
|
||||||
inherit PKGNAME;
|
inherit dynix;
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells = extraDevShells // {
|
devShells = extraDevShells // {
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,6 @@ in stdenv.mkDerivation (self: {
|
||||||
});
|
});
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
mainProgram = "PKGNAME";
|
mainProgram = "dynix";
|
||||||
};
|
};
|
||||||
}))
|
}))
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,14 @@
|
||||||
qpkgs ? let
|
qpkgs ? let
|
||||||
src = fetchTarball "https://github.com/Qyriad/nur-packages/archive/main.tar.gz";
|
src = fetchTarball "https://github.com/Qyriad/nur-packages/archive/main.tar.gz";
|
||||||
in import src { inherit pkgs; },
|
in import src { inherit pkgs; },
|
||||||
PKGNAME ? import ./default.nix { inherit pkgs qpkgs; },
|
dynix ? import ./default.nix { inherit pkgs qpkgs; },
|
||||||
}: let
|
}: let
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
mkDevShell = PKGNAME: qpkgs.callPackage PKGNAME.mkDevShell { };
|
mkDevShell = dynix: qpkgs.callPackage dynix.mkDevShell { };
|
||||||
devShell = mkDevShell PKGNAME;
|
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 {
|
in devShell.overrideAttrs (prev: lib.recursiveUpdate prev {
|
||||||
passthru = { inherit byStdenv; };
|
passthru = { inherit byStdenv; };
|
||||||
|
|
|
||||||
16
src/main.rs
16
src/main.rs
|
|
@ -5,17 +5,17 @@ use std::path::{Path, PathBuf};
|
||||||
use std::process::ExitCode;
|
use std::process::ExitCode;
|
||||||
use std::{error::Error as StdError, sync::Arc};
|
use std::{error::Error as StdError, sync::Arc};
|
||||||
|
|
||||||
use append_override::source::SourceFile;
|
use dynix::source::SourceFile;
|
||||||
use clap::{ColorChoice, Parser as _};
|
use clap::{ColorChoice, Parser as _};
|
||||||
use fs_err::File;
|
use fs_err::File;
|
||||||
use fs_err::os::unix::fs::OpenOptionsExt;
|
use fs_err::os::unix::fs::OpenOptionsExt;
|
||||||
|
|
||||||
fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
|
fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
|
||||||
let args = append_override::Parser::parse();
|
let args = dynix::Parser::parse();
|
||||||
|
|
||||||
dbg!(&args);
|
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::Always => true,
|
||||||
ColorChoice::Auto => io::stdin().is_terminal(),
|
ColorChoice::Auto => io::stdin().is_terminal(),
|
||||||
ColorChoice::Never => false,
|
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.
|
// 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);
|
dbg!(&def_path);
|
||||||
let def_path = Arc::from(def_path);
|
let def_path = Arc::from(def_path);
|
||||||
let mut opts = File::options();
|
let mut opts = File::options();
|
||||||
|
|
@ -44,10 +44,10 @@ fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
|
||||||
.custom_flags(libc::O_CLOEXEC);
|
.custom_flags(libc::O_CLOEXEC);
|
||||||
let source_file = SourceFile::open_from(Arc::clone(&def_path), opts)?;
|
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 = pri - 1;
|
||||||
|
|
||||||
let new_pri_line = append_override::get_next_prio_line(
|
let new_pri_line = dynix::get_next_prio_line(
|
||||||
source_file.clone(),
|
source_file.clone(),
|
||||||
args.name.into(),
|
args.name.into(),
|
||||||
new_pri,
|
new_pri,
|
||||||
|
|
@ -56,7 +56,7 @@ fn main_wrapped() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
|
||||||
|
|
||||||
eprintln!("new_pri_line={new_pri_line}");
|
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(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -65,7 +65,7 @@ fn main() -> ExitCode {
|
||||||
match main_wrapped() {
|
match main_wrapped() {
|
||||||
Ok(_) => ExitCode::SUCCESS,
|
Ok(_) => ExitCode::SUCCESS,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("append-override: error: {}", e);
|
eprintln!("dynix: error: {}", e);
|
||||||
ExitCode::FAILURE
|
ExitCode::FAILURE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue