alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-04 18:01:00 +00:00 committed by GitHub
parent a6fdcf8d52 0a17f3b530
commit 3c6502f618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 58 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/data/icons/papirus-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20210601";
version = "20210701";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds=";
sha256 = "sha256-eqSZBcypwnNX92SGG17MWlnsVzk0jOTdjtEaWMbQsMs=";
};
nativeBuildInputs = [ gtk3 ];

3
pkgs/development/compilers/llvm/12/clang/default.nix
View file

@ -17,6 +17,9 @@ let
mv clang-* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
mv clang-tools-extra-* $sourceRoot/tools/extra
substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \
--replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra'
'';
nativeBuildInputs = [ cmake python3 ]

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

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.39.16";
version = "0.40.7";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5We3Nk/AU5dj37vG4pvqzvNztK01PAPadQV/CgHZe8w=";
sha256 = "1cdxpmlfh76k491ldzv2flxs2wikrryr63h0zw8f6yvhkpbqf4cc";
};
goPackagePath = "github.com/tfsec/tfsec";

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.289.1";
version = "2.289.2";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh";
sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf";
};
buildCommand = ''

4
pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix
View file

@ -2,8 +2,8 @@
grafanaPlugin rec {
pname = "doitintl-bigquery-datasource";
version = "2.0.1";
zipHash = "sha256-tZyvER/rxL+mo2tgxFvwSIAmjFm/AnZ0RgvmD1YAE2U=";
version = "2.0.2";
zipHash = "sha256-GE6DNuQ5WtS/2VmXbQBeRdVKDbLlLirWXW51i0RF6Cc=";
meta = with lib; {
description = "BigQuery DataSource for Grafana";
license = licenses.mit;

4
pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix
View file

@ -2,8 +2,8 @@
grafanaPlugin rec {
pname = "grafana-polystat-panel";
version = "1.2.3";
zipHash = "sha256-Eu3dTPfJxAWwqqGT6l4El4MqviBbzERarU30OXU+eEM=";
version = "1.2.5";
zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ=";
meta = with lib; {
description = "Hexagonal multi-stat panel for Grafana";
license = licenses.asl20;

71
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
View file

@ -1,70 +1,64 @@
{ lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf
, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let
japanese_usage_dictionary = fetchFromGitHub {
owner = "hiroyuki-komatsu";
repo = "japanese-usage-dictionary";
rev = "e5b3425575734c323e1d947009dd74709437b684";
sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
};
in stdenv.mkDerivation rec {
name = "ibus-mozc-${version}";
version = "2.23.4206.102";
meta = with lib; {
isIbusEngine = true;
description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc";
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ gebner ericsagnes ];
};
nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six
python3Packages.gyp pkg-config qt5.wrapQtAppsHook ];
buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
stdenv.mkDerivation rec {
pname = "ibus-mozc";
version = "2.26.4423.100";
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d";
sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2";
owner = "google";
repo = "mozc";
rev = "7654223979067e3c5ae52ea238d43880c5508f85";
sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0=";
fetchSubmodules = true;
};
postUnpack = ''
rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
'' + lib.optionalString stdenv.isLinux ''
nativeBuildInputs = [
which ninja python3Packages.python python3Packages.six
python3Packages.gyp pkg-config qt5.wrapQtAppsHook
];
buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
postUnpack = lib.optionalString stdenv.isLinux ''
sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi
'';
configurePhase = ''
runHook preConfigure
export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model"
cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \
unix/ibus/ibus.gyp:ibus_mozc \
unix/emacs/emacs.gyp:mozc_emacs_helper \
server/server.gyp:mozc_server \
gui/gui.gyp:mozc_tool \
renderer/renderer.gyp:mozc_renderer
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -d $out/share/licenses/mozc
head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE
install -m 644 data/installer/*.html $out/share/licenses/mozc/
install -m 644 data/installer/*.html $out/share/licenses/mozc/
install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool
wrapQtApp $out/lib/mozc/mozc_tool
install -d $out/share/doc/mozc
install -m 644 data/installer/*.html $out/share/doc/mozc/
install -m 644 data/installer/*.html $out/share/doc/mozc/
install -D -m 755 out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc
install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml
@ -79,5 +73,16 @@ in stdenv.mkDerivation rec {
install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png
install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png
install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer
runHook postInstall
'';
meta = with lib; {
isIbusEngine = true;
description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc";
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ gebner ericsagnes ];
};
}

4
pkgs/tools/networking/amass/default.nix
View file

@ -5,7 +5,7 @@
buildGoModule rec {
pname = "amass";
version = "3.11.2";
version = "3.13.2";
src = fetchFromGitHub {
owner = "OWASP";
@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI=";
};
vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk=";
vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h";
outputs = [ "out" "wordlists" ];

6
pkgs/tools/security/age/default.nix
View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "age";
version = "1.0.0-rc.1";
vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2";
version = "1.0.0-rc.3";
vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI=";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = "age";
rev = "v${version}";
sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1";
sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU=";
};
meta = with lib; {

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-07-02";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-p6D0FM52SF4fnWXa/zpewr+lNWC4hZWc0yAQYnioUdQ=";
sha256 = "sha256-q+p4OnDs7T4bfCgKg4KBRwNyutULSItFATBE/ECG8N4=";
};
installPhase = ''