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

Merge master into staging-next

parents 83a5e12e 10189aca

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix

+5 −9
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
  rustPlatform,

  pkg-config,

  openssl,

  zlib,

  lib,

  darwin,

  stdenv,

}:

let

  fs = lib.fileset;
@@ -26,12 +25,9 @@ rustPlatform.buildRustPackage { 
    pkg-config

  ];



  buildInputs =

    [

  buildInputs = [

    openssl

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      darwin.apple_sdk.frameworks.Security

    zlib

  ];



  cargoLock = {

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ keywords = [ 
bar = "1.0.0"



[dependencies.foo]

version = "1.0.0"

features = [

    "cat",

    "meow",

]
 
version = "1.0.0"

pkgs/by-name/so/sourcepawn-studio/package.nix

0 → 100644
+42 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  rustPlatform,

  pkg-config,

  openssl,

  nix-update-script,

}:

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "sourcepawn-studio";

  version = "8.1.2";



  src = fetchFromGitHub {

    owner = "Sarrus1";

    repo = "sourcepawn-studio";

    tag = "v${finalAttrs.version}";

    hash = "sha256-L/xgzWbhfRTvoRElKApb9JKXNfqJF+nfDk9Xo/qwL00=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-5Zd3Stoi8AqsZE38pnilmjuRMgTPAGB+R8QI2JFZ7s4=";



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ openssl ];



  checkFlags = [

    # requires rustup and rustfmt

    "--skip tests::sourcegen::generate_node_kinds"

  ];



  passthru.updateScript = nix-update-script { };



  meta = {

    mainProgram = "sourcepawn-studio";

    description = "LSP implementation for the SourcePawn programming language written in Rust";

    homepage = "https://sarrus1.github.io/sourcepawn-studio/";

    changelog = "https://github.com/Sarrus1/sourcepawn-studio/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.awwpotato ];

  };

})

pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix

+16 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
  libgbm,

  pipewire,

  gst_all_1,

  cosmic-wallpapers,

  coreutils,

  nix-update-script,

  nixosTests,
@@ -59,8 +60,22 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    })

  ];



  # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly.

  postPatch = ''

    # While the `kate-hazen-COSMIC-desktop-wallpaper.png` image is present

    # in the `pop-wallpapers` package, we're using the Orion Nebula image

    # from NASA available in the `cosmic-wallpapers` package. Mainly because

    # the previous image was used in the GNOME shell extension and the

    # Orion Nebula image is widely used in the Rust-based COSMIC DE's

    # marketing materials. Another reason to use the Orion Nebula image

    # is that it's actually the default wallpaper as configured by the

    # `cosmic-bg` package's configuration in upstream [1] [2].

    #

    # [1]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/config/src/lib.rs#L142

    # [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3

    substituteInPlace src/screenshot.rs src/widget/screenshot.rs \

      --replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' '${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg'



    # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly.

    substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \

      --replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}'

  '';

pkgs/by-name/ya/yazi/plugins/ouch/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkYaziPlugin {

  pname = "ouch.yazi";

  version = "0-unstable-2025-04-09";

  version = "0-unstable-2025-04-12";



  src = fetchFromGitHub {

    owner = "ndtoan96";

    repo = "ouch.yazi";

    rev = "73b7842bbccb12f15e1af54b8b06fc88f5efe82d";

    hash = "sha256-pdnQB9NSqCndqbeJLeSg2og2vBDg5zKx8EKWKVixqTM=";

    rev = "2496cd9ac2d1fb52597b22ae84f3af06c826a86d";

    hash = "sha256-OsNfR7rtnq+ceBTiFjbz+NFMSV/6cQ1THxEFzI4oPJk=";

  };



  meta = {