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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-01 06:01:17 +00:00 committed by GitHub
commit 3bebe2a3f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "15.8.4";
version = "15.8.7";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616";
sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3";
};
nativeBuildInputs = [

28
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
View File

@ -1,28 +0,0 @@
{ lib, stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.33.0";
src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
};
buildInputs = [ pythonPackages.python ];
dontBuild = true;
installPhase = ''
install -Dm755 -t $out/bin git-filter-repo
install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
'';
meta = with lib; {
homepage = "https://github.com/newren/git-filter-repo";
description = "Quickly rewrite git repository history (filter-branch replacement)";
license = licenses.mit;
inherit (pythonPackages.python.meta) platforms;
maintainers = [ maintainers.marsam ];
};
}

4
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.61.2";
version = "0.61.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8wC3IX6BhpCEsj9SiWPpxgboIJsKjMlrIHKqiJbMp+8=";
sha256 = "sha256-hMLUdUZz7IUTldiJQLKwq0AJdpQqTTzuorfzaUR+ao8=";
};
goPackagePath = "github.com/aquasecurity/tfsec";

10
pkgs/servers/search/groonga/default.nix
View File

@ -1,21 +1,21 @@
{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config
, suggestSupport ? false, zeromq, libevent, msgpack
, suggestSupport ? false, zeromq, libevent, msgpack, openssl
, lz4Support ? false, lz4
, zlibSupport ? false, zlib
, zlibSupport ? true, zlib
}:
stdenv.mkDerivation rec {
pname = "groonga";
version = "11.0.5";
version = "11.0.9";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU=";
sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4=";
};
buildInputs = with lib;
[ pkg-config mecab kytea libedit ]
[ pkg-config mecab kytea libedit openssl ]
++ optional lz4Support lz4
++ optional zlibSupport zlib
++ optionals suggestSupport [ zeromq libevent msgpack ];

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
version = "2.3.2";
version = "2.3.4";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy";
sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/servers/tailscale/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "tailscale";
version = "1.14.6";
version = "1.18.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY=";
sha256 = "sha256-DmgCuv10TiB4UYISthJ1UghuPdvRKYl0cU9VxDvFjMc=";
};
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
CGO_ENABLED = 0;
vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o=";
vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k=";
doCheck = false;

6
pkgs/tools/networking/godns/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "godns";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-pNy1mTP2AaeuwNvvfrHOp5v1nQgv+1DJRGYKgnx98Xo=";
sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4=";
};
vendorSha256 = "sha256-TYjkow/9W467CMyqV2SSRJAuqXGdnAgR9gtfq4vX4u0=";
vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI=";
# Some tests require internet access, broken in sandbox
doCheck = false;

8
pkgs/top-level/all-packages.nix
View File

@ -5632,9 +5632,7 @@ with pkgs;
git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { };
git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo {
pythonPackages = python3Packages;
};
git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
inherit (darwin.apple_sdk.frameworks) Security;
@ -21641,7 +21639,9 @@ with pkgs;
syncserver = callPackage ../servers/syncserver { };
tailscale = callPackage ../servers/tailscale { };
tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo117Module;
};
thanos = callPackage ../servers/monitoring/thanos { };