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

Merge master into staging-nixos

parents b509b820 d8cc1036

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ let 
    {

      x86_64-linux = {

        arch = "linux-x64";

        hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0=";

        hash = "sha256-ZAw/n+JmsH/F8VwQzLfB3oPuofeiL6dtHXLiVMxxvCc=";

      };

      aarch64-linux = {

        arch = "linux-arm64";

        hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI=";

        hash = "sha256-qxytVpmDpHEc1bjEpKPrnINKbh/qNiG5vD3KdQ7vwGs=";

      };

      x86_64-darwin = {

        arch = "darwin-x64";

        hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA=";

        hash = "sha256-/FK16O23iZgEc9bnvyquf0TcbCuraG9jVverlcWZymU=";

      };

      aarch64-darwin = {

        arch = "darwin-arm64";

        hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4=";

        hash = "sha256-1BQ0YXQNd8yjGxA6NLxsfZZemwYNqRzyGQCZln9ChJA=";

      };

    }

    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    name = "csdevkit";

    publisher = "ms-dotnettools";

    version = "1.50.51";

    version = "1.70.3";

    inherit (extInfo) hash arch;

  };

  sourceRoot = "extension"; # This has more than one folder.

pkgs/by-name/al/alpaca/package.nix

+10 −3
Original line number Diff line number Diff line
@@ -22,7 +22,14 @@ 
  pipewire,

}:



python3Packages.buildPythonApplication rec {

let

  pythonPackages = python3Packages.overrideScope (

    self: super: {

      bibtexparser = self.bibtexparser_2;

    }

  );

in

pythonPackages.buildPythonApplication rec {

  pname = "alpaca";

  version = "8.1.1";

  pyproject = false; # Built with meson
@@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec { 
  ];



  dependencies =

    with python3Packages;

    with pythonPackages;

    [

      pygobject3

      requests
@@ -74,7 +81,7 @@ python3Packages.buildPythonApplication rec { 
    ]

    ++ lib.flatten (builtins.attrValues optional-dependencies);



  optional-dependencies = with python3Packages; {

  optional-dependencies = with pythonPackages; {

    speech-to-text = [

      openai-whisper

      pyaudio

pkgs/by-name/dj/django-upgrade/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "django-upgrade";

  version = "1.29.0";

  version = "1.29.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "adamchainz";

    repo = "django-upgrade";

    tag = version;

    hash = "sha256-ALAwOm+j0Gpx3ZiO8nyTDrJNqR9WaFSxLxAgTarNQeM=";

    hash = "sha256-NnVFMItWiTL82LMxDKeGofaestRBfZFVjTKFjbJFmmU=";

  };



  build-system = [ python3Packages.setuptools ];

pkgs/by-name/fe/fex/package.nix

+13 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
  xorg,

  withQt ? true,

  qt6,

  fetchpatch,

}:



let
@@ -95,13 +96,13 @@ let 
in

llvmPackages.stdenv.mkDerivation (finalAttrs: {

  pname = "fex";

  version = "2509.1";

  version = "2510";



  src = fetchFromGitHub {

    owner = "FEX-Emu";

    repo = "FEX";

    tag = "FEX-${finalAttrs.version}";

    hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";

    hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA=";



    leaveDotGit = true;

    postFetch = ''
@@ -127,6 +128,16 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { 
    '';

  };



  patches = [

    # Backported fix of unit test build with LLVM 21.

    # TODO: drop after next release

    (fetchpatch {

      name = "unittests-thunklibs-fix-build-with-llvm-21.patch";

      url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch";

      hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE=";

    })

  ];



  postPatch = ''

    substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \

      --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \

pkgs/by-name/gh/ghostfolio/package.nix

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


buildNpmPackage rec {

  pname = "ghostfolio";

  version = "2.209.0";

  version = "2.211.0";



  src = fetchFromGitHub {

    owner = "ghostfolio";

    repo = "ghostfolio";

    tag = version;

    hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI=";

    hash = "sha256-RoIOk0MIf1IAQLPO4MwemkXqQfJuDZtYYqn+OS6IUb0=";

    # populate values that require us to use git. By doing this in postFetch we

    # can delete .git afterwards and maintain better reproducibility of the src.

    leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec { 
    '';

  };



  npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE=";

  npmDepsHash = "sha256-Isy32xdxWlsGflqtcDJ6/lNaCA+IRbEOP8Z/BI0uV0s=";



  nativeBuildInputs = [

    prisma