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

Merge master into staging-next

parents be33506d 557f25ca

nixos/modules/services/continuous-integration/woodpecker/agents.nix

+4 −1
Original line number Diff line number Diff line
@@ -110,7 +110,10 @@ let 
  };

in

{

  meta.maintainers = with lib.maintainers; [ ambroisie ];

  meta.maintainers = with lib.maintainers; [

    ambroisie

    marcusramberg

  ];



  options = {

    services.woodpecker-agents = {

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

+3 −3
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 
  pkgs,

}:

let

  version = "0.0.27-unstable-2025-10-06";

  version = "0.0.27-unstable-2025-10-12";

  src = fetchFromGitHub {

    owner = "yetone";

    repo = "avante.nvim";

    rev = "a7052aca0bdfb93e524f0536ac80e6c542962f47";

    hash = "sha256-crtzBzRcpuqQdqymUJMAxky1Lfk+6YY0YifThHXz7Rw=";

    rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";

    hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";

  };

  avante-nvim-lib = rustPlatform.buildRustPackage {

    pname = "avante-nvim-lib";

pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index a3816f7..81116dd 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -19,8 +19,8 @@ set(VERSION 1.2.2)

 set(QTVERSION 5.12)

 set(CMAKE_AUTOMOC ON)

 

-cmake_minimum_required(VERSION 2.8.12)

-cmake_policy(VERSION 2.8.12)

+cmake_minimum_required(VERSION 3.10)

+cmake_policy(VERSION 3.10)

 

 find_package(Qt5 ${QTVERSION} REQUIRED COMPONENTS Core Widgets PrintSupport Network LinguistTools)

pkgs/applications/office/tagainijisho/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec { 
    hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94=";

  };



  patches = [

    ### Fix cmake minimum version

    ./0000-fix-cmake-min.patch

  ];



  nativeBuildInputs = [

    qttools

    cmake

pkgs/by-name/ba/ballerburg/package.nix

+14 −14
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchurl,

  fetchgit,

  cmake,

  SDL,

  makeDesktopItem,
@@ -10,20 +11,19 @@ 
}:



let



  icon = fetchurl {

    url = "https://baller.tuxfamily.org/king.png";

    sha256 = "1xq2h87s648wjpjl72ds3xnnk2jp8ghbkhjzh2g4hpkq2zdz90hy";

    hash = "sha256-HoL02xd4XkiegF/CueBDV4ppbR+6iUPllRwRow+CAvc=";

  };



in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "ballerburg";

  version = "1.2.0";

  version = "1.2.3";



  src = fetchurl {

    url = "https://download.tuxfamily.org/baller/ballerburg-${version}.tar.gz";

    sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA=";

  src = fetchgit {

    url = "https://framagit.org/baller/ballerburg.git";

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

    hash = "sha256-4rO7ixLE+EV6zd0EryHU6QZeVoa6N4fvxwoJWa0aO70=";

  };



  nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 
      name = "Ballerburg";

      desktopName = "Ballerburg SDL";

      exec = "_NET_WM_ICON=ballerburg ballerburg";

      comment = meta.description;

      comment = finalAttrs.meta.description;

      icon = "ballerburg";

      categories = [ "Game" ];

    })
@@ -55,15 +55,15 @@ stdenv.mkDerivation rec { 
    done

  '';



  meta = with lib; {

  meta = {

    description = "Classic cannon combat game";

    mainProgram = "ballerburg";

    longDescription = ''

      Two castles, separated by a mountain, try to defeat each other with their cannonballs,

      either by killing the opponent's king or by weakening the opponent enough so that the king capitulates.'';

    homepage = "https://baller.tuxfamily.org/";

    license = licenses.gpl3Plus;

    maintainers = [ maintainers.j0hax ];

    platforms = platforms.all;

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ j0hax ];

    platforms = lib.platforms.all;

  };

}
 
})