02-15-25 update

This commit is contained in:
2025-02-15 20:31:57 -05:00
parent 95c4f2bb0c
commit 7326ab40f0
13 changed files with 77 additions and 48 deletions

View File

@@ -20,7 +20,8 @@ in
});
myPkgs = {
# Packages that I've made
lash = super.callPackage ./pkgs/lash/package.nix {};
slash = super.callPackage ./pkgs/slash/package.nix {};
fzf-tab = super.callPackage ./pkgs/zsh-fzf-tab/package.nix {};
};
myScripts = {
# Scripts written using pkgs.writeShellApplication

View File

@@ -1,29 +0,0 @@
#!/usr/bin/env bash
export GIT_SSH_COMMAND="ssh -F /dev/null"
curl -O https://raw.githubusercontent.com/pagedMov/lash/refs/heads/master/Cargo.lock
NEW_SRC=$(fetchfromgh pagedMov/lash)
REV_SHORT=$(git ls-remote git@github.com:pagedMov/lash.git HEAD | awk '{print substr($1, 1, 7)}')
CUR_TAG=$(git ls-remote --tags git@github.com:pagedMov/lash.git | tail -n 2 | head -n 1 | cut -f2 | cut -d'/' -f3)
NEW_VER="${CUR_TAG}_$REV_SHORT"
cat <<EOF
{ pkgs ? import <nixpkgs> {} }:
pkgs.rustPlatform.buildRustPackage rec {
pname = "lash";
version = "$NEW_VER";
$NEW_SRC
doCheck = false; # TODO: Find a way to make tests work
cargoLock.lockFile = ./Cargo.lock;
passthru = {
shellPath = "/bin/lash";
};
}
EOF

View File

@@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
[[package]]
name = "lash"
name = "slash"
version = "0.1.0"
dependencies = [
"bincode",

View File

@@ -1,14 +1,14 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.rustPlatform.buildRustPackage rec {
pname = "lash";
version = "v0.5.0_5c038fb";
pname = "slash";
version = "v0.5.0_662cb43";
src = pkgs.fetchFromGitHub {
owner = "pagedMov";
repo = "lash";
rev = "5c038fbb569fdad802f22fa0bd5ca9a839dcaed8";
hash = "sha256-AGItl4LN8hWqcNmE6d9snIkaV/FZKKD58e2pf7A22UA=";
repo = "slash";
rev = "662cb43e499d179579d99bf358073516605230ea";
hash = "sha256-4DKAhRkd1XeDNyYH8yL1TnbTc6hZnp2+UV7UYeDRkpE=";
};
@@ -17,6 +17,6 @@ pkgs.rustPlatform.buildRustPackage rec {
cargoLock.lockFile = ./Cargo.lock;
passthru = {
shellPath = "/bin/lash";
shellPath = "/bin/slash";
};
}

View File

@@ -0,0 +1,29 @@
#!/usr/bin/env bash
export GIT_SSH_COMMAND="ssh -F /dev/null"
curl -O https://raw.githubusercontent.com/pagedMov/slash/refs/heads/master/Cargo.lock
NEW_SRC=$(fetchfromgh pagedMov/slash)
REV_SHORT=$(git ls-remote git@github.com:pagedMov/slash.git HEAD | awk '{print substr($1, 1, 7)}')
CUR_TAG=$(git ls-remote --tags git@github.com:pagedMov/slash.git | tail -n 2 | head -n 1 | cut -f2 | cut -d'/' -f3)
NEW_VER="${CUR_TAG}_$REV_SHORT"
cat <<EOF
{ pkgs ? import <nixpkgs> {} }:
pkgs.rustPlatform.buildRustPackage rec {
pname = "slash";
version = "$NEW_VER";
$NEW_SRC
doCheck = false; # TODO: Find a way to make tests work
cargoLock.lockFile = ./Cargo.lock;
passthru = {
shellPath = "/bin/slash";
};
}
EOF

View File

@@ -0,0 +1,16 @@
{ pkgs ? import <nixpkgs> { } }:
pkgs.stdenv.mkDerivation {
pname = "fzf-tab";
version = "v1.1.2";
src = pkgs.fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "6aced3f35def61c5edf9d790e945e8bb4fe7b305";
hash = "sha256-EWMeslDgs/DWVaDdI9oAS46hfZtp4LHTRY8TclKTNK8=";
};
installPhase = ''
cp -r $src $out
'';
}