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

Merge master into staging-next

parents fd3a0852 24900894

maintainers/maintainer-list.nix

+8 −8
Original line number Diff line number Diff line
@@ -8402,6 +8402,12 @@ 
    githubId = 55919390;

    name = "Vincent VILLIAUMEY";

  };

  eyenx = {

    email = "eye@eyenx.ch";

    github = "eyenx";

    githubId = 1947882;

    name = "Toni Tauro";

  };

  eyjhb = {

    email = "eyjhbb@gmail.com";

    matrix = "@eyjhb:eyjhb.dk";
@@ -8476,12 +8482,6 @@ 
    githubId = 116184;

    keys = [ { fingerprint = "2F6C 930F D3C4 7E38 6AFA  4EB4 E23C D2DD 36A4 397F"; } ];

  };

  fabiangd = {

    email = "fabian.g.droege@gmail.com";

    name = "Fabian G. Dröge";

    github = "FabianGD";

    githubId = 40316600;

  };

  fabianhauser = {

    email = "fabian.nixos@fh2.ch";

    github = "fabianhauser";
@@ -14262,9 +14262,9 @@ 
    name = "Kira";

  };

  koi = {

    name = "koi";

    name = "june";

    email = "me@koi.rip";

    matrix = "@koi:system72.dev";

    matrix = "@koi:nelliel.cv";

    github = "koibtw";

    githubId = 75480869;

    keys = [

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ let 
        mktplcRef = {

          name = "ng-template";

          publisher = "Angular";

          version = "21.2.2";

          hash = "sha256-rpll3EsTGEuynrw7EsP3GeltG/vtYqgO8mvTCVyU1ao=";

          version = "21.2.3";

          hash = "sha256-Gdxw1WvMQ/t4XUfDkekIvwOsWYjmDIjGE7scsImohNc=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";

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

+3 −3
Original line number Diff line number Diff line
@@ -1031,13 +1031,13 @@ 
    "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="

  },

  "opentelekomcloud_opentelekomcloud": {

    "hash": "sha256-EVHAWkNScPJCwHvmW1Lt/9qVwYjxDxtTTa3SC1dLSXw=",

    "hash": "sha256-+kEqzgcEHlGq85U55AzJBHSIHif6ClVk7Y159YfbqpQ=",

    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",

    "owner": "opentelekomcloud",

    "repo": "terraform-provider-opentelekomcloud",

    "rev": "v1.36.60",

    "rev": "v1.36.61",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-WPVk+wlAK6O2xXjyXekYu9svpEg0AFz9EnDGGTS9I3c="

    "vendorHash": "sha256-mZT6DdYvsQiowLZf1U4xW2FNTzYPvxjcIZ6ZWuTUZMs="

  },

  "opsgenie_opsgenie": {

    "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",

pkgs/by-name/an/anki/package.nix

+8 −11
Original line number Diff line number Diff line
@@ -128,18 +128,15 @@ let 
    exec ${yarn}/bin/yarn "$@"

  '';



  uvWheels = runCommand "uv-wheels" {

    # otherwise, it's too long of a string

    passAsFile = [ "installCommand" ];

    installCommand = ''

      #!${stdenv.shell}

  uvWheels = runCommand "uv-wheels" { } (

    ''

      mkdir -p $out

    ''

    + (lib.strings.concatStringsSep "\n" (map (dep: "ln -vsf ${dep.dist}/*.whl $out") pythonDeps));

  } "bash $installCommandPath";

    + (lib.strings.concatMapStringsSep "\n" (dep: "ln -vsf ${dep.dist}/*.whl $out") pythonDeps)

  );

in



python3Packages.buildPythonApplication rec {

python3Packages.buildPythonApplication (finalAttrs: {

  pyproject = false;

  inherit pname version;
@@ -164,8 +161,8 @@ python3Packages.buildPythonApplication rec { 


  missingHashes = ./missing-hashes.json;

  yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {

    inherit missingHashes;

    yarnLock = "${src}/yarn.lock";

    inherit (finalAttrs) missingHashes;

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = yarnHash;

  };
@@ -363,4 +360,4 @@ python3Packages.buildPythonApplication rec { 
      oxij

    ];

  };

}
 
})

pkgs/by-name/aw/awakened-poe-trade/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "awakened-poe-trade";

  version = "3.28.102";

  version = "3.28.103";



  src = fetchurl {

    url = "https://github.com/SnosMe/awakened-poe-trade/releases/download/v${finalAttrs.version}/Awakened-PoE-Trade-${finalAttrs.version}.AppImage";

    hash = "sha256-tej1rjkrpAXmQ8ZzvlAuxHkMGAuRpPqg1TlBoWhorIE=";

    hash = "sha256-p/XDWnE9lm/LwT3r/lhQWtEJ3YoaGRFd4Rv7RbdDIeg=";

  };



  passthru = {