mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 11:50:06 +00:00
Merge staging-next-21.11 into staging-21.11
This commit is contained in:
@@ -4,8 +4,8 @@ buildRubyGem rec {
|
||||
inherit ruby;
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundler";
|
||||
version = "2.2.24";
|
||||
source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62";
|
||||
version = "2.2.33";
|
||||
source.sha256 = "0m06ywj0lq3ba2i7sdk7wsx8dfi94w3dkw8m7l2k54ix1pdx8vqa";
|
||||
dontPatchShebangs = true;
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "postgres_exporter";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wrouesnel";
|
||||
owner = "prometheus-community";
|
||||
repo = "postgres_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw=";
|
||||
sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY=";
|
||||
vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -48,12 +48,12 @@ let
|
||||
in
|
||||
{
|
||||
varnish60 = common {
|
||||
version = "6.0.9";
|
||||
sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh";
|
||||
version = "6.0.10";
|
||||
sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb";
|
||||
};
|
||||
varnish70 = (common {
|
||||
version = "7.0.1";
|
||||
sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4";
|
||||
version = "7.0.2";
|
||||
sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj";
|
||||
}).overrideAttrs (oA: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
||||
Reference in New Issue
Block a user