Unverified Commit c9cd167b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 53a78082 31895336

nixos/modules/services/networking/bird.nix

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ in 
      checkPhase = optionalString cfg.checkConfig ''

        ln -s $out bird.conf

        ${cfg.preCheckConfig}

        bird -d -p -c bird.conf

        bird -d -p -c bird.conf || { exit=$?; cat -n bird.conf; exit $exit; }

      '';

    };

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ lib.packagesFromDirectoryRecursive { 


  elpaca = callPackage ./manual-packages/elpaca { inherit (pkgs) git; };



  emacs-application-framework = callPackage ./manual-packages/emacs-application-framework {

    inherit (pkgs) git;

  };



  lsp-bridge = callPackage ./manual-packages/lsp-bridge {

    inherit (pkgs)

      basedpyright

pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/default.nix→pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
  # Emacs dependencies

  all-the-icons,

  # Other dependencies

  git,

  nodejs,

  wmctrl,

  xdotool,
@@ -45,7 +44,6 @@ let 
  otherPackageLists = [

    (

      [

        git

        nodejs

        wmctrl

      ]

pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ let 
    passthru = (oldAttrs.passthru or { }) // {

      unwrapped = xeus-cling-unwrapped;

    };



    meta.badPlatforms = [

      # fatal error: 'stdlib.h' file not found

      lib.systems.inspect.patterns.isDarwin

    ];

  });



  mkKernelSpec = std: {

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

+8 −8
Original line number Diff line number Diff line
@@ -117,11 +117,11 @@ 
    "vendorHash": "sha256-2NSP0jGFchh3roqSKxCRbkQ+8lNiGRo4JivvBj6wqdg="

  },

  "aviatrix": {

    "hash": "sha256-uE2E/NWL/ITCIMvq90ul0463/rG9PJHmzw2wMi0imHI=",

    "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",

    "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",

    "owner": "AviatrixSystems",

    "repo": "terraform-provider-aviatrix",

    "rev": "v8.1.1",

    "rev": "v8.1.10",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -705,13 +705,13 @@ 
    "vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="

  },

  "kafka": {

    "hash": "sha256-5pHYJ7VIWmg8XCfdT9Uq5iNKUdIFsqzuf/j1WGrOcNE=",

    "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",

    "homepage": "https://registry.terraform.io/providers/Mongey/kafka",

    "owner": "Mongey",

    "repo": "terraform-provider-kafka",

    "rev": "v0.13.0",

    "rev": "v0.13.1",

    "spdx": "MIT",

    "vendorHash": "sha256-td8utsV5CBd4BcUg3DQx+EqVkUMieWr1Oa/H+qY+P/Q="

    "vendorHash": "sha256-JRqBv5N+i5yhKrC+Eenm1xmwylNF7k/EIJXaklrsFfA="

  },

  "kafka-connect": {

    "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",
@@ -849,13 +849,13 @@ 
    "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="

  },

  "mongodbatlas": {

    "hash": "sha256-DaGJHlprTlOfbYmXL0rqbxjbs0azi3aUzdutNv62Kc0=",

    "hash": "sha256-yBccJeD25hQiwqjMpaYIJM2DhoKzehppjR8NG/IOrQo=",

    "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",

    "owner": "mongodb",

    "repo": "terraform-provider-mongodbatlas",

    "rev": "v1.41.0",

    "rev": "v2.0.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-bSLbYA6phEi3jvsiSrcWfH1f2/ZdW+9JIA25pDRaDnQ="

    "vendorHash": "sha256-EvTuVhJfNrwAto9+6oi6iYQfgbCnHupkD+dk57vrT/c="

  },

  "namecheap": {

    "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",