gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-06-08 12:01:15 +00:00
committed by GitHub
parent e8c34ce973 8671b69d2d
commit 6bab56cd98
50 changed files with 227 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+11 -11
View File
@@ -8799,17 +8799,6 @@
githubId = 3073833;
name = "Massimo Redaelli";
};
mrhedgehog = {
name = "Mr Hedgehog";
email = "hedgehog@mrhedgehog.xyz";
matrix = "@mrhedgehog:jupiterbroadcasting.com";
github = "ModdedGamers";
githubId = 35778371;
keys = [{
longkeyid = "rsa4096/0x7D5107866B1C6752";
fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
}];
};
mrkkrp = {
email = "markkarpov92@gmail.com";
github = "mrkkrp";
@@ -12779,6 +12768,17 @@
githubId = 8547242;
name = "Stefan Rohrbacher";
};
thehedgeh0g = {
name = "The Hedgehog";
email = "hedgehog@mrhedgehog.xyz";
matrix = "@mrhedgehog:jupiterbroadcasting.com";
github = "ModdedGamers";
githubId = 35778371;
keys = [{
longkeyid = "rsa4096/0x7D5107866B1C6752";
fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
}];
};
thelegy = {
email = "mail+nixos@0jb.de";
github = "thelegy";
nixos/modules/services/misc/nix-daemon.nix
+1 -1
View File
@@ -734,7 +734,7 @@ in
CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy;
IOSchedulingClass = cfg.daemonIOSchedClass;
IOSchedulingPriority = cfg.daemonIOSchedPriority;
LimitNOFILE = 4096;
LimitNOFILE = 1048576;
};
restartTriggers = [ nixConf ];
pkgs/applications/misc/obsidian/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "0.14.6";
version = "0.14.15";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc=";
sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ=";
};
icon = fetchurl {
pkgs/applications/misc/sway-launcher-desktop/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.mrhedgehog ];
maintainers = [ maintainers.thehedgeh0g ];
mainProgram = "${pname}";
};
}
pkgs/applications/networking/cluster/terraform/default.nix
+4 -1
View File
@@ -196,7 +196,10 @@ rec {
sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8=";
vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
passthru = {
inherit plugins;
tests = { inherit terraform_plugins_test; };
};
};
# Tests that the plugins are being used. Terraform looks at the specific
pkgs/applications/video/qarte/default.nix
+4 -4
View File
@@ -1,15 +1,15 @@
{ mkDerivation, lib, fetchbzr, python3, rtmpdump }:
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]);
in mkDerivation {
pname = "qarte";
version = "4.15.1";
version = "4.17.1";
src = fetchbzr {
url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4";
rev = "67";
sha256 = "sha256:0ajvrvpyqyyxnq9nv69p3sr6c1kplphvrpph75k76yl0av94j2s3";
rev = "74";
sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4";
};
buildInputs = [ pythonEnv ];
pkgs/applications/window-managers/fbpanel/default.nix
+4
View File
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
--replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS="-lX11";
meta = with lib; {
pkgs/development/compilers/gcl/default.nix
+4 -1
View File
@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" "bindnow" ];
NIX_CFLAGS_COMPILE = "-fgnu89-inline";
# -fcommon: workaround build failure on -fno-common toolchains:
# ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of
# `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here
NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon";
meta = with lib; {
description = "GNU Common Lisp compiler working via GCC";
pkgs/development/coq-modules/coq-elpi/default.nix
+4 -3
View File
@@ -6,20 +6,21 @@ with builtins; with lib; let
{ case = "8.12"; out = { version = "1.12.0"; };}
{ case = "8.13"; out = { version = "1.13.7"; };}
{ case = "8.14"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.14.1"; };}
] { version = "1.14.1"; } );
{ case = "8.15"; out = { version = "1.15.0"; };}
] {} );
in mkCoqDerivation {
pname = "elpi";
repo = "coq-elpi";
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.15"; out = "1.13.0"; }
{ case = "8.15"; out = "1.14.0"; }
{ case = "8.14"; out = "1.11.2"; }
{ case = "8.13"; out = "1.11.1"; }
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
pkgs/development/go-modules/generic/default.nix
-5
View File
@@ -41,9 +41,6 @@
, meta ? {}
# disabled
, runVend ? false
# Not needed with buildGoModule
, goPackagePath ? ""
@@ -55,8 +52,6 @@
with builtins;
assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
let
pkgs/development/libraries/hidapi/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "hidapi";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "libusb";
repo = "hidapi";
rev = "${pname}-${version}";
sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko=";
sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/ocaml-modules/elpi/default.nix
+14 -6
View File
@@ -1,13 +1,18 @@
{ lib
, buildDunePackage, camlp5
, ocaml
, menhir, menhirLib
, stdlib-shims
, re, perl, ncurses
, ppxlib, ppx_deriving
, ppxlib_0_15, ppx_deriving_0_15
, coqPackages
, version ? "1.14.1"
, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
}:
with lib;
let fetched = coqPackages.metaFetch ({
release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
@@ -23,11 +28,16 @@ buildDunePackage rec {
pname = "elpi";
inherit (fetched) version src;
minimumOCamlVersion = "4.04";
minimalOCamlVersion = "4.04";
buildInputs = [ perl ncurses ];
buildInputs = [ perl ncurses ]
++ optional (versionAtLeast version "1.15" || version == "dev") menhir;
propagatedBuildInputs = [ camlp5 re ]
propagatedBuildInputs = [ re stdlib-shims ]
++ (if versionAtLeast version "1.15" || version == "dev"
then [ menhirLib ]
else [ camlp5 ]
)
++ (if lib.versionAtLeast version "1.13" || version == "dev"
then [ ppxlib ppx_deriving ]
else [ ppxlib_0_15 ppx_deriving_0_15 ]
@@ -43,6 +53,4 @@ buildDunePackage rec {
postPatch = ''
substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols"
'';
useDune2 = true;
}
pkgs/development/python-modules/dash/default.nix
+29 -10
View File
@@ -1,22 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, plotly
, flask
, flask-compress
, celery
, dash-core-components
, dash-html-components
, dash-table
, pytest-mock
, diskcache
, fetchFromGitHub
, flask
, flask-compress
, mock
, pyyaml
, multiprocess
, plotly
, psutil
, pytest-mock
, pytestCheckHook
, pythonOlder
, pyyaml
, redis
}:
buildPythonPackage rec {
pname = "dash";
version = "2.4.1";
version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +30,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ=";
hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0=";
};
propagatedBuildInputs = [
@@ -37,6 +42,18 @@ buildPythonPackage rec {
dash-table
];
passthru.optional-dependencies = {
celery = [
celery
redis
];
diskcache = [
diskcache
multiprocess
psutil
];
};
checkInputs = [
pytestCheckHook
pytest-mock
@@ -50,12 +67,14 @@ buildPythonPackage rec {
"tests/integration"
];
pythonImportsCheck = [ "dash" ];
pythonImportsCheck = [
"dash"
];
meta = with lib; {
description = "Python framework for building analytical web applications";
homepage = "https://dash.plot.ly/";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
maintainers = with maintainers; [ antoinerg ];
};
}
pkgs/development/python-modules/databricks-connect/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "9.1.16";
version = "9.1.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-agdky7AhRuObU9GT8IpdgB3SWdHDBRnuoaAtYAlCv/4=";
sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw=";
};
sourceRoot = ".";
pkgs/development/python-modules/dulwich/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
}:
buildPythonPackage rec {
version = "0.20.42";
version = "0.20.43";
pname = "dulwich";
format = "setuptools";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA=";
hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo=";
};
LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/mkdocs-material/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonApplication rec {
pname = "mkdocs-material";
version = "8.3.2";
version = "8.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
owner = "squidfunk";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-VcyBsIU2PJ2xh365kNAlO3wno3xushlaj43dIh1GkP8=";
hash = "sha256-4rJ1fKYIQli4j6x1/xipQeCXMfbILyroxrwbpcPGYiU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/plugwise/default.nix
+5 -3
View File
@@ -1,10 +1,11 @@
{ lib
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, crcmod
, defusedxml
, fetchFromGitHub
, freezegun
, jsonpickle
, munch
, mypy
@@ -20,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.18.5";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-J6RwPkObcoXIQ93nD8FNNjwllHoID4nFzqilArBS1C8=";
sha256 = "sha256-ST7eC7IXW47b1AlX25ubUPTi6Hkcjd+7L0tzht3fz9s=";
};
propagatedBuildInputs = [
@@ -45,6 +46,7 @@ buildPythonPackage rec {
];
checkInputs = [
freezegun
jsonpickle
mypy
pytest-aiohttp
pkgs/development/python-modules/pyfxa/default.nix
+45 -18
View File
@@ -1,37 +1,64 @@
{ lib, buildPythonPackage, fetchPypi
, requests, cryptography, pybrowserid, hawkauthlib, six
, grequests, mock, responses, pytest, pyjwt }:
{ lib
, buildPythonPackage
, cryptography
, fetchPypi
, grequests
, hawkauthlib
, mock
, pybrowserid
, pyjwt
, pytestCheckHook
, pythonOlder
, requests
, responses
, setuptools
, six
}:
buildPythonPackage rec {
pname = "PyFxA";
pname = "pyfxa";
version = "0.7.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb";
pname = "PyFxA";
inherit version;
hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs=";
};
postPatch = ''
# Requires network access
rm fxa/tests/test_core.py
'';
propagatedBuildInputs = [
pyjwt requests cryptography pybrowserid hawkauthlib six
cryptography
hawkauthlib
pybrowserid
pyjwt
requests
setuptools # imports pkg_resources
six
];
checkInputs = [
grequests mock responses pytest
grequests
mock
responses
pytestCheckHook
];
# test_oath is mostly network calls
checkPhase = ''
pytest --ignore=fxa/tests/test_oauth.py
'';
pythonImportsCheck = [
"fxa"
];
disabledTestPaths = [
# Requires network access
"fxa/tests/test_core.py"
"fxa/tests/test_oauth.py"
];
meta = with lib; {
description = "Firefox Accounts client library for Python";
description = "Firefox Accounts client library";
homepage = "https://github.com/mozilla/PyFxA";
license = licenses.mpl20;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/pyroute2-core/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk=";
hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw=";
};
# pyroute2 sub-modules have no tests
pkgs/development/python-modules/pyroute2-ethtool/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw=";
hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-ipdb/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A=";
hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-ipset/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI=";
hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-ndb/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ndb";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4=";
hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-nftables/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nftables";
version = "0.6.10";
version = "0.6.11";
src = fetchPypi {
pname = "pyroute2.nftables";
inherit version;
sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU=";
sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-nslink/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-nslink";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.nslink";
inherit version;
hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE=";
hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2-protocols/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-protocols";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.protocols";
inherit version;
hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E=";
hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyroute2/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyroute2";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI=";
hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-insightidr";
version = "0.1.5";
version = "0.1.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-insightidr";
rev = "refs/tags/v${version}";
hash = "sha256-RjBRFNMIpjW/x5vShXUgi25oOmvRlD2zP6mNQJ7sG8M=";
hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pysigma-backend-splunk/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-splunk";
version = "0.3.2";
version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-splunk";
rev = "v${version}";
hash = "sha256-wcAqXFou20V2ZPOXCsF1Nky008q2xkfuI0RbTsatC6k=";
hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-crowdstrike";
version = "0.1.5";
version = "0.1.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-crowdstrike";
rev = "v${version}";
hash = "sha256-TmvEWrkNu8gJ8rPFoRWd+uYob2rmmdasqxH1CYmz4Rk=";
hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-sysmon";
version = "0.1.5";
version = "0.1.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-sysmon";
rev = "v${version}";
hash = "sha256-Bh0Qh+pY22lm/0vtJC4tFIl1KRF3zFQ8vcH0JEfYGAc=";
hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
+5
View File
@@ -29,6 +29,11 @@ buildPythonPackage rec {
pysigma
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"'
'';
checkInputs = [
pytestCheckHook
];
pkgs/development/python-modules/pysigma/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.5.2";
version = "0.6.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "v${version}";
hash = "sha256-U5jBFnWC73W9tFco5faiqGmk8K+Ig18f9HhXJ4vhhGs=";
hash = "sha256-/SZe4pzlhlkzW84WOjPOibfdznf5uLHL5RsNnT/EL9M=";
};
nativeBuildInputs = [
pkgs/development/python-modules/quantum-gateway/default.nix
+7 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "quantum-gateway";
version = "0.0.6";
version = "0.0.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "cisasteelersfan";
repo = "quantum_gateway";
rev = version;
sha256 = "f2LYOr9xJSfbA/1aHfll5lg7r05o855Zkkk9HuRamP8=";
hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U=";
};
propagatedBuildInputs = [
@@ -39,6 +39,11 @@ buildPythonPackage rec {
"quantum_gateway"
];
disabledTests = [
# Tests require network features
"TestGateway3100"
];
meta = with lib; {
description = "Python library for interacting with Verizon Fios Quantum gateway devices";
homepage = "https://github.com/cisasteelersfan/quantum_gateway";
pkgs/development/python-modules/spacy/default.nix
+2 -2
View File
@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "spacy";
version = "3.3.0";
version = "3.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM=";
hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/webexteamssdk/default.nix
+10 -3
View File
@@ -3,19 +3,23 @@
, fetchFromGitHub
, future
, pyjwt
, pythonOlder
, requests
, requests-toolbelt
}:
buildPythonPackage rec {
pname = "webexteamssdk";
version = "1.6";
version = "1.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CiscoDevNet";
repo = pname;
rev = "v${version}";
sha256 = "0bw28ag1iqyqlxz83m4qb3r94kipv5mpf3bsvc8zv5vh4dv52bp2";
hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
};
propagatedBuildInputs = [
@@ -27,7 +31,10 @@ buildPythonPackage rec {
# Tests require a Webex Teams test domain
doCheck = false;
pythonImportsCheck = [ "webexteamssdk" ];
pythonImportsCheck = [
"webexteamssdk"
];
meta = with lib; {
description = "Python module for Webex Teams APIs";
pkgs/development/python-modules/xknx/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.21.3";
version = "0.21.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-AGKozbVdXfRPvaU1Et8GFu3vdNRLA8ZiV8Xc6T7BhOQ=";
sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/yolink-api/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "yolink-api";
version = "0.0.7";
version = "0.0.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "YoSmart-Inc";
repo = pname;
rev = "v${version}";
hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo=";
hash = "sha256-jKyugylgV9B8+PxUPsz4YtQjCfhB8NA2BYMxJOqkIP8=";
};
propagatedBuildInputs = [
pkgs/development/tools/analysis/checkov/default.nix
+7 -8
View File
@@ -32,17 +32,18 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1195";
version = "2.0.1201";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw=";
hash = "sha256-ZQCUYnoCaVZkXr5rZ/vkEOlADMQmj6OfZ12KBerXdmQ=";
};
nativeBuildInputs = with py.pkgs; [
pythonRelaxDepsHook
setuptools-scm
];
@@ -94,12 +95,10 @@ buildPythonApplication rec {
responses
];
postPatch = ''
substituteInPlace setup.py \
--replace "bc-python-hcl2==" "bc-python-hcl2>=" \
--replace "prettytable>=3.0.0" "prettytable" \
--replace "pycep-parser==0.3.6" "pycep-parser"
'';
pythonRelaxDeps = [
"bc-python-hcl2"
"pycep-parser"
];
preCheck = ''
export HOME=$(mktemp -d);
pkgs/development/tools/goresym/default.nix
+1 -1
View File
@@ -21,6 +21,6 @@ buildGoModule rec {
description = "Go symbol recovery tool";
homepage = "https://github.com/mandiant/GoReSym";
license = licenses.mit;
maintainers = with maintainers; [ mrhedgehog ];
maintainers = with maintainers; [ thehedgeh0g ];
};
}
pkgs/development/tools/misc/inotify-tools/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "inotify-tools";
version = "3.22.1.0";
version = "3.22.6.0";
src = fetchFromGitHub {
repo = "inotify-tools";
owner = "inotify-tools";
rev = version;
sha256 = "sha256-I0kr+wFUWnovH9MXVsGaCBtp4+RnnMWD7sPecI3xz+Y=";
sha256 = "sha256-EYWVSgwoMjAlc/V5kv+2jfxEqWVW/lEoIxVd+ctEMsk=";
};
nativeBuildInputs = [ autoreconfHook ];
pkgs/development/tools/vend/default.nix
-37
View File
@@ -1,37 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "vend";
/*
This package is used to generate vendor folders for
packages that use the `runVend` option with `buildGoModule`.
Do not update this package without checking that the vendorSha256
hashes of packages using the `runVend` option are unchanged
or updating their vendorSha256 hashes if necessary.
*/
version = "1.0.2";
# Disable the bot
# nixpkgs-update: no auto update
# Disable `mod tidy`, patch was refused upstream
# https://github.com/nomad-software/vend/pull/9
patches = [ ./remove_tidy.patch ];
src = fetchFromGitHub {
owner = "nomad-software";
repo = "vend";
rev = "v${version}";
sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d";
};
vendorSha256 = null;
meta = with lib; {
homepage = "https://github.com/nomad-software/vend";
description = "A utility which vendors go code including c dependencies";
maintainers = with maintainers; [ c00w mic92 zowoq ];
license = licenses.mit;
};
}
pkgs/development/tools/vend/remove_tidy.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/cli/cmd.go b/cli/cmd.go
index c766559..3a133fd 100644
--- a/cli/cmd.go
+++ b/cli/cmd.go
@@ -12,7 +12,7 @@ import (
// UpdateModule makes sure the module is updated ready to vendor the
// dependencies.
func UpdateModule() {
- var commands = []string{"tidy", "download", "vendor"}
+ var commands = []string{"download", "vendor"}
for _, command := range commands {
cmd := exec.Command("go", "mod", command)
pkgs/games/stuntrally/default.nix
+3 -7
View File
@@ -18,25 +18,21 @@
stdenv.mkDerivation rec {
pname = "stunt-rally";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "stuntrally";
repo = "stuntrally";
rev = version;
hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU=";
hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0=";
};
tracks = fetchFromGitHub {
owner = "stuntrally";
repo = "tracks";
rev = version;
hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0=";
hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso=";
};
# include/OGRE/OgreException.h:265:126: error: invalid conversion from
# 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive]
NIX_CFLAGS_COMPILE = "-fpermissive";
preConfigure = ''
ln -s ${tracks} data/tracks
'';
pkgs/servers/coturn/default.nix
+7
View File
@@ -35,6 +35,13 @@ stdenv.mkDerivation rec {
./pure-configure.patch
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of
# `PROM_COLLECTOR_REGISTRY_DEFAULT'; ...-libprom-0.1.1/include/prom_collector_registry.h:37: first defined here
# Should be fixed in libprom-1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25
NIX_CFLAGS_COMPILE = "-fcommon";
passthru.tests.coturn = nixosTests.coturn;
meta = with lib; {
pkgs/servers/search/elasticsearch/plugins.nix
+10 -10
View File
@@ -38,7 +38,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
sha256 =
if version == "7.16.1" then "1sz858m9963xqr5kzjlwnq7k0a146rn60v6xijyfbp8y3brg618p"
if version == "7.17.4" then "a4e881d86694ae70ab6b18f72ea700415971200145d33d438e57c0374d9fc16f"
else if version == "6.8.21" then "06b1pavyggzfp4wwdql0q9nm3r7i9px9cagp4yh4nhxhnk4w5fiq"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -55,7 +55,7 @@ in
src = fetchurl {
url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
sha256 =
if version == "7.16.1" then "0yjy9yhw77lmalivxnmv2rq8fk93ddxszkk73lgmpffladx2ikir"
if version == "7.17.3" then "1835f374230cb17193859cee22ac90e3d7a67fb41a55fd4578e840d708287a08"
else if version == "6.8.21" then "0m80cn7vkcvk95v4pdmi6vk5ww7p01k0hj2iqb9g870vs6x2qjzv"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -72,7 +72,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
sha256 =
if version == "7.16.1" then "1w5ndgffqzj5ijglmykifrk1jsgh7qwn8m7sbpiv0r7n3aayhz1x"
if version == "7.17.4" then "1c8175b2dac54277c1f41981fb4a784829e74e6e74268381fe0c27bc6652704b"
else if version == "6.8.21" then "07w8s4a5gvr9lzjzf629y8rx3kvs6zd1vl07ksw1paghp42yb354"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -89,7 +89,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
sha256 =
if version == "7.16.1" then "16mv7b9nl96bcygabvjqidxp2sjk340va19mrmliblpq3mxa2sii"
if version == "7.17.4" then "702e446997bde5cb38af120a1cb4271d976fdd23444be49e53b6be3801d845a9"
else if version == "6.8.21" then "1kdpbrasxwr3dn21zjrklp1s389rwa51fairygdwl8px9liwwfa5"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -106,7 +106,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
sha256 =
if version == "7.16.1" then "0bf8f8cybsp6s2ai3j04yay9kbhsafpgxivxjvzn2iy9qgc84ls4"
if version == "7.17.4" then "7d1574a585a9db0988ee248159d51f62cce5578a8c082096ef3e26efdb24aee7"
else if version == "6.8.21" then "0v31yyhjcdlqnjw1f9kihh7z3c6d31whc57hqqd1dn579n4s9rlz"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -123,7 +123,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
sha256 =
if version == "7.16.1" then "0sfa0ql3hh8jmha230dyhr51bvsvwmazyycf36ngpmxsysm8ccml"
if version == "7.17.4" then "cad923a662db705d40ca29698aa118e9e4cc50ae564c426a76d5acb777a4f57c"
else if version == "6.8.21" then "0sfh1az30q4f34zxig2fz8wn9gk53fmmxyg5pbi1svn9761p5awq"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -140,7 +140,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
sha256 =
if version == "7.16.1" then "1b95hjr4qhiavm7r7k19bwk5c64r00f1g5s0ydnb6gzym9hdb5s1"
if version == "7.17.4" then "a50be4cea5c68ad7615f87d672ba160d027fdfde2be0578bb2dabd6384cc8108"
else if version == "6.8.21" then "00lwj00rfdk6850gk1n86chiz2w6afpqn7jn588jdbwv41qh5mrv"
else throw "unsupported version ${version} for plugin ${pluginName}";
};
@@ -157,14 +157,14 @@ in
pluginName = "search-guard";
version =
# https://docs.search-guard.com/latest/search-guard-versions
if esVersion == "7.16.1" then "${esVersion}-52.5.0"
if esVersion == "7.17.3" then "${esVersion}-53.1.0"
else if esVersion == "6.8.21" then "${esVersion}-25.6"
else throw "unsupported version ${esVersion} for plugin ${pluginName}";
src =
if esVersion == "7.16.1" then
if esVersion == "7.17.3" then
fetchurl {
url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";
sha256 = "1m3nj35qyrkkh3mhmn66nippavima8h8qpaxddalhjsvf70lhnjb";
sha256 = "b49b24f7b74043cb5bab93f18316ea71656a7668e61bf063ccaa7b0ee2302a31";
}
else if esVersion == "6.8.21" then
fetchurl {
pkgs/shells/fish/plugins/hydro.nix
+1 -1
View File
@@ -15,6 +15,6 @@ buildFishPlugin rec {
description = "Ultra-pure, lag-free prompt with async Git status";
homepage = "https://github.com/jorgebucaran/hydro";
license = licenses.mit;
maintainers = with maintainers; [ mrhedgehog ];
maintainers = with maintainers; [ thehedgeh0g ];
};
}
pkgs/tools/security/sigma-cli/default.nix
+2 -1
View File
@@ -36,7 +36,8 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'prettytable = "^3.1.1"' 'prettytable = "*"'
--replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \
--replace 'pysigma = "^0.5.0"' 'pysigma = "*"'
'';
pythonImportsCheck = [
pkgs/tools/virtualization/cloud-init/default.nix
+1
View File
@@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec {
jsonschema
netifaces
oauthlib
pyserial
pyyaml
requests
];
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -11288,8 +11288,6 @@ with pkgs;
vcstool = callPackage ../development/tools/vcstool { };
vend = callPackage ../development/tools/vend { };
verco = callPackage ../applications/version-management/verco { };
verilator = callPackage ../applications/science/electronics/verilator {};
@@ -32285,7 +32283,7 @@ with pkgs;
stt = callPackage ../tools/audio/stt { };
stuntrally = callPackage ../games/stuntrally
{ stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
{ ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
superTux = callPackage ../games/supertux { };