1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 03:53:41 +00:00

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-29 12:06:29 +00:00 committed by GitHub
commit 884cf463fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 255 additions and 48 deletions

View file

@ -1036,6 +1036,16 @@
githubId = 75235;
name = "Michael Walker";
};
bartuka = {
email = "wand@hey.com";
github = "wandersoncferreira";
githubId = 17708295;
name = "Wanderson Ferreira";
keys = [{
longkeyid = "rsa4096/0x56840A614DBE37AE";
fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE";
}];
};
basvandijk = {
email = "v.dijk.bas@gmail.com";
github = "basvandijk";
@ -7615,6 +7625,12 @@
fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A";
}];
};
polendri = {
email = "paul@ijj.li";
github = "polendri";
githubId = 1829032;
name = "Paul Hendry";
};
polyrod = {
email = "dc1mdp@gmail.com";
github = "polyrod";
@ -7723,12 +7739,6 @@
githubId = 33375;
name = "Peter Sanford";
};
pshendry = {
email = "paul@pshendry.com";
github = "pshendry";
githubId = 1829032;
name = "Paul Hendry";
};
psibi = {
email = "sibi@psibi.in";
github = "psibi";

View file

@ -280,6 +280,8 @@ in
keep-outputs = true
keep-derivations = true
'' + optionalString (versionOlder (getVersion config.nix.package.out) "2.4pre") ''
# The default (`true') slows Nix down a lot since the build farm
# has so many GC roots.
gc-check-reachability = false

View file

@ -188,7 +188,8 @@ in
systemd.packages = [ package ];
# we cannot use DynamicUser as we need the the geoclue user to exist for the dbus policy to work
# we cannot use DynamicUser as we need the the geoclue user to exist for the
# dbus policy to work
users = {
users.geoclue = {
isSystemUser = true;
@ -217,6 +218,7 @@ in
# we can't be part of a system service, and the agent should
# be okay with the main service coming and going
wantedBy = [ "default.target" ];
unitConfig.ConditionUser = "!@system";
serviceConfig = {
Type = "exec";
ExecStart = "${package}/libexec/geoclue-2.0/demos/agent";

View file

@ -504,7 +504,7 @@ in
path = mkOption {
type = types.path;
example = "/nix/var/nix/profiles/containers/webserver";
example = "/nix/var/nix/profiles/per-container/webserver";
description = ''
As an alternative to specifying
<option>config</option>, you can specify the path to

View file

@ -9,7 +9,7 @@ mkDerivation {
pname = "libksane";
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ pshendry ];
maintainers = with maintainers; [ polendri ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];

View file

@ -0,0 +1,38 @@
{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config,
libappindicator-gtk3, gst_all_1, pcre }:
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
version = "1.1.5";
src = fetchFromGitHub {
owner = "eneshecan";
repo = pname;
rev = "v${version}";
sha256 = "1gzahls4givd2kbjdwx6yb3jv7a3r1krw40qihiz7hkamkrpaiaz";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
gnome3.gtkmm
gnome3.webkitgtk
libappindicator-gtk3
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
pcre
];
meta = with lib; {
homepage = "https://github.com/eneshecan/whatsapp-for-linux";
description = "Whatsapp desktop messaging app";
license = licenses.gpl3Only;
maintainers = with maintainers; [ bartuka ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -1,5 +1,15 @@
{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
{ lib
, fetchurl
, fetchpatch
, intltool
, libtorrent-rasterbar
, pythonPackages
, gtk3
, glib
, gobject-introspection
, librsvg
, wrapGAppsHook
}:
pythonPackages.buildPythonPackage rec {
pname = "deluge";
@ -10,28 +20,60 @@ pythonPackages.buildPythonPackage rec {
sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky";
};
patches = [
(fetchpatch {
url = "https://github.com/deluge-torrent/deluge/commit/d6c96d629183e8bab2167ef56457f994017e7c85.patch";
sha256 = "sha256-slGMt2bgp36pjDztJUXFeZNbzdJsus0s9ARRD6IpNUw=";
name = "fix_ngettext_warning.patch";
})
(fetchpatch {
url = "https://github.com/deluge-torrent/deluge/commit/351664ec071daa04161577c6a1c949ed0f2c3206.patch";
sha256 = "sha256-ry1LFgMe9lys66xAvATcPqIa3rzBPWVnsf8FL1dXkHo=";
name = "fix_logging_on_py38.patch";
})
];
propagatedBuildInputs = with pythonPackages; [
twisted Mako chardet pyxdg pyopenssl service-identity
libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
setproctitle pillow rencode six zope_interface
dbus-python pygobject3 pycairo
gtk3 gobject-introspection librsvg
twisted
Mako
chardet
pyxdg
pyopenssl
service-identity
libtorrent-rasterbar.dev
libtorrent-rasterbar.python
setuptools
setproctitle
pillow
rencode
six
zope_interface
dbus-python
pygobject3
pycairo
gtk3
gobject-introspection
librsvg
];
nativeBuildInputs = [ intltool wrapGAppsHook glib ];
checkInputs = with pythonPackages; [
pytest /* pytest-twisted */ pytestcov mock
mccabe pylint
pytestCheckHook
pytest-twisted
pytest-cov
mock
mccabe
pylint
];
doCheck = false; # until pytest-twisted is packaged
postInstall = ''
mkdir -p $out/share/applications
cp -R deluge/ui/data/pixmaps $out/share/
cp -R deluge/ui/data/icons $out/share/
cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications
mkdir -p $out/share
cp -R deluge/ui/data/{icons,pixmaps} $out/share/
install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
'';
meta = with lib; {

View file

@ -47,7 +47,7 @@ let
description = "Open Source Continuous File Synchronization";
changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ];
maintainers = with maintainers; [ joko peterhoeg andrew-d ];
platforms = platforms.unix;
};
};

View file

@ -24,7 +24,7 @@ mkDerivation rec {
description = "KDE simple image scanning application";
homepage = "https://apps.kde.org/skanlite";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pshendry ];
maintainers = with maintainers; [ polendri ];
platforms = platforms.linux;
};
}

View file

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "crystal2nix";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "crystal2nix";
rev = "v${version}";
sha256 = "sha256-K1ElG8VC/D0axmSRaufH3cE50xNQisAmFucDkV+5O0s=";
sha256 = "sha256-LKZychkhWy/rVdrP3Yo6g8CL1pGdiZlBykzFjnWh0fg=";
};
format = "shards";

View file

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.12.0";
version = "2.13.1";
src = fetchPypi {
inherit pname version;
sha256 = "484bb733e5dd14bb82d28480a5d7f540b8ee59f081fcf32782546b717180d1b8";
sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4";
};
propagatedBuildInputs = [

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.3.1";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "69e10c999c64996822aa2ca138cffcdf0f1e04bdbdb7206c286fa17fb800703a";
sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9";
};
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyzerproc";
version = "0.4.8";
version = "0.4.9";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "sha256-PNvkgjPcBbnETjWpVF3De9O9IprdpCke0nWvJ9Tju1M=";
sha256 = "11bsvmvazx9gpj0w80b6wgdp41z8y2sk6bhkj3ps7grsgr59n7rz";
};
postPatch = ''

View file

@ -18,11 +18,11 @@
mkDerivation rec {
pname = "gcompris";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
sha256 = "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds";
sha256 = "sha256-8Kj5R/7WwOuew7e9qgx2HWS8mnHX+cv8mhHmgXbm8q4=";
};
cmakeFlags = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rtl8821ce-${kernel.version}";
version = "unstable-2020-12-16";
version = "unstable-2021-03-21";
src = fetchFromGitHub {
owner = "tomaspinho";
repo = "rtl8821ce";
rev = "14b536f0c9ad2d0abbdab8afc7ade684900ca9cf";
sha256 = "0z7r7spsgn22gwv9pcmkdjn9ingi8jj7xkxasph8118h46fw8ip2";
rev = "897e7c4c15dd5a0a569745dc223d969a26ff5bfc";
sha256 = "0935dzz0njxh78wfd17yqah1dxn6b3kaszvzclwwrwwhwcrdp80j";
};
hardeningDisable = [ "pic" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Realtek rtl8821ce driver";
homepage = "https://github.com/tomaspinho/rtl8821ce";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ hhm samuelgrf ];
};

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.24.0";
version = "1.26.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8=";
sha256 = "sha256-vYezpO5Oe5KXmCx6D70GMKamhK8/EiaV2BPb0tQLDzg=";
};
goPackagePath = "github.com/exoscale/cli";

View file

@ -19,11 +19,14 @@ python3Packages.buildPythonApplication rec {
pbkdf2
pyyaml
requests
setuptools
tqdm
urllib3
zeroconf
];
pythonImportsCheck = [ "dptrp1" ];
meta = with lib; {
homepage = "https://github.com/janten/dpt-rp1-py";
description = "Python script to manage Sony DPT-RP1 without Digital Paper App";

View file

@ -2,6 +2,7 @@
, stdenv
, rustPlatform
, fetchFromGitHub
, installShellFiles
, pkg-config
, zlib
, libiconv
@ -10,22 +11,29 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
sha256 = "sha256-1LyDwQWC8cb3Sq8lZ9eDpZMcu5/yh0BJFuOWQ3iTtpY=";
sha256 = "sha256-1nXhAYvvvUQb0RcWidsRMQOhU8eXt7ngzodsMkYvqvg=";
};
cargoSha256 = "sha256-11aP0/p9wC9o1KuM+CLAuHhZxuYff6nvJPj0/yjb1+E=";
cargoSha256 = "sha256-P5ukE7eXBRJMrc7+T9/TMq2uGs0AuZliHTtoqiZXNZw=";
nativeBuildInputs = [ pkg-config zlib ];
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [ "--skip=cant_navigate_up_the_root" ];
postInstall = ''
installShellCompletion --cmd miniserve \
--bash <($out/bin/miniserve --print-completions bash) \
--fish <($out/bin/miniserve --print-completions fish) \
--zsh <($out/bin/miniserve --print-completions zsh)
'';
meta = with lib; {
description = "For when you really just want to serve some files over HTTP right now!";
homepage = "https://github.com/svenstaro/miniserve";

View file

@ -0,0 +1,50 @@
{ buildGoModule
, fetchFromGitHub
, fetchpatch
, pkg-config
, libnetfilter_queue
, libnfnetlink
, lib
}:
buildGoModule rec {
pname = "opensnitch";
version = "1.3.6";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
sha256 = "sha256-Cgo+bVQQeUZuYYhA1WSqlLyQQGAeXbbNno9LS7oNvhI=";
};
patches = [
# https://github.com/evilsocket/opensnitch/pull/384 don't require
# a configuration file in /etc
(fetchpatch {
name = "dont-require-config-in-etc.patch";
url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch";
sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg=";
})
];
modRoot = "daemon";
postBuild = ''
mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd
'';
vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnetfilter_queue libnfnetlink ];
meta = with lib; {
description = "An application firewall";
homepage = "https://github.com/evilsocket/opensnitch/wiki";
license = licenses.gpl3Only;
maintainers = [ maintainers.raboof ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,46 @@
{ python3Packages
, fetchFromGitHub
, wrapQtAppsHook
, lib
}:
python3Packages.buildPythonApplication rec {
pname = "opensnitch-ui";
version = "1.3.6";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
sha256 = "sha256-Cgo+bVQQeUZuYYhA1WSqlLyQQGAeXbbNno9LS7oNvhI=";
};
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
grpcio-tools
pyqt5
unidecode
unicode-slugify
pyinotify
];
preConfigure = ''
cd ui
'';
preCheck = ''
export PYTHONPATH=opensnitch:$PYTHONPATH
'';
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
meta = with lib; {
description = "An application firewall";
homepage = "https://github.com/evilsocket/opensnitch/wiki";
license = licenses.gpl3Only;
maintainers = [ maintainers.raboof ];
platforms = platforms.linux;
};
}

View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
sha256 = "sha256-99rYdyDLAdY2JCy/x4wYksrV8mhKPERYjWNh4UOtYrk=";
sha256 = "0dqirvn8pq6ssxjlf6rkqcsx6ndasws93lz2v9f9s01k9ny8x8mq";
};
cargoSha256 = "sha256-9XmCZwLzaX61HJWRSi7wf7BdLCOMFYIVXiDNYYfUTlk=";
cargoSha256 = "138aq64rb08s96q3xqcmvl3ax78rhjkwfa6v9iz8ywl32066gahb";
meta = with lib; {
description = "Nix code formatter for nixpkgs";

View file

@ -308,7 +308,7 @@ mapAliases ({
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools;
inte-ui = inter; # added 2021-03-27
inter-ui = inter; # added 2021-03-27
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15

View file

@ -6897,6 +6897,10 @@ in
openfortivpn = callPackage ../tools/networking/openfortivpn { };
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { };
opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
obexfs = callPackage ../tools/bluetooth/obexfs { };
obexftp = callPackage ../tools/bluetooth/obexftp { };
@ -13344,6 +13348,8 @@ in
vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
whatstyle = callPackage ../development/tools/misc/whatstyle {
inherit (llvmPackages) clang-unwrapped;
};