BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-12-15 06:01:03 +00:00 committed by GitHub
commit 823d14246a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 204 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/tauon/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "tauon";
version = "7.4.5";
version = "7.4.6";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
sha256 = "sha256-fxmCLjnYO7ZblEiRoByxuFzw9xFHqbQvne1WNcFnnwI=";
sha256 = "sha256-G3DDr2ON35ctjPkRMJDjnfDHMHMhR3tlTgJ65DXvzwk=";
};
postUnpack = ''

2
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -7,7 +7,6 @@
, bison
, proj
, geos
, xlibsWrapper
, sqlite
, gsl
, qwt
@ -92,7 +91,6 @@ in mkDerivation rec {
openssl
proj
geos
xlibsWrapper
sqlite
gsl
qwt

2
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -7,7 +7,6 @@
, bison
, proj
, geos
, xlibsWrapper
, sqlite
, gsl
, qwt
@ -92,7 +91,6 @@ in mkDerivation rec {
openssl
proj
geos
xlibsWrapper
sqlite
gsl
qwt

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202212080044";
version = "202212150047";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "b8fc720b187e59a55609b2db8cf971a6c938be83";
sha256 = "sha256-Fg+r23V5gs9wQKfgH/xkUqJvSOc8daaWLuNiDWD2Nz8=";
rev = "29c096b1285812a0a9a955b98ff2998c46f9b80a";
sha256 = "sha256-44kP+4Bc7fwxNViWiKo7jLtUov+7k60v+7NF7CTkbjg=";
};
installPhase = ''

20
pkgs/development/python-modules/bashlex/default.nix
View file

@ -1,33 +1,31 @@
{ enum-compat
, lib
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, python
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bashlex";
version = "0.15";
version = "0.16";
format = "setuptools";
src = fetchFromGitHub {
owner = "idank";
repo = pname;
rev = version;
sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84=";
hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI=";
};
checkInputs = [ nose ];
propagatedBuildInputs = [ enum-compat ];
# workaround https://github.com/idank/bashlex/issues/51
preBuild = ''
${python.interpreter} -c 'import bashlex'
'';
checkPhase = ''
${python.interpreter} -m nose --with-doctest
'';
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "bashlex" ];

77
pkgs/development/python-modules/bonsai/default.nix Normal file
View file

@ -0,0 +1,77 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, setuptools
, cyrus_sasl
, openldap
, typing-extensions
, gevent
, tornado
, trio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bonsai";
version = "1.5.1";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "noirello";
repo = "bonsai";
rev = "v${version}";
hash = "sha256-UR/Ds5famD8kuDa6IIIyEv45eJuAcoygXef8XE+5Cxk=";
};
nativeBuildInputs = [
setuptools
];
buildInputs = [
cyrus_sasl
openldap
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
typing-extensions
];
passthru.optional-dependencies = {
gevent = [ gevent ];
tornado = [ tornado ];
trio = [ trio ];
};
checkInputs = [
pytestCheckHook
];
disabledTestPaths = [
# requires running LDAP server
"tests/test_asyncio.py"
"tests/test_ldapclient.py"
"tests/test_ldapconnection.py"
"tests/test_ldapentry.py"
"tests/test_ldapreference.py"
"tests/test_pool.py"
];
disabledTests = [
# requires running LDAP server
"test_set_async_connect"
];
pythonImportsCheck = [ "bonsai" ];
meta = {
changelog = "https://github.com/noirello/bonsai/blob/${src.rev}/CHANGELOG.rst";
description = "Python 3 module for accessing LDAP directory servers";
homepage = "https://github.com/noirello/bonsai";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

68
pkgs/development/python-modules/cartopy/default.nix
View file

@ -1,28 +1,39 @@
{ buildPythonPackage, lib, fetchPypi
, pytestCheckHook, filelock, mock, pep8
, cython, setuptools-scm
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, proj, flufl_lock
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, cython
, setuptools-scm
, geos
, proj
, matplotlib
, numpy
, pyproj
, pyshp
, shapely
, owslib
, pillow
, gdal
, scipy
, fontconfig
, pytest-mpl
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cartopy";
version = "0.21.0";
version = "0.21.1";
disabled = pythonOlder "3.8";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "Cartopy";
sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI=";
hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo=";
};
postPatch = ''
# https://github.com/SciTools/cartopy/issues/1880
substituteInPlace lib/cartopy/tests/test_crs.py \
--replace "test_osgb(" "dont_test_osgb(" \
--replace "test_epsg(" "dont_test_epsg("
'';
nativeBuildInputs = [
cython
geos # for geos-config
@ -35,14 +46,27 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
# required
six pyshp shapely numpy
# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
matplotlib
numpy
pyproj
pyshp
shapely
];
checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ];
passthru.optional-dependencies = {
ows = [ owslib pillow ];
plotting = [ gdal pillow scipy ];
};
checkInputs = [
pytest-mpl
pytestCheckHook
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
preCheck = ''
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
export HOME=$TMPDIR
'';
pytestFlagsArray = [
"--pyargs" "cartopy"
@ -50,8 +74,6 @@ buildPythonPackage rec {
];
disabledTests = [
"test_nightshade_image"
"background_img"
"test_gridliner_labels_bbox_style"
];

7
pkgs/development/python-modules/mastodon-py/default.nix
View file

@ -18,13 +18,15 @@
buildPythonPackage rec {
pname = "mastodon-py";
version = "1.7.0";
version = "1.8.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
rev = "refs/tags/${version}";
sha256 = "sha256-QavgCWWiGmGnNoEX7pxzUyujEQObXhkaucv4FduZ/Vg=";
hash = "sha256-T/yG9LLdttBQ+9vCSit+pyQX/BPqqDXbrTcPfTAUu1U=";
};
postPatch = ''
@ -53,6 +55,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "mastodon" ];
meta = with lib; {
changelog = "https://github.com/halcy/Mastodon.py/blob/${src.rev}/CHANGELOG.rst";
description = "Python wrapper for the Mastodon API";
homepage = "https://github.com/halcy/Mastodon.py";
license = licenses.mit;

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

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "micloud";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "Squachen";
repo = "micloud";
rev = "v_${version}";
sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ=";
hash = "sha256-IsNXFs1N+rKwqve2Pjp+wRTZCxHF4acEo6KyhsSKuqI=";
};
propagatedBuildInputs = [

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

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "6.2.4";
version = "6.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g=";
hash = "sha256-5ADRKFGQ1k/O/r9CgEWCbOZLgasUJVXtPm+5ocRE4Fk=";
};
patches = [

6
pkgs/development/python-modules/pynetbox/default.nix
View file

@ -10,13 +10,14 @@
buildPythonPackage rec {
pname = "pynetbox";
version = "6.6.2";
version = "7.0.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "netbox-community";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w=";
hash = "sha256-PFSnINbXSnEo1gvntjfH6KCVa/LeaNrsiuWM4H+fOvQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -41,6 +42,7 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/netbox-community/pynetbox/releases/tag/v${version}";
description = "API client library for Netbox";
homepage = "https://github.com/netbox-community/pynetbox";
license = licenses.asl20;

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyomo";
version = "6.4.3";
version = "6.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
repo = "pyomo";
owner = "pyomo";
rev = "refs/tags/${version}";
hash = "sha256-EHttGeQUI8SWo8R9zRchguvDA6U8EKhDbBf5jdwl4dI=";
hash = "sha256-FVpwJRCRlc537tJomB4Alxx8zJj8FpZp+LxB0f12rGE=";
};
propagatedBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "safety";
version = "2.3.3";
version = "2.3.5";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-LhfPEnRyynIM3MZfg0AItVWhD+VmJ2RgCat1Zd0kWc8=";
hash = "sha256-pgwR+JUvQSy7Fl1wyx9nOjtDorqak84R+X5qTeg0qjo=";
};
postPatch = ''

5
pkgs/servers/bird/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bird";
version = "2.0.10";
version = "2.0.11";
src = fetchurl {
sha256 = "sha256-ftNB3djch/qXNlhrNRVEeoQ2/sRC1l9AIhVaud4f/Vo=";
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
hash = "sha256-YKe4O2e50InSp0WhH93RJGH2MavHtkW2wIWt+Qs/VdY=";
};
nativeBuildInputs = [ flex bison ];
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
passthru.tests = nixosTests.bird;
meta = with lib; {
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
description = "BIRD Internet Routing Daemon";
homepage = "http://bird.network.cz";
license = licenses.gpl2Plus;

44
pkgs/tools/graphics/steghide/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, libjpeg
, libmcrypt
, libmhash
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "steghide";
version = "0.5.1.1";
src = fetchFromGitHub {
owner = "museoa";
repo = "steghide";
rev = finalAttrs.version;
hash = "sha256-uUXEipIUfu9AbG7Ekz+25JkWSEGzqA7sJHZqezLzUto=";
};
nativeBuildInputs = [
autoreconfHook
];
buildInputs = [
libjpeg
libmcrypt
libmhash
zlib
];
postPatch = ''
cd src
'';
meta = with lib; {
homepage = "https://github.com/museoa/steghide";
description = "Open source steganography program";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
})

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

@ -22761,6 +22761,8 @@ with pkgs;
stduuid = callPackage ../development/libraries/stduuid { };
steghide = callPackage ../tools/graphics/steghide { };
stegsolve = callPackage ../tools/graphics/stegsolve { };
StormLib = callPackage ../development/libraries/StormLib { };

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

@ -1343,6 +1343,8 @@ self: super: with self; {
bond-async = callPackage ../development/python-modules/bond-async { };
bonsai = callPackage ../development/python-modules/bonsai { };
booleanoperations = callPackage ../development/python-modules/booleanoperations { };
boolean-py = callPackage ../development/python-modules/boolean-py { };