blog/Blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ensure treesitter parsers are picked up in nix git submodules

Browse Source
This commit is contained in:
Price Hiller 2024-04-15 13:01:30 -05:00
parent b8df40f149
commit 320dfbaef2
Signed by: Price
GPG Key ID: C3FADDE7A8534BEB
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1712963716,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,7 +37,25 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"self": "self"
}
},
"self": {
"flake": false,
"locked": {
"dirtyRev": "b8df40f1494c211c36bf1426a249bf8c448066d5-dirty",
"dirtyShortRev": "b8df40f-dirty",
"lastModified": 1712945559,
"narHash": "sha256-4VxNKgCoj8j67p/g/ED4CODyw/91zteY6NrjH6UxF78=",
"submodules": true,
"type": "git",
"url": "file:./."
},
"original": {
"submodules": true,
"type": "git",
"url": "file:./."
} }
}, },
"systems": { "systems": {

16
flake.nix
View File

@ -2,13 +2,25 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = github:numtide/flake-utils; flake-utils.url = "github:numtide/flake-utils";
self = {
flake = false;
type = "git";
url = "git+file:./.?submodules=1";
};
}; };
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
# src = builtins.fetchGit {
# url = ./.;
# # inherit (self) (rev or dirtyRev);
# rev = toString (self.rev or self.dirtyRev);
# # shallow = true;
# submodules = true;
# };
rust-toolchain = pkgs.symlinkJoin { rust-toolchain = pkgs.symlinkJoin {
name = "rust-toolchain"; name = "rust-toolchain";
paths = with pkgs; [ paths = with pkgs; [
@ -25,7 +37,7 @@
# shoves the newly created static site into the result. # shoves the newly created static site into the result.
packages.default = pkgs.rustPlatform.buildRustPackage { packages.default = pkgs.rustPlatform.buildRustPackage {
name = "blog"; name = "blog";
src = ./.; src = "${self}";
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
postBuild = '' postBuild = ''
./target/*/release/blog ./target/*/release/blog