diff options
Diffstat (limited to 'pkgs/development')
46 files changed, 361 insertions, 264 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index eb0be521daa88..18ff90b6ff007 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -86,25 +86,7 @@ stdenv.mkDerivation { ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 ../../common/compiler-rt/armv7l-15.patch - ] - # The `compiler-rt` build inspects `ld` to figure out whether it needs to - # explicitly call `codesign`: - # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/Modules/AddCompilerRT.cmake#L409-L422 - # - # In our case, despite (currently) having an `ld` version than 609, we don't - # need an explicit codesigning step because `postLinkSignHook` handles this - # for us. - # - # Unfortunately there isn't an easy way to override - # `NEED_EXPLICIT_ADHOC_CODESIGN`. - # - # Adding `codesign` as a build input also doesn't currently work because, as - # of this writing, `codesign` in nixpkgs doesn't support the `--sign` alias - # which the `compiler-rt` build uses. See here for context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272116014 - # - # So, for now, we patch `compiler-rt` to skip the explicit codesigning step. - ++ lib.optional stdenv.hostPlatform.isDarwin ./skip-explicit-codesign.patch; + ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch b/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch deleted file mode 100644 index 894a74e74d464..0000000000000 --- a/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type) - if (HAD_ERROR) - message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") - endif() -- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) -+ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us - if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") - string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) - if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index dfae27b371048..2a152ef3ee395 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1224"; + version = "1.11.1.1237"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI="; + sha256 = "sha256-1uucH0/kx7w991kvZnwjRTSbVbu62W0j0/7iaRTZ5I8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f0c6924995717..373dce60d940a 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.02"; + version = "23.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; + sha256 = "sha256-sQbltmHmScSn5E1tE32uU16JQasjOnLW5N2m6+LC9CI="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 0fa807ebe7999..d4aeaa8f2a73d 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.3"; + version = "22.3.4"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-ghCB9wrjixAX06KUYZUEL1Tq6fKSH7pqe3Ti1y/+a2U="; + sha256 = "sha256-V8mimy4yB7BO5YdbUh8byN9K6ylQ3lOLynQbXxiOUok="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 20c9a64c60b4a..730ebf270446c 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.67"; + version = "1.0.68"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-SXyMmkyC1RZLIYhrG2TDcH/PDCHfrJOVZOX1PC3EDLg="; + sha256 = "sha256-FlBXSX6ZA6vDV1Kf1QU1XGxkyS3aWGSrwr2RtdVss10="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 18376f4b7f42d..8c052b5ce80cb 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "Library for reading and writing Jcat files"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 09dbcc3a0f511..2a1f0941f4dba 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "A library to help create and query binary XML blobs"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index db963e5d86237..843eb2f5b1038 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.24"; + version = "1.0.26"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; + hash = "sha256-vbuzV4ZZnb0Vl+U9B8BorDD7mHQ7ILwkR35GaFs+aTI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index 63a9987994c90..95e953e1f5a16 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -2,25 +2,32 @@ , aiowinreg , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , pycryptodomex , pythonOlder +, setuptools , tqdm , unicrypto }: buildPythonPackage rec { pname = "aesedb"; - version = "0.1.1"; - format = "setuptools"; + version = "0.1.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pnbzPVXr3qgBH7t5wNR+jbTdQGMdnLpV+xfgQjdc+7A="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TXGRXo3754dEgRotDO5vSl9vj119Xday/176yem3cqk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiowinreg colorama diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index f4248a27ddde2..efd590e7e827e 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI="; + hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 55dc7fd2202b9..71e8f9d29dd1f 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "brother"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jMvbZ4/NOA3dnJUdDWk2KTRz1gBOC+oDE0ChGNdFl1o="; + hash = "sha256-bp4YerSTTsuWX3Yc+btlhwCNZO3eDxRgKNzLZFJbKV0="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; homepage = "https://github.com/bieniu/brother"; + changelog = "https://github.com/bieniu/brother/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index e8bccf2928aa7..643674f4f0a1b 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; + hash = "sha256-Ua6XxFmvF2EDtCZTeVHGRfwNAMjX3p5s4Jo5ylutYqY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 2fbaa7f66ae54..16b468ab621aa 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "3.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; - rev = "v${version}"; - sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix new file mode 100644 index 0000000000000..ca2cdc02162e4 --- /dev/null +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, pkgconfig +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faust-cchardet"; + version = "2.1.18"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "faust-streaming"; + repo = "cChardet"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + }; + + nativeBuildInputs = [ + cython + pkgconfig + setuptools + wheel + ]; + + pythonImportsCheck = [ + "cchardet" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst"; + description = "High-speed universal character encoding detector"; + homepage = "https://github.com/faust-streaming/cChardet"; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ dotlambda ivan ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index dddde1a3093ae..e6051ed93a338 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; + hash = "sha256-fc/87JW9FExvZPk+pHLuntLHfdj0kRi2e5ohRq5Ujpg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index c8949968536c6..1b80c9a4986e1 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -1,13 +1,10 @@ { lib , buildPythonPackage , fetchPypi - -# build -, antlr4 +, pythonOlder # propagates -, antlr4-python3-runtime -, dataclasses-json +, importlib-resources , pyyaml # tests @@ -16,7 +13,7 @@ let pname = "hassil"; - version = "0.2.6"; + version = "1.0.6"; in buildPythonPackage { inherit pname version; @@ -24,23 +21,13 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; + hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k="; }; - nativeBuildInputs = [ - antlr4 - ]; - - postPatch = '' - sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt - rm hassil/grammar/*.{tokens,interp} - antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4 - ''; - propagatedBuildInputs = [ - antlr4-python3-runtime - dataclasses-json pyyaml + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 8807d0877bb8d..67393f6f113f8 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; + hash = "sha256-FsIE4dcZOP24/DX6TLnmoCHMYe4f9gWqmv2L25ujqu4="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index a3a8cf93b810d..ebf7a9163875b 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; + hash = "sha256-15olERnpfe4PbDsDfw47vsYsqjFe8P8IDmSSGxGLtx8="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; platforms = [ "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 71cd3b9a260df..58f65b6e3d46d 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.6.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U="; + rev = "refs/tags/${version}"; + hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 825f89354e56a..ee51cdd7cd505 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "1.6.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc="; + hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nuheat/default.nix b/pkgs/development/python-modules/nuheat/default.nix new file mode 100644 index 0000000000000..97607ceab3dcf --- /dev/null +++ b/pkgs/development/python-modules/nuheat/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, parameterized +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "nuheat"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "broox"; + repo = "python-nuheat"; + rev = "refs/tags/${version}"; + hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + mock + parameterized + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "nuheat" + ]; + + meta = with lib; { + description = "Library to interact with NuHeat Signature and Mapei Mapeheat radiant floor thermostats"; + homepage = "https://github.com/broox/python-nuheat"; + changelog = "https://github.com/broox/python-nuheat/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index d6fed8f9ac5b9..92b8f03572927 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.2.12"; + version = "23.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4="; + hash = "sha256-00vIdNiiUmvPevGAUAgaxo8tKICPbAt9byJrSySogPY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix new file mode 100644 index 0000000000000..6c70ad8861c7b --- /dev/null +++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -0,0 +1,49 @@ +{ lib +, bleak +, bleak-retry-connector +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "py-dormakaba-dkey"; + version = "1.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "emontnemery"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + cryptography + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "py_dormakaba_dkey" + ]; + + meta = with lib; { + description = "Library to interact with a Dormakaba dkey lock"; + homepage = "https://github.com/emontnemery/py-dormakaba-dkey"; + changelog = "https://github.com/emontnemery/py-dormakaba-dkey/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 04206796d4d6e..e398643aa510b 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,7 +3,6 @@ , aioresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-aiohttp , poetry-core , pytest-asyncio @@ -13,24 +12,16 @@ buildPythonPackage rec { pname = "pyairnow"; - version = "1.1.0"; + version = "1.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "asymworks"; repo = pname; - rev = "v${version}"; - sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + rev = "refs/tags/v${version}"; + hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; - hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 3c290b8439416..7c6a477c7c3d2 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -2,22 +2,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "pybalboa"; - version = "0.13"; - format = "setuptools"; + version = "1.0.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "garbled1"; repo = pname; - rev = version; - sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd"; + rev = "refs/tags/${version}"; + hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI="; }; + nativeBuildInputs = [ + poetry-core + ]; + # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 70f76c129f022..400791197b6f6 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -7,17 +7,16 @@ , pypubsub , pyserial , pyserial-asyncio -, pytest-asyncio -, pytest-timeout , pytestCheckHook , pythonOlder -, pyyaml +, setuptools +, voluptuous }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,29 +24,27 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; + hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp pypubsub pyserial pyserial-asyncio - pyyaml + voluptuous ]; nativeCheckInputs = [ async_generator - pytest-asyncio - pytest-timeout pytestCheckHook ]; - disabledTests = [ - "test_results" - ]; - pythonImportsCheck = [ "pyinsteon" ]; diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index da6cdd5dc10ef..10c25dbe64367 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.6.3"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rb4QCxntXJYA8sqkgAjS6e8WJK9ljhIKgM3dfpmbHSc="; + hash = "sha256-1cHQ05yKofZC3pz8JIZCjZmZasqSb/SSwJlg8ThIn1k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix index 5907be3a22a0c..144aec0fa5c51 100644 --- a/pkgs/development/python-modules/python-decouple/default.nix +++ b/pkgs/development/python-modules/python-decouple/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "python-decouple"; - version = "3.7"; + version = "3.8"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "HBNetwork"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ="; + hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index e59781180b38c..0caf9f85e3e9c 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "2.1.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; + hash = "sha256-nNf0Q3J5nrYDinMnl+p3HC4FYMX+GubYmtchfuATWms="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix new file mode 100644 index 0000000000000..11f402cc7a9ea --- /dev/null +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, voluptuous +}: + +buildPythonPackage rec { + pname = "python-otbr-api"; + version = "1.0.5"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-yI7TzVJGSWdi+NKZ0CCOi3BC4WIqFuS7YZgihfWDBSY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + cryptography + voluptuous + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "python_otbr_api" + ]; + + meta = with lib; { + description = "Library for the Open Thread Border Router"; + homepage = "https://github.com/home-assistant-libs/python-otbr-api"; + changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 3ad320751acbe..8b22b098a8ce0 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pytest , colored -, pytestCheckHook +, invoke }: buildPythonPackage rec { pname = "syrupy"; - version = "3.0.6"; + version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.8.1"; + src = fetchFromGitHub { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE="; }; nativeBuildInputs = [ @@ -32,9 +35,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + invoke + pytest ]; + checkPhase = '' + runHook preCheck + # https://github.com/tophat/syrupy/blob/main/CONTRIBUTING.md#local-development + invoke test + runHook postCheck + ''; + meta = with lib; { changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; description = "Pytest Snapshot Test Utility"; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index d02a152903ad4..3ceab45ec5da0 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -65,6 +65,11 @@ buildPythonPackage rec { time-machine ]; + disabledTestPaths = [ + # snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + ]; + pythonImportsCheck = [ "textual" ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 3c7b7ba032542..881c24d25b129 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.12.0"; + version = "2023.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc="; + hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 2cb55c69cec7a..f35ab607a07c1 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -8,25 +8,30 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.5.0"; + version = "2.6.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; - rev = version; - sha256 = "sha256-8rWMz8tBanxHdU/F4HhBxxz3ltqbdRoP4JED2dmZfTk="; + repo = "voluptuous-serialize"; + rev = "refs/tags/${version}"; + hash = "sha256-vvreXSQDkA3JkZpOKZqJgMRyObJX/cSR8r+A26h9fNE="; }; - propagatedBuildInputs = [ voluptuous ]; + propagatedBuildInputs = [ + voluptuous + ]; nativeCheckInputs = [ pytestCheckHook voluptuous ]; - pythonImportsCheck = [ "voluptuous_serialize" ]; + pythonImportsCheck = [ + "voluptuous_serialize" + ]; meta = with lib; { homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index bde97b8e1245d..a3e4c0c561a81 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -3,7 +3,7 @@ , aiodns , aiohttp , buildPythonPackage -, cchardet +, faust-cchardet , fetchFromGitHub , pyopenssl , pythonOlder @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ="; + hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik="; }; propagatedBuildInputs = [ aenum aiodns aiohttp - cchardet + faust-cchardet pyopenssl pytz related diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index af7f10e3fd8d5..bada705c78d87 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.4.0"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw="; + hash = "sha256-ivqUego6a9ieSxgHKd3szVAE23zMI54nYqbZjHIgVVE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index e882a48c6332b..b3cda18f7789f 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -2,15 +2,17 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, paho-mqtt +, asyncio-mqtt , pydantic , pythonOlder +, setuptools +, tenacity }: buildPythonPackage rec { pname = "yolink-api"; - version = "0.1.5"; - format = "setuptools"; + version = "0.2.8"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,13 +20,18 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Ch17aKUT8jVUo+pYD5EvydEzP/TTjLtgkUQJnHYkKg="; + hash = "sha256-dcuP2VPAp3Na1o9DV3bPejCrtaIxvt+g/vRaQYqI67Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - paho-mqtt + asyncio-mqtt pydantic + tenacity ]; # Module has no tests diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 9c2b3945642b0..c5521f0f0d6b1 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.47.1"; + version = "0.47.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; + hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index f1b846e9482bb..e4d6ddad8de31 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; + sha256 = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 3a759b15815e0..ca8b65b341373 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.44.0"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4="; + hash = "sha256-EeQ0gUSDsHIJnp1Oc2Imld4ZFa5maX8xj6GzchHlCoc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index e826fd9d2cd58..f8cbc806250db 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak="; + hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; }; - cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc="; + cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/development/tools/dockfmt/default.nix index d637b8ca3e512..18dfed5f2fbcb 100644 --- a/pkgs/development/tools/dockfmt/default.nix +++ b/pkgs/development/tools/dockfmt/default.nix @@ -5,13 +5,14 @@ buildGoModule rec { pname = "dockfmt"; - version = "0.3.3"; + version = "unstable-2020-09-18"; + # The latest released version doesn't support reading from stdin. src = fetchFromGitHub { owner = "jessfraz"; repo = "dockfmt"; - rev = "v${version}"; - sha256 = "0m56ydmf7zbcsa5yym7j5fgr75v677h9s40zyzwrqccyq01myp06"; + rev = "1455059b8bb53ab4723ef41946c43160583a8333"; + hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg="; }; vendorSha256 = null; @@ -25,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Dockerfile format"; homepage = "https://github.com/jessfraz/dockfmt"; - license = [ licenses.mit ]; - maintainers = [ maintainers.cpcloud ]; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index ada936ed540b1..0587a3e1d912c 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gomplate"; - version = "3.11.3"; - owner = "hairyhenderson"; - rev = "v${version}"; + version = "3.11.4"; src = fetchFromGitHub { - inherit owner rev; + owner = "hairyhenderson"; repo = pname; - sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw="; + rev = "refs/tags/v${version}"; + hash = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4="; }; - vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc="; + vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg="; postPatch = '' # some tests require network access @@ -32,13 +34,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" + "-X github.com/${src.owner}/${pname}/v3/version.Version=${version}" ]; meta = with lib; { description = "A flexible commandline tool for template rendering"; homepage = "https://gomplate.ca/"; - maintainers = with maintainers; [ ris jlesquembre ]; + changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ris jlesquembre ]; }; } diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 3894dcd2c6ef9..563a2e7fd33ee 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.5"; + version = "3.8.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-u7Hwj/RYE8pZkIVulJrwdC1kxhTGl3P5DEug6v5lMvg="; + sha256 = "sha256-hnECB/tqyEN0g3WIIEHg2uAzEmspB+TQUTECyOtUNy4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/patchelf/patches/380.patch b/pkgs/development/tools/misc/patchelf/patches/380.patch deleted file mode 100644 index 6811550bb0304..0000000000000 --- a/pkgs/development/tools/misc/patchelf/patches/380.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8db45c6a0c1a4dbbd492ac7fb59c1bca9460fe3e Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 21:45:22 -0700 -Subject: [PATCH 1/3] elf.h: resynchronize with glibc elf.h - -This commit adds two symbols (SHT_MIPS_XHASH and DT_MIPS_XHASH) found -in glibc, and updates the value of DT_MIPS_NUM. These changes were -made to glibc in 23c1c256ae7b0f010d0fcaff60682b620887b164 on -29-Aug-2019. ---- - src/elf.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/elf.h b/src/elf.h -index b3e567c3..702f2e60 100644 ---- a/src/elf.h -+++ b/src/elf.h -@@ -1400,6 +1400,7 @@ typedef struct - #define SHT_MIPS_EH_REGION 0x70000027 - #define SHT_MIPS_XLATE_OLD 0x70000028 - #define SHT_MIPS_PDR_EXCEPTION 0x70000029 -+#define SHT_MIPS_XHASH 0x7000002b - - /* Legal values for sh_flags field of Elf32_Shdr. */ - -@@ -1647,7 +1648,9 @@ typedef struct - in a PIE as it stores a relative offset from the address of the tag - rather than an absolute address. */ - #define DT_MIPS_RLD_MAP_REL 0x70000035 --#define DT_MIPS_NUM 0x36 -+/* GNU-style hash table with xlat. */ -+#define DT_MIPS_XHASH 0x70000036 -+#define DT_MIPS_NUM 0x37 - - /* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ - - -From 820da7be8d1e1a49c4831dcb3800ed3b9f11e8a6 Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 21:49:14 -0700 -Subject: [PATCH 2/3] patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash - -glibc changed their ABI in commit -23c1c256ae7b0f010d0fcaff60682b620887b164 on 2019-Aug-29, by changing -the structure of the .gnu.hash data on MIPS and moving it to a -different section. We need to adapt to this change by glibc. - -Closes #368 ---- - src/patchelf.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 6882b288..08585139 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -990,6 +990,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) - // some binaries might this section stripped - // in which case we just ignore the value. - if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr; -+ } else if (d_tag == DT_MIPS_XHASH) { -+ // the .MIPS.xhash section was added to the glibc-ABI -+ // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164 -+ dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr; - } else if (d_tag == DT_JMPREL) { - auto shdr = tryFindSectionHeader(".rel.plt"); - if (!shdr) shdr = tryFindSectionHeader(".rela.plt"); - -From 7b155fda3105ceca5643cacbdd4207c4c4c59cf5 Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 22:44:04 -0700 -Subject: [PATCH 3/3] formatting: fix incorrect indentation in previous commit - ---- - src/patchelf.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 08585139..402b2bed 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -990,7 +990,7 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) - // some binaries might this section stripped - // in which case we just ignore the value. - if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr; -- } else if (d_tag == DT_MIPS_XHASH) { -+ } else if (d_tag == DT_MIPS_XHASH) { - // the .MIPS.xhash section was added to the glibc-ABI - // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164 - dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr; |