JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-15 06:01:32 +00:00 committed by GitHub
commit 0db5cea36d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/logic/gappa/default.nix
View File

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "gappa-1.4.0";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz";
sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA=";
url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz";
sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb";
};
buildInputs = [ gmp mpfr boost.dev ];

4
pkgs/development/libraries/dqlite/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U=";
sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];

8
pkgs/development/tools/misc/reviewdog/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc";
sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp";
};
vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5";
vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; {
description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
homepage = "https://github.com/reviewdog/reviewdog";
changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}";
changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md";
maintainers = [ maintainers.marsam ];
license = licenses.mit;
};

7
pkgs/tools/admin/lxd/default.nix
View File

@ -19,13 +19,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.15";
version = "4.16";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU=";
sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r";
};
postPatch = ''
@ -40,6 +40,9 @@ buildGoPackage rec {
cp -r _dist/src/* ../../..
popd
# required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
makeFlagsArray+=("-tags libsqlite3")
'';