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

Merge master into staging-next

parents 6f836daa ce58c68e

pkgs/applications/editors/jupyter-kernels/octave/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -51,13 +51,14 @@ rec { 


      src = octave.src;



      buildInputs = [ imagemagick ];

      nativeBuildInputs = [ imagemagick ];

      strictDeps = true;



      dontConfigure = true;

      dontInstall = true;



      buildPhase = ''

        convert ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out

        magick ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out

      '';

    };

pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
}:

vimUtils.buildVimPlugin rec {

  pname = "codediff.nvim";

  version = "2.9.3";

  version = "2.13.1";



  src = fetchFromGitHub {

    owner = "esmuellert";

    repo = "codediff.nvim";

    tag = "v${version}";

    hash = "sha256-hHBAGDWtw56gk1kWUtU9QEP2QqIATmPNeJ2lPD8dWIc=";

    hash = "sha256-9pzEO5RzDTX0BVg06XA0AiD9gCmpp1eEqH3Adqptrrs=";

  };



  dependencies = [ vimPlugins.nui-nvim ];

pkgs/applications/networking/instant-messengers/gajim/default.nix

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


python3.pkgs.buildPythonApplication rec {

  pname = "gajim";

  version = "2.4.2";

  version = "2.4.3";



  src = fetchFromGitLab {

    domain = "dev.gajim.org";

    owner = "gajim";

    repo = "gajim";

    tag = version;

    hash = "sha256-VBo0+8lOXWbi3a9FT0qcEkyoxzVAm+QLrBtHmRjUHbg=";

    hash = "sha256-3Z6ADcq+E83xD3GMd19zm0n7+w1SuCYP4KcNL9M/DM4=";

  };



  pyproject = true;

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
}:

mkHyprlandPlugin (finalAttrs: {

  pluginName = "hy3";

  version = "0.53.0";

  version = "0.53.0.1";



  src = fetchFromGitHub {

    owner = "outfoxxed";

    repo = "hy3";

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

    hash = "sha256-N0kFdc6tSE0yFeQ/Iit3KNrz4nf2K5xvP3juL7SUyhc=";

    hash = "sha256-0gUgUk8XFtu8HWZySFgb4bzvn+MHK9ZEZ1trVU8YfPw=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/by-name/ac/acli/sources.json

+9 −9
Original line number Diff line number Diff line 
{

  "version": "1.3.9-stable",

  "version": "1.3.11-stable",

  "sources": {

    "aarch64-darwin": {

      "url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_arm64.tar.gz",

      "sha256": "4cc82582a74e75ef290af17d1ec157ed69f5120d58cbde188b85273bdf8c66ef"

      "url": "https://acli.atlassian.com/darwin/1.3.11-stable/acli_1.3.11-stable_darwin_arm64.tar.gz",

      "sha256": "39f80d387324923f0093b455ee4d3d4bd2af44ffd52be33c1d69e8418376d0e4"

    },

    "aarch64-linux": {

      "url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_arm64.tar.gz",

      "sha256": "9fb2841ad16034f5086f04387a6209c70f2edc26153a44aef91691e5cdc78164"

      "url": "https://acli.atlassian.com/linux/1.3.11-stable/acli_1.3.11-stable_linux_arm64.tar.gz",

      "sha256": "43cc72aca128605f0580fc404f14efef6659bb754c9bd3343fb5f43d1f2bbf4b"

    },

    "x86_64-darwin": {

      "url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_amd64.tar.gz",

      "sha256": "2a0703c5940db30587f63c8fffa0de143fee92d4618f9356badcb62bdb088efe"

      "url": "https://acli.atlassian.com/darwin/1.3.11-stable/acli_1.3.11-stable_darwin_amd64.tar.gz",

      "sha256": "84a56f7197bcdc5358a035c79bb706dbd80405255fc90f260973a268831ffe18"

    },

    "x86_64-linux": {

      "url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_amd64.tar.gz",

      "sha256": "3cfc9fa3bbcb1ebf9c2a14574874a9f3f9dec8d2db561415f914c9bd70656de7"

      "url": "https://acli.atlassian.com/linux/1.3.11-stable/acli_1.3.11-stable_linux_amd64.tar.gz",

      "sha256": "50bb48e965e48531e008923be763a7b1f74fe9e2e33cc02cd2aaf5e2f00c6dc4"

    }

  }

}