commit ab4849492ddab726337e643104096d91323f33e2 · pyrox.dev/nixpkgs

+1 -1

.github/workflows/direct-push.yml

···

       21
       21
        
             id: ismerge

     

       22
       22
        
             run: |

     

       23
       23
        
               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')

     

       24
       24
       -
               echo "::set-output name=ismerge::$ISMERGE"

     

       24
       24
       +
               echo "ismerge=$ISMERGE" >> $GITHUB_OUTPUT

     

       25
       25
        
           # github events are eventually consistent, so wait until changes propagate to thier DB

     

       26
       26
        
           - run: sleep 60

     

       27
       27
        
             if: steps.ismerge.outputs.ismerge != 'true'

+1 -1

.github/workflows/update-terraform-providers.yml

···

       23
       23
        
             - name: setup

     

       24
       24
        
               id: setup

     

       25
       25
        
               run: |

     

       26
       26
       -
                 echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")"

     

       26
       26
       +
                 echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT

     

       27
       27
        
             - name: update terraform-providers

     

       28
       28
        
               run: |

     

       29
       29
        
                 git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

+1 -1

maintainers/scripts/feature-freeze-teams.pl

···

       31
       31
        
                   push @ret, $_->{'login'};

     

       32
       32
        
               }

     

       33
       33
        
           } else {

     

       34
       34
       -
               print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: $response->status_line";

     

       34
       34
       +
               print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: " . $response->status_line;

     

       35
       35
        
           }

     

       36
       36
        
       

     

       37
       37
        
           return \@ret;

+1 -1

nixos/modules/services/cluster/kubernetes/pki.nix

···

       266
       266
        
                 in

     

       267
       267
        
                 ''

     

       268
       268
        
                   export KUBECONFIG=${clusterAdminKubeconfig}

     

       269
       269
       -
                   ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files}

     

       269
       269
       +
                   ${top.package}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files}

     

       270
       270
        
                 '';

     

       271
       271
        
               })]);

     

       272
       272

-2

nixos/tests/kubernetes/default.nix

···

       4
       4
        
       let

     

       5
       5
        
         dns = import ./dns.nix { inherit system pkgs; };

     

       6
       6
        
         rbac = import ./rbac.nix { inherit system pkgs; };

     

       7
       7
       -
         # TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works

     

       8
       8
       -
         # e2e = import ./e2e.nix { inherit system pkgs; };

     

       9
       7
        
       in

     

       10
       8
        
       {

     

       11
       9
        
         dns-single-node = dns.singlenode.test;

-40

nixos/tests/kubernetes/e2e.nix

···

       1
       1
       -
       { system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:

     

       2
       2
       -
       with import ./base.nix { inherit system; };

     

       3
       3
       -
       let

     

       4
       4
       -
         domain = "my.zyx";

     

       5
       5
       -
         certs = import ./certs.nix { externalDomain = domain; kubelets = ["machine1" "machine2"]; };

     

       6
       6
       -
         kubeconfig = pkgs.writeText "kubeconfig.json" (builtins.toJSON {

     

       7
       7
       -
           apiVersion = "v1";

     

       8
       8
       -
           kind = "Config";

     

       9
       9
       -
           clusters = [{

     

       10
       10
       -
             name = "local";

     

       11
       11
       -
             cluster.certificate-authority = "${certs.master}/ca.pem";

     

       12
       12
       -
             cluster.server = "https://api.${domain}";

     

       13
       13
       -
           }];

     

       14
       14
       -
           users = [{

     

       15
       15
       -
             name = "kubelet";

     

       16
       16
       -
             user = {

     

       17
       17
       -
               client-certificate = "${certs.admin}/admin.pem";

     

       18
       18
       -
               client-key = "${certs.admin}/admin-key.pem";

     

       19
       19
       -
             };

     

       20
       20
       -
           }];

     

       21
       21
       -
           contexts = [{

     

       22
       22
       -
             context = {

     

       23
       23
       -
               cluster = "local";

     

       24
       24
       -
               user = "kubelet";

     

       25
       25
       -
             };

     

       26
       26
       -
             current-context = "kubelet-context";

     

       27
       27
       -
           }];

     

       28
       28
       -
         });

     

       29
       29
       -
       

     

       30
       30
       -
         base = {

     

       31
       31
       -
           name = "e2e";

     

       32
       32
       -
           inherit domain certs;

     

       33
       33
       -
           test = ''

     

       34
       34
       -
             $machine1->succeed("e2e.test -kubeconfig ${kubeconfig} -provider local -ginkgo.focus '\\[Conformance\\]' -ginkgo.skip '\\[Flaky\\]|\\[Serial\\]'");

     

       35
       35
       -
           '';

     

       36
       36
       -
         };

     

       37
       37
       -
       in {

     

       38
       38
       -
         singlenode = mkKubernetesSingleNodeTest base;

     

       39
       39
       -
         multinode = mkKubernetesMultiNodeTest base;

     

       40
       40
       -
       }

+3 -3

pkgs/applications/misc/ipmicfg/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ipmicfg";

     

       5
       5
       -
         version = "1.32.0";

     

       6
       6
       -
         buildVersion = "200910";

     

       5
       5
       +
         version = "1.34.0";

     

       6
       6
       +
         buildVersion = "220906";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchzip {

     

       9
       9
        
           url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";

     

       10
       10
       -
           sha256 = "1mncinwgx5d8jkvnvhccqlj2xp0xa5xjsab4r5mblmcnvm609rr3";

     

       10
       10
       +
           sha256 = "ZumCXuR7M2Ep7maBOBFk0UsxyRo4fBkf+9AVmkz4AF0=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         installPhase = ''

+5 -3

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

···

       87
       87
        
         fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

     

       88
       88
        
       

     

       89
       89
        
         # Upstream source

     

       90
       90
       -
         version = "11.5.2";

     

       90
       90
       +
         version = "11.5.4";

     

       91
       91
        
       

     

       92
       92
        
         lang = "en-US";

     

       93
       93
        
       

     
···

       95
       95
        
           x86_64-linux = fetchurl {

     

       96
       96
        
             urls = [

     

       97
       97
        
               "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       98
       98
       +
               "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       98
       99
        
               "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       99
       100
        
               "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       100
       101
        
             ];

     

       101
       101
       -
             sha256 = "sha256-kM3OOFTpEU7nIyqqdGcqLZ86QLb6isM5cfWG7jo891o=";

     

       102
       102
       +
             sha256 = "sha256-23P8Ew0asOptDYVJ0xA+ATOOT92nz/I2F2+CsAejfKo=";

     

       102
       103
        
           };

     

       103
       104
        
       

     

       104
       105
        
           i686-linux = fetchurl {

     

       105
       106
        
             urls = [

     

       106
       107
        
               "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       108
       108
       +
               "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       107
       109
        
               "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       108
       110
        
               "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       109
       111
        
             ];

     

       110
       110
       -
             sha256 = "sha256-62dGoIqaCrSzsDjvt8c5hEAwOSTFst9PCpvMzveBukY=";

     

       112
       112
       +
             sha256 = "sha256-ye4qq+zH1AlDItP8lKfA9YIJ7AMg1Roc4itpr0kWNtY=";

     

       111
       113
        
           };

     

       112
       114
        
         };

     

       113
       115
        
       in

-1

pkgs/applications/networking/cluster/kubernetes/default.nix

···

       15
       15
        
           "cmd/kube-controller-manager"

     

       16
       16
        
           "cmd/kube-proxy"

     

       17
       17
        
           "cmd/kube-scheduler"

     

       18
       18
       -
           "test/e2e/e2e.test"

     

       19
       18
        
         ]

     

       20
       19
        
       }:

     

       21
       20

+3 -3

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       741
       741
        
           "version": "3.3.0"

     

       742
       742
        
         },

     

       743
       743
        
         "minio": {

     

       744
       744
       -
           "hash": "sha256-9EpVDRX5rPJ1TIlC+gI79AC442cBzWq76ebFLKPbwmc=",

     

       744
       744
       +
           "hash": "sha256-rB7GhbTUSPTd8YOFV2XG1riBr2Wd6DTEZd2CreMbBD0=",

     

       745
       745
        
           "owner": "aminueza",

     

       746
       746
        
           "provider-source-address": "registry.terraform.io/aminueza/minio",

     

       747
       747
        
           "repo": "terraform-provider-minio",

     

       748
       748
       -
           "rev": "v1.7.0",

     

       748
       748
       +
           "rev": "v1.7.1",

     

       749
       749
        
           "vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=",

     

       750
       750
       -
           "version": "1.7.0"

     

       750
       750
       +
           "version": "1.7.1"

     

       751
       751
        
         },

     

       752
       752
        
         "mongodbatlas": {

     

       753
       753
        
           "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",

+1 -2

pkgs/applications/virtualization/qemu/default.nix

···

       152
       152
        
           ++ lib.optional spiceSupport "--enable-spice"

     

       153
       153
        
           ++ lib.optional usbredirSupport "--enable-usb-redir"

     

       154
       154
        
           ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}"

     

       155
       155
       -
           ++ lib.optional stdenv.isDarwin "--enable-cocoa"

     

       156
       156
       -
           ++ lib.optional stdenv.isDarwin "--enable-hvf"

     

       155
       155
       +
           ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ]

     

       157
       156
        
           ++ lib.optional stdenv.isLinux "--enable-linux-aio"

     

       158
       157
        
           ++ lib.optional gtkSupport "--enable-gtk"

     

       159
       158
        
           ++ lib.optional xenSupport "--enable-xen"

+2

pkgs/development/libraries/boost/generic.nix

···

       85
       85
        
           "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"

     

       86
       86
        
           "architecture=${if stdenv.hostPlatform.isMips64

     

       87
       87
        
                           then if versionOlder version "1.78" then "mips1" else "mips"

     

       88
       88
       +
                           else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"

     

       88
       89
        
                           else toString stdenv.hostPlatform.parsed.cpu.family}"

     

       89
       90
        
           "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"

     

       90
       91
        
           "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"

     
···

       101
       102
        
           ++ optional (toolset != null) "toolset=${toolset}"

     

       102
       103
        
           ++ optional (!enablePython) "--without-python"

     

       103
       104
        
           ++ optional needUserConfig "--user-config=user-config.jam"

     

       105
       105
       +
           ++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"

     

       104
       106
        
           ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [

     

       105
       107
        
           "threadapi=win32"

     

       106
       108
        
         ] ++ extraB2Args

+45

pkgs/development/python-modules/face-recognition/default.nix

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , fetchPypi

     

       3
       3
       +
       , lib

     

       4
       4
       +
       

     

       5
       5
       +
       # propagates

     

       6
       6
       +
       , click

     

       7
       7
       +
       , dlib

     

       8
       8
       +
       , face-recognition-models

     

       9
       9
       +
       , numpy

     

       10
       10
       +
       , pillow

     

       11
       11
       +
       

     

       12
       12
       +
       # tests

     

       13
       13
       +
       , pytestCheckHook

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "face-recognition";

     

       18
       18
       +
         version = "1.3.0";

     

       19
       19
       +
         format = "setuptools";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchPypi  {

     

       22
       22
       +
           pname = "face_recognition";

     

       23
       23
       +
           inherit version;

     

       24
       24
       +
           hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           click

     

       29
       29
       +
           dlib

     

       30
       30
       +
           face-recognition-models

     

       31
       31
       +
           numpy

     

       32
       32
       +
           pillow

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         checkInputs = [

     

       36
       36
       +
           pytestCheckHook

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         meta = with lib; {

     

       40
       40
       +
           license = licenses.mit;

     

       41
       41
       +
           homepage = "https://github.com/ageitgey/face_recognition";

     

       42
       42
       +
           maintainers = with maintainers; [ ];

     

       43
       43
       +
           description = "The world's simplest facial recognition api for Python and the command line";

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+35

pkgs/development/python-modules/face-recognition/models.nix

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , setuptools

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "face-recognition-models";

     

       9
       9
       +
         version = "0.3.0";

     

       10
       10
       +
         format = "setuptools";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           pname = "face_recognition_models";

     

       14
       14
       +
           inherit version;

     

       15
       15
       +
           hash = "sha256-t5vSAKiMh8mp1EbJkK5xxaYm0fNzAXTm1XAVf/HYls8=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [

     

       19
       19
       +
           setuptools

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         # no tests

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
       

     

       25
       25
       +
         pythonImportsCheck = [

     

       26
       26
       +
           "face_recognition_models"

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with lib; {

     

       30
       30
       +
           homepage = "https://github.com/ageitgey/face_recognition_models";

     

       31
       31
       +
           license = licenses.cc0;

     

       32
       32
       +
           maintainers = with maintainers; [ ];

     

       33
       33
       +
           description = "Trained models for the face_recognition python library";

     

       34
       34
       +
         };

     

       35
       35
       +
       }

-42

pkgs/development/python-modules/face_recognition/default.nix

···

       1
       1
       -
       { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy

     

       2
       2
       -
       , face_recognition_models, lib, flake8, pytest, glibcLocales

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "face_recognition";

     

       7
       7
       -
         version = "1.3.0";

     

       8
       8
       -
       

     

       9
       9
       -
         src = fetchFromGitHub {

     

       10
       10
       -
           repo = pname;

     

       11
       11
       -
           owner = "ageitgey";

     

       12
       12
       -
           rev = "d34c622bf42e2c619505a4884017051ecf61ac77";

     

       13
       13
       -
           sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         postPatch = ''

     

       17
       17
       -
           substituteInPlace setup.py --replace "flake8==2.6.0" "flake8"

     

       18
       18
       -
         '';

     

       19
       19
       -
       

     

       20
       20
       -
         propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ];

     

       21
       21
       -
       

     

       22
       22
       -
         # Our dlib is compiled with AVX instructions by default which breaks

     

       23
       23
       -
         # with "Illegal instruction" on some builders due to missing hardware features.

     

       24
       24
       -
         #

     

       25
       25
       -
         # As this makes the build fairly unreliable, it's better to skip the test and to ensure that

     

       26
       26
       -
         # the build is working and after each change to the package, manual testing should be done.

     

       27
       27
       -
         doCheck = false;

     

       28
       28
       -
       

     

       29
       29
       -
         # Although tests are disabled by default, checkPhase still exists, so

     

       30
       30
       -
         # maintainers can check the package's functionality locally before modifying it.

     

       31
       31
       -
         checkInputs = [ flake8 pytest glibcLocales ];

     

       32
       32
       -
         checkPhase = ''

     

       33
       33
       -
           LC_ALL="en_US.UTF-8" py.test

     

       34
       34
       -
         '';

     

       35
       35
       -
       

     

       36
       36
       -
         meta = with lib; {

     

       37
       37
       -
           license = licenses.mit;

     

       38
       38
       -
           homepage = "https://github.com/ageitgey/face_recognition";

     

       39
       39
       -
           maintainers = with maintainers; [ ];

     

       40
       40
       -
           description = "The world's simplest facial recognition api for Python and the command line";

     

       41
       41
       -
         };

     

       42
       42
       -
       }

-23

pkgs/development/python-modules/face_recognition_models/default.nix

···

       1
       1
       -
       { buildPythonPackage, lib, fetchPypi, setuptools }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "face_recognition_models";

     

       5
       5
       -
         version = "0.3.0";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         # no module named `tests` as no tests are available

     

       13
       13
       -
         doCheck = false;

     

       14
       14
       -
       

     

       15
       15
       -
         propagatedBuildInputs = [ setuptools ];

     

       16
       16
       -
       

     

       17
       17
       -
         meta = with lib; {

     

       18
       18
       -
           homepage = "https://github.com/ageitgey/face_recognition_models";

     

       19
       19
       -
           license = licenses.cc0;

     

       20
       20
       -
           maintainers = with maintainers; [ ];

     

       21
       21
       -
           description = "Trained models for the face_recognition python library";

     

       22
       22
       -
         };

     

       23
       23
       -
       }

+3 -2

pkgs/development/python-modules/matrix-client/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
       -
         pname = "matrix_client";

     

       11
       11
       +
         pname = "matrix-client";

     

       12
       12
        
         version = "0.4.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
       -
           inherit pname version;

     

       15
       15
       +
           pname = "matrix_client";

     

       16
       16
       +
           inherit version;

     

       16
       17
        
           sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06";

     

       17
       18
        
         };

     

       18
       19

+3 -3

pkgs/development/python-modules/pi1wire/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "pi1wire";

     

       9
       9
       -
         version = "0.2.0";

     

       9
       9
       +
         version = "0.3.0";

     

       10
       10
        
       

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "ushiboy";

     

       15
       15
        
           repo = "pi1wire";

     

       16
       16
       -
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-70w71heHWR5yArl+HuNAlzL2Yq/CL0iMNMiQw5qovls=";

     

       16
       16
       +
           rev = "refs/tags/v${version}";

     

       17
       17
       +
           hash = "sha256-l/5w71QsAW4BvILOaLdUVvQ8xxUm1ZTzUESRFzUgtic=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [

+2 -1

pkgs/development/python-modules/pushbullet/default.nix pkgs/development/python-modules/pushbullet-py/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
       -
         pname = "pushbullet.py";

     

       12
       12
       +
         pname = "pushbullet-py";

     

       13
       13
        
         version = "0.12.0";

     

       14
       14
       +
         format = "setuptools";

     

       14
       15
        
       

     

       15
       16
        
         src = fetchPypi {

     

       16
       17
        
           inherit pname version;

+3 -3

pkgs/development/tools/selene/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "selene";

     

       13
       13
       -
         version = "0.21.1";

     

       13
       13
       +
         version = "0.22.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "kampfkarren";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-a3mslAqDzUlMLBMjxScMkR4GePmpBeH+Ottd1ENum/c=";

     

       19
       19
       +
           sha256 = "sha256-6DbWz4u4mbW/aSDpaLxP4bG14gHxMGc4A8zMTVH/vj0=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-nFtZDoNbUxO5YY+Mqu5W6AR+tH2zsBLMQ7EDK6A8qAg=";

     

       22
       22
       +
         cargoSha256 = "sha256-6dYXGxDNiLzpyZCmF2OJl2HAFyzJeAeQpEfaIZBBJD8=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = lib.optional robloxSupport pkg-config;

     

       25
       25

+5 -5

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2022.10.3";

     

       5
       5
       +
         version = "2022.10.4";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [

     

       8
       8
        
             abodepy

     
···

       635
       635
        
             zeroconf

     

       636
       636
        
           ];

     

       637
       637
        
           "dlib_face_detect" = ps: with ps; [

     

       638
       638
       -
             face_recognition

     

       638
       638
       +
             face-recognition

     

       639
       639
        
           ];

     

       640
       640
        
           "dlib_face_identify" = ps: with ps; [

     

       641
       641
       -
             face_recognition

     

       641
       641
       +
             face-recognition

     

       642
       642
        
           ];

     

       643
       643
        
           "dlink" = ps: with ps; [

     

       644
       644
        
           ]; # missing inputs: pyW215

     
···

       1276
       1276
        
             sqlalchemy

     

       1277
       1277
        
           ];

     

       1278
       1278
        
           "homekit" = ps: with ps; [

     

       1279
       1279
       -
             hap-python

     

       1280
       1279
        
             pyqrcode

     

       1281
       1280
        
             pyturbojpeg

     

       1282
       1281
        
             aiohttp-cors

     

       1283
       1282
        
             base36

     

       1284
       1283
        
             fnvhash

     

       1284
       1284
       +
             hap-python

     

       1285
       1285
        
             ha-ffmpeg

     

       1286
       1286
        
             ifaddr

     

       1287
       1287
        
             zeroconf

     
···

       2369
       2369
        
             aiohttp-cors

     

       2370
       2370
        
           ];

     

       2371
       2371
        
           "pushbullet" = ps: with ps; [

     

       2372
       2372
       -
             pushbullet

     

       2372
       2372
       +
             pushbullet-py

     

       2373
       2373
        
           ];

     

       2374
       2374
        
           "pushover" = ps: with ps; [

     

       2375
       2375
        
             pushover-complete

+30 -37

pkgs/servers/home-assistant/default.nix

···

       40
       40
        
                 hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4=";

     

       41
       41
        
               };

     

       42
       42
        
             });

     

       43
       43
       -
           })

     

       44
       43
        
       

     

       45
       45
       -
           (self: super: {

     

       46
       44
        
             bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec {

     

       47
       45
        
               version = "0.5.0";

     

       48
       46
        
               postPatch = null;

     
···

       54
       52
        
                 hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg=";

     

       55
       53
        
               };

     

       56
       54
        
             });

     

       57
       57
       -
           })

     

       58
       55
        
       

     

       59
       59
       -
           (self: super: {

     

       60
       56
        
             blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec {

     

       61
       57
        
               version = "2.0.2";

     

       62
       58
        
               src = fetchFromGitHub {

     
···

       66
       62
        
                 hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA=";

     

       67
       63
        
               };

     

       68
       64
        
             });

     

       69
       69
       -
           })

     

       70
       65
        
       

     

       71
       71
       -
           (self: super: {

     

       72
       66
        
             gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {

     

       73
       67
        
               version = "4.0.0";

     

       74
       68
        
               src = fetchFromGitHub {

     
···

       78
       72
        
                 hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk=";

     

       79
       73
        
               };

     

       80
       74
        
             });

     

       81
       81
       -
           })

     

       82
       75
        
       

     

       83
       83
       -
           # pytest-aiohttp>0.3.0 breaks home-assistant tests

     

       84
       84
       -
           (self: super: {

     

       76
       76
       +
             hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec {

     

       77
       77
       +
               pname = "ha-hap-python";

     

       78
       78
       +
               version = "4.5.2";

     

       79
       79
       +
               src = fetchFromGitHub {

     

       80
       80
       +
                 owner = "bdraco";

     

       81
       81
       +
                 repo = "ha-HAP-python";

     

       82
       82
       +
                 rev = "refs/tags/v4.5.2";

     

       83
       83
       +
                 hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig=";

     

       84
       84
       +
               };

     

       85
       85
       +
             });

     

       86
       86
       +
       

     

       87
       87
       +
             iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec {

     

       88
       88
       +
               version = "0.4.1";

     

       89
       89
       +
               src = fetchFromGitHub {

     

       90
       90
       +
                 owner = "flz";

     

       91
       91
       +
                 repo = "iaqualink-py";

     

       92
       92
       +
                 rev = "v${version}";

     

       93
       93
       +
                 hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU=";

     

       94
       94
       +
               };

     

       95
       95
       +
             });

     

       96
       96
       +
       

     

       97
       97
       +
             # pytest-aiohttp>0.3.0 breaks home-assistant tests

     

       85
       98
        
             pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {

     

       86
       99
        
               version = "0.3.0";

     

       87
       100
        
               src = self.fetchPypi {

     
···

       126
       139
        
             zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: {

     

       127
       140
        
               doCheck = false; # requires aiohttp>=1.0.0

     

       128
       141
        
             });

     

       129
       129
       -
           })

     

       130
       142
        
       

     

       131
       131
       -
           # Pinned due to API changes in 0.1.0

     

       132
       132
       -
           (self: super: {

     

       143
       143
       +
             # Pinned due to API changes in 0.1.0

     

       133
       144
        
             poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {

     

       134
       145
        
               version = "0.0.8";

     

       135
       146
        
               src = super.fetchPypi {

     
···

       138
       149
        
                 hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=";

     

       139
       150
        
               };

     

       140
       151
        
             });

     

       141
       141
       -
           })

     

       142
       152
        
       

     

       143
       143
       -
           # Pinned due to API changes >0.3.5.3

     

       144
       144
       -
           (self: super: {

     

       153
       153
       +
             # Pinned due to API changes >0.3.5.3

     

       145
       154
        
             pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec {

     

       146
       155
        
               version = "0.3.5.3";

     

       147
       156
        
               src = fetchFromGitHub {

     
···

       151
       160
        
                 sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6";

     

       152
       161
        
               };

     

       153
       162
        
             });

     

       154
       154
       -
           })

     

       155
       163
        
       

     

       156
       156
       -
           (self: super: {

     

       157
       164
        
             pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {

     

       158
       165
        
               doCheck = false; # requires pytest-aiohttp>=1.0.0

     

       159
       166
        
             });

     

       160
       160
       -
           })

     

       161
       167
        
       

     

       162
       162
       -
           (self: super: {

     

       163
       168
        
             python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {

     

       164
       169
        
               pname = "python-slugify";

     

       165
       170
        
               version = "4.0.1";

     
···

       168
       173
        
                 hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=";

     

       169
       174
        
               };

     

       170
       175
        
             });

     

       171
       171
       -
           })

     

       172
       176
        
       

     

       173
       173
       -
           (self: super: {

     

       174
       177
        
             pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec {

     

       175
       178
        
               version = "9.0.0";

     

       176
       179
        
               src = fetchFromGitHub {

     
···

       180
       183
        
                 hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE=";

     

       181
       184
        
               };

     

       182
       185
        
             });

     

       183
       183
       -
           })

     

       184
       186
        
       

     

       185
       185
       -
           (self: super: {

     

       186
       187
        
             pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec {

     

       187
       188
        
               version = "0.0.10";

     

       188
       189
        
               src = super.fetchPypi {

     
···

       191
       192
        
                 hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE=";

     

       192
       193
        
               };

     

       193
       194
        
             });

     

       194
       194
       -
           })

     

       195
       195
        
       

     

       196
       196
       -
           # Pinned due to API changes in 0.3.0

     

       197
       197
       -
           (self: super: {

     

       196
       196
       +
             # Pinned due to API changes in 0.3.0

     

       198
       197
        
             tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {

     

       199
       198
        
               version = "0.2.0";

     

       200
       199
        
               src = fetchFromGitHub {

     
···

       204
       203
        
                 hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE=";

     

       205
       204
        
               };

     

       206
       205
        
             });

     

       207
       207
       -
           })

     

       208
       206
        
       

     

       209
       209
       -
           # Pinned due to API changes in 0.4.0

     

       210
       210
       -
           (self: super: {

     

       207
       207
       +
             # Pinned due to API changes in 0.4.0

     

       211
       208
        
             vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec {

     

       212
       209
        
               version = "0.3.3";

     

       213
       210
        
               src = fetchFromGitHub {

     
···

       217
       214
        
                 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

     

       218
       215
        
               };

     

       219
       216
        
             });

     

       220
       220
       -
           })

     

       221
       217
        
       

     

       222
       222
       -
           # Pinned due to API changes ~1.0

     

       223
       223
       -
           (self: super: {

     

       218
       218
       +
             # Pinned due to API changes ~1.0

     

       224
       219
        
             vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {

     

       225
       220
        
               version = "0.1.2";

     

       226
       221
        
               src = fetchFromGitHub {

     
···

       230
       225
        
                 sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";

     

       231
       226
        
               };

     

       232
       227
        
             });

     

       233
       233
       -
           })

     

       234
       228
        
       

     

       235
       235
       -
           # home-assistant-frontend does not exist in python3.pkgs

     

       236
       236
       -
           (self: super: {

     

       229
       229
       +
             # home-assistant-frontend does not exist in python3.pkgs

     

       237
       230
        
             home-assistant-frontend = self.callPackage ./frontend.nix { };

     

       238
       231
        
           })

     

       239
       232
        
         ];

     
···

       261
       254
        
         extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

     

       262
       255
        
       

     

       263
       256
        
         # Don't forget to run parse-requirements.py after updating

     

       264
       264
       -
         hassVersion = "2022.10.3";

     

       257
       257
       +
         hassVersion = "2022.10.4";

     

       265
       258
        
       

     

       266
       259
        
       in python.pkgs.buildPythonApplication rec {

     

       267
       260
        
         pname = "homeassistant";

     
···

       279
       272
        
           owner = "home-assistant";

     

       280
       273
        
           repo = "core";

     

       281
       274
        
           rev = version;

     

       282
       282
       -
           hash = "sha256-5ffMs6gXOyg0hhB0Wx4bRmSqkr0uRhNcLhLo1PI2UqE=";

     

       275
       275
       +
           hash = "sha256-949QvezOYW6hA3iU9j2Wu6DhX35CzW0ruwGe3JGPsH4=";

     

       283
       276
        
         };

     

       284
       277
        
       

     

       285
       278
        
         # leave this in, so users don't have to constantly update their downstream patch handling

+3 -2

pkgs/servers/home-assistant/parse-requirements.py

···

       37
       37
        
       # If some requirements are matched by multiple or no Python packages, the

     

       38
       38
        
       # following can be used to choose the correct one

     

       39
       39
        
       PKG_PREFERENCES = {

     

       40
       40
       +
           "fiblary3": "fiblary3-fork",  # https://github.com/home-assistant/core/issues/66466

     

       40
       41
        
           "ha-av": "av",

     

       42
       42
       +
           "ha-HAP-python": "hap-python",

     

       43
       43
       +
           "tensorflow": "tensorflow",

     

       41
       44
        
           "youtube_dl": "youtube-dl-light",

     

       42
       42
       -
           "tensorflow": "tensorflow",

     

       43
       43
       -
           "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466

     

       44
       45
        
       }

     

       45
       46
        
       

     

       46
       47

+3 -5

pkgs/tools/filesystems/f3/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       -
       , parted, systemd ? null

     

       2
       2
       +
       , parted, systemd, argp-standalone

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       22
       22
        
            done

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [

     

       26
       26
       -
           parted

     

       27
       27
       -
         ]

     

       28
       28
       -
         ++ lib.optional stdenv.isLinux systemd;

     

       25
       25
       +
         buildInputs = lib.optional stdenv.isLinux [ systemd parted ]

     

       26
       26
       +
         ++ lib.optional stdenv.isDarwin [ argp-standalone ];

     

       29
       27
        
       

     

       30
       28
        
         enableParallelBuilding = true;

     

       31
       29

+1 -1

pkgs/tools/networking/urlwatch/default.nix

···

       23
       23
        
           markdown2

     

       24
       24
        
           matrix-client

     

       25
       25
        
           minidb

     

       26
       26
       -
           pushbullet

     

       26
       26
       +
           pushbullet-py

     

       27
       27
        
           pycodestyle

     

       28
       28
        
           pyppeteer

     

       29
       29
        
           pyyaml

+2 -2

pkgs/tools/package-management/pdm/default.nix

···

       24
       24
        
       with python.pkgs;

     

       25
       25
        
       buildPythonApplication rec {

     

       26
       26
        
         pname = "pdm";

     

       27
       27
       -
         version = "2.1.4";

     

       27
       27
       +
         version = "2.1.5";

     

       28
       28
        
         format = "pyproject";

     

       29
       29
        
         disabled = pythonOlder "3.7";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchPypi {

     

       32
       32
        
           inherit pname version;

     

       33
       33
       -
           hash = "sha256-nKCdthPgheBR4bySQww0I5eI8K5IzLhxiTCCYnQRknI=";

     

       33
       33
       +
           hash = "sha256-W+5B1JfOyTpJaT+le1zxyDNwGATrErxNNHw+x5VdfOc=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         propagatedBuildInputs = [

+3

pkgs/top-level/python-aliases.nix

···

       72
       72
        
         dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20

     

       73
       73
        
         eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03

     

       74
       74
        
         email_validator = email-validator; # added 2022-06-22

     

       75
       75
       +
         face_recognition = face-recognition; # added 2022-10-15

     

       76
       76
       +
         face_recognition_models = face-recognition-models; # added 2022-10-15

     

       75
       77
        
         fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30

     

       76
       78
        
         faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12

     

       77
       79
        
         flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20

     
···

       126
       128
        
         prometheus_client = prometheus-client; # added 2021-06-10

     

       127
       129
        
         prompt_toolkit = prompt-toolkit; # added 2021-07-22

     

       128
       130
        
         pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08

     

       131
       131
       +
         pushbullet = pushbullet-py;  # Added 2022-10-15

     

       129
       132
        
         pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01

     

       130
       133
        
         pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15

     

       131
       134
        
         pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18

+3 -3

pkgs/top-level/python-packages.nix

···

       3217
       3217
        
       

     

       3218
       3218
        
         facedancer = callPackage ../development/python-modules/facedancer { };

     

       3219
       3219
        
       

     

       3220
       3220
       -
         face_recognition = callPackage ../development/python-modules/face_recognition { };

     

       3220
       3220
       +
         face-recognition = callPackage ../development/python-modules/face-recognition { };

     

       3221
       3221
        
       

     

       3222
       3222
       -
         face_recognition_models = callPackage ../development/python-modules/face_recognition_models { };

     

       3222
       3222
       +
         face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { };

     

       3223
       3223
        
       

     

       3224
       3224
        
         factory_boy = callPackage ../development/python-modules/factory_boy { };

     

       3225
       3225
        
       

     
···

       7466
       7466
        
       

     

       7467
       7467
        
         push-receiver = callPackage ../development/python-modules/push-receiver { };

     

       7468
       7468
        
       

     

       7469
       7469
       -
         pushbullet = callPackage ../development/python-modules/pushbullet { };

     

       7469
       7469
       +
         pushbullet-py = callPackage ../development/python-modules/pushbullet-py { };

     

       7470
       7470
        
       

     

       7471
       7471
        
         pushover-complete = callPackage ../development/python-modules/pushover-complete { };

     

       7472
       7472