diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-25 12:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-25 12:01:40 +0000 |
| commit | b48679133ad34e9175476cacd6bdbd888a15b2cb (patch) | |
| tree | 837f5c02c65ac2813f5eb05dbc5089d05455eb75 /pkgs/misc | |
| parent | b4b746ca00bb6ee7e21be8ed6826892fdf0ee4ed (diff) | |
| parent | cc78557f49cdd2d26f3d9ed70bf7430b465d0ad3 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/fastly/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/logging/pacemaker/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 9b81a34248dfe..081a063cdbaa7 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -49,8 +49,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config"; - sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg="; + url = "https://web.archive.org/web/20221224152051/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-IjakfeqjHshlGoamRJTnhUC8cTVMIY63F3vO6I/ZHO4="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 5da634203dc6c..7d8cd24e3d82d 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-b3ljxAuawhqTnURBJMqy4Zzzfi8PCFwie/zC1yeErhQ="; + sha256 = "sha256-vsHWNKCrHJIgXlJYyZZEUfuIUBnaejPrPCM1HrYOTKQ="; }; nativeBuildInputs = [ |