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

Merge master into staging-nixos

parents e9350ca2 529c52fb

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

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

    publisher = "sourcegraph";

    name = "amp";

    version = "0.0.1769991964";

    hash = "sha256-RlACEEbRZjeM1JUgAxfMlwFIo8CmrJxr1DVq1XxRdoM=";

    version = "0.0.1770596843";

    hash = "sha256-FLajygfJM+EPOXSU7g5I7Yo1YU7zYvTuw2cfY3B17BE=";

  };



  meta = {

pkgs/by-name/bc/bcachefs-tools/kernel-module.nix

+1 −1
Original line number Diff line number Diff line
@@ -44,6 +44,6 @@ stdenv.mkDerivation { 
      platforms

      ;



    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.19");

    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.20");

  };

}

pkgs/by-name/la/LAStools/package.nix→pkgs/by-name/la/lastools/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
}:



stdenv.mkDerivation (finalAttrs: {

  pname = "LAStools";

  pname = "lastools";

  version = "2.0.4";



  src = fetchFromGitHub {