diff --git a/.envrc b/.envrc index 172993c4..bad73b75 100644 --- a/.envrc +++ b/.envrc @@ -2,8 +2,6 @@ dotenv_if_exists -if [ -f /etc/os-release ] && grep -q '^ID=nixos' /etc/os-release; then - use flake ".#${DIRENV_DEVSHELL:-default}" -fi +# use flake ".#${DIRENV_DEVSHELL:-default}" PATH_add bin diff --git a/.forgejo/workflows/prek-checks.yml b/.forgejo/workflows/prek-checks.yml index ac330ca2..18f573bb 100644 --- a/.forgejo/workflows/prek-checks.yml +++ b/.forgejo/workflows/prek-checks.yml @@ -18,7 +18,7 @@ jobs: persist-credentials: false - name: Install uv - uses: https://github.com/astral-sh/setup-uv@v5 + uses: https://github.com/astral-sh/setup-uv@v6 with: enable-cache: true ignore-nothing-to-cache: true diff --git a/flake.lock b/flake.lock index 4af82c75..51a04c6c 100644 --- a/flake.lock +++ b/flake.lock @@ -516,16 +516,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1753385396, - "narHash": "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY=", - "ref": "10.4.fb", - "rev": "28d4b7276c16ed3e28af1bd96162d6442ce25923", - "revCount": 13318, + "lastModified": 1741308171, + "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=", + "ref": "v9.11.1", + "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986", + "revCount": 13177, "type": "git", "url": "https://forgejo.ellis.link/continuwuation/rocksdb" }, "original": { - "ref": "10.4.fb", + "ref": "v9.11.1", "type": "git", "url": "https://forgejo.ellis.link/continuwuation/rocksdb" } diff --git a/flake.nix b/flake.nix index f0dcb6fb..564cd479 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nix-filter.url = "github:numtide/nix-filter?ref=main"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable"; rocksdb = { - url = "git+https://forgejo.ellis.link/continuwuation/rocksdb?ref=10.4.fb"; + url = "git+https://forgejo.ellis.link/continuwuation/rocksdb?ref=v9.11.1"; flake = false; }; }; @@ -62,7 +62,7 @@ }).overrideAttrs (old: { src = inputs.rocksdb; - version = "v10.4.fb"; + version = "v9.11.1"; cmakeFlags = pkgs.lib.subtractLists [ # No real reason to have snappy or zlib, no one uses this