From e49c52b173d7a19a013f65bbd3476e2e9bc1c125 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 30 Mar 2021 21:20:50 +0300 Subject: [PATCH] Update --- flake.lock | 24 ++++++++++++------------ modules/hardware.nix | 10 +--------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index fdee9b3..d7ad53a 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1614639498, - "narHash": "sha256-LdViQ/r6W8M2MpKR1zcSY9qCPAfA/FK3X5dTTIhO6hc=", + "lastModified": 1616993087, + "narHash": "sha256-MPmREQbhtq6v7/qzqXesJCz7/PFTxUr5DBetyaEPQJM=", "owner": "rycee", "repo": "home-manager", - "rev": "e72e241d7a602559285205820cfd708282a4197a", + "rev": "cbf0667037e6ca16fcc38818b2aa1391de702c6a", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1614790842, - "narHash": "sha256-efMEO1vQocqqyh5XyyaFyx+BxzWW9jjYPSwsoKhP+R8=", + "lastModified": 1617101868, + "narHash": "sha256-qSr7Lrq27oLyxYKMZEgSvFalJSbuSZdUmEsfGlpziA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "364a0e3e7f7009a0c9dd1bd22cfb0bad403ec2c8", + "rev": "8bc58b6a9a12d32fe9107af4bc86cca890892beb", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1614535430, - "narHash": "sha256-kZwi0CooIOmFrk9eIteYSZIr4a4DVTEYV7UnURs6DSM=", + "lastModified": 1616779317, + "narHash": "sha256-+mUTkYguFMNGb57JkwauDgjcq65RnOLUhDo4mhb8qAI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0aeba64fb26e4defa0842a942757144659c6e29f", + "rev": "ad47284f8b01f587e24a4f14e0f93126d8ebecda", "type": "github" }, "original": { @@ -440,11 +440,11 @@ "simple-nixos-mailserver": { "flake": false, "locked": { - "lastModified": 1605859935, - "narHash": "sha256-XWrZtMrSWjElf2TsHzDTGs3yNQlyqfEiC2NALF5JNtU=", + "lastModified": 1616524844, + "narHash": "sha256-7O3J2c9JrsRGmWekRMtvr1RBbfxE+Dv5XXmaTkmiX+I=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ee1ad50830b479ed8fb46c4c51d3bcdbc2184b8b", + "rev": "66e8baa6f27581ae28678917f67ed2750842c14a", "type": "gitlab" }, "original": { diff --git a/modules/hardware.nix b/modules/hardware.nix index ab01ac3..269142e 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -23,15 +23,7 @@ with deviceSpecific; { sound.enable = true; hardware.pulseaudio = { enable = true; - package = pkgs.pulseaudioFull.overrideAttrs (oa: { - patches = [ - (pkgs.fetchurl { - url = - "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/239.diff"; - sha256 = "07qrpqwvn9sr87z2kn1yaza5bs9ivywd7sl194zwphlq94xrlzdf"; - }) - ]; - }); + package = pkgs.pulseaudioFull; support32Bit = true; extraConfig = '' load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1