Unverified Commit b990c2bb authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents ef9a26b1 d33993d9

nixos/modules/services/backup/zfs-replication.nix

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ in 
            ++ (lib.optional cfg.followDelete "--follow-delete")

          );

        in

        "${lib.getExe cfg.package} ${lib.concatStringSep " " args}";

        "${lib.getExe cfg.package} ${lib.concatStringsSep " " args}";

      wantedBy = [

        "zfs-snapshot-daily.service"

        "zfs-snapshot-frequent.service"

nixos/modules/services/hardware/sane.nix

+6 −0
Original line number Diff line number Diff line
@@ -184,6 +184,12 @@ in 
      environment.etc."sane-config".source = config.hardware.sane.configDir;

      environment.etc."sane-libs".source = "${saneConfig}/lib/sane";

      services.udev.packages = backends;

      # sane sets up udev rules that tag scanners with `uaccess`. This way, physically logged in users

      # can access them without belonging to the `scanner` group. However, the `scanner` user used by saned

      # does not have a real logind seat, so `uaccess` is not enough.

      services.udev.extraRules = ''

        ENV{DEVNAME}!="", ENV{libsane_matched}=="yes", RUN+="${pkgs.acl}/bin/setfacl -m g:scanner:rw $env{DEVNAME}"

      '';



      users.groups.scanner.gid = config.ids.gids.scanner;

      networking.firewall.allowedUDPPorts = lib.mkIf config.hardware.sane.openFirewall [ 8612 ];

pkgs/applications/audio/jamesdsp/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,13 @@ stdenv.mkDerivation (finalAttrs: { 


  qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ];



  # https://github.com/Audio4Linux/JDSP4Linux/issues/228

  env.NIX_CFLAGS_COMPILE = toString [

    "-Wno-error=incompatible-pointer-types"

    "-Wno-error=implicit-int"

    "-Wno-error=implicit-function-declaration"

  ];



  desktopItems = [

    (makeDesktopItem {

      name = "jamesdsp";

pkgs/applications/office/beamerpresenter/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 


stdenv.mkDerivation rec {

  pname = "beamerpresenter";

  version = "0.2.5";

  version = "0.2.6";



  src = fetchFromGitHub {

    owner = "stiglers-eponym";

    repo = "BeamerPresenter";

    rev = "v${version}";

    hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo=";

    hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";

  };



  nativeBuildInputs = [

pkgs/by-name/an/ananicy-rules-cachyos/package.nix

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


stdenvNoCC.mkDerivation {

  pname = "ananicy-rules-cachyos";

  version = "0-unstable-2024-12-17";

  version = "0-unstable-2024-12-27";



  src = fetchFromGitHub {

    owner = "CachyOS";

    repo = "ananicy-rules";

    rev = "c942e9a4a606a27fda4aff5754dd2e397ea5d310";

    hash = "sha256-4qbvXaGh6zcTwn2dKbVZSfbroBQ9xh02FCq/0t/8sjY=";

    rev = "8e8452c210f005e409f6b1eddbb2907e8db0a6d3";

    hash = "sha256-73MltJrKlTvj+ijjhbNQsxGl05KGx+jioSrFGA6IdxE=";

  };



  dontConfigure = true;