Unverified Commit efe8ad87 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 130aa9ca 8ff7b290
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -12000,6 +12000,12 @@
    github = "sioodmy";
    githubId = 81568712;
  };
  siph = {
    name = "Chris Dawkins";
    email = "dawkins.chris.dev@gmail.com";
    github = "siph";
    githubId = 6619112;
  };
  schmitthenner = {
    email = "development@schmitthenner.eu";
    github = "fkz";
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildGoModule rec {
    fetchSubmodules = true;
  };

  vendorSha256 = "sha256-zdm11bGkCcwnz+8dve2pdcpg6pDgLe4UG3Ob/mbqhko=";
  vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw=";
  proxyVendor = true;

  # Build errors in mdbx when format hardening is enabled:
+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
  pname = "genact";
  version = "1.1.1";
  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "svenstaro";
    repo = pname;
    rev = "v${version}";
    sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw=";
    sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
  };

  cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug=";
  cargoSha256 = "sha256-wpCzWJglX3FnNySnBRJjFWST5FIG5wAO7u+D4VIevtU=";

  depsExtraArgs = {
    nativeBuildInputs = [ jq ];
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ buildGoModule rec {
    sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4=";
  };

  vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU=";
  vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI=";

  doCheck = false;

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildGoModule rec {
  };

  proxyVendor = true;
  vendorSha256 = "sha256-Faz/cujnbK83vrIM1KUWXbUzNIB9eYAWCqWs+oJ1sYk=";
  vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E=";

  ldflags = [ "-s" "-w" ];

Loading