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

Merge staging-next into staging

parents 479aa3cd 15d99ee5

pkgs/applications/display-managers/ly/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ stdenv.mkDerivation { 
  ];



  postPatch = ''

    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

    ln -s ${

      callPackage ./deps.nix {

        zig = zig_0_12;

      }

    } $ZIG_GLOBAL_CACHE_DIR/p

  '';



  passthru.tests = { inherit (nixosTests) ly; };

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
{ lib, vscode-utils }:



vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "solargraph";

    publisher = "castwide";

    version = "0.24.1";

    hash = "sha256-M96kGuCKo232rIwLovDU+C/rhEgZWT4s/zsR7CUYPnk=";

  };

  meta = {

    description = "Ruby language server featuring code completion, intellisense, and inline documentation";

    downloadPage = "https://marketplace.visualstudio.com/items?itemName=castwide.solargraph";

    homepage = "https://github.com/castwide/vscode-solargraph";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.bbenno ];

  };

}

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

+2 −0
Original line number Diff line number Diff line
@@ -870,6 +870,8 @@ let 
        };

      };



      castwide.solargraph = callPackage ./castwide.solargraph { };



      catppuccin = {

        catppuccin-vsc = buildVscodeMarketplaceExtension {

          mktplcRef = {

pkgs/by-name/ca/cargo-lambda/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  pkg-config,

  openssl,

  stdenv,

  zig,

  zig_0_13,

  nix-update-script,

}:
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { 
  '';



  postInstall = ''

    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]}

    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}

  '';



  CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";

pkgs/by-name/fl/flow-editor/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";

  };

  postPatch = ''

    ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

    ln -s ${

      callPackage ./build.zig.zon.nix {

        zig = zig_0_13;

      }

    } $ZIG_GLOBAL_CACHE_DIR/p

  '';



  nativeBuildInputs = [