diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-23 00:13:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 00:13:31 +0000 |
| commit | 69d32db54427d937384cfcede967af2bf30d9535 (patch) | |
| tree | f0a5cddcc3403cebafce3b7b2b5411503c9ff0c8 /pkgs/development | |
| parent | 1c8747bc8c51518ce0467a80212c04ee0b6406f6 (diff) | |
| parent | 16da38cd4f2760e5390573c198287d3de113e5d3 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development')
67 files changed, 491 insertions, 861 deletions
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 99fde9c66a591..f7a05f8d1455c 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -2,8 +2,8 @@ let ocamlDependencies = version: - if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages_4_12; [ + if lib.versionAtLeast version "4.3" + then with ocaml-ng.ocamlPackages_4_14; [ ocaml findlib sedlex @@ -126,7 +126,7 @@ in { sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; }; haxe_4_3 = generic { - version = "4.3.3"; - sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y="; + version = "4.3.4"; + sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; }; } diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 0d9202df8aeeb..45955dc5e1b36 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -56,7 +56,7 @@ let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -74,7 +74,7 @@ let ./clang/gnu-install-dirs.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit clang-tools-extra_src llvm_meta; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index ecdbd14e98e74..018fb0c638505 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -82,7 +82,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -105,7 +105,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index fb1b8743b6ebb..588dc8fffefdd 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -78,7 +78,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -96,7 +96,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index ce8426857ebe7..bfcbe2b86e247 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -84,7 +84,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -102,7 +102,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5716267426b24..5dd07d77cf8c6 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 2f60666536f37..9f4be2261b0cf 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 0a30288755e6f..4d2b160a23ff1 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 56fae64d59d8d..1a34130679db2 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index f0d95323fe33f..8385f5063db9e 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -55,7 +55,11 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fcommon" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + ]); makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/development/compilers/ocaml/5.2.nix b/pkgs/development/compilers/ocaml/5.2.nix index 26d77f63044d4..8df6f1d5d48ea 100644 --- a/pkgs/development/compilers/ocaml/5.2.nix +++ b/pkgs/development/compilers/ocaml/5.2.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "5"; minor_version = "2"; - patch_version = "0-beta1"; + patch_version = "0-beta2"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta1.tar.xz"; - sha256 = "sha256:0prf87a41k2y1znnh2pjkggrvhh5cihj68sxqrjn162889rf7wam"; + url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta2.tar.xz"; + sha256 = "sha256:1cyw0w79j7kyr3x0ivsqm1si704b29ic33yj621dq7f125jabk00"; }; } diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 74eb0f05d3f2b..ea3fd6e1ac784 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GmVekTySfSOIWkKLdVuhhtJFQBBBfHBj410jNUfSrkc="; + sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; }; passthru = { diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 68416ef2edc03..118646c619ae0 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "grisha"; + owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 HTML parsing algorithm"; - homepage = "https://github.com/google/gumbo-parser"; + homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index c18e699eaf869..cd9e7778a80be 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2024-02-05"; + version = "unstable-2024-04-15"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "bd4fa85d7f772f2ad32146d5681c91612fc93842"; - sha256 = "2F6MmLfKyFl7HzdTb1NDBVHMSRVzVhcib93JVaR58Qw="; + rev = "25541e312f7094e9c90895000d435af520d42418"; + sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index dc0236a378afb..2e2ef053a1198 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.1"; + version = "0.5.2"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-l5s7GTKpqGvRs1o14QNXq3kyQsoPwwUmd0TKlBKTAKE="; + hash = "sha256-SXLHQbjh4IygV+925fsPXgj7DFIPQj48oLNKWkUhuK8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index d238b8137d337..16c2124cf0831 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -1,39 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, - qtwebengine, qtxmlpatterns, - qttools, unzip }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + qmake, + qtwebengine, + qtxmlpatterns, + qttools, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; - rev = "v${version}"; - hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-IED6UFk8UTle7g/yPC0nXOEgJwrs6sB/Dk3OTyVgHPo="; }; - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt - postPatch = '' - substituteInPlace build/python.prf \ - --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" - ''; - - hardeningDisable = [ "all" ]; - - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; + nativeBuildInputs = [ + qmake + qttools + qtxmlpatterns + qtwebengine + ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; qmakeFlags = [ - "PythonQt.pro" - "PYTHON_DIR=${python}" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; dontWrapQtApps = true; - unpackCmd = "unzip $src"; - installPhase = '' mkdir -p $out/include/PythonQt cp -r ./lib $out @@ -42,6 +45,15 @@ stdenv.mkDerivation rec { cp -r ./extensions $out/include/PythonQt ''; + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib + install_name_tool -id \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib + ''; + meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "https://pythonqt.sourceforge.net/"; @@ -49,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; }; -} +}) diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix index a93b8f32cef2a..6c4061c4c05b9 100644 --- a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, cmake, msgpack } : -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mmtf-cpp"; version = "1.1.0"; src = fetchFromGitHub { owner = "rcsb"; - repo = pname; - rev = "v${version}"; + repo = "mmtf-cpp"; + rev = "v${finalAttrs.version}"; hash = "sha256-8JrNobvekMggS8L/VORKA32DNUdXiDrYMObjd29wQmc="; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/rcsb/mmtf-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 97e899731e34b..9129ad98ae6ae 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.92"; + version = "3.98"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-F6eF5jQO9qJACQldad8va5jXPj05o61L8Bp1SDXHBTg="; + hash = "sha256-N1/cz8e3KB3pBd5+ZV/JbuW6FaaVijNhok7QyMB7ppc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/janestreet/old.nix b/pkgs/development/ocaml-modules/janestreet/old.nix deleted file mode 100644 index 8b4a6ed529624..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/old.nix +++ /dev/null @@ -1,639 +0,0 @@ -{ self -, super -, lib -, stdenv -, openssl -}: - -let - inherit (super) - janePackage - ocaml - ocamlbuild - cryptokit - ctypes - magic-mime - ocaml-migrate-parsetree - octavius - ounit - ppx_deriving - re - zarith - num - ; - -in - -with self; - -{ - - # Jane Street packages, up to ppx_core - - sexplib = janePackage { - pname = "sexplib"; - meta.description = "Automated S-expression conversion"; - version = "0.10.0"; - hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2"; - buildInputs = [ num ]; - }; - - base = janePackage { - pname = "base"; - version = "0.9.4"; - hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw"; - propagatedBuildInputs = [ sexplib ]; - meta.description = "Full standard library replacement for OCaml"; - }; - - ocaml-compiler-libs = janePackage { - pname = "ocaml-compiler-libs"; - hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l"; - meta.description = "OCaml compiler libraries repackaged"; - }; - - ppx_ast = janePackage ({ - pname = "ppx_ast"; - propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; - meta.description = "OCaml AST used by Jane Street ppx rewriters"; - } // (if lib.versionAtLeast ocaml.version "4.06" - then { - version = "0.9.2"; - hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0"; - } else { - version = "0.9.1"; - hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw"; - } - )); - - ppx_traverse_builtins = janePackage { - pname = "ppx_traverse_builtins"; - hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi"; - meta.description = "Builtins for Ppx_traverse"; - }; - - stdio = janePackage { - pname = "stdio"; - version = "0.9.1"; - hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx"; - propagatedBuildInputs = [ base ]; - meta.description = "Standard IO library for OCaml"; - }; - - ppx_core = janePackage { - pname = "ppx_core"; - hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3"; - propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ]; - meta.description = "Jane Street's standard library for ppx rewriters"; - }; - - # Jane Street packages, up to ppx_base - - ppx_optcomp = janePackage { - pname = "ppx_optcomp"; - hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd"; - propagatedBuildInputs = [ ppx_core ]; - meta.description = "Optional compilation for OCaml"; - }; - - ppx_driver = janePackage { - pname = "ppx_driver"; - version = "0.9.1"; - hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ ppx_optcomp ]; - meta.description = "Feature-full driver for OCaml AST transformers"; - }; - - ppx_metaquot = janePackage { - pname = "ppx_metaquot"; - hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Metaquotations for ppx_ast"; - }; - - ppx_type_conv = janePackage { - pname = "ppx_type_conv"; - hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p"; - propagatedBuildInputs = [ ppx_metaquot ppx_deriving ]; - meta.description = "Support Library for type-driven code generators"; - }; - - ppx_sexp_conv = janePackage { - pname = "ppx_sexp_conv"; - hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l"; - propagatedBuildInputs = [ ppx_type_conv sexplib ]; - meta.description = "Generation of S-expression conversion functions from type definitions"; - }; - - ppx_compare = janePackage { - pname = "ppx_compare"; - hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Generation of comparison functions from types"; - }; - - ppx_enumerate = janePackage { - pname = "ppx_enumerate"; - hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Generate a list containing all values of a finite type"; - }; - - ppx_hash = janePackage { - pname = "ppx_hash"; - hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d"; - propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; - meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; - }; - - ppx_js_style = janePackage { - pname = "ppx_js_style"; - hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59"; - propagatedBuildInputs = [ ppx_metaquot octavius ]; - meta.description = "Code style checker for Jane Street Packages"; - }; - - ppx_base = janePackage { - pname = "ppx_base"; - hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3"; - propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ]; - meta.description = "Base set of ppx rewriters"; - }; - - # Jane Street packages, up to ppx_bin_prot - - fieldslib = janePackage { - pname = "fieldslib"; - hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "OCaml record fields as first class values"; - }; - - variantslib = janePackage { - pname = "variantslib"; - hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "OCaml variants as first class values"; - }; - - ppx_traverse = janePackage { - pname = "ppx_traverse"; - hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Automatic generation of open recursion classes"; - }; - - ppx_custom_printf = janePackage { - pname = "ppx_custom_printf"; - hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ]; - meta.description = "Printf-style format-strings for user-defined string conversion"; - }; - - ppx_fields_conv = janePackage { - pname = "ppx_fields_conv"; - hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z"; - propagatedBuildInputs = [ fieldslib ppx_type_conv ]; - meta.description = "Generation of accessor and iteration functions for OCaml records"; - }; - - ppx_variants_conv = janePackage { - pname = "ppx_variants_conv"; - hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834"; - propagatedBuildInputs = [ ppx_type_conv variantslib ]; - meta.description = "Generation of accessor and iteration functions for OCaml variant types"; - }; - - bin_prot = janePackage { - pname = "bin_prot"; - version = "0.9.1"; - hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk"; - propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; - meta.description = "Binary protocol generator"; - }; - - ppx_here = janePackage { - pname = "ppx_here"; - hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Expands [%here] into its location"; - }; - - ppx_bin_prot = janePackage { - pname = "ppx_bin_prot"; - hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3"; - propagatedBuildInputs = [ ppx_here bin_prot ]; - meta.description = "Generation of bin_prot readers and writers from types"; - }; - - # Jane Street packages, up to ppx_jane - - ppx_assert = janePackage { - pname = "ppx_assert"; - hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ]; - meta.description = "Assert-like extension nodes that raise useful errors on failure"; - }; - - ppx_inline_test = janePackage { - pname = "ppx_inline_test"; - version = "0.9.2"; - hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "Syntax extension for writing in-line tests in OCaml code"; - }; - - typerep = janePackage { - pname = "typerep"; - hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3"; - propagatedBuildInputs = [ base ]; - meta.description = "Runtime types for OCaml"; - }; - - ppx_bench = janePackage { - pname = "ppx_bench"; - hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93"; - propagatedBuildInputs = [ ppx_inline_test ]; - meta.description = "Syntax extension for writing in-line benchmarks in OCaml code"; - }; - - ppx_expect = janePackage { - pname = "ppx_expect"; - hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b"; - propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ]; - meta.description = "Cram like framework for OCaml"; - }; - - ppx_fail = janePackage { - pname = "ppx_fail"; - hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32"; - propagatedBuildInputs = [ ppx_here ppx_metaquot ]; - meta.description = "Add location to calls to failwiths"; - }; - - ppx_let = janePackage { - pname = "ppx_let"; - hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Monadic let-bindings"; - }; - - ppx_optional = janePackage { - pname = "ppx_optional"; - hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "Pattern matching on flat options"; - }; - - ppx_pipebang = janePackage { - pname = "ppx_pipebang"; - hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "A ppx rewriter that inlines reverse application operators |> and |!"; - }; - - ppx_sexp_message = janePackage { - pname = "ppx_sexp_message"; - hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; - meta.description = "A ppx rewriter for easy construction of s-expressions"; - }; - - ppx_sexp_value = janePackage { - pname = "ppx_sexp_value"; - hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; - meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values"; - }; - - ppx_typerep_conv = janePackage { - pname = "ppx_typerep_conv"; - hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1"; - propagatedBuildInputs = [ ppx_type_conv typerep ]; - meta.description = "Generation of runtime types from type declarations"; - }; - - ppx_jane = janePackage { - pname = "ppx_jane"; - hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc"; - propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ]; - meta.description = "Standard Jane Street ppx rewriters"; - }; - - # Jane Street packages, up to core - - configurator = janePackage { - pname = "configurator"; - version = "0.9.1"; - hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; - propagatedBuildInputs = [ ppx_base ]; - meta.description = "Helper library for gathering system configuration"; - }; - - jane-street-headers = janePackage { - pname = "jane-street-headers"; - hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy"; - meta.description = "Jane Street header files"; - }; - - core_kernel = janePackage { - pname = "core_kernel"; - hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh"; - propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ]; - meta.description = "Jane Street's standard library overlay (kernel)"; - }; - - spawn = janePackage { - pname = "spawn"; - hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5"; - meta.description = "Spawning sub-processes"; - }; - - core = janePackage { - pname = "core"; - version = "0.9.1"; - hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8"; - propagatedBuildInputs = [ core_kernel spawn ]; - meta.description = "Jane Street's standard library overlay"; - }; - - # Jane Street packages, up to core_extended - - re2 = janePackage { - pname = "re2"; - hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi"; - propagatedBuildInputs = [ core_kernel ]; - meta = { - description = "OCaml bindings for RE2"; - broken = stdenv.isDarwin; - }; - }; - - textutils = janePackage { - pname = "textutils"; - hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d"; - propagatedBuildInputs = [ core ]; - meta.description = "Text output utilities"; - }; - - core_extended = janePackage { - pname = "core_extended"; - hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk"; - propagatedBuildInputs = [ core re2 textutils ]; - postPatch = '' - patchShebangs src/discover.sh - ''; - meta = { - description = "Jane Street Capital's standard library overlay"; - }; - }; - - # Jane Street async packages - - async_kernel = janePackage { - pname = "async_kernel"; - hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (core)"; - }; - - async_rpc_kernel = janePackage { - pname = "async_rpc_kernel"; - hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b"; - propagatedBuildInputs = [ core_kernel async_kernel ]; - meta.description = "Platform-independent core of Async RPC library"; - }; - - async_unix = janePackage { - pname = "async_unix"; - hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d"; - propagatedBuildInputs = [ core async_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (unix)"; - }; - - async_extra = janePackage { - pname = "async_extra"; - hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0"; - propagatedBuildInputs = [ async_rpc_kernel async_unix ]; - meta.description = "Jane Street's asynchronous execution library (extra)"; - }; - - async = janePackage { - pname = "async"; - hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1"; - propagatedBuildInputs = [ async_extra ]; - meta.description = "Jane Street Capital's asynchronous execution library"; - }; - - async_find = janePackage { - pname = "async_find"; - hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq"; - propagatedBuildInputs = [ async ]; - meta.description = "Directory traversal with Async"; - }; - - async_interactive = janePackage { - pname = "async_interactive"; - hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for building simple command-line based user interfaces"; - }; - - async_parallel = janePackage { - pname = "async_parallel"; - hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn"; - propagatedBuildInputs = [ async ]; - meta.description = "Distributed computing library"; - }; - - async_shell = janePackage { - pname = "async_shell"; - hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2"; - propagatedBuildInputs = [ core_extended async ]; - meta = { - description = "Shell helpers for Async"; - }; - }; - - async_ssl = janePackage { - pname = "async_ssl"; - hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss"; - propagatedBuildInputs = [ async ctypes openssl ]; - meta.description = "Async wrappers for SSL"; - }; - - # Jane Street packages, up to expect_test_helpers - - sexp_pretty = janePackage { - pname = "sexp_pretty"; - hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx"; - propagatedBuildInputs = [ ppx_base re ]; - meta.description = "S-expression pretty-printer"; - }; - - expect_test_helpers_kernel = janePackage { - pname = "expect_test_helpers_kernel"; - hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6"; - propagatedBuildInputs = [ core_kernel sexp_pretty ]; - meta.description = "Helpers for writing expectation tests"; - }; - - expect_test_helpers = janePackage { - pname = "expect_test_helpers"; - hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - meta.description = "Async helpers for writing expectation tests"; - }; - - # Miscellaneous Jane Street packages - - bignum = janePackage { - pname = "bignum"; - hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3"; - propagatedBuildInputs = [ core_kernel zarith ]; - meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; - }; - - cinaps = janePackage { - pname = "cinaps"; - hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5"; - propagatedBuildInputs = [ re ]; - meta.description = "Trivial Metaprogramming tool using the OCaml toplevel"; - }; - - command_rpc = janePackage { - pname = "command_rpc"; - hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout"; - }; - - core_bench = janePackage { - pname = "core_bench"; - hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h"; - propagatedBuildInputs = [ core_extended ]; - meta = { - description = "Micro-benchmarking library for OCaml"; - }; - }; - - core_profiler = janePackage { - pname = "core_profiler"; - hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44"; - propagatedBuildInputs = [ core_extended ]; - meta = { - description = "Profiling library"; - }; - }; - - csvfields = janePackage { - pname = "csvfields"; - hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v"; - propagatedBuildInputs = [ core ]; - meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; - }; - - ecaml = janePackage { - pname = "ecaml"; - hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i"; - propagatedBuildInputs = [ async ]; - meta.description = "Writing Emacs plugin in OCaml"; - }; - - email_message = janePackage { - pname = "email_message"; - hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz"; - propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; - meta = { - description = "E-mail message parser"; - }; - }; - - incremental_kernel = janePackage { - pname = "incremental_kernel"; - hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Library for incremental computations depending only on core_kernel"; - }; - - incremental = janePackage { - pname = "incremental"; - hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh"; - propagatedBuildInputs = [ core incremental_kernel ]; - meta.description = "Library for incremental computations"; - }; - - incr_map = janePackage { - pname = "incr_map"; - hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv"; - propagatedBuildInputs = [ incremental_kernel ]; - meta.description = "Helpers for incremental operations on map like data structures"; - }; - - ocaml_plugin = janePackage { - pname = "ocaml_plugin"; - hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ async ]; - meta.description = "Automatically build and dynlink ocaml source files"; - }; - - parsexp = janePackage { - pname = "parsexp"; - hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b"; - propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ]; - meta.description = "S-expression parsing library"; - }; - - parsexp_io = janePackage { - pname = "parsexp_io"; - hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5"; - propagatedBuildInputs = [ parsexp ]; - meta.description = "S-expression parsing library (IO functions)"; - }; - - patience_diff = janePackage { - pname = "patience_diff"; - hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Tool and library implementing patience diff"; - }; - - posixat = janePackage { - pname = "posixat"; - hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl"; - propagatedBuildInputs = [ ppx_sexp_conv ]; - meta.description = "Binding to the posix *at functions"; - meta.broken = lib.versionAtLeast ocaml.version "4.05"; - }; - - rpc_parallel = janePackage { - pname = "rpc_parallel"; - hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38"; - propagatedBuildInputs = [ async ]; - meta.description = "Type-safe library for building parallel applications"; - }; - - shexp = janePackage { - pname = "shexp"; - hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y"; - propagatedBuildInputs = [ posixat spawn ]; - meta.description = "Process library and s-expression based shell"; - }; - - topological_sort = janePackage { - pname = "topological_sort"; - hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Topological sort algorithm"; - }; - - typerep_extended = janePackage { - pname = "typerep_extended"; - hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Runtime types for OCaml (Extended)"; - }; - -} diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 9fdff45b6a541..3eb8c2c08b558 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -21,11 +21,11 @@ buildDunePackage rec { pname = "letsencrypt"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; - hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M="; + hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/python-modules/airtouch5py/default.nix b/pkgs/development/python-modules/airtouch5py/default.nix new file mode 100644 index 0000000000000..f474e23457863 --- /dev/null +++ b/pkgs/development/python-modules/airtouch5py/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + poetry-core, + pythonRelaxDepsHook, + + # dependencies + bitarray, + crc, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "airtouch5py"; + version = "0.2.8"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "danzel"; + repo = "airtouch5py"; + rev = "refs/tags/${version}"; + hash = "sha256-MpwppyAWDiA3CZXCIUQ/vidzcxKXZJSlrFRhmrPMgCE="; + }; + + build-system = [ poetry-core ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "crc" ]; + + dependencies = [ + bitarray + crc + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "airtouch5py" ]; + + meta = with lib; { + changelog = "https://github.com/danzel/airtouch5py/releases/tag/${version}"; + description = "Python client for the airtouch 5"; + homepage = "https://github.com/danzel/airtouch5py"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix index d6fda0fb4fc20..cc1c93c8677f7 100644 --- a/pkgs/development/python-modules/aranet4/default.nix +++ b/pkgs/development/python-modules/aranet4/default.nix @@ -1,11 +1,12 @@ -{ lib -, bleak -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools +{ + lib, + bleak, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-j53d2Ki9xVWGHWkAu1wkjYE56Xq7kfMmqQrQiKrBg2I="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bleak requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "aranet4" - ]; + pythonImportsCheck = [ "aranet4" ]; disabledTests = [ # Test compares rendered output @@ -46,9 +41,9 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Aranet4 devices"; - mainProgram = "aranetctl"; homepage = "https://github.com/Anrijs/Aranet4-Python"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "aranetctl"; }; } diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 3343c46241bbd..d5d0cb5891719 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.6"; + version = "0.20.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4LcUK7Zx1EVE2HlyhUbf1NnH7EYNEyJNXacwvqePkW0="; + hash = "sha256-JDeFrJ7mSUXgR5wjhDJVRfKVl1dXQ86Ew3FVbRAU5j4="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 7d7f2e3765c6d..ea543b6ee4af5 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.6"; + version = "1.7.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-p75WEozbkPXBThuW8i1tpJmca1nxBXTlGQR9U976mOs="; + hash = "sha256-DKqJ/8hEPe9O9YrAjrTL2Gh1lj6QrdtHtd7aarZ7GkQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index f655aebf8910c..aa44378f6c793 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -1,9 +1,19 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitLab, pythonOlder, pytestCheckHook, pybind11, numpy }: +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitLab, + numpy, + pybind11, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "ducc0"; - version = "0.33.0"; - format = "setuptools"; + version = "0.34.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -11,14 +21,17 @@ buildPythonPackage rec { domain = "gitlab.mpcdf.mpg.de"; owner = "mtr"; repo = "ducc"; - rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-MezcqQRitBkK4/1rRQM2c9w+iZb2kIsDdcNd6I8CPoI="; + rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM="; }; buildInputs = [ pybind11 ]; propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + setuptools + ]; pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index ace614bcaeb4c..9f357168b0b5e 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/dungeon-eos"; description = "A package that simulates PMD EoS dungeon generation"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 014fa1057d56d..4adc91b25dbae 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/explorerscript"; description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index d95aa2b2323a0..b2480e4684b79 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.41.0"; + version = "1.42.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-wrgbc8sMISJvXxefGl2PBsJ3d308BXVH7wYIeaFmdZ8="; + hash = "sha256-PY0GpwO1OG4DKutMR3MF9HtTJbLFRCWypeoqVoiRD4o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 1d6a173e265ee..0a67730726bc6 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , python-lsp-jsonrpc , pythonOlder +, stdenv }: buildPythonPackage rec { @@ -49,6 +50,12 @@ buildPythonPackage rec { HOME="$(mktemp -d)" ''; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/pappasam/jedi-language-server/issues/313 + "test_publish_diagnostics_on_change" + "test_publish_diagnostics_on_save" + ]; + pythonImportsCheck = [ "jedi_language_server" ]; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 4031b10f55d03..aeb881754345b 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IiM7iJs3CIl6WjstgvtJzIylVL49jRG246GU5G5GEG0="; + hash = "sha256-wFDx90zTaPF9gHLZnWBJQlMBuz8iZQRHkcS8BAxcZRA="; }; build-system = [ diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index dbdce14ae1f47..c4a7a6bf5578b 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Python library for many Nintendo DS file formats"; homepage = "https://github.com/RoadrunnerWMC/ndspy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 1668cfa9f9be9..8d9d06b053112 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.20.0"; + version = "1.23.2"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-aR/OEOz6xUKjsZk3lynx0SZJ4lnWk0uDFioO/NakVl8="; + hash = "sha256-ScBD+g+xbbZOdIip4ISXYug9MqKLahutUNIoQnD1tHc="; }; build-system = [ diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 1aaf94710311e..c2d2bea352226 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -1,54 +1,48 @@ -{ lib -, aiohttp -, buildPythonPackage -, click -, fetchFromGitHub -, incremental -, pydantic -, pythonOlder -, typer +{ + lib, + aiohttp, + buildPythonPackage, + click, + fetchFromGitHub, + incremental, + pythonOlder, + setuptools, + typer, }: buildPythonPackage rec { pname = "ovoenergy"; - version = "1.3.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "timmo001"; - repo = pname; + repo = "ovoenergy"; rev = "refs/tags/${version}"; - hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4="; + hash = "sha256-ZcTSf7UejEUqQo0qEXP3fWjZYRx0a3ZBNVkwS2dL3Yk="; }; - nativeBuildInputs = [ - incremental - ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typer==0.6.1" "typer" - ''; + nativeBuildInputs = [ incremental ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp click - pydantic typer ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "ovoenergy" - ]; + pythonImportsCheck = [ "ovoenergy" ]; meta = with lib; { description = "Python client for getting data from OVO's API"; homepage = "https://github.com/timmo001/ovoenergy"; + changelog = "https://github.com/timmo001/ovoenergy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index a7b132c230889..f42041f1a56f0 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.16.2"; + version = "2.18.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y="; + hash = "sha256-fzxshqh2QurpbilG0gC3NWnUntTRoxOHPpfpg6bPI98="; }; build-system = [ diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 8a8b89e604552..17511c8fc23b8 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python"; homepage = "https://github.com/SkyTemple/pmdsky-debug-py"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 6d63a7db9c8f0..1009a1fbedb7a 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 32450e254ea12..4118e780d3d0b 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.10"; + version = "0.6.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; rev = "refs/tags/${version}"; - hash = "sha256-jdv49cpd2ewfrhWzjWM5Uxhaj3UZfOXMMOZeobpXe0E="; + hash = "sha256-YzrRkFa4J3NXdc4W5CHrHvqSVJ8yBGtaf6gRqmiY7gI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index 22b71bdbac833..1f9ac10b9eb45 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/koehlma/pygtkspellcheck"; description = "A Python spell-checking library for GtkTextViews based on Enchant"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 32f81827836b4..87b32a590769a 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; description = "Discord RPC client written in Python"; license = licenses.mit; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix new file mode 100644 index 0000000000000..633e8baf58532 --- /dev/null +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + poetry-core, + + # dependencies + aiohttp, + yarl, + mashumaro, + orjson, + + # tests + pytestCheckHook, + aioresponses, + pytest-asyncio, + syrupy, +}: + +buildPythonPackage rec { + pname = "python-homeassistant-analytics"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-homeassistant-analytics"; + rev = "refs/tags/v${version}"; + hash = "sha256-uGi72UCIIvb5XZl7RkiAiR/TS+5VCpyvZfBsmlPzQEs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + mashumaro + orjson + ]; + + nativeCheckInputs = [ + pytestCheckHook + aioresponses + pytest-asyncio + syrupy + ]; + + pythonImportsCheck = [ "python_homeassistant_analytics" ]; + + meta = with lib; { + changelog = "https://github.com/joostlek/python-homeassistant-analytics +/releases/tag/v${version}"; + description = "Asynchronous Python client for Homeassistant Analytics"; + homepage = "https://github.com/joostlek/python-homeassistant-analytics +"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index b4f5df6e42da0..fd5cdb62dd7c5 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.3"; + version = "2.2.0"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y="; + hash = "sha256-Njd+sc35jlA96iVf2uuVN2BK92ctwUDfBAUfpgqtPs0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar pytz python-dateutil diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix index c33a89deabf6d..306d6b794e609 100644 --- a/pkgs/development/python-modules/setuptools-dso/default.nix +++ b/pkgs/development/python-modules/setuptools-dso/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "setuptools extension for building non-Python Dynamic Shared Objects"; homepage = "https://github.com/mdavidsaver/setuptools_dso"; license = licenses.bsd3; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index 1c1edb663e3c9..92b03f7d35496 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A format for standardized rule-based tilesets with 256 adjacency combinations"; homepage = "https://github.com/SkyTemple/skytemple-dtef"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix index dc31cbcbd9eca..94c38cbcf468c 100644 --- a/pkgs/development/python-modules/skytemple-eventserver/default.nix +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-eventserver"; description = "Websocket server that emits SkyTemple UI events"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 1b8d744b7d175..1f91f3a4bea20 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; broken = stdenv.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix index 34b9dd5cee730..b78bc27e3c259 100644 --- a/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-icons"; description = "Icons for SkyTemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 411aadb9b400e..5a604db033e61 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-rust"; description = "Binary Rust extensions for SkyTemple"; license = licenses.mit; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index c378053c206af..324f34f33524d 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple-ssb-debugger"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index d3bbb87d6e09a..39c034e3d87a2 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "SkyTemple Script Engine Debugger Emulator Backend"; homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index e7defb682db32..6b024d4fd83bf 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.15.0"; + version = "0.15.1"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "felix-hilden"; repo = "sphinx-codeautolink"; rev = "refs/tags/v${version}"; - hash = "sha256-iXUdOwyTRViDTDRPCcteiJ2Rcdbpiol7JPEzqbUwIPc="; + hash = "sha256-BnGcLAM/KK8Ub+GmRY1oatUCyP4hvY2O1WTjLHBebpw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 14b7c5c2f8197..771971445156f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1132"; + version = "3.0.1133"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-SMdevyChfbUMIY/KynIUE5T3bQAvD23QTW8lyA87kDE="; + hash = "sha256-RQudhUn4BfsdwQOCt9CUuKVVlXbHLMEohg6C2srZ9pk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index c25c9ff2659c6..906f644d89b11 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/tilequant"; changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; mainProgram = "tilequant"; }; } diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 53d38125f8f56..9b81e9e8e57bd 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240409"; + version = "4.6.0.20240417"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ziF8J5WB12nfmSxbdtYcZUJbCmeWJgSOYz5kOGjriBs="; + hash = "sha256-i+Sz5ZRRIKze8KI0jAS+QolOhMbWFiiLkIo9jtXomo0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index 3029545302aa1..339a83f7b17ca 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "types-tqdm"; - version = "4.66.0.20240106"; + version = "4.66.0.20240417"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-es9KreW6097XbrgpeD+ZYbHCGHlI6qbdGuhkTf+VqTg="; + hash = "sha256-Ftzp71IuqNQOT1uNhN2KEWbu/BPO7np+FYvw8aFCGjE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 7044262373de2..e9d907c6f86d9 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.17.0"; + version = "4.17.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-lsqSWhozTdLPwqnwYMLxH3kF62MsUCcjzKJ7qTU79qQ="; + sha256 = "sha256-9PJ3XxEA2PEaPFE3BbZkJB8XdJmm0gZf2Ko5T9DAZBw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; + vendorHash = "sha256-03nNN1FkGee01gNOmIASc2B7mMTes1pEDc6Lo08dhcw="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 6b3b8b940ef6d..e807618188981 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-RniriePoHo608PlT3XrxogWI2oXq0Q48+Jaxz/2xIVo="; + sha256 = "sha256-XvvwVdovFTJNTqfqnX+luaRHD+7nmPLdQAu9TLRI/TQ="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7acf37c5ccf83..99f51272c573b 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 = "4.3.8"; + version = "4.4.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-8sUXJExg1CApMbF95Lx3B/mnOJ5Y6HAck8+0UgF0bdc="; + sha256 = "sha256-hoy7hvabXvrU/ZcW9dRJnO1l4fnOIFpbgvAZ+CBnSbA="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 37029689e63f0..972f137034415 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,6 +43,7 @@ , cacert , glibcLocales , fetchFromGitHub +, fetchpatch2 , nixosTests }: @@ -205,6 +206,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + # https://github.com/NixOS/hydra/security/advisories/GHSA-2p75-6g9f-pqgx + (fetchpatch2 { + name = "CVE-2024-32657.patch"; + url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch"; + hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU="; + }) + ]; + postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 90a9505980316..6f6d2c11c4158 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-9iXQKwzcWATnqsKrDAyLAkuRHUsfxfEpyeCxZ1JUpV8="; + hash = "sha256-G2mN7f5dpE6fF5ti7JJXVk8qBiwKO/yy5cyOYBxDJNo="; }; - vendorHash = "sha256-cq8KD2STIpPSB3RXv9sl8Bty1noUQak5FZfrfq1rj10="; + vendorHash = "sha256-ux3nrQtY1sY4VJIeTSZAipfURspWDqnZ9YfxmFUvElI="; doCheck = false; diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index a7b3c36d87b2f..5b3bc7b1472cd 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ alibabzo ]; }; } diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 64562c17f5a0a..56b07f8aee0f4 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.20.0"; + version = "19.21.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f85CKfYPNh06eVHu5nn4MhX5wuptpJCmvSiPHWGzjkg="; + hash = "sha256-Vhqk7U4FKl9r7WMX/FJ/4LEtuTUsZquM98A+nQRFqMQ="; }; - vendorHash = "sha256-SeeVHqeQCfOJTNfWIfTd71jGk5mYH5HRArUosZqRreY="; + vendorHash = "sha256-rcw9HgN677NxrMZDrpNFLHNyHdlRXvgxCtQnLt0TRLw="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 33204d80b9d23..fd83af91f15e7 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.3.0"; + version = "24.4.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-FlD2bSCNToyXLiMb4c2tJYJxHN4QORMJPeFPuFpjMEM="; + hash = "sha256-u59NnxDFQN92BMkm2sHy8OhundFJElJ2H1SgdeLpOMs="; }; - cargoHash = "sha256-GJFUSOAY6F0ZmqF/9SHOGMNFssfHUdFIcsgz6JwZuqE="; + cargoHash = "sha256-7dLpqhT3v7b0I1wmn7Q6IL1M5Ul/Mu9xxrdwlI2xKAs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index fa6bc5ce3634d..2c3269681d7e4 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-5+UE1Ka2pciuNrkrPDCJMp12+IUbgq7k3cKSP5pahw4="; + hash = "sha256-iumHMVDlgwjjQsn0aoSJUPoOKmLztD47b7he2nJhins="; }; - cargoHash = "sha256-GuajrFdPlgneL95eWT3n2MdzfsbuID/pI9ED8TlVOCo="; + cargoHash = "sha256-/mrVrbPHi4lo2iu/IWwDYIjqWZYNkm/4lWpRMLKBNpA="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 02a06edf5d238..a7737222d3480 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-P0/c9GTQRdErwE3/uuZpMqiTl/nFGSaHoWGRtBDjc8M="; + hash = "sha256-sqBZVCVJkgqCK5JcNcJ6kKxL26XGxOA1uDlOOt/+iDo="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-+uRjitfaSbjsO1yO5NL3gw+qjx4neiht3BDvWltogX0="; + cargoHash = "sha256-g1uDF7lL9dmZY5J8uNDAsA8dG5IVrV7MumN1w+fk1/8="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index e10ebf1e5519d..6e0b80497f4bd 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -1,80 +1,104 @@ -{ lib, stdenv, fetchFromGitHub, openjdk20, maven, makeDesktopItem, copyDesktopItems, makeWrapper, glib, wrapGAppsHook }: +{ lib +, jdk21 +, maven +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, glib +, makeWrapper +, wrapGAppsHook +}: let - jdk = openjdk20.override (lib.optionalAttrs stdenv.isLinux { + jdk = jdk21.override { enableJavaFX = true; - }); + }; maven' = maven.override { inherit jdk; }; - selectSystem = attrs: - attrs.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in maven'.buildMavenPackage rec { pname = "scenebuilder"; - version = "20.0.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "gluonhq"; - repo = pname; + repo = "scenebuilder"; rev = version; - hash = "sha256-Og+dzkJ6+YH0fD4HJw8gUKGgvQuNw17BxgzZMP/bEA0="; + hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA="; }; - buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date - mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; - mvnHash = selectSystem { - x86_64-linux = "sha256-QwxA3lKVkRG5CV2GIwfVFPOj112pHr7bDlZJD6KwrHc="; - aarch64-linux = "sha256-cO5nHSvv2saBuAjq47A+GW9vFWEM+ysXyZgI0Oe/F70="; - }; + patches = [ + # makes the mvnHash platform-independent + ./pom-remove-javafx.patch + + # makes sure that maven upgrades don't change the mvnHash + ./fix-default-maven-plugin-versions.patch + ]; + + postPatch = '' + # set the build timestamp to $SOURCE_DATE_EPOCH + substituteInPlace app/pom.xml \ + --replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" + ''; + + mvnParameters = toString [ + "-Dmaven.test.skip" + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" + ]; - nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ]; + mvnHash = "sha256-fS7dS2Q4ORThLBwDOzJJnRboNNRmhp0RG6Dae9fl+pw="; + + nativeBuildInputs = [ + copyDesktopItems + glib + makeWrapper + wrapGAppsHook + ]; dontWrapGApps = true; # prevent double wrapping installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/java $out/share/{${pname},icons/hicolor/128x128/apps} - cp app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/java/${pname}.jar - - cp app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png + install -Dm644 app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/scenebuilder/scenebuilder.jar + install -Dm644 app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png runHook postInstall ''; postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/${pname} \ + makeWrapper ${jdk}/bin/java $out/bin/scenebuilder \ --add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \ --add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \ - --add-flags "-cp $out/share/java/${pname}.jar" \ - --add-flags "com.oracle.javafx.scenebuilder.app.SceneBuilderApp" \ + --add-flags "-jar $out/share/scenebuilder/scenebuilder.jar" \ "''${gappsWrapperArgs[@]}" - ''; - - desktopItems = [ (makeDesktopItem { - name = "scenebuilder"; - exec = "scenebuilder"; - icon = "scenebuilder"; - comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = "Scene Builder"; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" ]; - }) ]; + ''; + + desktopItems = [ + (makeDesktopItem { + name = "scenebuilder"; + exec = "scenebuilder"; + icon = "scenebuilder"; + comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; + }) + ]; meta = with lib; { - broken = stdenv.isDarwin; + changelog = "https://github.com/gluonhq/scenebuilder/releases/tag/${src.rev}"; description = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - mainProgram = "scenebuilder"; homepage = "https://gluonhq.com/products/scene-builder/"; + license = licenses.bsd3; + mainProgram = "scenebuilder"; + maintainers = with maintainers; [ wirew0rm ]; + platforms = jdk.meta.platforms; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; - license = licenses.bsd3; - maintainers = with maintainers; [ wirew0rm ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch new file mode 100644 index 0000000000000..be5e590694a02 --- /dev/null +++ b/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch @@ -0,0 +1,60 @@ +diff --git a/pom.xml b/pom.xml +index 193f7ca..45faa1a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -137,6 +137,55 @@ + </plugins> + </pluginManagement> + <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.3.0</version> ++ <executions> ++ <execution> ++ <id>require-all-plugin-versions-to-be-set</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>3.3.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>4.0.0-M13</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <version>3.2.5</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.3.0</version> ++ </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> diff --git a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch new file mode 100644 index 0000000000000..6c9c9784d0375 --- /dev/null +++ b/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch @@ -0,0 +1,28 @@ +diff --git a/kit/pom.xml b/kit/pom.xml +index 644d36c..e4d91fb 100644 +--- a/kit/pom.xml ++++ b/kit/pom.xml +@@ -11,23 +11,6 @@ + </parent> + + <dependencies> +- <!-- JavaFX --> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-fxml</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-web</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-swing</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- + <!-- Eclipse Aether --> + <dependency> + <groupId>org.eclipse.aether</groupId> |