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

Merge master into staging-next

parents b9190b96 13d99034

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -21431,6 +21431,11 @@ 
    githubId = 1215104;

    keys = [ { fingerprint = "B1FD 4E2A 84B2 2379 F4BF  2EF5 FE33 A228 2371 E831"; } ];

  };

  tyberius-prime = {

    name = "Tyberius Prime";

    github = "TyberiusPrime";

    githubId = 1257580;

  };

  tylerjl = {

    email = "tyler+nixpkgs@langlois.to";

    github = "tylerjl";
@@ -23162,6 +23167,12 @@ 
    github = "zbioe";

    githubId = 7332055;

  };

  zebradil = {

    email = "german.lashevich+nixpkgs@gmail.com";

    github = "zebradil";

    githubId = 1475583;

    name = "German Lashevich";

  };

  zebreus = {

    matrix = "@lennart:cicen.net";

    email = "lennarteichhorn+nixpkgs@gmail.com";

nixos/modules/services/network-filesystems/samba.nix

+9 −0
Original line number Diff line number Diff line
@@ -239,6 +239,15 @@ in 


        security.pam.services.samba = {};

        environment.systemPackages = [ cfg.package ];

        # Like other mount* related commands that need the setuid bit, this is

        # required too.

        security.wrappers."mount.cifs" = {

          program = "mount.cifs";

          source = "${lib.getBin pkgs.cifs-utils}/bin/mount.cifs";

          owner = "root";

          group = "root";

          setuid = true;

        };



        networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 139 445 ];

        networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 137 138 ];

nixos/modules/services/web-apps/weblate.nix

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ let 


  weblatePath = with pkgs; [

    gitSVN

    borgbackup



    #optional

    git-review

pkgs/applications/blockchains/dcrwallet/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "dcrwallet";

  version = "2.0.3";

  version = "2.0.4";



  src = fetchFromGitHub {

    owner = "decred";

    repo = "dcrwallet";

    rev = "release-v${version}";

    hash = "sha256-sRwGpOVydfZjgo7W+4RsHC4JElPyilbV5xhcHxPh2Wc=";

    hash = "sha256-JKux64ANtoBumfVU2OyAyLgHDNZMe/bn+SMuQ8qV43M=";

  };



  vendorHash = "sha256-lVVIS3FL8XwthCpzRKdw59NVtHVxXQ0ouD7jYQzOecM=";

  vendorHash = "sha256-ic8328r3BpycC2NiErTiFtRIkQaBhYcBwRgq/t9hmT8=";



  subPackages = [ "." ];

pkgs/applications/misc/chatblade/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 


python3Packages.buildPythonApplication rec {

  pname = "chatblade";

  version = "0.6.3";

  version = "0.6.4";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-4zLyIrBkilZ2ciBRkU41iK6Q8xDTdFJYOYalNeEMApg=";

    hash = "sha256-d8XavZBuWsuIUxraC2XaWM6tgo2JmsPZwzyl9Rj5wWM=";

  };



  doCheck = false; # there are no tests