diff options
Diffstat (limited to 'pkgs')
54 files changed, 835 insertions, 547 deletions
diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 2483bd3471d0..e39612f9ee1c 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -28,13 +28,13 @@ }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "2022.12.14"; + version = "2022.12.14.1"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-G2FQy+mea/+2RjK/WjLeX+7TP+HU6fCUFYuprFGKEyw="; + sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE="; }; patches = [ ./vulkan_icd.patch ]; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index dfb0d36f64dd..43923c99eae3 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -2,6 +2,7 @@ , buildFHSUserEnvBubblewrap , symlinkJoin , bottles-unwrapped +, gst_all_1 , extraPkgs ? pkgs: [ ] , extraLibraries ? pkgs: [ ] }: @@ -9,6 +10,8 @@ let fhsEnv = { targetPkgs = pkgs: with pkgs; [ bottles-unwrapped + # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) + # See https://github.com/bottlesdevs/Bottles/issues/2401 vkbasalt ] ++ extraPkgs pkgs; @@ -46,6 +49,9 @@ let fhsEnv = { gsm gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-bad libgphoto2 libjpeg_turbo libkrb5 @@ -83,6 +89,13 @@ let fhsEnv = { zlib # Freetype ] ++ xorgDeps pkgs ++ extraLibraries pkgs; + + profile = '' + # Remove if merged https://github.com/bottlesdevs/Bottles/pull/2415 + export BOTTLES_USE_SYSTEM_GSTREAMER=1 + # Dirty hack, may be related with https://github.com/NixOS/nixpkgs/issues/148007 + export GST_PLUGIN_PATH=${ lib.makeSearchPath "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) } + ''; }; in symlinkJoin { diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/applications/misc/lswt/default.nix new file mode 100644 index 000000000000..d6bdf77a8bdb --- /dev/null +++ b/pkgs/applications/misc/lswt/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromSourcehut, nixos, wayland }: + +stdenv.mkDerivation rec { + pname = "lswt"; + version = "1.0.4"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0="; + }; + + buildInputs = [ wayland ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = with lib; { + description = "A command that lists Wayland toplevels"; + homepage = "https://sr.ht/~leon_plickat/lswt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ edrex ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 35a5a9591c2f..5635d6ab2745 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -90,6 +90,7 @@ let ps.nixops-hetzner ps.nixopsvbox ps.nixops-virtd + ps.nixops-hetznercloud ]) // rec { # Workaround for https://github.com/NixOS/nixpkgs/issues/119407 # TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; }) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 7166c3ac288a..8c47fde8bb7b 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -71,6 +71,16 @@ self: super: { } ); + nixops-hetznercloud = super.nixops-hetznercloud.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/lukebfox/nixops-hetznercloud.git"; + rev = "386f8b7cfe724308a9c1e97e76d238498a279495"; + sha256 = "0ig9maxcprxvz0fgriyzgcqz990s1pspizzsqj7x3xg0w0dpx853"; + }; + } + ); + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 56405bc1460e..134dec79feb2 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -1,10 +1,16 @@ +# This file is automatically @generated by Poetry and should not be changed by hand. + [[package]] name = "apache-libcloud" -version = "3.6.0" +version = "3.6.1" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false python-versions = ">=3.6, <4" +files = [ + {file = "apache-libcloud-3.6.1.tar.gz", hash = "sha256:0facf3206568430c998da40e9bbac6d3a0c4fc80dd51674d9e794b381450120c"}, + {file = "apache_libcloud-3.6.1-py2.py3-none-any.whl", hash = "sha256:d01eee601b6367e711788c47a275ee717f23854f5267d9ba3b3e8ed3bb400e56"}, +] [package.dependencies] requests = ">=2.26.0" @@ -16,17 +22,25 @@ description = "Amazon Web Services Library" category = "main" optional = false python-versions = "*" +files = [ + {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, + {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, +] [[package]] name = "boto3" -version = "1.24.88" +version = "1.26.32" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" +files = [ + {file = "boto3-1.26.32-py3-none-any.whl", hash = "sha256:672b97a634f3408d455bf94a6dfd59ef0c6150019885bc7107e465f062d58c26"}, + {file = "boto3-1.26.32.tar.gz", hash = "sha256:e0d6215313b03f09a9a38eccc88c1d3ba9868bcaaeb8b20eeb6d88fc3018b94d"}, +] [package.dependencies] -botocore = ">=1.27.88,<1.28.0" +botocore = ">=1.29.32,<1.30.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -35,11 +49,15 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.27.88" +version = "1.29.32" description = "Low-level, data-driven core of boto 3." category = "main" optional = false python-versions = ">= 3.7" +files = [ + {file = "botocore-1.29.32-py3-none-any.whl", hash = "sha256:b1a65edca151665a6844bf9f317440e31d8d5e4cbce3477f2661462e20c213b1"}, + {file = "botocore-1.29.32.tar.gz", hash = "sha256:27bc3903f7f8c813efd1605ff13ffdfca2c37dc78cadfa488cfda78fca323deb"}, +] [package.dependencies] jmespath = ">=0.7.1,<2.0.0" @@ -47,15 +65,19 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.14.0)"] +crt = ["awscrt (==0.15.3)"] [[package]] name = "certifi" -version = "2022.9.24" +version = "2022.12.7" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, + {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, +] [[package]] name = "cffi" @@ -64,6 +86,72 @@ description = "Foreign Function Interface for Python calling C code." category = "main" optional = false python-versions = "*" +files = [ + {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, + {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, + {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, + {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, + {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, + {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, + {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, + {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, + {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, + {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, + {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, + {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, + {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, + {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, + {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, + {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, + {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, + {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, + {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, +] [package.dependencies] pycparser = "*" @@ -75,9 +163,13 @@ description = "The Real First Universal Charset Detector. Open, modern and activ category = "main" optional = false python-versions = ">=3.6.0" +files = [ + {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"}, + {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, +] [package.extras] -unicode_backport = ["unicodedata2"] +unicode-backport = ["unicodedata2"] [[package]] name = "cryptography" @@ -86,6 +178,27 @@ description = "cryptography is a package which provides cryptographic recipes an category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, + {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, + {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, + {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, +] [package.dependencies] cffi = ">=1.12" @@ -99,12 +212,46 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] [[package]] +name = "future" +version = "0.18.2" +description = "Clean single-source support for Python 3 and 2" +category = "main" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] + +[[package]] +name = "hcloud" +version = "1.18.0" +description = "Official Hetzner Cloud python library" +category = "main" +optional = false +python-versions = ">3.5" +files = [ + {file = "hcloud-1.18.0-py2.py3-none-any.whl", hash = "sha256:4a999b46a9e427df499bba3c70a7ab8da1bd3a95dc8495f7512ac69f8bf8424c"}, + {file = "hcloud-1.18.0.tar.gz", hash = "sha256:a21d940cde8f0c1fd10a0581b0618eb840a6f592404faafdb6070101f4525ff6"}, +] + +[package.dependencies] +future = ">=0.17.1" +python-dateutil = ">=2.7.5" +requests = ">=2.20" + +[package.extras] +docs = ["Sphinx (==1.8.1)", "sphinx-rtd-theme (==0.4.2)"] + +[[package]] name = "hetzner" version = "0.8.3" description = "High level access to the Hetzner robot" category = "main" optional = false python-versions = "*" +files = [ + {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, +] [[package]] name = "idna" @@ -113,6 +260,10 @@ description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false python-versions = ">=3.5" +files = [ + {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, + {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, +] [[package]] name = "jmespath" @@ -121,27 +272,38 @@ description = "JSON Matching Expressions" category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, + {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, +] [[package]] name = "jsonpickle" -version = "2.2.0" +version = "3.0.1" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false -python-versions = ">=2.7" +python-versions = ">=3.7" +files = [ + {file = "jsonpickle-3.0.1-py2.py3-none-any.whl", hash = "sha256:130d8b293ea0add3845de311aaba55e6d706d0bb17bc123bd2c8baf8a39ac77c"}, + {file = "jsonpickle-3.0.1.tar.gz", hash = "sha256:032538804795e73b94ead410800ac387fdb6de98f8882ac957fcd247e3a85200"}, +] [package.extras] docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["ecdsa", "enum34", "feedparser", "jsonlib", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (<1.1.0)", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] -"testing.libs" = ["simplejson", "ujson", "yajl"] +testing = ["ecdsa", "feedparser", "gmpy2", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] +testing-libs = ["simplejson", "ujson"] [[package]] name = "libvirt-python" -version = "8.8.0" +version = "8.10.0" description = "The libvirt virtualization API python binding" category = "main" optional = false python-versions = "*" +files = [ + {file = "libvirt-python-8.10.0.tar.gz", hash = "sha256:fc30f136abe0b8228029a90814c8f44ac2947433c12f211363051c57df2d5401"}, +] [[package]] name = "nixops" @@ -150,6 +312,7 @@ description = "NixOS cloud provisioning and deployment tool" category = "main" optional = false python-versions = "^3.10" +files = [] develop = false [package.dependencies] @@ -171,6 +334,7 @@ description = "NixOps AWS plugin" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -193,6 +357,7 @@ description = "NixOps plugin for Digital Ocean" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -212,6 +377,7 @@ description = "Encrypted links support for NixOps" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -230,6 +396,7 @@ description = "NixOps backend for Google Cloud Platform" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -251,6 +418,7 @@ description = "" category = "main" optional = false python-versions = "^3.8" +files = [] develop = false [package.dependencies] @@ -269,6 +437,7 @@ description = "NixOS deployment tool, but for hetzner" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -284,12 +453,34 @@ reference = "HEAD" resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" [[package]] +name = "nixops-hetznercloud" +version = "0.1.2" +description = "NixOps Hetzner Cloud plugin" +category = "main" +optional = false +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +hcloud = "1.18.0" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/lukebfox/nixops-hetznercloud.git" +reference = "HEAD" +resolved_reference = "386f8b7cfe724308a9c1e97e76d238498a279495" + +[[package]] name = "nixops-virtd" version = "1.0" description = "NixOps plugin for virtd" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -309,6 +500,7 @@ description = "NixOps backend for VirtualBox" category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -327,6 +519,7 @@ description = "NixOS modules that don't quite belong in NixOS." category = "main" optional = false python-versions = "^3.7" +files = [] develop = false [package.dependencies] @@ -345,6 +538,10 @@ description = "plugin and hook calling mechanisms for python" category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, +] [package.extras] dev = ["pre-commit", "tox"] @@ -357,6 +554,11 @@ description = "A simple Python library for easily displaying tabular data in a v category = "main" optional = false python-versions = "*" +files = [ + {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, + {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, + {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, +] [[package]] name = "pycparser" @@ -365,6 +567,10 @@ description = "C parser in Python" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, + {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, +] [[package]] name = "python-dateutil" @@ -373,6 +579,10 @@ description = "Extensions to the standard Python datetime module" category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" +files = [ + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, +] [package.dependencies] six = ">=1.5" @@ -384,6 +594,10 @@ description = "digitalocean.com API to manage Droplets and Images" category = "main" optional = false python-versions = "*" +files = [ + {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, + {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, +] [package.dependencies] jsonpickle = "*" @@ -396,6 +610,10 @@ description = "Python HTTP for Humans." category = "main" optional = false python-versions = ">=3.7, <4" +files = [ + {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, + {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, +] [package.dependencies] certifi = ">=2017.4.17" @@ -405,7 +623,7 @@ urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "s3transfer" @@ -414,6 +632,10 @@ description = "An Amazon S3 Transfer Manager" category = "main" optional = false python-versions = ">= 3.7" +files = [ + {file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"}, + {file = "s3transfer-0.6.0.tar.gz", hash = "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947"}, +] [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -428,6 +650,10 @@ description = "Python 2 and 3 compatibility utilities" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, +] [[package]] name = "typeguard" @@ -436,6 +662,10 @@ description = "Run-time type checker for Python" category = "main" optional = false python-versions = ">=3.5.3" +files = [ + {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, + {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, +] [package.extras] doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] @@ -448,14 +678,23 @@ description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false python-versions = "*" +files = [ + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, +] [[package]] name = "urllib3" -version = "1.26.12" +version = "1.26.13" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +files = [ + {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"}, + {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"}, +] [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] @@ -463,193 +702,6 @@ secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "p socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] -lock-version = "1.1" +lock-version = "2.0" python-versions = "^3.10" -content-hash = "dd5b4dffae860fa56cf6c00bf5aea7a89d7501b2839fdd5e25c5782548092e55" - -[metadata.files] -apache-libcloud = [ - {file = "apache-libcloud-3.6.0.tar.gz", hash = "sha256:4a3b9141033798e4fb07886ff26254e635e022acbdd708375eac6f56e323506c"}, - {file = "apache_libcloud-3.6.0-py2.py3-none-any.whl", hash = "sha256:4aa8cf11caad7090753d6b19af2abfe779847df4296b15a39db3ded15a122478"}, -] -boto = [ - {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, - {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, -] -boto3 = [ - {file = "boto3-1.24.88-py3-none-any.whl", hash = "sha256:6b4cf1cd0be65202c4cf0e4c69099bac3620bcd4049ca25a5e223c668401dd69"}, - {file = "boto3-1.24.88.tar.gz", hash = "sha256:93934343cac76084600a520e5be70c52152364d0c410681c2e25c2290f0e151c"}, -] -botocore = [ - {file = "botocore-1.27.88-py3-none-any.whl", hash = "sha256:de4e087b24cd3bc369eb2e27f8fe94a6499f7dea08c919fba13cefb2496bd2bb"}, - {file = "botocore-1.27.88.tar.gz", hash = "sha256:ded0a4035baf91eb358ef501c92a8512543f5ab7658f459df3077a70a555b5cd"}, -] -certifi = [ - {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"}, - {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"}, -] -cffi = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] -charset-normalizer = [ - {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"}, - {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, -] -cryptography = [ - {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, - {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, - {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, - {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, - {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, - {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, - {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, - {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, - {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, - {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, - {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, - {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"}, - {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"}, - {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"}, - {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"}, - {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"}, - {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"}, - {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, - {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, -] -hetzner = [ - {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, -] -idna = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] -jmespath = [ - {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, - {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, -] -jsonpickle = [ - {file = "jsonpickle-2.2.0-py2.py3-none-any.whl", hash = "sha256:de7f2613818aa4f234138ca11243d6359ff83ae528b2185efdd474f62bcf9ae1"}, - {file = "jsonpickle-2.2.0.tar.gz", hash = "sha256:7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e"}, -] -libvirt-python = [ - {file = "libvirt-python-8.8.0.tar.gz", hash = "sha256:3441dd34c8936393e195a1b046bc2cab1b14d35d66772e8a51fe4d9735ec6349"}, -] -nixops = [] -nixops-aws = [] -nixops-digitalocean = [] -nixops-encrypted-links = [] -nixops-gcp = [] -nixops-hercules-ci = [] -nixops-hetzner = [] -nixops-virtd = [] -nixopsvbox = [] -nixos-modules-contrib = [] -pluggy = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, -] -prettytable = [ - {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, - {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, - {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, -] -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] -python-dateutil = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] -python-digitalocean = [ - {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, - {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, -] -requests = [ - {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, - {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, -] -s3transfer = [ - {file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"}, - {file = "s3transfer-0.6.0.tar.gz", hash = "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947"}, -] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] -typeguard = [ - {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, - {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, -] -typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] -urllib3 = [ - {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, - {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, -] +content-hash = "e58721318221aacb55ace3d0df65d71382f20147367dfa1466b59a13bda564b4" diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 2f1132a51bc9..31afcfb408c0 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -13,6 +13,7 @@ nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypt nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} +nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.git"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index f86be07dfecc..dea70ffacdce 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.1.0-12923"; + version = "3.2.0-13258"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-gL08uJbA2S+SuP1afMBmcJMIcu7QRzdiXgIMxSZQl/I="; + sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0pwm2xi1b9p9zmhy4dhix3aas49i183wxslyidfwvlaphic9qkxm"; + sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index 257de8b4c204..5bd408e25566 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "srsran"; - version = "22.04.1"; + version = "22.10"; src = fetchFromGitHub { owner = "srsran"; repo = "srsran"; rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-jqaGlMhy6L6lRknl6Ezi0n+vNjMb7C+FN9a+QeOy/RY="; + sha256 = "sha256-O43MXJ6EyKXg7hA1WjW8TqLmAWC+h5RLBGzBO6f/0zo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 91834642681d..d7250db07b49 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -33,6 +33,7 @@ , dbus , at-spi2-core , libXtst +, pcre2 , swig4 , python @@ -67,6 +68,11 @@ stdenv.mkDerivation rec { src = kicadSrc; + patches = [ + # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) + ./writable.patch + ]; + # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here @@ -114,6 +120,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" + ] + ++ optionals (!stable) [ # upstream issue 12491 + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -136,6 +145,7 @@ stdenv.mkDerivation rec { dbus at-spi2-core libXtst + pcre2 ]; buildInputs = [ @@ -162,14 +172,10 @@ stdenv.mkDerivation rec { ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt - ++ optional (debug) valgrind - ; - - # started becoming necessary halfway into 2022, not sure what changed to break a test... - preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; + ++ optional (debug) valgrind; # debug builds fail all but the python test - doInstallCheck = !debug; + doInstallCheck = !(debug); installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1540e3bdb696..6aeb63d67114 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -138,8 +138,7 @@ stdenv.mkDerivation rec { ++ optionals (withScripting) [ python.pkgs.wrapPython ]; - # We are emulating wrapGAppsHook, along with other variables to the - # wrapper + # We are emulating wrapGAppsHook, along with other variables to the wrapper makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" @@ -231,5 +230,7 @@ stdenv.mkDerivation rec { # as long as the base and libraries (minus 3d) are build, # this wrapper does not need to get built # the kicad-*small "packages" cause this to happen + + mainProgram = "kicad"; }; } diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 737a819e8477..811a40585363 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.9"; + version = "6.0.10"; src = { - rev = "8da3e8f7071484853b31c61cbd5045903b5c6dd3"; - sha256 = "1fr02jcy09v14d3k8ril0zhwnzhcqcf77wfj5b3bkrh6r8xraqhs"; + rev = "86aedd382b4ece39e27bef209e81792915103704"; + sha256 = "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q"; }; }; libVersion = { - version = "6.0.9"; + version = "6.0.10"; libSources = { - symbols.rev = "0d9559dfddd51110e5c5223901ada2445285ce80"; - symbols.sha256 = "0y5mjjmmln37hkp9wmydinlfgrn8im8rn20145g9xgdpj8j38d48"; + symbols.rev = "3ec40517b37d78faf7ff5504c81362420c4b601f"; + symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "6705da57c29e9896556c7cdbe719ede3f96e9121"; - footprints.sha256 = "02j445i0kcf87fhj9y6pwfcwq3arppxbrv77lbizm8kcpkpcfldl"; - packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f"; - packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; + footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; + footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; + packages3d.rev = "417c4ea884a0d1501061f511730604890bbb0a35"; + packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-09-18"; + version = "2022-12-19"; src = { - rev = "0efc1149afed2af5b81e4555de4623217ece650f"; - sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q"; + rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692"; + sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0"; }; }; libVersion = { - version = "2022-09-18"; + version = "2022-12-19"; libSources = { - symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa"; - symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; + symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e"; + symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb"; templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62"; - footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y"; - packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f"; - packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; + footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; + footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; + packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267"; + packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp"; }; }; }; diff --git a/pkgs/applications/science/electronics/kicad/writable.patch b/pkgs/applications/science/electronics/kicad/writable.patch new file mode 100644 index 000000000000..a2969f26f43b --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/writable.patch @@ -0,0 +1,49 @@ +commit 6a72fd032405515e468797be91b5a6ebcbbb5fd8 +Author: Evils <evils.devils@protonmail.com> +Date: Wed Nov 23 19:49:13 2022 +0100 + + ensure new projects are writable + +diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp +index 7ee8090858..391514519c 100644 +--- a/kicad/kicad_manager_frame.cpp ++++ b/kicad/kicad_manager_frame.cpp +@@ -638,6 +638,12 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxFileName& aProjectFileName, + + // wxFFile dtor will close the file + } ++ ++ if( destFileName.IsOk() && !destFileName.IsFileWritable() ) ++ { ++ destFileName.SetPermissions(0644); ++ } ++ + } + } + +diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp +index bf951fcddb..2bef94326b 100644 +--- a/kicad/project_template.cpp ++++ b/kicad/project_template.cpp +@@ -282,6 +282,21 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr + + result = false; + } ++ else if( !destFile.IsFileWritable() && !destFile.SetPermissions(0644) ) ++ { ++ if( aErrorMsg ) ++ { ++ if( !aErrorMsg->empty() ) ++ *aErrorMsg += "\n"; ++ ++ wxString msg; ++ ++ msg.Printf( _( "Cannot make file writable: '%s'." ), destFile.GetFullPath() ); ++ *aErrorMsg += msg; ++ } ++ ++ result = false; ++ } + } + + return result; diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix new file mode 100644 index 000000000000..b536642cbf55 --- /dev/null +++ b/pkgs/applications/version-management/git-branchstack/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonApplication +, git-revise +}: + +buildPythonApplication rec { + pname = "git-branchstack"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; + }; + + buildInputs = [ + git-revise + ]; + + meta = with lib; { + homepage = "https://github.com/krobelus/git-branchstack"; + description = "Efficiently manage Git branches without leaving your local branch"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7b66aa3799f3..f66b81299a24 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -977,45 +977,45 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian9i386 = { - name = "debian-9.13-stretch-i386"; - fullName = "Debian 9.13 Stretch (i386)"; + debian10i386 = { + name = "debian-10.13-buster-i386"; + fullName = "Debian 10.13 Buster (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz"; - sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; + hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian9x86_64 = { - name = "debian-9.13-stretch-amd64"; - fullName = "Debian 9.13 Stretch (amd64)"; + debian10x86_64 = { + name = "debian-10.13-buster-amd64"; + fullName = "Debian 10.13 Buster (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz"; - sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; + hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian10i386 = { - name = "debian-10.9-buster-i386"; - fullName = "Debian 10.9 Buster (i386)"; + debian11i386 = { + name = "debian-11.5-bullseye-i386"; + fullName = "Debian 11.5 Bullseye (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz"; - sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz"; + hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian10x86_64 = { - name = "debian-10.9-buster-amd64"; - fullName = "Debian 10.9 Buster (amd64)"; + debian11x86_64 = { + name = "debian-11.5-bullseye-amd64"; + fullName = "Debian 11.5 Bullseye (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz"; - sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz"; + hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/data/fonts/garamond-libre/default.nix new file mode 100644 index 000000000000..202ae2ce41f1 --- /dev/null +++ b/pkgs/data/fonts/garamond-libre/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchzip }: + +fetchzip rec { + pname = "garamond-libre"; + version = "1.4"; + + url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; + stripRoot = false; + + postFetch = '' + install -Dm644 $out/*.otf -t $out/share/fonts/opentype + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob + ''; + + sha256 = "6WiuUe3CHXXL/0G7wURvSIgWPQ4isl50e3OBQ+ui0U4="; + + meta = with lib; { + homepage = "https://github.com/dbenjaminmiller/garamond-libre"; + description = "Garamond Libre font family"; + maintainers = with maintainers; [ drupol ]; + license = licenses.x11; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index a269edd6668a..e38f416b261b 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "fstar"; - version = "2022.01.15"; + version = "2022.11.19"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; + sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q="; }; strictDeps = true; @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; + passthru.updateScript = writeScript "update-fstar" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p git gnugrep common-updater-scripts + set -eu -o pipefail + + version="$(git ls-remote --tags git@github.com:FStarLang/FStar.git | grep -Po 'v\K\d{4}\.\d{2}\.\d{2}' | sort | tail -n1)" + update-source-version fstar "$version" + ''; + meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e6e29aa98479..fb59b1ec88d8 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -6,7 +6,7 @@ , platformToolsVersion ? "33.0.2" , buildToolsVersions ? [ "32.0.0" ] , includeEmulator ? false -, emulatorVersion ? "31.3.7" +, emulatorVersion ? "31.3.9" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false @@ -250,7 +250,7 @@ rec { by setting nixpkgs config option 'android_sdk.accept_license = true;'. '' else callPackage ./tools.nix { - inherit deployAndroidPackage packages toolsVersion; + inherit deployAndroidPackage packages toolsVersion os; postInstall = '' # Symlink all requested plugins diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index b383453f7b92..7c57bdfe983c 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -14,6 +14,7 @@ , pytest-mock , python-json-logger , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , pyyaml , toolz @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.23"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,23 +33,29 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FQnyWC7d9h8Ya2BlaTGTrNXkHtJJLdeNL7qXP7scLFA="; + hash = "sha256-pYNL9G4A45IE6hZcihPICYfOzd5hH6Xqy0EYyBajbxQ="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \ - --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ - --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ - --replace 'jsonschema = "' 'jsonschema = "^' \ - --replace 'python-json-logger = "' 'python-json-logger = "^' \ - --replace 'toolz = "0.11.2' 'toolz = "*' \ - --replace 'yamllint = "' 'yamllint = "^' + --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" ''; + pythonRelaxDeps = [ + "flake8" + "jsonschema" + "pathspec" + "python-json-logger" + "pyyaml" + "toolz" + "unidiff" + "yamllint" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -84,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Best practice scanner for Ansible roles and playbooks"; homepage = "https://github.com/thegeeklab/ansible-later"; + changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ tboerger ]; }; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 5f5a24600dec..47ec470dfde9 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-uZkPQYuF8EbX5+Qyj7CjxJhpT+DywCSwbORKXqaY0z8="; + hash = "sha256-1WBaNTARe0ULWHf0g/6Jljo1yCffnJAS9ycbhGqzOUk="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { packageurl-python semver tabulate - ]; + ] ++ httpx.optional-dependencies.http2; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 85ce9deba6cf..9ebf947c7346 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.15.1"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2VBdad9NL19eW2Djot2gkynyjSCUvG4f0KnEub6M0vg="; + hash = "sha256-j9++euxSsvf6ZLkVJtyGdlOx6WWrAXEOczqwypYZkXA="; }; buildInputs = lib.optionals stdenv.isDarwin [ @@ -33,11 +33,6 @@ buildPythonPackage rec { "strictoverflow" ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "extra_link_args += ['-Wl,-fatal_warnings']" "" - ''; - # gcc <10 is not supported, LLVM on darwin is just fine nativeBuildInputs = [ cmake @@ -58,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/awslabs/aws-crt-python"; + changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${version}"; description = "Python bindings for the AWS Common Runtime"; license = licenses.asl20; maintainers = with maintainers; [ davegallant ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 812ff1a64cb6..d2cefade9c44 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p $out/bin - '' + pip.postPatch; + '' + (pip.postPatch or ""); # `pip` does not necessarily have a `postPatch` field. nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ python ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 08a1fa5ca5ea..15c533c91fce 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -1,65 +1,103 @@ { lib , backoff -, backports-datetime-fromisoformat , buildPythonPackage , fetchFromGitHub +, geojson , google-api-core -, jinja2 +, imagesize , ndjson +, numpy +, opencv + # , opencv-python +, packaging , pillow , pydantic + # , pygeotile +, pyproj , pytest-cases , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , rasterio , requests , shapely +, tqdm +, typeguard +, typing-extensions }: buildPythonPackage rec { pname = "labelbox"; - version = "3.24.1"; + version = "3.33.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - sha256 = "sha256-pcIbCtVOr6pwodgNv8aGZ+k2Z9cQPCQm1UBJWJAlj/o="; + hash = "sha256-lYhgBELeVtNUp6ZvcSTIeKp2YkaGt6MH8BbzSERGHXw="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace "-s -vv -x --reruns 5 --reruns-delay 10 --durations=20" "-s -vv -x --durations=20" + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "backoff" + ]; + propagatedBuildInputs = [ backoff - backports-datetime-fromisoformat google-api-core - jinja2 ndjson - pillow pydantic - rasterio requests - shapely + tqdm ]; - postPatch = '' - substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8" - ''; + passthru.optional-dependencies = { + data = [ + shapely + geojson + numpy + pillow + # opencv-python + typeguard + imagesize + pyproj + # pygeotile + typing-extensions + packaging + ]; + }; checkInputs = [ pytest-cases pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.data; disabledTestPaths = [ # Requires network access "tests/integration" + # Missing requirements + "tests/data" ]; - pythonImportsCheck = [ "labelbox" ]; + pythonImportsCheck = [ + "labelbox" + ]; meta = with lib; { description = "Platform API for LabelBox"; homepage = "https://github.com/Labelbox/labelbox-python"; + changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index ae0217b0ebdc..f07691abdca7 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,14 +1,14 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi -, isPy27 , odfpy , openpyxl , pandas -, setuptools-scm , pytestCheckHook -, pytest-cov +, pythonOlder , pyyaml +, setuptools-scm +, tabulate , unicodecsv , xlrd , xlwt @@ -17,26 +17,79 @@ buildPythonPackage rec { pname = "tablib"; version = "3.2.1"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE="; + hash = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov=tablib --cov=tests --cov-report xml --cov-report term --cov-report html" "" + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + passthru.optional-dependencies = { + all = [ + # markuppy + odfpy + openpyxl + pandas + pyyaml + tabulate + xlrd + xlwt + ]; + cli = [ + tabulate + ]; + html = [ + # markuppy + ]; + ods = [ + odfpy + ]; + pandas = [ + pandas + ]; + xls = [ + xlrd + xlwt + ]; + xlsx = [ + openpyxl + ]; + yaml = [ + pyyaml + ]; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytestCheckHook pytest-cov unicodecsv pandas ]; + checkInputs = [ + pandas + pytestCheckHook + unicodecsv + ]; - # test_tablib needs MarkupPy, which isn't packaged yet - pytestFlagsArray = [ "--ignore=tests/test_tablib.py" ]; + disabledTestPaths = [ + # test_tablib needs MarkupPy, which isn't packaged yet + "tests/test_tablib.py" + ]; - pythonImportsCheck = [ "tablib" ]; + pythonImportsCheck = [ + "tablib" + ]; meta = with lib; { description = "Format-agnostic tabular dataset library"; homepage = "https://tablib.readthedocs.io/"; changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index f03c54e72de3..c029d7922fba 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chezou"; repo = pname; - rev = "v${version}"; - hash = "sha256-Dfi6LzrLDz9VVDmbeK1dEaWuQosD4tvAH13Q4Mp3smA="; + rev = "refs/tags/v${version}"; + hash = "sha256-L/N4TqVHIlwqVeBKlUq5Oz1VW/105Ov6Yicvnn/lxlI="; }; patches = [ @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to extract table from PDF into pandas DataFrame"; homepage = "https://github.com/chezou/tabula-py"; + changelog = "https://github.com/chezou/tabula-py/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index ba8ee074664f..7ccafafad54e 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "10.3"; + version = "10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,12 +17,9 @@ buildPythonPackage rec { owner = "aaugustin"; repo = pname; rev = version; - hash = "sha256-ZUn/DvO1Kx7Uxne4DF/am69YL1c48qpgQrGek355Z+4="; + hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY="; }; - # Tests fail on Darwin with `OSError: AF_UNIX path too long` - doCheck = !stdenv.isDarwin; - patchPhase = '' # Disable all tests that need to terminate within a predetermined amount of # time. This is nondeterministic. @@ -44,7 +41,12 @@ buildPythonPackage rec { done ''; - checkInputs = [ unittestCheckHook ]; + checkInputs = [ + unittestCheckHook + ]; + + # Tests fail on Darwin with `OSError: AF_UNIX path too long` + doCheck = !stdenv.isDarwin; pythonImportsCheck = [ "websockets" @@ -53,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket implementation in Python"; homepage = "https://websockets.readthedocs.io/"; + changelog = "https://github.com/aaugustin/websockets/blob/${version}/docs/project/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c197aa8b9ec5..5c0838fce73f 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }@args: let diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 8c64b86b43a1..76f2bc427590 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }: version: hashes: @@ -64,7 +65,7 @@ let }; electronLibPath = with lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] + [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/development/tools/ocaml/opam2json/default.nix index 198a5f575eb4..a3ca535d3f86 100644 --- a/pkgs/development/tools/ocaml/opam2json/default.nix +++ b/pkgs/development/tools/ocaml/opam2json/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }: stdenv.mkDerivation rec { pname = "opam2json"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "v${version}"; - sha256 = "fe8bm/V/4r2iNxgbitT2sXBqDHQ0GBSnSUSBg/1aXoI="; + sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM="; }; buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ]; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 117491d3bad7..b1d8e5065f28 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.25.3"; + version = "1.26.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f+FbmkCdM5Ub/nbq5Z8HnZ1KexGV59U/zPLpOkfs200="; + hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo="; }; vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM="; diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix index 4ebbb797230e..004b6ed27543 100644 --- a/pkgs/development/tools/rust/cargo-pgx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-pgx"; - version = "0.6.0"; + version = "0.6.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-CXOInyT0fY17e4iuGhUpR9EPd2M8jauR5TKpPlhTJoQ="; + sha256 = "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs="; }; - cargoSha256 = "sha256-RtPFFIuurSPMhGLcGLOu0em1biimVkTaAKP5EUPtQ9U="; + cargoSha256 = "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 57d173440eb4..7f6ba52dccc4 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , jdk8 -, jdk +, jdk17 , zlib , file , wrapQtAppsHook @@ -20,7 +20,7 @@ , tomlplusplus , ghc_filesystem , msaClientID ? "" -, jdks ? [ jdk jdk8 ] +, jdks ? [ jdk17 jdk8 ] }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aIBaenSnssv0/r2+UT5R4nBwo2QBGZ1Zp0CWOeiaeDE="; }; - nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index fefd7c56d761..2ed667f40ce7 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20221109"; - sourceHash = "sha256-77xRUo4g24j5rGWYzVn/DZ1rfY+Ks9cmZ/+GCHELP5E="; - outputHash = "sha256-pPhqbi4PRr+0FQ7K8M/SibgYeI45spcdqgb5garyJo8="; + version = "20221214"; + sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE="; + outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk="; } diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 5fd6fd45b357..63ab388eb61f 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2022.04.26-138a1"; + version = "2022.12.07-138a1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "v${version}"; - hash = "sha256-/Y+EaAxJQofDRE67HY8AVqAdOPdFI01/EhYCAT5qlSM="; + hash = "sha256-/Q9zj/Hn/8S7bF1CN6ZCg705VYU+QUagNr4RNgZl+oA="; }; buildInputs = [ python3 ]; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index b2f3d61d8f4d..6e53286fcd58 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, buildGoModule, fetchFromGitHub -, pkg-config, taglib, alsa-lib -, zlib, AudioToolbox, AppKit +, pkg-config, taglib, zlib # Disable on-the-fly transcoding, # removing the dependency on ffmpeg. @@ -8,32 +7,37 @@ # to the original file, but if transcoding is configured # that takes a while. So best to disable all transcoding # in the configuration if you disable transcodingSupport. -, transcodingSupport ? true, ffmpeg }: +, transcodingSupport ? true, ffmpeg +, mpv }: buildGoModule rec { pname = "gonic"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wX97HtvHgHpKTDwZl/wHQRpiyDJ7U38CpdzWu/CYizQ="; + sha256 = "sha256-sTvdMLa7rwrTRDH5DR5nJCzzbtXM9y8mq63CNR1lVfI="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib zlib ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ]; - vendorSha256 = "sha256-oTuaA5ZsZ7zMcjzGh37zO/1XyOfj6xjfNr6A7ecrOiA="; + buildInputs = [ taglib zlib ]; + vendorSha256 = "sha256-B9qzhh7FKkZPfuylxlyNP0blU5sjGwM6bLsw+vFkkb4="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break postPatch = lib.optionalString transcodingSupport '' substituteInPlace \ - server/encode/encode.go \ + transcode/transcode.go \ --replace \ - '"ffmpeg"' \ - '"${lib.getBin ffmpeg}/bin/ffmpeg"' + '`ffmpeg' \ + '`${lib.getBin ffmpeg}/bin/ffmpeg' + '' + '' + substituteInPlace \ + jukebox/jukebox.go \ + --replace \ + '"mpv"' \ + '"${lib.getBin mpv}/bin/mpv"' ''; meta = { @@ -41,5 +45,6 @@ buildGoModule rec { description = "Music streaming server / subsonic server API implementation"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ Profpatsch ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 46dd1f1f067b..83360ed2131b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.12.6"; + version = "2022.12.7"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 42e8a056af5d..12cb7778cdfe 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -188,7 +188,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.12.6"; + hassVersion = "2022.12.7"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 55ff5dbae8de..e91913798a18 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20221213.0"; + version = "20221213.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-s/rVgsVyNyyW2wvv7IK4/0wy99ZtHn8iZ7tVjOBGozQ="; + hash = "sha256-QL+3dIZlUJstRgK80ANnK9CKR4muvfEQz16bTTMS3Fs="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index bb7153a301a1..d456fc3a543f 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,16 +1,13 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -let - pinData = lib.importJSON ./pin.json; -in +{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = pinData.version; + version = "2.5.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = pinData.sha256; + sha256 = "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM="; }; vendorSha256 = null; @@ -21,7 +18,10 @@ buildGoModule rec { ]; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { + attrPath = pname; + extraArgs = [ "--version-regex" "mimir-([0-9.]+)" ]; + }; tests = { inherit (nixosTests) mimir; }; diff --git a/pkgs/servers/monitoring/mimir/pin.json b/pkgs/servers/monitoring/mimir/pin.json deleted file mode 100644 index 52e041745783..000000000000 --- a/pkgs/servers/monitoring/mimir/pin.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "mimir-2.5.0", - "sha256": "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM=" -} diff --git a/pkgs/servers/monitoring/mimir/update.sh b/pkgs/servers/monitoring/mimir/update.sh deleted file mode 100755 index 242767c2ecb2..000000000000 --- a/pkgs/servers/monitoring/mimir/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep - -# TODO set to `verbose` or `extdebug` once implemented in oil -shopt --set xtrace -# we need failures inside of command subs to get the correct vendorSha256 -shopt --unset inherit_errexit - -const directory = $(dirname $0 | xargs realpath) -const owner = "grafana" -const repo = "mimir" -const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ - jq -r '.tag_name') -const latest_version = $(echo $latest_rev | sd 'v' '') -const current_version = $(jq -r '.version' $directory/pin.json) -if ("$latest_version" === "$current_version") { - echo "$repo is already up-to-date" - return 0 -} else { - const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") - const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" - - jq ".version = \"$latest_version\" | \ - .\"sha256\" = \"$tarball_hash\"" $directory/pin.json | sponge $directory/pin.json -} diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 03d754eca733..531a2e31a4b2 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.7.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-ngsNDxK3J8acrVqxtEnfoqEOhNsQemOcuaf3ru3eQMw="; + sha256 = "sha256-Zzqqh/3ijOTVVm5ksmsHY4LOL034VXHeZ7XsEg8cxY0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0a0838d676d9..0982e47c5517 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -11,15 +11,6 @@ let py = python3.override { packageOverrides = self: super: { - awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { - version = "0.14.0"; - src = self.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw="; - }; - }); - prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "3.0.28"; src = self.fetchPypi { @@ -34,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.6"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.8"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-3zB0Uy2pmkrOLb+/mXZGs/pnzo6zi2zVPyeNPGPVQJM="; + hash = "sha256-Q1iHGwkFg0rkunwEgWQIqLEPAGfOLfqA1UpjmCe2x8M="; }; nativeBuildInputs = [ @@ -120,6 +111,8 @@ with py.pkgs; buildPythonApplication rec { python = py; # for aws_shell updateScript = nix-update-script { attrPath = pname; + # Excludes 1.x versions from the Github tags list + extraArgs = [ "--version-regex" "^(2\.(.*))" ]; }; tests.version = testers.testVersion { package = awscli2; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 1ce947361df9..d8181142c09f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,17 +13,15 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.7.5"; + version = "2.19.10"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "072mi8r10v78sfs81zxdwfabf87fp872c99c5iral1ywwa4iynpl"; + sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM="; }; - patches = [ ./hunspell-dirs.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; buildInputs = [ python ibus gtk3 m17n_lib ]; @@ -34,8 +32,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mike-fabian.github.io/ibus-typing-booster/"; license = licenses.gpl3Plus; - description = "A typing booster engine for the IBus platform"; - maintainers = with maintainers; [ ]; + description = "A completion input method for faster typing"; + maintainers = with maintainers; [ ncfavier ]; isIbusEngine = true; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch deleted file mode 100644 index 7b624b379a26..000000000000 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/engine/itb_util.py b/engine/itb_util.py -index ded236a..633525a 100755 ---- a/engine/itb_util.py -+++ b/engine/itb_util.py -@@ -1876,14 +1876,18 @@ def find_hunspell_dictionary(language): - If no dictionary can be found for the requested language, - the return value is ('', ''). - ''' -- dirnames = [ -- '/usr/share/hunspell', -- '/usr/share/myspell', -- '/usr/share/myspell/dicts', -- '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here -- '/usr/local/share/myspell', -- '/usr/local/share/myspell/dicts', -- ] -+ -+ if "NIX_HUNSPELL_DIRS" in os.environ: -+ dirnames = os.environ["NIX_HUNSPELL_DIRS"].split(":") -+ else: # fallback to the original behavior -+ dirnames = [ -+ '/usr/share/hunspell', -+ '/usr/share/myspell', -+ '/usr/share/myspell/dicts', -+ '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here -+ '/usr/local/share/myspell', -+ '/usr/local/share/myspell/dicts', -+ ] - dic_path = '' - aff_path = '' - for language in expand_languages([language]): diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix index e4394028658d..4b5180f0e15c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix @@ -1,14 +1,10 @@ { typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper -, langs ? [ "de-de" "en-us" "es-es" "fr-moderne" "it-it" "sv-se" "sv-fi" ] +, langs ? [ "de-de" "en-gb-ise" "en-us" "es-es" "fr-moderne" "it-it" "sv-se" "sv-fi" ] }: let - hunspellDirs = with lib; makeSearchPath ":" (flatten (forEach langs (lang: [ - "${hunspellDicts.${lang}}/share/hunspell" - "${hunspellDicts.${lang}}/share/myspell" - "${hunspellDicts.${lang}}/share/myspell/dicts" - ]))); + hunspellDirs = lib.makeSearchPath "share/hunspell" (lib.attrVals langs hunspellDicts); in @@ -20,7 +16,7 @@ symlinkJoin { postBuild = '' for i in bin/emoji-picker libexec/ibus-{setup,engine}-typing-booster; do wrapProgram "$out/$i" \ - --prefix NIX_HUNSPELL_DIRS : ${lib.escapeShellArg hunspellDirs} + --prefix DICPATH : ${lib.escapeShellArg hunspellDirs} done sed -i -e "s,${typing-booster},$out," $out/share/ibus/component/typing-booster.xml diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 7f3ba8ea31ac..87cf267afc0c 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.12.1"; + version = "2022.12.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gDAwZhfkXMqU4dbowpPhNl52Kg3Kx9lgBNzhzkQPrN0="; + hash = "sha256-9yyfcygEmnOcaooSg9bmGGOP2aph0i6d/Ot4nGlTPw4="; }; postPatch = '' diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix new file mode 100644 index 000000000000..9c8b0a47ab86 --- /dev/null +++ b/pkgs/tools/misc/iay/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, AppKit +, Cocoa +, Foundation +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "iay"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "aaqaishtyaq"; + repo = pname; + rev = "v${version}"; + sha256 = "0r2yp34gxkh32amrysfj1jg543dh0kyqxzcx0zyi6a8y9232d8ky"; + }; + + cargoHash = "sha256-SMqiwM6LrXXjV4Mb2BY9WbeKKPkxiYxPyZ4aepVIAqU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + Security + ]; + + NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ "-framework" "AppKit" ]; + + meta = with lib; { + description = + "Minimalistic, blazing-fast, and extendable prompt for bash and zsh"; + homepage = "https://github.com/aaqaishtyaq/iay"; + license = licenses.mit; + maintainers = with maintainers; [ aaqaishtyaq ]; + }; +} diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix new file mode 100644 index 000000000000..ca72a2ca6b17 --- /dev/null +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + pname = "open-pdf-sign"; + + src = fetchurl { + url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${version}/open-pdf-sign.jar"; + sha256 = "AfxpqDLIycXMQmYexRoFh5DD/UCBHrnGSMjfjljvKs4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + install -Dm644 $src $out/lib/open-pdf-sign.jar + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/open-pdf-sign \ + --add-flags "-jar $out/lib/open-pdf-sign.jar" + ''; + + meta = with lib; { + description = "Digitally sign PDF files from your commandline"; + homepage = "https://github.com/open-pdf-sign/open-pdf-sign"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.asl20; + maintainers = with maintainers; [ drupol ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 56f5d676a8b8..bc694986c8d1 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I7tA6FRsG3miIXibmBAFvanIyI8jgThrInQEzUCxvAs="; + hash = "sha256-XcMDdnqx64UcEzD44z34sm5TmshPOTb5tivBnGXQLjo="; }; - vendorSha256 = "sha256-ahj67MoS+VXNlh5dRA722tq27JRQGaC7TejOVIAH8ms="; + vendorHash = "sha256-HjWUV5gfh2WnUAayZIj6LGFs0rMv2n7v6zJJrzBHBwg="; # Tests want to download a vulnerable Terraform project doCheck = false; @@ -27,6 +27,7 @@ buildGoModule rec { 500+ polices and support for Terraform and Kubernetes. ''; homepage = "https://github.com/accurics/terrascan"; + changelog = "https://github.com/tenable/terrascan/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/tools/text/textpieces/default.nix index db4edd417c20..7b20083a80bf 100644 --- a/pkgs/tools/text/textpieces/default.nix +++ b/pkgs/tools/text/textpieces/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "textpieces"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "liferooter"; repo = pname; rev = "v${version}"; - hash = "sha256-QLPvK2kiOGf8XN2aors6cZtl9d9uqsxcho2A1kISO5Y="; + hash = "sha256-LQq6pjue72a4kIHhWtoxJi/eKxPa4du5sBQY97SG1gY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index ce4264bdf838..3c2b170be2d9 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,82 +1,43 @@ -{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -stdenv.mkDerivation (rec { +buildGoModule rec { pname = "xe-guest-utilities"; - version = "6.2.0"; - meta = { - description = "Citrix XenServer Tools"; - homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; - maintainers = with lib.maintainers; [ benwbooth ]; - platforms = lib.platforms.linux; - license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; - }; - src = fetchurl { - url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; - sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; + version = "7.30.0"; + + src = fetchFromGitHub { + owner = "xenserver"; + repo = "xe-guest-utilities"; + rev = "v${version}"; + hash = "sha256-gMb8QIUg8t0SiTtUzqeh4XM5hHgCXuf5KlV3OeoU0LI="; }; - buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz gnugrep which ]; - patches = [ ./ip-address.patch ]; - postPatch = '' - tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" - ''; - # Workaround build failure on -fno-common toolchains: - # ld: utils.o:xenstore/utils.h:27: - # multiple definition of `xprintf'; xenstored_core.o:xenstore/utils.h:27: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + vendorHash = "sha256-zhpDvo8iujE426/gxJY+Pqfv99vLNKHqyMQbbXIKodY="; buildPhase = '' - export CC=gcc - export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' - export PYTHON=python2 - cd "$NIX_BUILD_TOP/$name/uclibc-sources" - for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do - substituteInPlace "$file" --replace -Werror "" - done - make -C tools/include - make -C tools/libxc - make -C tools/xenstore + runHook preBuild + + make RELEASE=nixpkgs + + runHook postBuild ''; installPhase = '' - export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' - if [[ $CARCH == x86_64 ]]; then - export LIBLEAFDIR_x86_64=lib - fi - for f in include libxc xenstore; do - [[ ! -d $NIX_BUILD_TOP/$name/uclibc-sources/tools/$f ]] && continue - make -C "$NIX_BUILD_TOP/$name/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install - done - rm -r "$out"/var + runHook preInstall - cd "$NIX_BUILD_TOP/$name" - install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs" - install -Dm755 xe-daemon "$out/bin/xe-daemon" - install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" - substituteInPlace "$out/bin/xe-daemon" --replace sbin bin - substituteInPlace "$out/bin/xe-daemon" --replace /usr/ "$out/" - substituteInPlace "$out/bin/xe-update-guest-attrs" --replace /usr/ "$out/" - substituteInPlace "$out/bin/xe-update-guest-attrs" --replace 'export PATH=' 'export PATH=$PATH:' - substituteInPlace "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" --replace /bin/sh '${bash}/bin/sh' + install -Dt "$out"/bin build/stage/usr/{,s}bin/* + install -Dt "$out"/etc/udev/rules.d build/stage/etc/udev/rules.d/* - cat <<'EOS' >"$out/bin/xe-linux-distribution" - #!${bash}/bin/bash -eu - . /etc/os-release - if [[ $# -gt 0 ]]; then - mkdir -p "$(dirname "$1")" - exec 1>"$1" - fi - cat <<EOF - os_distro="$ID" - os_majorver="''${VERSION_ID%%.*}" - os_minorver="''${VERSION_ID#*.}" - os_uname="$(uname -r)" - os_name="$PRETTY_NAME" - EOF - EOS - chmod 0755 "$out/bin/xe-linux-distribution" + runHook postInstall ''; -}) + meta = { + description = "XenServer guest utilities"; + homepage = "https://github.com/xenserver/xe-guest-utilities"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch b/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch deleted file mode 100644 index 185f259ef708..000000000000 --- a/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr a/xe-update-guest-attrs b/xe-update-guest-attrs ---- a/xe-update-guest-attrs 2012-09-25 12:45:14.000000000 +0200 -+++ b/xe-update-guest-attrs 2012-11-21 16:46:35.000000000 +0100 -@@ -177,9 +177,9 @@ - # collisions:0 txqueuelen:0 - # RX bytes:3604609 (3.4 MiB) TX bytes:3604609 (3.4 MiB) - --ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \ -- -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \ -- -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \ -+ifs=`ip addr show | sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/name \1 /gp;' \ -+ -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/ipv4 \1 /gp;' \ -+ -e 's/^[[:space:]]\{4\}inet6 \('${IPADDR6_RE}'\)\/.*/ipv6 \1 /gp;' | \ - while read tag value; do - case "${tag}" in - name) \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0312c21d495..f1593b7e74a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -416,10 +416,6 @@ with pkgs; comedilib = callPackage ../development/libraries/comedilib { }; - commitlint = nodePackages."@commitlint/cli"; - - commit-formatter = callPackage ../applications/version-management/commit-formatter { }; - commix = callPackage ../tools/security/commix { }; conserver = callPackage ../tools/misc/conserver { }; @@ -448,8 +444,6 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - datalad = callPackage ../applications/version-management/datalad { }; - dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; @@ -1587,8 +1581,14 @@ with pkgs; cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; + commit-formatter = callPackage ../applications/version-management/commit-formatter { }; + + commitlint = nodePackages."@commitlint/cli"; + conform = callPackage ../applications/version-management/conform { }; + datalad = callPackage ../applications/version-management/datalad { }; + darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; delta = callPackage ../applications/version-management/delta { @@ -1667,6 +1667,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { }; + git-bug = callPackage ../applications/version-management/git-bug { }; git-chglog = callPackage ../applications/version-management/git-chglog { }; @@ -3251,7 +3253,7 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; - pdepend = callPackage ../development/php-packages/pdepend/default.nix { }; + pdepend = callPackage ../development/php-packages/pdepend { }; platformsh = callPackage ../misc/platformsh { }; @@ -10274,6 +10276,8 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; + open-pdf-sign = callPackage ../tools/misc/open-pdf-sign { }; + opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; @@ -14628,6 +14632,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + iay = callPackage ../tools/misc/iay { + inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; + }; + idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; }); @@ -26597,6 +26605,8 @@ with pkgs; freepats = callPackage ../data/misc/freepats { }; + garamond-libre = callPackage ../data/fonts/garamond-libre { }; + g15daemon = callPackage ../os-specific/linux/g15daemon {}; galatia-sil = callPackage ../data/fonts/galatia-sil { }; @@ -29287,9 +29297,7 @@ with pkgs; gollum = callPackage ../applications/misc/gollum { }; - gonic = callPackage ../servers/gonic { - inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; - }; + gonic = callPackage ../servers/gonic { }; goodvibes = callPackage ../applications/audio/goodvibes { }; @@ -30376,6 +30384,8 @@ with pkgs; lscolors = callPackage ../applications/misc/lscolors { }; + lswt = callPackage ../applications/misc/lswt { }; + luddite = with python3Packages; toPythonApplication luddite; goobook = with python3Packages; toPythonApplication goobook; |