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

Merge master into staging-next

parents c156b12c 50a029a7

nixos/modules/hardware/all-firmware.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ in 
        with pkgs;

        [

          linux-firmware

          intel2200BGFirmware

          ipw2200-firmware

          rtl8192su-firmware

          rt5677-firmware

          rtl8761b-firmware

nixos/modules/hardware/network/intel-2200bg.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


  config = lib.mkIf config.networking.enableIntel2200BGFirmware {



    hardware.firmware = [ pkgs.intel2200BGFirmware ];

    hardware.firmware = [ pkgs.ipw2200-firmware ];



  };

nixos/modules/services/monitoring/fusion-inventory.nix

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ in 
      wantedBy = [ "multi-user.target" ];



      serviceConfig = {

        ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";

        ExecStart = "${pkgs.fusioninventory-agent}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";

      };

    };

  };

nixos/modules/services/networking/ircd-hybrid/control.in

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ if test "$1" = "start"; then 
	chown ircd: /home/ircd

	cd /home/ircd

    env - HOME=/homeless-shelter $extraEnv \

        @su@/bin/su ircd --shell=/bin/sh -c ' @ircdHybrid@/bin/ircd -configfile @out@/conf/ircd.conf </dev/null -logfile /home/ircd/ircd.log' 2>&1 >/var/log/ircd-hybrid.out

        @su@/bin/su ircd --shell=/bin/sh -c ' @ircd-hybrid@/bin/ircd -configfile @out@/conf/ircd.conf </dev/null -logfile /home/ircd/ircd.log' 2>&1 >/var/log/ircd-hybrid.out

	fi;

fi

nixos/modules/services/networking/ircd-hybrid/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ let 
      ./ircd.conf

    ];

    inherit (pkgs)

      ircdHybrid

      ircd-hybrid

      coreutils

      su

      iproute2