summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-01-13 11:46:02 +0300
committerVincent Ambo <mail@tazj.in>2023-01-13 11:46:02 +0300
commitbdfee7b3b07a8bc32ab40492e91ecbd37adf6f76 (patch)
tree9311d90ba7fdbdbcbf6dcab1cc80038208ee090e /pkgs
parent2ec6e40b0cff0fc528703512c642589426a3a43d (diff)
downloadnixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar.gz
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar.bz2
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar.lz
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar.xz
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.tar.zst
nixpkgs-bdfee7b3b07a8bc32ab40492e91ecbd37adf6f76.zip
journaldriver: 1.1.0 -> 5656.0.0; new upstream
This includes the following upstream changes:

* tvl/cl/7818: bump of all Rust dependency versions
* tvl/cl/7819: bump of version number to current revision

Prompted by #210452
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/journaldriver/default.nix26
1 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 5ce1bb5d158..bf835e8bcff 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -1,25 +1,27 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, systemd }:
+{ lib, fetchgit, rustPlatform, pkg-config, openssl, systemd }:
 
 rustPlatform.buildRustPackage rec {
   pname = "journaldriver";
-  version     = "1.1.0";
-  cargoSha256 = "1gzfwkcm63fn41jls16c5sqxz28b0hrfpjhwsvvbwcfv40qxjhsg";
+  version = "5656.0.0";
+  cargoSha256 = "0jxv7skqgkk2j28jzs0gqnic0pqbdpgy8ryhz613pn0cslgy1p5q";
 
-  src = fetchFromGitHub {
-    owner  = "tazjin";
-    repo   = "journaldriver";
-    rev    = "v${version}";
-    sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf";
+  src = fetchgit {
+    url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git";
+    sha256 = "0bnf67k6pkw4rngn58b5zm19danr4sh2g6rfd4k5w2sa1lzqai04";
+
+    # TVL revision r/5656; as of 2023-01-13 the revision tag is
+    # unavailable through git, hence the pinned hash.
+    rev = "4e191353228197ce548d63cb9955e53661244f9c";
   };
 
-  buildInputs       = [ openssl systemd ];
+  buildInputs = [ openssl systemd ];
   nativeBuildInputs = [ pkg-config ];
 
   meta = with lib; {
     description = "Log forwarder from journald to Stackdriver Logging";
-    homepage    = "https://github.com/tazjin/journaldriver";
-    license     = licenses.gpl3;
+    homepage = "https://code.tvl.fyi/about/ops/journaldriver";
+    license = licenses.gpl3;
     maintainers = [ maintainers.tazjin ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }