diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-26 22:00:24 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-26 22:00:37 -0500 |
| commit | ab9b819011e1ec810a99e37827a634b183c15fe4 (patch) | |
| tree | 307e927033b54b3d790956d56c92e154e70abbc4 | |
| parent | 36f1c9edf79d7d9e74135954a1280233cff5a681 (diff) | |
Bump pjournal src
| -rw-r--r-- | config/pjournal.nix | 2 | ||||
| -rw-r--r-- | pkgs/pjournal/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/pjournal.nix b/config/pjournal.nix index 59c9af8..2c6fc11 100644 --- a/config/pjournal.nix +++ b/config/pjournal.nix @@ -52,7 +52,7 @@ in # This will fail the first time. Run pjournal init to initialize # the database. ${cfg.package}/bin/pjournal \ - --database_url postgres://pjournal@/pjournal \ + --database-url postgres://pjournal@/pjournal \ --port ${toString cfg.port} ''; serviceConfig = { diff --git a/pkgs/pjournal/default.nix b/pkgs/pjournal/default.nix index 39769c9..137833d 100644 --- a/pkgs/pjournal/default.nix +++ b/pkgs/pjournal/default.nix @@ -30,8 +30,8 @@ in rustPlatform.buildRustPackage rec { cp -r templates $out/etc cp -r static $out/etc wrapProgram "$out/bin/pjournal" \ - --add-flags "--template_path $out/etc/templates" \ - --add-flags "--static_path $out/etc/static" + --add-flags "--template-path $out/etc/templates" \ + --add-flags "--static-path $out/etc/static" ''; preConfigure = '' @@ -44,10 +44,10 @@ in rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.orbekk.com/pjournal.git"; - rev = "b17a844f2d1b20882f57b50d1b7ffd9940f90fb7"; - sha256 = "1vkybzf6frzs1gf1h4sir3z22r32v4zcc5kv2jg62i2fvnjj1xa8"; + rev = "0d2146adfd6d6a3b4a9f0cfc6ad120f3a42ac591"; + sha256 = "0v8gcq886pzb5qaa97dk900xn7xwzllg8a2b56r7pxssl48zkjlb"; }; - cargoSha256 = "1fblssff1g74x70din0wb89ral1651mg00v9gprwffszgc17mcd2"; + cargoSha256 = "11ij2mc5qfrws3m4fxzqcfq48l79j2928h2v5ximbh8lgwbfm3jj"; # verifyCargoDeps = true; } |