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

Merge master into staging-next

parents 7f555db5 ef0f3cb0

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

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

      };



      johnpapa.winteriscoming = callPackage ./johnpapa.winteriscoming { };



      jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension {

        mktplcRef = {

          name = "vscode-todo-highlight";

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

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



vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "winteriscoming";

    publisher = "johnpapa";

    version = "1.4.4";

    hash = "sha256-47zCB7VDj+gYXUeblbNsWnGMJt4U4UMyqU1NYTmz2Jc=";

  };

  meta = {

    description = "Preferred dark/light themes by John Papa";

    downloadPage = "https://marketplace.visualstudio.com/items?itemName=johnpapa.winteriscoming";

    homepage = "https://github.com/johnpapa/vscode-winteriscoming";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.therobot2105 ];

  };

}

pkgs/by-name/aa/aapt/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ stdenvNoCC.mkDerivation rec { 
    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ linsui ];

    platforms = lib.platforms.unix;

    badPlatforms = [

      # The linux executable only supports x86_64

      "aarch64-linux"

    ];

    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

  };

}

pkgs/by-name/ca/cartridges/package.nix

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


python3Packages.buildPythonApplication rec {

  pname = "cartridges";

  version = "2.11";

  version = "2.11.1";

  pyproject = false;



  src = fetchFromGitHub {

    owner = "kra-mo";

    repo = "cartridges";

    tag = "v${version}";

    hash = "sha256-6v/R83eYq993epcAkcf9jyNakKuGmSsGXrQYQMro6nI=";

    hash = "sha256-2w7qHTEaRnVDRa0e39Dg9H7pjhgM2UATe8pGYncYILE=";

  };



  strictDeps = true;

pkgs/by-name/ca/castero/package.nix

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { 
  };



  build-system = with python3.pkgs; [

    setuptools

    wheel

  ];
@@ -48,6 +49,11 @@ python3.pkgs.buildPythonApplication rec { 
    "test_datafile_download"

    "test_display_get_input_str"

    "test_display_get_y_n"

    # > assert mymenu.metadata == episode1.metadata

    # E AssertionError: assert '' == <MagicMock name='mock.metadata' id='140737279137104'>

    # E  +  where '' = <castero.menus.episodemenu.EpisodeMenu object at 0x7ffff3acd0d0>.metadata

    # E  +  and   <MagicMock name='mock.metadata' id='140737279137104'> = episode1.metadata

    "test_menu_episode_metadata"

  ];



  pythonImportsCheck = [