lkjdsalkjdsalkj

This commit is contained in:
2025-05-08 13:49:28 +02:00
parent a2da17dcbb
commit 9b4a6dcd03
2 changed files with 14 additions and 17 deletions

View File

@@ -1,6 +1,8 @@
#!/usr/bin/env just --justfile
# makes variables accesible as $1 $2 $@, useful for escaping variadics
# TODO: something with NIX_SHOW_STATS=1 NIX_COUNT_CALLS=1 nix-instantiate . -A ....
set positional-arguments := true
export invokedir := invocation_directory()
@@ -439,7 +441,7 @@ bump-new-worktree *packages:
worktree=$(just _new_worktree bump "$(printf "%s\n" "${packages[0]}" | rev | cut -d. -f1 | rev)")
[[ -n "worktree" ]]
cd "$worktree"
bump-here "${packages[@]}"
just bump-here "${packages[@]}"
NIXPKGS_ALLOW_UNFREE=1 "$SHELL"
[no-cd]
@@ -527,8 +529,8 @@ pr $number=`just _a_pr`:
cd prs/pr-"$number"
(set -x; gh pr checkout "$number")
if [[ -n "$upstream_branch" ]]; then
remote="$(tr <<<"upstream_branch" -d/ -f1)"
branch="$(tr <<<"upstream_branch" -d/ -f2)"
remote="$(cut <<<"$upstream_branch" -d'/' -f1)"
branch="$(cut <<<"$upstream_branch" -d'/' -f2)"
(set -x; $GIT pull --rebase "$remote" "$branch" || $GIT rebase --abort) ||:
fi
fi

View File

@@ -336,15 +336,16 @@ let
{
requiredSystemFeatures = prevAttrs.requiredSystemFeatures or [ ] ++ [
"ccache"
# "sccache"
#"sccache"
##"sccache-redis"
];
# RUSTC_WRAPPER = lib.getExe final.sccache;
# SCCACHE_DIR = "/var/cache/sccache";
# # SCCACHE_REDIS_ENDPOINT = "redis+unix://run/redis-nix-sccache/redis.sock";
# # SCCACHE_IDLE_TIMEOUT = 0;
# SCCACHE_CACHE_ZSTD_LEVEL = 19;
# # SCCACHE_LOG = "debug";
# # SCCACHE_NO_DAEMON = true;
#RUSTC_WRAPPER = lib.getExe final.sccache;
#SCCACHE_DIR = "/var/cache/sccache";
#SCCACHE_CACHE_ZSTD_LEVEL = 19;
## SCCACHE_REDIS_ENDPOINT = "redis+unix://run/redis-nix-sccache/redis.sock";
## SCCACHE_IDLE_TIMEOUT = 0;
## SCCACHE_LOG = "debug";
## SCCACHE_NO_DAEMON = true;
}
// prevAttrs
);
@@ -506,12 +507,6 @@ let
{
pkgsCuda = mkPkgs { config.cudaSupport = true; };
pkgsRocm = mkPkgs { config.rocmSupport = true; };
# pkgsDarwin?
# pkgsLinux?
# pkgsFreeBSD?
# pkgsNetBSD?
# pkgsOpenBSD?
# pkgsWindows?
};
in