removed nix artifacts

This commit is contained in:
2025-04-19 12:45:02 -04:00
parent 80b6453597
commit b6be68b235
6 changed files with 2 additions and 132 deletions

27
flake.lock generated
View File

@@ -1,27 +0,0 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1737746512,
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@@ -1,60 +0,0 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
outputs = { self, nixpkgs }:
let
pkgs = import nixpkgs {
system = "x86_64-linux"; # Replace with your target system if necessary
};
slashBuild = pkgs.rustPlatform.buildRustPackage rec {
pname = "slash";
version = "v0.2.0";
src = pkgs.fetchFromGitHub {
owner = "pagedMov";
repo = "slash";
rev = "65a7a713a954c0f3fba668c6d7e0cdd023f705f7";
hash = "sha256-AVBDv0HQn7hAGo0tW1ZFCdfO4+3VJQ0mCDkow8skD7U=";
};
doCheck = false; # TODO: Find a way to make tests work
cargoHash = "sha256-lekH6AESWpKjp6mCW7KgN6ACNcG8bHAg4Pu4OXhGJ3Y=";
nativeBuildInputs = [
pkgs.openssl
pkgs.openssl.dev
pkgs.pkg-config
];
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
passthru = {
shellPath = "/bin/slash";
};
};
in
{
packages.${pkgs.system}.default = slashBuild;
devShells.default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.rust-bin.stable.latest.default
pkgs.gcc
pkgs.clang
pkgs.pkg-config
pkgs.libgit2
pkgs.libssh2
pkgs.libssh2.dev
pkgs.openssl
pkgs.openssl.dev
pkgs.llvm
pkgs.libclang
pkgs.pam
];
shellHook = ''
exec slash
'';
};
};
}

View File

@@ -1,25 +0,0 @@
{ inputs, lib, ... }: {
imports = [
inputs.devshell.flakeModule
];
config.perSystem =
{ pkgs
, ...
}: {
config.devshells.default = {
imports = [
"${inputs.devshell}/extra/language/c.nix"
# "${inputs.devshell}/extra/language/rust.nix"
];
commands = with pkgs; [
{ package = rust-toolchain; category = "rust"; }
];
language.c = {
libraries = lib.optional pkgs.stdenv.isDarwin pkgs.libiconv;
};
};
};
}

View File

@@ -1,18 +0,0 @@
{ inputs, ... }:
let
overlays = [
(import inputs.rust-overlay)
(self: super: assert !(super ? rust-toolchain); rec {
rust-toolchain = super.rust-bin.fromRustupToolchainFile ../../rust-toolchain.toml;
# buildRustCrate/crate2nix depend on this.
rustc = rust-toolchain;
cargo = rust-toolchain;
})
];
in
{
perSystem = { system, ... }: {
_module.args.pkgs = import inputs.nixpkgs { inherit system overlays; config = { }; };
};
}

View File

@@ -248,8 +248,7 @@ impl Display for ShErr {
"{padding}{arrow} [{line_fmt};{col_fmt}]", "{padding}{arrow} [{line_fmt};{col_fmt}]",
)?; )?;
let mut bar = format!("{padding}|"); let bar = format!("{padding}|").styled(Style::Cyan | Style::Bold);
bar = bar.styled(Style::Cyan | Style::Bold);
writeln!(f,"{bar}")?; writeln!(f,"{bar}")?;
let mut first_ind_ln = true; let mut first_ind_ln = true;

View File

@@ -30,6 +30,7 @@ pub const OPENERS: [&'static str;6] = [
"case" "case"
]; ];
/// Span::new(10..20)
#[derive(Clone,PartialEq,Default,Debug)] #[derive(Clone,PartialEq,Default,Debug)]
pub struct Span { pub struct Span {
range: Range<usize>, range: Range<usize>,