Update Tuprules and revert Nim to 1.6.10
This commit is contained in:
parent
d5034e2ef5
commit
523eebf571
|
|
@ -8,9 +8,9 @@ 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 = |> ^ nim run %B^$(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o -r %f |> %B.run
|
||||
!nim_run = |> ^o nim run %B^$(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o -r %f |> %B.run
|
||||
|
||||
!symlink = |> ln -s %f %o |>
|
||||
|
||||
!preserves_schema_nim = | $(BIN_DIR)/<preserves_schema_nim> |> ^o generate nim module %B^ $(BIN_DIR)/preserves_schema_nim %f |>
|
||||
!preserves_schemac = | $(BIN_DIR)/<preserves_schemac> |> ^o^ $(BIN_DIR)/preserves_schemac |>
|
||||
!preserves_schemac = | $(BIN_DIR)/<schemac> |> ^o^ $(BIN_DIR)/schemac |>
|
||||
|
|
|
|||
192
flake.lock
192
flake.lock
|
|
@ -1,24 +1,198 @@
|
|||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"eris": {
|
||||
"inputs": {
|
||||
"nimble": "nimble",
|
||||
"nixpkgs": [
|
||||
"ops",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1670701925,
|
||||
"narHash": "sha256-2iF54l6UW7cm/8Fqa0hsHnLNKZGm6NxqfA5NHB94zgI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9bc8e04ebb30c1f7cbf9bc55a8e32bb092dbefa2",
|
||||
"lastModified": 1670785411,
|
||||
"narHash": "sha256-yygCyqvXXMphLUVkaTDF4dxV8w5cVGkZQQ4Mp2ppMig=",
|
||||
"ref": "trunk",
|
||||
"rev": "b2424c4e14ab87ee9f75ac9c8060a4dbdce59520",
|
||||
"revCount": 34,
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/eris/nix-eris"
|
||||
},
|
||||
"original": {
|
||||
"ref": "trunk",
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/eris/nix-eris"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "release-22.11",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gemini": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639155521,
|
||||
"narHash": "sha256-Lh74QEjPIPZSZNvz1zPKEqEjSA6eIci0eDRoZJKIYeE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-gemini",
|
||||
"rev": "2900f752c983974a03e66077f1e6522764486aed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "gemini",
|
||||
"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=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e462a4baf75eeac639b4942481759de08a3bc94e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixos-hardware",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1639153468,
|
||||
"narHash": "sha256-AXlstb8jjYs8HKGTLOuSjIdFLyPQSI5aYPN34qUy+Rc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cf8f41fe116c8e733c833acd4759d9261ecd6d1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-21.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1671312106,
|
||||
"narHash": "sha256-VVai8xLP6P+7xsaCCZsVrJwV0L9/M5nXw+H73T3f2Ic=",
|
||||
"owner": "ehmry",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "98e8530a5d845087e463062c285b8852f80d6702",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ehmry",
|
||||
"ref": "jellyfin",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ops": {
|
||||
"inputs": {
|
||||
"eris": "eris",
|
||||
"gemini": "gemini",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"syndicate": "syndicate"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1671399081,
|
||||
"narHash": "sha256-/6EbOBOCBlriicI3Wy1SS1TODwPaORgZPJMLm3uv6sQ=",
|
||||
"ref": "refs/heads/trunk",
|
||||
"rev": "93e327d92f01ca2c8dba7afc6560183ec7a9f0ea",
|
||||
"revCount": 657,
|
||||
"type": "git",
|
||||
"url": "git://[20a:c3d2:8cf8:f8e5:80fe:9194:3800:87e6]/ops"
|
||||
},
|
||||
"original": {
|
||||
"id": "ops",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"ops": "ops"
|
||||
}
|
||||
},
|
||||
"rust": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"ops",
|
||||
"syndicate",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1663038100,
|
||||
"narHash": "sha256-DpqF/1FYpUo3Fm54oBaXzdqIG7BuRkHHFOgLM0uVVF0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "dbd08f5b5469e1e24f00de45ddc73c26290a2bcb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"syndicate": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"ops",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust": "rust"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1663517796,
|
||||
"narHash": "sha256-9ay9RvgR2hh0ClQ8P6NkbJKIz4gmgcT/vZ7qXiK0Hik=",
|
||||
"ref": "synit",
|
||||
"rev": "3cf46ea6e18cd72c917a2431b716767481262409",
|
||||
"revCount": 68,
|
||||
"type": "git",
|
||||
"url": "https://git.syndicate-lang.org/ehmry/syndicate-flake"
|
||||
},
|
||||
"original": {
|
||||
"ref": "synit",
|
||||
"type": "git",
|
||||
"url": "https://git.syndicate-lang.org/ehmry/syndicate-flake"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -1,8 +1,9 @@
|
|||
{
|
||||
description = "Packages pin";
|
||||
inputs.nixpkgs.url = "github:nixos/nixpkgs/release-22.11";
|
||||
outputs = { self, nixpkgs }:
|
||||
let inherit (nixpkgs) lib;
|
||||
outputs = { self, ops }:
|
||||
let
|
||||
nixpkgs = ops;
|
||||
inherit (ops.inputs.nixpkgs) lib;
|
||||
in {
|
||||
|
||||
overlay = final: prev: {
|
||||
|
|
@ -24,8 +25,8 @@
|
|||
|
||||
devShells = lib.mapAttrs (_: pkgs:
|
||||
with pkgs.extend self.overlay; {
|
||||
default = mkShell { packages = [ ccacheWrapper tup ]; };
|
||||
nim = mkShell { packages = [ ccacheWrapper nim-unwrapped ]; };
|
||||
default = mkShell { packages = [ ccacheWrapper gdb tup ]; };
|
||||
nim = mkShell { packages = [ ccacheWrapper nim-unwrapped nodejs openssl solo5 ]; };
|
||||
config = mkShell { packages = [ gnused ]; };
|
||||
eris = mkShell { packages = [ getdns pkg-config solo5 tkrzw ]; };
|
||||
getdns = mkShell { packages = [ getdns pkg-config ]; };
|
||||
|
|
|
|||
2
nim
2
nim
|
|
@ -1 +1 @@
|
|||
Subproject commit 86dfe484caaec8f6c39e33b7377ddb7dc97c86f8
|
||||
Subproject commit f1519259f85cbdf2d5ff617c6a5534fcd2ff6942
|
||||
Loading…
Reference in New Issue