Use this flake from direnv through an indirection

Tup is invoking direnv and direnv is invoking nix-flake and this
is creating false dependency relations for Tup. Use this flake
through the flake registry to introducing caching behavior.
This commit is contained in:
Ehmry - 2023-01-18 15:50:55 -06:00
parent f2eb08d7db
commit 75f45dc1f2
4 changed files with 21 additions and 53 deletions

2
.envrc
View File

@ -1,3 +1,3 @@
use flake .#
use flake work
PATH_add bin
PATH_add nim/bin

9
.gitignore vendored
View File

@ -1,9 +0,0 @@
.direnv
.tup
bin
##### TUP GITIGNORE #####
##### Lines below automatically generated by Tup.
##### Do not edit.
.tup
/.gitignore
/bin

View File

@ -8,8 +8,8 @@ BIN_DIR = $(TUP_CWD)/bin
NIM_BACKEND = compile
!nim = |> ^o nim compile %B^ $(DIRENV) nim $(NIM_BACKEND) --hints:off -o:%o %f |> %B
!nim_run = |> ^o nim run %B^$(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o -r %f |> %B.run
!nim_bin = |> ^o nim bin %B^$(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o %f |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B>
!nim_run = |> ^o nim run %B^ $(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o -r %f |> %B.run
!nim_bin = |> ^o nim bin %B^ $(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o %f |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B>
!symlink = |> ln -s %f %o |>

View File

@ -2,23 +2,21 @@
"nodes": {
"eris": {
"inputs": {
"nimble": "nimble",
"nixpkgs": [
"ops",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670785411,
"narHash": "sha256-yygCyqvXXMphLUVkaTDF4dxV8w5cVGkZQQ4Mp2ppMig=",
"ref": "trunk",
"rev": "b2424c4e14ab87ee9f75ac9c8060a4dbdce59520",
"revCount": 34,
"lastModified": 1673553193,
"narHash": "sha256-fw8DQs+NrFfZTSlwWNGbEZ8rre69YOKAIsk1MqJIFgY=",
"ref": "refs/heads/trunk",
"rev": "008b29ca3b27e53e678b6c2f11da98d2755fe437",
"revCount": 48,
"type": "git",
"url": "https://codeberg.org/eris/nix-eris"
},
"original": {
"ref": "trunk",
"type": "git",
"url": "https://codeberg.org/eris/nix-eris"
}
@ -55,34 +53,13 @@
"type": "indirect"
}
},
"nimble": {
"inputs": {
"nixpkgs": [
"ops",
"eris",
"nixpkgs"
]
},
"locked": {
"lastModified": 1667353956,
"narHash": "sha256-3p6X2Lf+2grUsHExWVGJIUgpS+chL2qgqS/HcCdrl28=",
"owner": "nix-community",
"repo": "flake-nimble",
"rev": "5be8c215324614409044420e1468668d02e1b449",
"type": "github"
},
"original": {
"id": "nimble",
"type": "indirect"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1671228065,
"narHash": "sha256-Az/ig9LVL5xdqtyl4/CVKJIH1G7sP/9Ott2XnNyie0E=",
"lastModified": 1673440569,
"narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e462a4baf75eeac639b4942481759de08a3bc94e",
"rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6",
"type": "github"
},
"original": {
@ -108,16 +85,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1671312106,
"narHash": "sha256-VVai8xLP6P+7xsaCCZsVrJwV0L9/M5nXw+H73T3f2Ic=",
"owner": "ehmry",
"lastModified": 1673450908,
"narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "98e8530a5d845087e463062c285b8852f80d6702",
"rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e",
"type": "github"
},
"original": {
"owner": "ehmry",
"ref": "jellyfin",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -131,11 +108,11 @@
"syndicate": "syndicate"
},
"locked": {
"lastModified": 1671399081,
"narHash": "sha256-/6EbOBOCBlriicI3Wy1SS1TODwPaORgZPJMLm3uv6sQ=",
"lastModified": 1673902012,
"narHash": "sha256-jbvQJgMqeB6q0mWi0RU9NYS7luoE8x8yY5XzQ2WY/Jk=",
"ref": "refs/heads/trunk",
"rev": "93e327d92f01ca2c8dba7afc6560183ec7a9f0ea",
"revCount": 657,
"rev": "df23e65b3d67a19f11a1ee455845ddcc68c454d9",
"revCount": 673,
"type": "git",
"url": "git://[20a:c3d2:8cf8:f8e5:80fe:9194:3800:87e6]/ops"
},