MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-09-04 18:01:10 +00:00 committed by GitHub
commit 6c9e0f15dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 240 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View file

@ -1324,6 +1324,12 @@
githubId = 7346933;
name = "betaboon";
};
bew = {
email = "benoit.dechezelles@gmail.com";
github = "bew";
githubId = 9730330;
name = "Benoit de Chezelles";
};
bfortz = {
email = "bernard.fortz@gmail.com";
github = "bfortz";
@ -10278,6 +10284,12 @@
githubId = 8668915;
name = "Stephane Schitter";
};
staccato = {
name = "staccato";
email = "moveq@riseup.net";
github = "staccato";
githubId = 86573128;
};
steell = {
email = "steve@steellworks.com";
github = "Steell";

10
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View file

@ -1143,6 +1143,16 @@ Superuser created successfully.
make the apps fit better visually.
</para>
</listitem>
<listitem>
<para>
<literal>rofi</literal> has been updated from
<quote>1.6.1</quote> to <quote>1.7.0</quote>, one important
thing is the removal of the old xresources based configuration
setup. Read more
<link xlink:href="https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1">in
rofi’s changelog</link>.
</para>
</listitem>
</itemizedlist>
</section>
</section>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View file

@ -325,3 +325,5 @@ To be able to access the web UI this port needs to be opened in the firewall.
- The MariaDB C client library, also known as libmysqlclient or mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While this should hopefully not have any impact, this upgrade comes with some changes to default behavior, so you might want to review the [upstream release notes](https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/).
- GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually.
- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).

6
pkgs/applications/misc/hugo/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.87.0";
version = "0.88.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc=";
sha256 = "sha256-6dJ8H9oJwIW7rY2NrYVKuWDjwrFc9C30Vb0i20+opM0=";
};
vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU=";
vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8=";
doCheck = false;

55
pkgs/applications/misc/rofi/default.nix
View file

@ -1,16 +1,35 @@
{ stdenv, lib, fetchurl
, autoreconfHook, pkg-config, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, pkg-config
, libxkbcommon
, pango
, which
, git
, cairo
, libxcb
, xcbutil
, xcbutilwm
, xcbutilxrm
, xcb-util-cursor
, libstartup_notification
, bison
, flex
, librsvg
, check
}:
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz";
sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd";
src = fetchFromGitHub {
owner = "davatorium";
repo = "rofi";
rev = version;
fetchSubmodules = true;
sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v";
};
preConfigure = ''
@ -20,8 +39,22 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
buildInputs = [
libxkbcommon
pango
cairo
git
bison
flex
librsvg
check
libstartup_notification
libxcb
xcbutil
xcbutilwm
xcbutilxrm
xcb-util-cursor
which
];
doCheck = false;
@ -30,7 +63,7 @@ stdenv.mkDerivation rec {
description = "Window switcher, run dialog and dmenu replacement";
homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ bew ];
platforms = with platforms; linux;
};
}

4
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -28,14 +28,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "3.2";
version = "3.2.1";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "0pck4lczkk52mgwa1n0habp1xqi9xsgsh5q6bbsjmdbandvy5vc8";
sha256 = "sha256-gtFskJoJLw7cqLao46LRUcZobOtzgwUOiKf7I4OiJAQ=";
};
patches = [

2
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
mkdir -p $out/share
cp -R files/* $out/share
cp -R examples files/* $out/share
'';
postFixup = ''

38
pkgs/development/embedded/fpga/trellis/default.nix
View file

@ -1,30 +1,27 @@
{ lib, stdenv, fetchFromGitHub
, python3, boost
, cmake
}:
stdenv.mkDerivation rec {
pname = "trellis";
version = "2021.07.06";
{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }:
let
rev = "03e0070f263fbe31c247de61d259544722786210";
# git describe --tags
realVersion = with lib; with builtins;
"1.0-482-g${substring 0 7 (elemAt srcs 0).rev}";
realVersion = "1.0-532-g${builtins.substring 0 7 rev}";
in stdenv.mkDerivation rec {
pname = "trellis";
version = "2021-09-01";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
rev = "dff1cbcb1bd30de7e96f8a059f2e19be1bb2e44d";
sha256 = "1gbrka9gqn124shx448aivbgywyp30zyjwfazr7v49lhrl7d46lb";
inherit rev;
sha256 = "joQMsjVj8d3M3IaqOkfVQ1I5qPDM8HHJiye+Ak8f3dg=";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "0ee729d20eaf9f1e0f1d657bc6452e3ffe6a0d63";
sha256 = "0069c98bb4wilxz21snwc39yy0rm7ffma179djyz57d99p0vcfkq";
rev = "fdf4bf275a7402654bc643db537173e2fbc86103";
sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA=";
name = "trellis-database";
})
];
@ -34,14 +31,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ];
cmakeFlags = [
"-DCURRENT_GIT_VERSION=${realVersion}"
# TODO: should this be in stdenv instead?
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
];
preConfigure = with builtins; ''
rmdir database && ln -sfv ${elemAt srcs 1} ./database
preConfigure = ''
rmdir database && ln -sfv ${builtins.elemAt srcs 1} ./database
source environment.sh
cd libtrellis
'';
@ -53,9 +47,9 @@ stdenv.mkDerivation rec {
to provide sufficient information to develop a free and
open Verilog to bitstream toolchain for these devices.
'';
homepage = "https://github.com/SymbiFlow/prjtrellis";
license = lib.licenses.isc;
homepage = "https://github.com/YosysHQ/prjtrellis";
license = licenses.isc;
maintainers = with maintainers; [ q3k thoughtpolice emily ];
platforms = lib.platforms.all;
platforms = platforms.all;
};
}

4
pkgs/development/python-modules/aiokafka/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "aiokafka";
version = "0.7.1";
version = "0.7.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D89ppIUliJJMDuCySrZUyN6Rlm01gFskz6ayHmqploc=";
sha256 = "sha256-D+91k4zVg28qPbWIrvyXi6WtDs1jeJt9jFGsrSBA3cs=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/anyascii/default.nix
View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "anyascii";
version = "0.2.0";
version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh";
sha256 = "sha256-JPJ0Mftkxsk6MxJftm+MugB6UmK8H6q+r+2l9LtwtZM=";
};
checkInputs = [

30
pkgs/development/python-modules/dpath/default.nix
View file

@ -1,24 +1,38 @@
{ lib, fetchPypi, buildPythonPackage, isPy27
, mock, pytestCheckHook, nose, hypothesis
{ lib
, buildPythonPackage
, fetchPypi
, hypothesis
, isPy27
, mock
, nose
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dpath";
version = "2.0.1";
version = "2.0.2";
disabled = isPy27; # uses python3 imports
src = fetchPypi {
inherit pname version;
sha256 = "bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa";
sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64=";
};
# use pytest as nosetests hangs
checkInputs = [ mock nose pytestCheckHook hypothesis ];
checkInputs = [
hypothesis
mock
nose
pytestCheckHook
];
pythonImportsCheck = [ "dpath" ];
meta = with lib; {
description = "Python library for accessing and searching dictionaries via /slashed/paths ala xpath";
homepage = "https://github.com/akesterson/dpath-python";
license = [ licenses.mit ];
description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath";
maintainers = [ maintainers.mmlb ];
license = with licenses; [ mit ];
maintainers = with maintainers; [ mmlb ];
};
}

9
pkgs/development/python-modules/fakeredis/default.nix
View file

@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.5.2";
version = "1.6.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020";
sha256 = "sha256-Ecz8l2nXGNN+RbOC5kproCWGtiKvoDcaa9hXZtciVfM=";
};
propagatedBuildInputs = [
@ -40,6 +40,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = [
# Missing support for later pytest-asyncio, https://github.com/jamesls/fakeredis/issues/307
"test/test_aioredis1.py"
];
pythonImportsCheck = [ "fakeredis" ];
meta = with lib; {

4
pkgs/development/python-modules/lupa/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "lupa";
version = "1.9";
version = "1.10";
src = fetchPypi {
inherit pname version;
sha256 = "13ifv0nxbf70xg69sp49j484m8cnid7rgh8f94pgfb50dj01vqd3";
sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE=";
};
nativeBuildInputs = [ cython ];

23
pkgs/development/python-modules/rstcheck/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, buildPythonPackage, docutils }:
buildPythonPackage rec {
pname = "rstcheck";
version = "v3.3.1";
src = fetchFromGitHub {
owner = "myint";
repo = pname;
rev = version;
sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI=";
};
pythonImportsCheck = [ "rstcheck" ];
propagatedBuildInputs = [ docutils ];
meta = with lib; {
description = "Checks syntax of reStructuredText and code blocks nested within it";
homepage = "https://github.com/myint/rstcheck";
license = licenses.mit;
maintainers = with maintainers; [ staccato ];
};
}

4
pkgs/development/python-modules/xdis/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
version = "5.0.10";
version = "5.0.11";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
sha256 = "sha256-/3qyMgliua7W4Va1HdRbHyiR/eBQzHK+GrZVAMvMhLA=";
sha256 = "sha256-KTPu0+bERLRCVESqJgBPtcftlniWl2+C9GDcf84ssiA=";
};
checkInputs = [ pytest ];

0
pkgs/development/python-modules/{}
View file

13
pkgs/misc/vscode-extensions/default.nix
View file

@ -1400,6 +1400,19 @@ let
vadimcn.vscode-lldb = callPackage ./vscode-lldb { };
viktorqvarfordt.vscode-pitch-black-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pitch-black-theme";
publisher = "ViktorQvarfordt";
version = "1.2.4";
sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw=";
};
meta = {
license = lib.licenses.mit;
};
};
vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "highlight-matching-tag";

30
pkgs/servers/domoticz/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv,
fetchzip,
fetchFromGitHub,
makeWrapper,
cmake,
python3,
@ -17,29 +17,17 @@
cereal
}:
let
version = "2020.2";
minizip = "f5282643091dc1b33546bb8d8b3c23d78fdba231";
domoticz-src = fetchzip {
url = "https://github.com/domoticz/domoticz/archive/${version}.tar.gz";
sha256 = "1b4pkw9qp7f5r995vm4xdnpbwi9vxjyzbnk63bmy1xkvbhshm0g3";
};
minizip-src = fetchzip {
url = "https://github.com/domoticz/minizip/archive/${minizip}.tar.gz";
sha256 = "1vddrzm4pwl14bms91fs3mbqqjhcxrmpx9a68b6nfbs20xmpnsny";
};
in
stdenv.mkDerivation rec {
pname = "domoticz";
inherit version;
version = "2021.1";
src = domoticz-src;
postUnpack = ''
cp -r ${minizip-src}/* $sourceRoot/extern/minizip
'';
src = fetchFromGitHub {
owner = "domoticz";
repo = pname;
rev = version;
sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk";
fetchSubmodules = true;
};
buildInputs = [
openssl

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.5.0";
version = "7.6.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s7EOCoGciGT5+Fose9BffsHHE/SsSMmNoWGmeAv6Agk=";
sha256 = "sha256-XRpbbtQiF9EnGMICjyXXm2XjuR0jGC7UiY+UHIAMODM=";
};
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc=";
ldflags = [
"-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"

30
pkgs/tools/security/gotestwaf/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gotestwaf";
version = "0.3.1";
src = fetchFromGitHub {
owner = "wallarm";
repo = pname;
rev = "v${version}";
sha256 = "0c627bxx0mlxhc1fsd2k3x1lm5855pl215m88la662d70559z6k8";
};
vendorSha256 = null;
postFixup = ''
# Rename binary
mv $out/bin/cmd $out/bin/${pname}
'';
meta = with lib; {
description = "Tool for API and OWASP attack simulation";
homepage = "https://github.com/wallarm/gotestwaf";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/tools/security/metabigor/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "metabigor";
version = "1.9";
src = fetchFromGitHub {
owner = "j3ssie";
repo = pname;
rev = "v${version}";
sha256 = "0gjqjz35m9hj4dpch9akkjs895qrp8fwhcsn474lz6z2q6sb65pr";
};
vendorSha256 = "071s3vlz0maz1597l8y899758g24vh58s4kam4q2mxkzfynzs0cr";
# Disabled for now as there are some failures ("undefined:")
doCheck = false;
meta = with lib; {
description = "Tool to perform OSINT tasks";
homepage = "https://github.com/j3ssie/metabigor";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -7274,6 +7274,8 @@ with pkgs;
mscgen = callPackage ../tools/graphics/mscgen { };
metabigor = callPackage ../tools/security/metabigor { };
metasploit = callPackage ../tools/security/metasploit { };
ms-sys = callPackage ../tools/misc/ms-sys { };
@ -20120,7 +20122,7 @@ with pkgs;
modules = [ nginxModules.dav nginxModules.moreheaders ];
};
nginxModules = callPackage ../servers/http/nginx/modules.nix { };
nginxModules = recurseIntoAttrs (callPackage ../servers/http/nginx/modules.nix { });
# We should move to dynmaic modules and create a nginxFull package with all modules
nginxShibboleth = nginxStable.override {
@ -31112,6 +31114,8 @@ with pkgs;
gobuster = callPackage ../tools/security/gobuster { };
gotestwaf = callPackage ../tools/security/gotestwaf { };
guetzli = callPackage ../applications/graphics/guetzli { };
gummi = callPackage ../applications/misc/gummi { };

2
pkgs/top-level/python-packages.nix
View file

@ -7835,6 +7835,8 @@ in {
rst2ansi = callPackage ../development/python-modules/rst2ansi { };
rstcheck = callPackage ../development/python-modules/rstcheck { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
rtoml = callPackage ../development/python-modules/rtoml { };