Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-07 18:14:53 +00:00
committed by GitHub
14 changed files with 65 additions and 29 deletions

View File

@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
# Add pkg-config file so that Meson projects can find this.
# https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/26
(fetchpatch {
url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/d65ed2e4827c4129d26e3c1df9a48054b4e72c50.patch";
url = "https://gitlab.gnome.org/jtojnar/gi-docgen/commit/d65ed2e4827c4129d26e3c1df9a48054b4e72c50.patch";
sha256 = "BEefcHiAd/HTW5zo39J2WtfQjGXUkNFB6MDJj8/Ge80=";
})

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ginkgo";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-phVpOKgMhebkVQlMDO/9IrETe72hXTgyGJtlKipKgv0=";
sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0=";
};
vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y=";
doCheck = false;