chore: re-add nix stuff from @waalge

Co-authored-by: waalge
This commit is contained in:
rvcas 2023-06-07 17:16:56 -04:00
parent 8d107b1293
commit 41a08e4a06
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
3 changed files with 14 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/.direnv
/target
.idea
_site/

View File

@ -63,9 +63,12 @@ fn main() -> miette::Result<()> {
}
fn version() -> String {
use std::env;
let nix_git_rev = env::var("GIT_REVISION").unwrap_or("unknown".to_string());
format!(
"v{} {}",
built_info::PKG_VERSION,
built_info::GIT_COMMIT_HASH_SHORT.unwrap_or("unknown")
built_info::GIT_COMMIT_HASH_SHORT.unwrap_or(&nix_git_rev)
)
}

View File

@ -54,10 +54,18 @@
package = packages.aiken;
}
];
in rec {
gitRev = if (builtins.hasAttr "rev" self)
then self.rev
else "dirty";
in {
inherit packages;
devShell = rustPkgs.workspaceShell {
packages = [deno];
shellHook =
''
export GIT_REVISION=${gitRev}
'';
};
devShells = {
aiken = pkgs.devshell.mkShell {