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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-23 12:01:10 +00:00 committed by GitHub
commit 7d1034b04d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 215 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/ticker/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ticker";
version = "4.3.0";
version = "4.4.4";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DdUXT8xrKd114U+CSwIgl7XczxQZGWVZA3tMU7461xY=";
sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8=";
};
vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg=";
vendorSha256 = "sha256-aPL3npryiCv+SiSyEUNhdPCDmM/hJDMspCbSNy+SuoA=";
ldflags = [
"-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"

4
pkgs/applications/virtualization/crun/default.nix
View File

@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "sha256-c0jXhqYdEpt4De1Z6VNwyrv0KJcf039Wp3ye0oTW0Qc=";
sha256 = "sha256-hO3gOZ0AaSvymIDvoylHzlHscoN1+G7wDXTCP1c5uIw=";
fetchSubmodules = true;
};

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.10730";
version = "9.1.10913";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lmtxCl9QiVVd6cQ8jFMDpJg7rC99Htac0q5VFp7LVyk=";
sha256 = "sha256-S+ntSC9KySj2njkxEkr7p2TDsBqY0Gf+zzwomnGwSEk=";
};
propagatedBuildInputs = [ pyvex ];

4
pkgs/development/python-modules/angr/default.nix
View File

@ -44,14 +44,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.10730";
version = "9.1.10913";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-vH5TL3l4KQh48iBXQDCH+SsB9z6fFKzHLZbtMds6JV0=";
sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A=";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/angrcli/default.nix
View File

@ -44,6 +44,9 @@ buildPythonPackage rec {
disabledTests = [
"test_sims"
"test_proper_termination"
"test_branching"
"test_morph"
];
pythonImportsCheck = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.10730";
version = "9.1.10913";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AfnX7MmxdQWYC86T37A383s+56aCYRitbGYmET+jeTE=";
sha256 = "sha256-8M3d8lG7jDNgICjzjFRi9Wl2I7aYI5b5IvjEhixsk9k=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.10730";
version = "9.1.10913";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z48nlPqbKiJkF1sAufUfUSfGLjKhTRaGq5t5nbsbsh8=";
sha256 = "sha256-VLFbjKX7WXWoJCS9hYwtEikGC48gRg7E24D9Un+/gdc=";
};
checkInputs = [

4
pkgs/development/python-modules/aws-lambda-builders/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.9.0";
version = "1.10.0";
# No tests available in PyPI tarball
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "v${version}";
sha256 = "1ff1hr282snpjs5ggf7agxk5y6nr4xjdahmzq6hv56gj4lcfsq7c";
sha256 = "0nrqxgl24c6lknxhmmf7vkhvdy54dhnr9qcm1r1gwxzdsymq2l54";
};
# Package is not compatible with Python 3.5

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.10730";
version = "9.1.10913";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ATc6PiYxkBx48O55sh5lHVkJVdqlx2wLPUZRgGKb20U=";
sha256 = "sha256-66dc0y4mu5S5PtTx2fRkBdpNlH53ZpTiKyM3s0OUamw=";
};
# Use upstream z3 implementation

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.10730";
version = "9.1.10913";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q5T5HNUE6WLDjz+qu5hMM6lIZp9WoK7+Sqs+ohlBgzc=";
sha256 = "sha256-z8hBOqeI7T6Rov00OySDBdzUQ6jeBRseE7sz8VfIJmk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/digi-xbee/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "digi-xbee";
version = "1.4.0";
version = "1.4.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa";
sha256 = "3b10e749431f406d80c189d872f4673b8d3cd510f7b411f817780a0e72499cd2";
};
propagatedBuildInputs = [ pyserial srp ];

4
pkgs/development/python-modules/flux-led/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.27.10";
version = "0.27.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-xHPP6QxPmlMAEdZ3t5RyDXKN51okwxBtaOZPTyONy5w=";
sha256 = "sha256-lOfEEMHuhTfti7NYeZpXc+jeYQMJd/EnvT1oHByaCbw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/goveelights/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "goveelights";
version = "0.1.0";
version = "0.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4j4iBT4PIpk6BbHwJF7+sp/PeIlHw+8dsOK1Ecfuwtc=";
sha256 = "sha256-A7tfY+aFzhfruCZ43usj1/CsTejbPMzHM8SYrY/TU1s=";
};
propagatedBuildInputs = [

30
pkgs/development/python-modules/mariadb/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ buildPythonPackage, fetchPypi, libmysqlclient, lib, pythonOlder }:
buildPythonPackage rec {
pname = "mariadb";
version = "1.0.9";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Aqmz0KB26aDQ6hxItF7Qm2R14rak6Mge2fHoLK87/Ck=";
extension = "zip";
};
nativeBuildInputs = [
libmysqlclient
];
# Requires a running MariaDB instance
doCheck = false;
pythonImportsCheck = [ "mariadb" ];
meta = with lib; {
description = "MariaDB Connector/Python";
homepage = "https://github.com/mariadb-corporation/mariadb-connector-python";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ vanilla ];
};
}

25
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, dotmap
, fetchPypi
, fetchFromGitHub
, pexpect
, protobuf
, pygatt
, pypubsub
, pyqrcode
, pyserial
, pytestCheckHook
, pythonOlder
, pyyaml
, tabulate
, timeago
}:
buildPythonPackage rec {
pname = "meshtastic";
version = "1.2.44";
version = "1.2.46";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "f99e076dde0db86a5ba734b48257ffc7355a2b4729cea1ff5cd7638ca93dbd90";
src = fetchFromGitHub {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
sha256 = "sha256-XNoAt0R3Jt8i0erovwHBIJ3l9bY5po2UjRl/uzGBs9k=";
};
propagatedBuildInputs = [
@ -33,13 +37,18 @@ buildPythonPackage rec {
pypubsub
pyqrcode
pyserial
pyyaml
tabulate
timeago
];
# Project only provides PyPI releases which don't contain the tests
# https://github.com/meshtastic/Meshtastic-python/issues/86
doCheck = false;
checkInputs = [
pytestCheckHook
];
preCheck = ''
export PATH="$PATH:$out/bin";
'';
pythonImportsCheck = [
"meshtastic"

61
pkgs/development/python-modules/pvo/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "pvo";
version = "0.1.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-pvoutput";
rev = "v${version}";
sha256 = "sha256-m+6fCBPN0LG6HoRwefVVOGEjccoB8mCWJOlSNHxEErM=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
pydantic
yarl
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version for the pyproject.toml
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" ""
'';
pythonImportsCheck = [
"pvo"
];
meta = with lib; {
description = "Python module to interact with the PVOutput API";
homepage = "https://github.com/frenck/python-pvoutput";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/pyskyqremote/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
version = "0.2.52";
version = "0.2.54";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = version;
sha256 = "sha256-iVXi9wopDjtZcqoEWYfg1oPx4RV3e3b9P07rC8ftz9U=";
sha256 = "sha256-Z3fcihyK8QHtdREXWt2ESqjwAwxFZFEI9OXf3Y9onmw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.10730";
version = "9.1.10913";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2cXbdPqWasGlXulxy6zGKQk3ent4dRwQWRGzKj3v6Ns=";
sha256 = "sha256-EUgCyjD5ia5KQMvZWVAsXeKRjmSVE7tRRYH5u/Ozug0=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/pyweatherflowrest/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyweatherflowrest";
version = "0.1.21";
version = "0.1.23";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lW7mhjCYrPBsHL0plHZo6L3OwZFHAzBK2TtNVre5Lt8=";
sha256 = "sha256-VeLkQmH9h41upATWEWwKjf2GCXjltBnHHauGB76ViBc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/soco/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "soco";
version = "0.25.0";
version = "0.25.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "sha256-tp8tc8Ob5luxf0ASpSICy5T2XGGIALWqY7L9S6PM/xw=";
sha256 = "sha256-KmB7uTONzNTFPNzwyjQ2eBId7RQynzuNUMeIqSO2gm4=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.682";
version = "2.0.687";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-WQSt3z2U4cQeT2AAGiVA4UhJlsMjzgR16cW9/7foHUI=";
sha256 = "sha256-iO33SutzL302AHpUQwljLig7DWTLIx5JTn+51BNTbLU=";
};
nativeBuildInputs = with py.pkgs; [

35
pkgs/development/tools/fq/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, buildGo117Module
, fetchFromGitHub
, fq
, testVersion
}:
buildGo117Module rec {
pname = "fq";
version = "0.0.2";
src = fetchFromGitHub {
owner = "wader";
repo = "fq";
rev = "v${version}";
sha256 = "sha256-ykjt9MPkN5dgTaY2VhApNt5DKh9TFapMpoHwLdpOKcw=";
};
vendorSha256 = "sha256-89rSpxhP35wreo+0AqM+rDICCPchF+yFVvrTtZ2Xwr4=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
passthru.tests = testVersion { package = fq; };
meta = with lib; {
description = "jq for binary formats";
homepage = "https://github.com/wader/fq";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}

4
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "1.7.1";
version = "1.8";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wSJjA9eZCb3DJed07xuCS0M7ey3DnyuIlp9kvFvDDC8=";
sha256 = "sha256-VqtBJ8HRyhjwKVoRu6+EArZMVbzXkaK89yV56MzRUJo=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/tools/security/sslscan/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "sslscan";
version = "2.0.10";
version = "2.0.11";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = version;
sha256 = "sha256-L6cNmvR6zy2tkMHh+LBsQ3VZDUr0tD5AlOEj+dTLV5k=";
sha256 = "sha256-ROdi1pU2VeswmItHOSZimOkPYlgdqEMg2b7zt0f9WrM=";
};
buildInputs = [ openssl ];

22
pkgs/tools/text/morsel/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "morsel";
version = "0.1.0";
src = fetchFromGitHub {
owner = "SamLee514";
repo = "morsel";
rev = "v${version}";
sha256 = "sha256-m4bCni/9rMTPhZSogpd5+ARrW11TPHSvQpdz3wUr9H4=";
};
cargoSha256 = "sha256-2xR2/013ocDKWS1oWitpAbSDPRwEJJqFcCIm6ZQpCoc=";
meta = with lib; {
description = "Command line tool to translate morse code input to text in real time";
homepage = "https://github.com/SamLee514/morsel";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -3427,6 +3427,8 @@ with pkgs;
moonraker = callPackage ../servers/moonraker { };
morsel = callPackage ../tools/text/morsel {};
mousetweaks = callPackage ../applications/accessibility/mousetweaks {
inherit (xorg) libX11 libXtst libXfixes;
};
@ -5426,6 +5428,8 @@ with pkgs;
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
fq = callPackage ../development/tools/fq { };
franz = callPackage ../applications/networking/instant-messengers/franz {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};

4
pkgs/top-level/python-packages.nix
View File

@ -4757,6 +4757,8 @@ in {
mapbox = callPackage ../development/python-modules/mapbox { };
mariadb = callPackage ../development/python-modules/mariadb { };
marisa-trie = callPackage ../development/python-modules/marisa-trie { };
markdown2 = callPackage ../development/python-modules/markdown2 { };
@ -6297,6 +6299,8 @@ in {
pvlib = callPackage ../development/python-modules/pvlib { };
pvo = callPackage ../development/python-modules/pvo { };
Pweave = callPackage ../development/python-modules/pweave { };
pwntools = callPackage ../development/python-modules/pwntools {