diff --git a/.github/workflows/direct-push.yml b/.github/workflows/direct-push.yml index 167253ac6db6..9046022af662 100644 --- a/.github/workflows/direct-push.yml +++ b/.github/workflows/direct-push.yml @@ -21,7 +21,7 @@ jobs: id: ismerge run: | ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any') - echo "::set-output name=ismerge::$ISMERGE" + echo "ismerge=$ISMERGE" >> $GITHUB_OUTPUT # github events are eventually consistent, so wait until changes propagate to thier DB - run: sleep 60 if: steps.ismerge.outputs.ismerge != 'true' diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 3d00ed1b6773..3a6e0ad63e52 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -23,7 +23,7 @@ jobs: - name: setup id: setup run: | - echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")" + echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT - name: update terraform-providers run: | git config user.email "41898282+github-actions[bot]@users.noreply.github.com" diff --git a/maintainers/scripts/feature-freeze-teams.pl b/maintainers/scripts/feature-freeze-teams.pl index eb37150befe3..1c1a5c00907d 100755 --- a/maintainers/scripts/feature-freeze-teams.pl +++ b/maintainers/scripts/feature-freeze-teams.pl @@ -31,7 +31,7 @@ sub github_team_members { push @ret, $_->{'login'}; } } else { - print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: $response->status_line"; + print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: " . $response->status_line; } return \@ret; diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 507e74570e45..d68267883e45 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -266,7 +266,7 @@ in in '' export KUBECONFIG=${clusterAdminKubeconfig} - ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ${top.package}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} ''; })]); diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix index 60ba482758fb..a3de9ed115d4 100644 --- a/nixos/tests/kubernetes/default.nix +++ b/nixos/tests/kubernetes/default.nix @@ -4,8 +4,6 @@ let dns = import ./dns.nix { inherit system pkgs; }; rbac = import ./rbac.nix { inherit system pkgs; }; - # TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works - # e2e = import ./e2e.nix { inherit system pkgs; }; in { dns-single-node = dns.singlenode.test; diff --git a/nixos/tests/kubernetes/e2e.nix b/nixos/tests/kubernetes/e2e.nix deleted file mode 100644 index fb29d9cc6953..000000000000 --- a/nixos/tests/kubernetes/e2e.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }: -with import ./base.nix { inherit system; }; -let - domain = "my.zyx"; - certs = import ./certs.nix { externalDomain = domain; kubelets = ["machine1" "machine2"]; }; - kubeconfig = pkgs.writeText "kubeconfig.json" (builtins.toJSON { - apiVersion = "v1"; - kind = "Config"; - clusters = [{ - name = "local"; - cluster.certificate-authority = "${certs.master}/ca.pem"; - cluster.server = "https://api.${domain}"; - }]; - users = [{ - name = "kubelet"; - user = { - client-certificate = "${certs.admin}/admin.pem"; - client-key = "${certs.admin}/admin-key.pem"; - }; - }]; - contexts = [{ - context = { - cluster = "local"; - user = "kubelet"; - }; - current-context = "kubelet-context"; - }]; - }); - - base = { - name = "e2e"; - inherit domain certs; - test = '' - $machine1->succeed("e2e.test -kubeconfig ${kubeconfig} -provider local -ginkgo.focus '\\[Conformance\\]' -ginkgo.skip '\\[Flaky\\]|\\[Serial\\]'"); - ''; - }; -in { - singlenode = mkKubernetesSingleNodeTest base; - multinode = mkKubernetesMultiNodeTest base; -} diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index ecad4bd9821b..074b7520f38c 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ipmicfg"; - version = "1.32.0"; - buildVersion = "200910"; + version = "1.34.0"; + buildVersion = "220906"; src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "1mncinwgx5d8jkvnvhccqlj2xp0xa5xjsab4r5mblmcnvm609rr3"; + sha256 = "ZumCXuR7M2Ep7maBOBFk0UsxyRo4fBkf+9AVmkz4AF0="; }; installPhase = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 416ea09be69d..8256f036f2e3 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.2"; + version = "11.5.4"; lang = "en-US"; @@ -95,19 +95,21 @@ let x86_64-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-kM3OOFTpEU7nIyqqdGcqLZ86QLb6isM5cfWG7jo891o="; + sha256 = "sha256-23P8Ew0asOptDYVJ0xA+ATOOT92nz/I2F2+CsAejfKo="; }; i686-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-62dGoIqaCrSzsDjvt8c5hEAwOSTFst9PCpvMzveBukY="; + sha256 = "sha256-ye4qq+zH1AlDItP8lKfA9YIJ7AMg1Roc4itpr0kWNtY="; }; }; in diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a33328b2b691..58d63c63a7fd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,7 +15,6 @@ "cmd/kube-controller-manager" "cmd/kube-proxy" "cmd/kube-scheduler" - "test/e2e/e2e.test" ] }: diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f48c0177c9ad..8b99f574cbcb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -741,13 +741,13 @@ "version": "3.3.0" }, "minio": { - "hash": "sha256-9EpVDRX5rPJ1TIlC+gI79AC442cBzWq76ebFLKPbwmc=", + "hash": "sha256-rB7GhbTUSPTd8YOFV2XG1riBr2Wd6DTEZd2CreMbBD0=", "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.7.0", + "rev": "v1.7.1", "vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=", - "version": "1.7.0" + "version": "1.7.1" }, "mongodbatlas": { "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 410c3bf2d9e2..683d94fc2be9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -152,8 +152,7 @@ stdenv.mkDerivation rec { ++ lib.optional spiceSupport "--enable-spice" ++ lib.optional usbredirSupport "--enable-usb-redir" ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" - ++ lib.optional stdenv.isDarwin "--enable-cocoa" - ++ lib.optional stdenv.isDarwin "--enable-hvf" + ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ] ++ lib.optional stdenv.isLinux "--enable-linux-aio" ++ lib.optional gtkSupport "--enable-gtk" ++ lib.optional xenSupport "--enable-xen" diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 38631d3242d3..18f3fc2bf9c8 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -85,6 +85,7 @@ let "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" "architecture=${if stdenv.hostPlatform.isMips64 then if versionOlder version "1.78" then "mips1" else "mips" + else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" @@ -101,6 +102,7 @@ let ++ optional (toolset != null) "toolset=${toolset}" ++ optional (!enablePython) "--without-python" ++ optional needUserConfig "--user-config=user-config.jam" + ++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix new file mode 100644 index 000000000000..150429acf879 --- /dev/null +++ b/pkgs/development/python-modules/face-recognition/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# propagates +, click +, dlib +, face-recognition-models +, numpy +, pillow + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "face-recognition"; + version = "1.3.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "face_recognition"; + inherit version; + hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew="; + }; + + propagatedBuildInputs = [ + click + dlib + face-recognition-models + numpy + pillow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + license = licenses.mit; + homepage = "https://github.com/ageitgey/face_recognition"; + maintainers = with maintainers; [ ]; + description = "The world's simplest facial recognition api for Python and the command line"; + }; +} diff --git a/pkgs/development/python-modules/face-recognition/models.nix b/pkgs/development/python-modules/face-recognition/models.nix new file mode 100644 index 000000000000..9df1ac060589 --- /dev/null +++ b/pkgs/development/python-modules/face-recognition/models.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, lib +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "face-recognition-models"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "face_recognition_models"; + inherit version; + hash = "sha256-t5vSAKiMh8mp1EbJkK5xxaYm0fNzAXTm1XAVf/HYls8="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "face_recognition_models" + ]; + + meta = with lib; { + homepage = "https://github.com/ageitgey/face_recognition_models"; + license = licenses.cc0; + maintainers = with maintainers; [ ]; + description = "Trained models for the face_recognition python library"; + }; +} diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix deleted file mode 100644 index b0c5266d6fb1..000000000000 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, lib, flake8, pytest, glibcLocales -}: - -buildPythonPackage rec { - pname = "face_recognition"; - version = "1.3.0"; - - src = fetchFromGitHub { - repo = pname; - owner = "ageitgey"; - rev = "d34c622bf42e2c619505a4884017051ecf61ac77"; - sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" - ''; - - propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; - - # Our dlib is compiled with AVX instructions by default which breaks - # with "Illegal instruction" on some builders due to missing hardware features. - # - # As this makes the build fairly unreliable, it's better to skip the test and to ensure that - # the build is working and after each change to the package, manual testing should be done. - doCheck = false; - - # Although tests are disabled by default, checkPhase still exists, so - # maintainers can check the package's functionality locally before modifying it. - checkInputs = [ flake8 pytest glibcLocales ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" py.test - ''; - - meta = with lib; { - license = licenses.mit; - homepage = "https://github.com/ageitgey/face_recognition"; - maintainers = with maintainers; [ ]; - description = "The world's simplest facial recognition api for Python and the command line"; - }; -} diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix deleted file mode 100644 index ccf20f494998..000000000000 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, lib, fetchPypi, setuptools }: - -buildPythonPackage rec { - pname = "face_recognition_models"; - version = "0.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp"; - }; - - # no module named `tests` as no tests are available - doCheck = false; - - propagatedBuildInputs = [ setuptools ]; - - meta = with lib; { - homepage = "https://github.com/ageitgey/face_recognition_models"; - license = licenses.cc0; - maintainers = with maintainers; [ ]; - description = "Trained models for the face_recognition python library"; - }; -} diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 6605009b8fdd..a2a5a155b5ea 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "matrix_client"; + pname = "matrix-client"; version = "0.4.0"; src = fetchPypi { - inherit pname version; + pname = "matrix_client"; + inherit version; sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; }; diff --git a/pkgs/development/python-modules/pi1wire/default.nix b/pkgs/development/python-modules/pi1wire/default.nix index 993c715999b2..faaaec0caa1c 100644 --- a/pkgs/development/python-modules/pi1wire/default.nix +++ b/pkgs/development/python-modules/pi1wire/default.nix @@ -6,15 +6,15 @@ buildPythonPackage rec { pname = "pi1wire"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ushiboy"; repo = "pi1wire"; - rev = "v${version}"; - hash = "sha256-70w71heHWR5yArl+HuNAlzL2Yq/CL0iMNMiQw5qovls="; + rev = "refs/tags/v${version}"; + hash = "sha256-l/5w71QsAW4BvILOaLdUVvQ8xxUm1ZTzUESRFzUgtic="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix similarity index 93% rename from pkgs/development/python-modules/pushbullet/default.nix rename to pkgs/development/python-modules/pushbullet-py/default.nix index e697683b9b84..3fff30cb6dd5 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet-py/default.nix @@ -9,8 +9,9 @@ }: buildPythonPackage rec { - pname = "pushbullet.py"; + pname = "pushbullet-py"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index e5e8d822debc..27f61f4e7021 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-a3mslAqDzUlMLBMjxScMkR4GePmpBeH+Ottd1ENum/c="; + sha256 = "sha256-6DbWz4u4mbW/aSDpaLxP4bG14gHxMGc4A8zMTVH/vj0="; }; - cargoSha256 = "sha256-nFtZDoNbUxO5YY+Mqu5W6AR+tH2zsBLMQ7EDK6A8qAg="; + cargoSha256 = "sha256-6dYXGxDNiLzpyZCmF2OJl2HAFyzJeAeQpEfaIZBBJD8="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0d94bf24c62e..0fbf7caea35c 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.10.3"; + version = "2022.10.4"; components = { "abode" = ps: with ps; [ abodepy @@ -635,10 +635,10 @@ zeroconf ]; "dlib_face_detect" = ps: with ps; [ - face_recognition + face-recognition ]; "dlib_face_identify" = ps: with ps; [ - face_recognition + face-recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -1276,12 +1276,12 @@ sqlalchemy ]; "homekit" = ps: with ps; [ - hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash + hap-python ha-ffmpeg ifaddr zeroconf @@ -2369,7 +2369,7 @@ aiohttp-cors ]; "pushbullet" = ps: with ps; [ - pushbullet + pushbullet-py ]; "pushover" = ps: with ps; [ pushover-complete diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 118701d24529..84b810c1df61 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -40,9 +40,7 @@ let hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; }; }); - }) - (self: super: { bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { version = "0.5.0"; postPatch = null; @@ -54,9 +52,7 @@ let hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; }; }); - }) - (self: super: { blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { version = "2.0.2"; src = fetchFromGitHub { @@ -66,9 +62,7 @@ let hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; }; }); - }) - (self: super: { gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { version = "4.0.0"; src = fetchFromGitHub { @@ -78,10 +72,29 @@ let hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; }; }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests - (self: super: { + hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec { + pname = "ha-hap-python"; + version = "4.5.2"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "ha-HAP-python"; + rev = "refs/tags/v4.5.2"; + hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig="; + }; + }); + + iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { + version = "0.4.1"; + src = fetchFromGitHub { + owner = "flz"; + repo = "iaqualink-py"; + rev = "v${version}"; + hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU="; + }; + }); + + # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; src = self.fetchPypi { @@ -126,10 +139,8 @@ let zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - }) - # Pinned due to API changes in 0.1.0 - (self: super: { + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; src = super.fetchPypi { @@ -138,10 +149,8 @@ let hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc="; }; }); - }) - # Pinned due to API changes >0.3.5.3 - (self: super: { + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; src = fetchFromGitHub { @@ -151,15 +160,11 @@ let sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; }; }); - }) - (self: super: { pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); - }) - (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -168,9 +173,7 @@ let hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA="; }; }); - }) - (self: super: { pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.0"; src = fetchFromGitHub { @@ -180,9 +183,7 @@ let hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; }); - }) - (self: super: { pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec { version = "0.0.10"; src = super.fetchPypi { @@ -191,10 +192,8 @@ let hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE="; }; }); - }) - # Pinned due to API changes in 0.3.0 - (self: super: { + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; src = fetchFromGitHub { @@ -204,10 +203,8 @@ let hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; }; }); - }) - # Pinned due to API changes in 0.4.0 - (self: super: { + # Pinned due to API changes in 0.4.0 vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { version = "0.3.3"; src = fetchFromGitHub { @@ -217,10 +214,8 @@ let sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; }; }); - }) - # Pinned due to API changes ~1.0 - (self: super: { + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; src = fetchFromGitHub { @@ -230,10 +225,8 @@ let sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; }); - }) - # home-assistant-frontend does not exist in python3.pkgs - (self: super: { + # home-assistant-frontend does not exist in python3.pkgs home-assistant-frontend = self.callPackage ./frontend.nix { }; }) ]; @@ -261,7 +254,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.10.3"; + hassVersion = "2022.10.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +272,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-5ffMs6gXOyg0hhB0Wx4bRmSqkr0uRhNcLhLo1PI2UqE="; + hash = "sha256-949QvezOYW6hA3iU9j2Wu6DhX35CzW0ruwGe3JGPsH4="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b7bf2937a297..b2d8e49efc58 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -37,10 +37,11 @@ PKG_SET = "home-assistant.python.pkgs" # If some requirements are matched by multiple or no Python packages, the # following can be used to choose the correct one PKG_PREFERENCES = { + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "ha-av": "av", - "youtube_dl": "youtube-dl-light", + "ha-HAP-python": "hap-python", "tensorflow": "tensorflow", - "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 + "youtube_dl": "youtube-dl-light", } diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index b9817ecb05c0..e11fad78d9f1 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, parted, systemd ? null +, parted, systemd, argp-standalone }: stdenv.mkDerivation rec { @@ -22,10 +22,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ - parted - ] - ++ lib.optional stdenv.isLinux systemd; + buildInputs = lib.optional stdenv.isLinux [ systemd parted ] + ++ lib.optional stdenv.isDarwin [ argp-standalone ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 472c699a3d8c..4142e2323ff7 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { markdown2 matrix-client minidb - pushbullet + pushbullet-py pycodestyle pyppeteer pyyaml diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 54c83f0094f5..5b98582a1dff 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.1.4"; + version = "2.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nKCdthPgheBR4bySQww0I5eI8K5IzLhxiTCCYnQRknI="; + hash = "sha256-W+5B1JfOyTpJaT+le1zxyDNwGATrErxNNHw+x5VdfOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c3141a6bea25..ba0f5a7f5240 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -72,6 +72,8 @@ mapAliases ({ dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 email_validator = email-validator; # added 2022-06-22 + face_recognition = face-recognition; # added 2022-10-15 + face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 @@ -126,6 +128,7 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pushbullet = pushbullet-py; # Added 2022-10-15 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d8f5829acd6..a3ba093ca423 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3217,9 +3217,9 @@ in { facedancer = callPackage ../development/python-modules/facedancer { }; - face_recognition = callPackage ../development/python-modules/face_recognition { }; + face-recognition = callPackage ../development/python-modules/face-recognition { }; - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { }; factory_boy = callPackage ../development/python-modules/factory_boy { }; @@ -7464,7 +7464,7 @@ in { push-receiver = callPackage ../development/python-modules/push-receiver { }; - pushbullet = callPackage ../development/python-modules/pushbullet { }; + pushbullet-py = callPackage ../development/python-modules/pushbullet-py { }; pushover-complete = callPackage ../development/python-modules/pushover-complete { };