diff --git a/flake.lock b/flake.lock index c2c9aed7..55b8d291 100644 --- a/flake.lock +++ b/flake.lock @@ -1291,11 +1291,11 @@ "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1725358301, - "narHash": "sha256-clY4INR7RjOVKya3FGNYvOhyFyUhd3dGQsnV2Za3rz0=", + "lastModified": 1727277425, + "narHash": "sha256-AkYXR8hhAcijhJFYu71+xkdkfTUKOM9ROjYwx5zIsdY=", "owner": "CHN-beta", "repo": "poetry2nix", - "rev": "1f803d2b2faa5b785dfd2fafe99b2411731bf08c", + "rev": "4d1c8dea2d0e3a81208d8598a1a776e65f71d73f", "type": "github" }, "original": { diff --git a/flake/src.nix b/flake/src.nix index 019190e3..d96ce6d2 100644 --- a/flake/src.nix +++ b/flake/src.nix @@ -7,4 +7,5 @@ sha256 = "0faahbzsr44bjmwr6508wi5hg59dfb57fzh5x6jh7zwmv4pzhqlb"; fetchLFS = true; }; + git-lfs-transfer = "sha256-AXXYo00ewbg656KiDasHrf3Krh6ZPUabmB3De090zCw="; } diff --git a/modules/services/samba.nix b/modules/services/samba.nix index 01cc66e8..b906177e 100644 --- a/modules/services/samba.nix +++ b/modules/services/samba.nix @@ -33,18 +33,7 @@ inputs: enable = true; # TCP 139 445 UDP 137 138 openFirewall = !samba.private; - securityType = "user"; - settings = - { - workgroup = "WORKGROUP"; - "server string" = "Samba Server"; - "server role" = "standalone server"; - "hosts allow" = "${samba.hostsAllowed}"; - "dns proxy" = "no"; - }; - # obey pam restrictions = yes - # encrypt passwords = no - shares = listToAttrs (map + settings = listToAttrs (map (share: { name = share.name; @@ -60,7 +49,8 @@ inputs: "force directory mode" = "2755"; }; }) - (attrsToList samba.shares)); + (attrsToList samba.shares)) + // { global."hosts allow" = "${samba.hostsAllowed}"; }; }; }; nixos.services.xray.client.v2ray-forwarder = diff --git a/packages/default.nix b/packages/default.nix index 29ddc4f1..e9fad053 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -99,7 +99,8 @@ inputs: rec chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; }; winjob = inputs.pkgs.callPackage ./winjob { stdenv = inputs.pkgs.gcc14Stdenv; }; sockpp = inputs.pkgs.callPackage ./sockpp.nix { src = inputs.topInputs.sockpp; }; - git-lfs-transfer = inputs.pkgs.callPackage ./git-lfs-transfer.nix { src = inputs.topInputs.git-lfs-transfer; }; + git-lfs-transfer = inputs.pkgs.callPackage ./git-lfs-transfer.nix + { src = inputs.topInputs.git-lfs-transfer; hash = inputs.topInputs.self.src.git-lfs-transfer; }; py4vasp = inputs.pkgs.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; }; pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; }; diff --git a/packages/git-lfs-transfer.nix b/packages/git-lfs-transfer.nix index 75067947..fa3c03a3 100644 --- a/packages/git-lfs-transfer.nix +++ b/packages/git-lfs-transfer.nix @@ -1,6 +1,6 @@ -{ buildGoModule, src }: buildGoModule +{ buildGoModule, src, hash }: buildGoModule { name = "git-lfs-transfer"; inherit src; - vendorHash = "sha256-DYupPz6VnFeFWG4helRv5ahbTDQk+6w6alxwNGU9B9Q="; + vendorHash = hash; }