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

Merge master into staging-nixos

parents 8d5b8973 42519c85

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -9418,6 +9418,15 @@ 
    githubId = 10353047;

    name = "Tobias Happ";

  };

  gesperon = {

    email = "gesperon@mac.com";

    github = "gesperon";

    githubId = 117491118;

    name = "Gabor Esperon";

    keys = [

      { fingerprint = "8102 3AF7 84FC 4DA7 B9D7  ECFF A0AF 4AD2 D44C C6FE"; }

    ];

  };

  getchoo = {

    name = "Seth Flynn";

    email = "getchoo@tuta.io";

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    name = "claude-code";

    publisher = "anthropic";

    version = "2.0.49";

    hash = "sha256-norWEwxgAFlylLH+NphYdmpb0vkVcmkidi0SN8Kr6R0=";

    version = "2.0.50";

    hash = "sha256-wYDJPzqWPUTdVnba35BioFgV6jeBiZlagQ5L8gzwVF0=";

  };



  meta = {

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

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

          publisher = "mesonbuild";

          name = "mesonbuild";

          version = "1.27.0";

          hash = "sha256-dEDDw8fDBkRYE09mrOzQNzAhWZEczTTahBZT4nhrClw=";

          version = "1.28.0";

          hash = "sha256-mvW0u0Tpc1JqoFJYyRirdcLDCHfm72XvTs8sFvvw490=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog";

pkgs/by-name/ba/balena-cli/package.nix

+18 −10
Original line number Diff line number Diff line
@@ -3,51 +3,59 @@ 
  stdenv,

  buildNpmPackage,

  fetchFromGitHub,

  nodejs_20,

  nodejs_latest,

  versionCheckHook,

  node-gyp,

  python3,

  udev,

  cctools,

  xcbuild,

}:



let

  buildNpmPackage' = buildNpmPackage.override {

    nodejs = nodejs_20;

    nodejs = nodejs_latest;

  };

  node-gyp' = node-gyp.override {

    nodejs = nodejs_20;

    nodejs = nodejs_latest;

  };

in

buildNpmPackage' rec {

  pname = "balena-cli";

  version = "22.4.13";

  version = "23.2.0";



  src = fetchFromGitHub {

    owner = "balena-io";

    repo = "balena-cli";

    rev = "v${version}";

    hash = "sha256-nke7EQscVPu1A/d4DKi7pSb6/MQgeFtG+zhMZT+bhWk=";

    hash = "sha256-T4eOiFpU17vAwAM02gwJq93ZtJQUC7bv0CCFpj4NKEA=";

  };



  npmDepsHash = "sha256-GQXbXkOt8nkOB2OeEcKsp1yJd5lXS+KKout/5ffLgD0=";

  npmDepsHash = "sha256-kRkc3o8xmROlH17GI3yoGvMwEweHrLeGpvW3rH0wOSU=";



  makeCacheWritable = true;



  nativeBuildInputs = [

    node-gyp'

    python3

    versionCheckHook

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    cctools

    xcbuild

  ];



  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    udev

  ];



  doInstallCheck = true;

  nativeInstallCheckInputs = [

    versionCheckHook

  ];

  # Disabled on Darwin due to:

  #

  # https://github.com/NixOS/nix/issues/5748

  #

  # No matter whether $TMP and $HOME point to real writable directories, the

  # Darwin sandbox tries to use /var/empty and fails.

  doInstallCheck = !stdenv.hostPlatform.isDarwin;

  versionCheckProgram = "${placeholder "out"}/bin/balena";



  meta = {

pkgs/by-name/ca/cadical/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

  copyPkgconfigItems,

  makePkgconfigItem,

  version ? "2.1.3",

  version ? "2.2.0",

}:



stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 
    rev = "rel-${version}";

    hash =

      {

        "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";

        "2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg=";

        "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";

      }

      .${version};