waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: waalge:c925d09792ad6285c8aca2c801e541bbe8bfc3b5
Branches Tags
waalge:waalge/direnv
waalge:waalge/bump-flake-cargo-1-85
waalge:waalge/new-include-validator-template
waalge:w/bump-nix
waalge:waalge/moonrat
waalge:waalge/git-rev
waalge:waalge/rm-unused-pub-func
waalge:w/pub-func
...
compare: waalge:15a43d1a87ebf91834507002d169a7b348ade705
Branches Tags
waalge:waalge/bump-flake-cargo-1-85
waalge:waalge/new-include-validator-template
waalge:w/bump-nix
waalge:waalge/moonrat
waalge:waalge/git-rev
waalge:waalge/rm-unused-pub-func
waalge:w/pub-func
waalge:waalge/direnv

3 Commits
c925d09792 ... 15a43d1a87

Author SHA1 Message Date
waalge 15a43d1a87 fix rust version 2023-09-27 22:25:55 +00:00
waalge cf7020c528 shortRev 2023-09-27 21:27:55 +00:00
waalge 873b39169e rev 2023-09-27 21:03:47 +00:00
2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
crates/aiken/src/cmd/mod.rs
View File

@ -1,5 +1,4 @@
use clap::Parser; use clap::Parser;
use std::env;
pub mod blueprint; pub mod blueprint;
pub mod build; pub mod build;
@ -57,7 +56,6 @@ fn version() -> String {
format!( format!(
"v{} {}", "v{} {}",
built_info::PKG_VERSION, built_info::PKG_VERSION,
built_info::GIT_COMMIT_HASH_SHORT built_info::GIT_COMMIT_HASH_SHORT.unwrap_or("unknown")
.unwrap_or(&env::var("GIT_COMMIT_HASH_SHORT").unwrap_or("unknown".to_string()))
) )
} }

6
flake.nix
View File

@ -31,10 +31,12 @@
src = pkgs.lib.cleanSourceWith { src = self; }; src = pkgs.lib.cleanSourceWith { src = self; };
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
GIT_COMMIT_HASH_SHORT = self.rev or "dirty"; # or self.dirtyRev;
GIT_COMMIT_HASH_SHORT = self.shortRev or "dirty"; # or self.dirtyRev;
postPatch = '' postPatch = ''
substituteInPlace crates/aiken/src/cmd/mod.rs --replace "built_info::GIT_COMMIT_HASH_SHORT" "\"$GIT_COMMIT_HASH_SHORT\"" substituteInPlace crates/aiken/src/cmd/mod.rs \
--replace "built_info::GIT_COMMIT_HASH_SHORT" \
"Some(\"$GIT_COMMIT_HASH_SHORT\")"
''; '';
postInstall = '' postInstall = ''