Commit 1d039734 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 56d41825 7d32565c

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -5413,6 +5413,12 @@ 
    githubId = 64467514;

    name = "Daniel Krywult";

  };

  danilobuerger = {

    email = "info@danilobuerger.de";

    github = "danilobuerger";

    githubId = 996231;

    name = "Danilo Bürger";

  };

  daniyalsuri6 = {

    email = "daniyal.suri@gmail.com";

    github = "daniyalsuri6";

pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix

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

    publisher = "RooVeterinaryInc";

    name = "roo-cline";

    version = "3.11.9";

    hash = "sha256-+Bi9nHRXXZGKGvTS8o0CbtS6KBJmQz+Wiiinqs16vZA=";

    version = "3.11.12";

    hash = "sha256-f7IPxeF/UxywMm8yVEZV/sHTKILZ3n788bhwH4xx89I=";

  };



  passthru.updateScript = vscode-extensions-update-script { };

pkgs/applications/science/biology/ants/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "ANTs";

  version = "2.5.4";

  version = "2.6.0";



  src = fetchFromGitHub {

    owner = "ANTsX";

    repo = "ANTs";

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

    hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY=";

    hash = "sha256-3k9EOylOAUwxBNpzi6U/XZGarCZlbh9PdecKyJh81Yk=";

  };



  nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { 


  postInstall = ''

    for file in $out/bin/*; do

      wrapProgram $file --set PATH "$out/bin"

      wrapProgram $file --prefix PATH : "$out/bin"

    done

  '';

pkgs/build-support/node/fetch-yarn-deps/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
  makeSetupHook,

  cacert,

  callPackage,

  nixForLinking,

}:



let
@@ -55,7 +54,6 @@ in 
          lib.makeBinPath [

            coreutils

            nix-prefetch-git

            nixForLinking

          ]

        }

pkgs/by-name/an/anvil-editor/extras.nix

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
{

  buildGoModule,

  anvil-editor,

}:



buildGoModule {

  inherit (anvil-editor) version src meta;



  pname = "anvil-editor-extras";



  modRoot = "anvil-extras";



  vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E=";

}