this repo has no description

better rev handling

0xda157 4ef30b88 6b31d24a

+7 -14
+3 -1
flake.nix
··· 16 16 in 17 17 { 18 18 packages = forEachPkgs (pkgs: { 19 - default = pkgs.callPackage ./package.nix { inherit self; }; 19 + default = pkgs.callPackage ./package.nix { 20 + version = self.shortRev or self.dirtyShortRev or "dirty"; 21 + }; 20 22 }); 21 23 22 24 devShells = forEachPkgs (pkgs: {
+4 -13
package.nix
··· 1 1 { 2 - self, 2 + version, 3 3 lib, 4 4 stdenv, 5 5 zola, 6 6 }: 7 - let 8 - commit = self.rev or (lib.removeSuffix "-dirty" self.dirtyRev); 9 - rev = lib.pipe (self.rev or self.dirtyRev) [ 10 - lib.stringToCharacters 11 - (lib.take 5) 12 - lib.concatStrings 13 - (str: if self ? rev then str else "${str}-dirty") 14 - ]; 15 - in 16 7 stdenv.mkDerivation { 17 8 pname = "da157dotid"; 18 - version = "0+commit=${rev}"; 9 + version = "0+rev=${version}"; 19 10 20 11 src = ./.; 21 12 ··· 23 14 24 15 postPatch = '' 25 16 substituteInPlace templates/partials/footer.html \ 26 - --replace %COMMIT% ${commit} \ 27 - --replace %REV% ${rev} 17 + --replace %REV% ${version} \ 18 + --replace %COMMIT% ${lib.removeSuffix "-dirty" version} 28 19 ''; 29 20 30 21 buildPhase = ''