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

Merge master into staging-next

parents dc23b83b b932c31b

nixos/modules/services/matrix/synapse.nix

+7 −6
Original line number Diff line number Diff line
@@ -124,12 +124,13 @@ let 
  genLogConfigFile =

    logName:

    format.generate "synapse-log-${logName}.yaml" (

      cfg.log

      // optionalAttrs (cfg.log ? handlers.journal) {

      attrsets.recursiveUpdate cfg.log (

        optionalAttrs (cfg.log ? handlers.journal) {

          handlers.journal = cfg.log.handlers.journal // {

            SYSLOG_IDENTIFIER = logName;

          };

        }

      )

    );



  toIntBase8 =

pkgs/applications/emulators/libretro/cores/scummvm.nix

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ let 
in

mkLibretroCore {

  core = "scummvm";

  version = "0-unstable-2025-05-23";

  version = "0-unstable-2025-06-03";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "scummvm";

    rev = "e566a6432fd1951417bf78280cc7c741957fc419";

    hash = "sha256-K78lyq1v3v55CCFLVAJStvfPltfkoGE9tj39gwPgZ44=";

    rev = "55fcf4050ac1102638cd7975677f81ae1a2c2070";

    hash = "sha256-GJqh34l7qC59l5zFnGGBeVIvyUCB9AfHKioqtCmjN2s=";

  };



  extraBuildInputs = [

pkgs/by-name/ch/chawan/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ stdenv.mkDerivation { 
    homepage = "https://sr.ht/~bptato/chawan/";

    license = lib.licenses.publicDomain;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ jtbx ];

    maintainers = with lib.maintainers; [ ];

    mainProgram = "cha";

  };

}

pkgs/by-name/co/cordless/package.nix

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

  lib,

  buildGoModule,

  fetchFromGitHub,

}:



buildGoModule rec {

  pname = "cordless";

  version = "2020-11-22";



  src = fetchFromGitHub {

    owner = "Bios-Marcel";

    repo = "cordless";

    rev = version;

    hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis=";

  };



  subPackages = [ "." ];



  vendorHash = "sha256-XnwTqd19q+hOJZsfnFExiPDbg4pzV1Z9A6cq/jhcVgU=";



  meta = with lib; {

    homepage = "https://github.com/Bios-Marcel/cordless";

    description = "Discord terminal client";

    mainProgram = "cordless";

    license = licenses.bsd3;

    maintainers = with maintainers; [ ];

  };

}

pkgs/by-name/de/detach/package.nix

0 → 100644
+38 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchzip,

  installShellFiles,

}:



stdenv.mkDerivation rec {

  pname = "detach";

  version = "0.2.3";



  src = fetchzip {

    url = "http://inglorion.net/download/detach-${version}.tar.bz2";

    hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc=";

  };



  nativeBuildInputs = [ installShellFiles ];



  dontConfigure = true;



  makeFlags = [ "PREFIX=$(out)" ];



  postInstall = ''

    installShellCompletion --cmd detach \

      --zsh contrib/zsh-completer/_detach

  '';



  doCheck = false;



  meta = {

    description = "Utility for running a command detached from the current terminal";

    homepage = "https://inglorion.net/software/detach/";

    license = lib.licenses.mit;

    mainProgram = "detach";

    maintainers = with lib.maintainers; [ pbsds ];

    platforms = lib.platforms.unix;

  };

}