From 9b4a6dcd0379fad978a4c37e7bd06a37504e40a0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 8 May 2025 13:49:28 +0200 Subject: [PATCH] lkjdsalkjdsalkj --- justfile | 8 +++++--- overlays.nix | 23 +++++++++-------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/justfile b/justfile index 0d65000..82b0392 100644 --- a/justfile +++ b/justfile @@ -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 diff --git a/overlays.nix b/overlays.nix index be2c3a1..76d4e4c 100755 --- a/overlays.nix +++ b/overlays.nix @@ -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