diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d245f534648..ea6c701ca8c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -513,6 +513,17 @@ github = "alexnortung"; githubId = 1552267; }; + alexshpilkin = { + email = "ashpilkin@gmail.com"; + github = "alexshpilkin"; + githubId = 1010468; + keys = [{ + longkeyid = "rsa4096/0x73E9AA114B3A894B"; + fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; + }]; + matrix = "@alexshpilkin:matrix.org"; + name = "Alexander Shpilkin"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 480366921ae..d9d21f30f34 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.7.0-49.BETA"; + version = "8.8.0-11.BETA"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4="; + sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index c43df6b5f57..72b542e24fe 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.6.1"; + version = "8.7.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-CbSx1UJAvNrA1gTQyi6r8NgjwQ7H+tqWU9t3TUNrDMg="; + sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index fff8101e55a..494ed3001e5 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: +{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +, withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { pname = "catclock"; - version = "unstable-2015-10-04"; + version = "unstable-2021-11-15"; src = fetchFromGitHub { owner = "BarkyTheDog"; repo = "catclock"; - rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; - sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; + rev = "b2f277974b5a80667647303cabf8a89d6d6a4290"; + sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi"; }; preInstall = '' @@ -17,14 +18,15 @@ stdenv.mkDerivation { cp xclock.man $out/share/man/man1/xclock.1 ''; - makeFlags = [ - "DESTINATION=$(out)/bin/" - ]; + makeFlags = [ "DESTINATION=$(out)/bin/" ] + ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ]; + buildInputs = [ xlibsWrapper motif ] + ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { homepage = "http://codefromabove.com/2014/05/catclock/"; + description = "Analog / Digital / Cat clock for X"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; mainProgram = "xclock"; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 4f77118c0a4..7f705bc3526 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.10"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F058lCuIxH0lqJlPrWIznu2Ks2w+KXrTnJD7CmYSZFU="; + sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 7698e6619d9..1319f72f4e9 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.8+matrix.1"; + version = "0.5.10+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; + sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 1083fe11106..2815c3d53ea 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; + sha256 = "LYjv61d+2viqrkMcd5um5uuWHuvd8FzKLsyhqgTbekA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 1ad36f7e96b..e3b8d6c344d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; + sha256 = "9e6KYVj6EiYnQScmy4gATn4tBGrcMiFQViROWbdAY+o="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index f92b162476a..415fd7b80c9 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -47,13 +47,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; + sha256 = "cZQhi/7EW5o+/avOb4RQ7Uw5dyIaHqQBTC5Fii/poVQ="; }; patches = [ diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 1f663b5488d..b5ba81ebc28 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM="; + sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8="; }; executable = "bb"; diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 69e6519b32c..b656b194785 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2022-02-03"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; - hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; + rev = "v${version}"; + hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM="; }; postPatch = '' @@ -32,13 +32,6 @@ buildPythonPackage rec { "--asyncio-mode=strict" ]; - disabledTests = [ - # https://github.com/aio-libs/async-lru/issues/341 - "test_alru_cache_deco" - "test_alru_cache_fn_called" - "test_close" - ]; - pythonImportsCheck = [ "async_lru" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 02aeec5bfcc..7cf41e9fcbd 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - pythonImportCheck = [ "contexttimer" ]; + pythonImportsCheck = [ "contexttimer" ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix new file mode 100644 index 00000000000..6e785d0c9a2 --- /dev/null +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, git +, hatchling +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "hatch-vcs"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "hatch_vcs"; + inherit version; + sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + hatchling + setuptools-scm + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hatch_vcs" + ]; + + meta = with lib; { + description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions"; + homepage = "https://github.com/ofek/hatch-vcs"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index a63754f0c09..404731e22a9 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.54.0"; + version = "0.55.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; + hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index a329d5ab9e5..6fa1728deea 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.6"; + version = "1.22.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; + hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix new file mode 100644 index 00000000000..3b6d24d6168 --- /dev/null +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-nextbusnext"; + version = "0.1.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ViViDboarder"; + repo = "py_nextbus"; + rev = "v${version}"; + hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "py_nextbus" ]; + + meta = { + description = "Minimalistic Python client for the NextBus public API"; + homepage = "https://github.com/ViViDboarder/py_nextbus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c3a6a4af9e5..315678b874e 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.11.2"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; + sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 7a7132a8326..7457cc14f31 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yte"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koesterlab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 3c191d7c6a9..e8020787130 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; + sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 5152b3dfe71..86a3924c0e2 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { description = "facetimehd calibration"; homepage = "https://support.apple.com/kb/DL1837"; license = licenses.unfree; - maintainers = with maintainers; [ womfoo grahamc ]; + maintainers = with maintainers; [ alexshpilkin womfoo grahamc ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d91ad268c9a..afed37e315d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1753,7 +1753,8 @@ nexia ]; "nextbus" = ps: with ps; [ - ]; # missing inputs: py_nextbusnext + py-nextbusnext + ]; "nextcloud" = ps: with ps; [ nextcloudmonitor ]; @@ -3501,6 +3502,7 @@ "netgear" "network" "nexia" + "nextbus" "nightscout" "nina" "no_ip" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72568265a82..adf03ae7271 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18989,6 +18989,20 @@ let }; }; + POSIXAtFork = buildPerlPackage { + pname = "POSIX-AtFork"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors//id/N/NI/NIKOLAS/POSIX-AtFork-0.04.tar.gz"; + sha256 = "sha256-wuIpOobUhxRLyPe6COfEt2sRsOTf3EGAmEXTDvoH5g4="; + }; + buildInputs = [ TestSharedFork ]; + meta = { + description = "Hook registrations at fork(2)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + POSIXstrftimeCompiler = buildPerlModule { pname = "POSIX-strftime-Compiler"; version = "0.44"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index eb0062fa17c..385bf1142b3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,7 +108,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 - python-magic = python-magic; # added 2022-05-07 + python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20ac68bb774..acfe5eca863 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3793,6 +3793,8 @@ in { hatchling = callPackage ../development/python-modules/hatchling { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; @@ -6370,6 +6372,8 @@ in { proxy_tools = callPackage ../development/python-modules/proxy_tools { }; + py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; + pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { }; pyatag = callPackage ../development/python-modules/pyatag { };