diff options
Diffstat (limited to 'pkgs/development')
14 files changed, 57 insertions, 67 deletions
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index a4538aa370c..a6974295690 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; + sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 68e81866e1e..b5da1ad6e19 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.9"; + version = "1.1.10"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; + sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 99defb3f696..657ebc1aa9a 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.4.2"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-rHd5mQlD/4enGgFyVRVnLXG1Fcd+8hyQj+WnF8QFqm0="; + hash = "sha256-Lcs+Ieh5TEUE+sHqFAZr9rsAZMsI9t2/w87r36IUa1A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 22cbd96cae0..eafd7d2e8bc 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SvoX2nPG6TygnF/fJPo1UpZYVLu8PxQoz00n7bdRtyw="; + sha256 = "sha256-ZfFcPfL/uqREwF8zK7KKuIn6wMnaGFOx6W/e/sPGnAw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index e52ecfc6493..2ef78ecf8d4 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-g+iHUL83PokXPGu7HJ8ffLocQr0uGpMqS5MbfIlZZ2E="; + hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; }; patches = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 name = "flask-appbuilder-wtf3.patch"; url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - sha256 = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; + hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc="; excludes = [ "requirements.txt" "setup.py" @@ -78,8 +78,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3" \ - --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ + --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \ --replace "WTForms<3.0.0" "WTForms" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "prison>=0.2.1, <1.0.0" "prison" diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 19692f988fc..a3e5c2ddb1d 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yEBi/9FVvLYYGMvsVZO94oGXEqXOdtHQ0G+6o2LEmOQ="; + hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index b3077edcc5d..d85c2196e84 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -38,6 +38,8 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; + # https://github.com/miyakogi/m2r/issues/66 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 5d7b53f77a4..bc4e4fc4b2c 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, mistune_2_0, cjkwrap, wcwidth +{ lib, buildPythonPackage, fetchPypi, mistune, cjkwrap, wcwidth , pytestCheckHook }: buildPythonPackage rec { pname = "md2gemini"; version = "1.9.0"; - propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; + propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "md2gemini" ]; diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix deleted file mode 100644 index 24508372d9a..00000000000 --- a/pkgs/development/python-modules/mistune/common.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, version -, sha256 -, format ? "setuptools" -, extraMeta ? {} -}: - -buildPythonPackage rec { - inherit version format; - pname = "mistune"; - - src = fetchPypi { - inherit pname version sha256; - }; - - buildInputs = [ nose ]; - pythonImportsCheck = [ "mistune" ]; - - meta = with lib; { - description = "The fastest markdown parser in pure Python"; - homepage = "https://github.com/lepture/mistune"; - license = licenses.bsd3; - } // extraMeta; -} diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 515844443f1..16a5e22ac6a 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -1,15 +1,30 @@ -self: rec { - mistune_0_8 = self.callPackage ./common.nix { - version = "0.8.4"; - sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; - extraMeta = { - knownVulnerabilities = [ "CVE-2022-34749" ]; - }; +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mistune"; + version = "2.0.4"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; }; - mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.4"; - sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg="; - format = "pyproject"; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mistune" ]; + + meta = with lib; { + description = "A sane Markdown parser with useful plugins and renderers"; + homepage = "https://github.com/lepture/mistune"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; }; - mistune = mistune_0_8; } diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix index 22cd93910d6..0d97a91a16f 100644 --- a/pkgs/development/python-modules/mrkd/default.nix +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -24,5 +24,7 @@ buildPythonPackage rec { description = "Write man pages using Markdown, and convert them to Roff or HTML"; homepage = "https://github.com/refi64/mrkd"; license = licenses.bsd2; + # https://github.com/refi64/mrkd/pull/6 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index d1be6e639b3..efa35f67ddf 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-0CPOK577tl86orjN9Xou8dPm425Yx1m8x6xfHaZEv10="; + hash = "sha256-3xvh/Ic2Mtczi5WREDXy+qQLpXhJQZf6fosT0h+fA0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index b6c4d6fb1c8..33a150be346 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -84,6 +84,7 @@ let DigestSHA1 EmailMIME EmailSender + FileLibMagic FileSlurper FileWhich IOCompress @@ -126,13 +127,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-06-30"; + version = "2022-08-08"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "f2f82b3eeed652e7fc076adf6dcd5a72baaaed18"; - sha256 = "sha256-WPcwFX3q0Y0uMLVN853Xvn3e7RnOOHt8yTLbOBzz5oE="; + rev = "2b1c1e65d5fbbe25625a31ee93cb14c9a9edf969"; + sha256 = "sha256-mjCdJPB4t5OLGZ0r5usJTVs1BBr4cWeGGE7imyUfQnQ="; }; patches = [ diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 2ff94ae2d74..97848a72d12 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,22 +9,21 @@ , gtk3 , webkitgtk , nodejs -, upx , zlib }: buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.42"; + version = "2.0.0-beta.43"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZfzaDUUM3W2ZvmLJufeVZ3eK/grvSxbKbsReV7BmcGA="; + sha256 = "sha256-IX60xXU1sV39EI2nC/oL+s/RfE0apSJ2nMza6Av864I="; } + "/v2"; - vendorSha256 = "sha256-qmj7pZV9VaxWcC7EgbKZOjlDj6/66Qf5d222aj4TViw="; + vendorSha256 = "sha256-KB6fzyeeHCl164ZnDIy9auUC7Qzm8rVMo3XxXbeYCgY="; proxyVendor = true; @@ -49,7 +48,6 @@ buildGoModule rec { gtk3 webkitgtk nodejs - upx ]; ldflags = [ @@ -60,7 +58,7 @@ buildGoModule rec { # As Wails calls a compiler, certain apps and libraries need to be made available. postFixup = '' wrapProgram $out/bin/wails \ - --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" |