Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-17 00:01:37 +00:00 committed by GitHub
commit 6d11e6d03e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 103 additions and 42 deletions

View file

@ -7888,6 +7888,12 @@
githubId = 757752;
name = "Jonas Heinrich";
};
ony = {
name = "Mykola Orliuk";
email = "virkony@gmail.com";
github = "ony";
githubId = 11265;
};
OPNA2608 = {
email = "christoph.neidahl@gmail.com";
github = "OPNA2608";

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1";
sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -8,7 +8,7 @@
let
pname = "trezor-suite";
version = "21.6.1";
version = "21.7.1";
name = "${pname}-${version}";
suffix = {
@ -20,8 +20,8 @@ let
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
# sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml
sha512 = {
aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA==";
x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw==";
aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A==";
x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols
, glib, wayland, libxkbcommon, makeWrapper
, glib, wayland, libxkbcommon, makeWrapper, wayland-scanner
, fetchpatch
}:
stdenv.mkDerivation rec {
@ -15,9 +16,19 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ];
buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ];
# Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/
patches = [
# can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included
(fetchpatch {
url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch";
sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o=";
})
];
postInstall = ''
wrapProgram $out/bin/dmenu-wl_run \
--prefix PATH : $out/bin

View file

@ -19,14 +19,14 @@ for entry in feed.entries:
continue
url = requests.get(entry.link).url.split('?')[0]
content = entry.content[0].value
content = html_tags.sub('', content) # Remove any HTML tags
if re.search(r'Linux', content) is None:
continue
#print(url) # For debugging purposes
version = re.search(r'\d+(\.\d+){3}', content).group(0)
print('chromium: TODO -> ' + version)
print('\n' + url)
if fixes := re.search(r'This update includes .+ security fixes\.', content):
fixes = html_tags.sub('', fixes.group(0))
if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content)
if zero_days:
fixes += " " + zero_days.group(0)

View file

@ -2,8 +2,9 @@
, gtkspell2, aspell
, gst_all_1, startupnotification, gettext
, perlPackages, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM
, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn
, lib, python3, libICE, libXext, libSM
, libgnt, ncurses
, cyrus_sasl ? null
, openssl ? null
, gnutls ? null
@ -16,28 +17,27 @@
let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin";
majorVersion = "2";
version = "${majorVersion}.13.0";
version = "${majorVersion}.14.6";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2";
sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336";
};
inherit nss ncurses;
nativeBuildInputs = [ makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
buildInputs = let
python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]);
python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
in [
aspell startupnotification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr
libXScrnSaver ncurses python-with-dbus
libXScrnSaver python-with-dbus
avahi dbus dbus-glib intltool libidn
libICE libXext libSM cyrus_sasl
libgnt ncurses # optional: build finch - the console UI
]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
@ -62,6 +62,7 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-meanwhile"
"--disable-nm"
"--disable-tcl"
"--disable-gevolution"
]
++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ])
++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"])

View file

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "runc";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "sha256-slNVSlyJLaqIFF4uJP/7u4M0AkJLQjqkHO5TeKFYgSA=";
sha256 = "sha256-xd46HlZenTNCzmnCGN3x7Ah8pPLwbG9LSMGmiPIPyv0=";
};
vendorSha256 = null;

View file

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.7.2";
version = "2.7.3";
repoName = "videos";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-MSyhCXsziQ0MD4lGp9X/9odidjT/L+2Aihwd1qCGvB0=";
sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7";
};
passthru = {

View file

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "5.3.1";
version = "6.0.0";
repoName = "icons";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-6XFzjpuHpGIZ+azkPuFcSF7p66sDonwLwjvlNBZDRmc=";
sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b";
};
passthru = {

View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "6.0.0";
version = "6.1.0";
outputs = [ "out" "dev" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0=";
sha256 = "02hn4abnsn6fm2m33pjmlnkj8dljsm292z62vn8ccvy7l8f9my6l";
};
passthru = {

View file

@ -0,0 +1,37 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config
, gtk-doc, docbook-xsl-nons
, glib, ncurses, libxml2
, buildDocs ? true
}:
stdenv.mkDerivation rec {
pname = "libgnt";
version = "2.14.1";
outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz";
sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy";
};
nativeBuildInputs = [ meson ninja pkg-config ]
++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ];
buildInputs = [ glib ncurses libxml2 ];
postPatch = ''
substituteInPlace meson.build --replace \
"ncurses_sys_prefix = '/usr'" \
"ncurses_sys_prefix = '${lib.getDev ncurses}'"
'' + lib.optionalString (!buildDocs) ''
sed "/^subdir('doc')$/d" -i meson.build
'';
meta = with lib; {
description = "An ncurses toolkit for creating text-mode graphical user interfaces";
homepage = "https://keep.imfreedom.org/libgnt/libgnt/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ ony ];
};
}

View file

@ -220,6 +220,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit libdrm;
inherit (libglvnd) driverLink;
inherit llvmPackages;
tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {
name = "mesa-dev-does-not-depend-on-llvm";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
version = "4.7.0";
version = "4.8.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97";
sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";
};
# almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed

View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.48.2";
version = "0.48.7";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZJHm+shCbyM2cyLW5ZgrqLMwnnvp7IOHI5+Ta2gdaNQ=";
sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I=";
};
goPackagePath = "github.com/aquasecurity/tfsec";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }:
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "rq";
@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj";
buildInputs = [ llvmPackages.libclang v8 ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
postPatch = ''
# Remove #[deny(warnings)] which is equivalent to -Werror in C.
# Prevents build failures when upgrading rustc, which may give more warnings.
@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec {
--replace "#![deny(warnings)]" ""
'';
configurePhase = ''
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
export V8_SOURCE="${v8}"
'';
meta = with lib; {
description = "A tool for doing record analysis and transformation";
homepage = "https://github.com/dflemstr/rq";

View file

@ -150,6 +150,7 @@ in buildFHSUserEnv rec {
# dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers
mesa.llvmPackages.llvm.lib
vulkan-loader
expat
wayland
@ -157,7 +158,6 @@ in buildFHSUserEnv rec {
xorg.libXdamage
xorg.libxshmfence
xorg.libXxf86vm
llvm_11.lib
libelf
] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override {

View file

@ -3406,6 +3406,18 @@ final: prev:
meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
};
nterm-nvim = buildVimPluginFrom2Nix {
pname = "nterm-nvim";
version = "2021-07-16";
src = fetchFromGitHub {
owner = "jlesquembre";
repo = "nterm.nvim";
rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793";
sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361";
};
meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
};
numb-nvim = buildVimPluginFrom2Nix {
pname = "numb-nvim";
version = "2021-07-12";

View file

@ -251,6 +251,7 @@ jiangmiao/auto-pairs
jistr/vim-nerdtree-tabs
jjo/vim-cue
jlanzarotta/bufexplorer
jlesquembre/nterm.nvim
jnurmine/zenburn
jonbri/vim-colorstepper
jonsmithers/vim-html-template-literals

View file

@ -8483,9 +8483,7 @@ in
routino = callPackage ../tools/misc/routino { };
rq = callPackage ../development/tools/rq {
inherit (darwin) libiconv;
};
rq = callPackage ../development/tools/rq { };
rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };
@ -16534,6 +16532,8 @@ in
libgksu = callPackage ../development/libraries/libgksu { };
libgnt = callPackage ../development/libraries/libgnt { };
libgpgerror = callPackage ../development/libraries/libgpg-error { };
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118