From d317303dac5df231fdbf362c6c231efddeacf838 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 28 Jul 2021 00:28:46 -0400 Subject: [PATCH] Bump agenix: e543aa7 -> fb00f17 emacs-overlay: 9fbb5e4 -> 9da066d home-manager: ac319fd -> f6f6990 nixos-hardware: 4177578 -> 03e7686 nixpkgs-unstable: f930ea2 -> ecaf3da No need for ALSA fix anymore; fix is in nixos-unstable now. --- flake.lock | 36 ++++++++++++++++++------------------ modules/hardware/audio.nix | 15 --------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 7ab263ee..38860b6b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1620877075, - "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=", + "lastModified": 1626960455, + "narHash": "sha256-N3+qOtsADo59UcG8PxqNMhT94wqTQ73k08gpy1dLaWU=", "owner": "ryantm", "repo": "agenix", - "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3", + "rev": "fb00f178b3a49a39cc964049075439b575d36d60", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1625475975, - "narHash": "sha256-gCOhldE8f0ve5HCP5VPDGRnvh2TUfzDyWWTcfaMvov4=", + "lastModified": 1627320437, + "narHash": "sha256-1HGXjkm7kElz3VsGSciaQlZclUhyvfIXVl+FOooBTJo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9fbb5e43ed6ea3b5b704f13b2169f5404c24113b", + "rev": "9da066d11fbedda841cae9d06c5391e1ebd65801", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1625384440, - "narHash": "sha256-WnDK+LZioER6eeC8Sm7GPvbiS6XPyUqn+qtc2lvjLHo=", + "lastModified": 1627312560, + "narHash": "sha256-h2mpDJIu/rd4nZX4i5U1AFA/3MGXrmFRFy04FDxnvhE=", "owner": "rycee", "repo": "home-manager", - "rev": "ac319fd3149b23a3ad8ee24cb2def6e67acf194c", + "rev": "f6f6990fc811454cb3082ba3662b711488fd0554", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1625333638, - "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=", + "lastModified": 1627212500, + "narHash": "sha256-KMUQCT3JSqznp+dR6BTvbwLqPFErjNlotVpkp/P/ZmM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d", + "rev": "03e7686c72345f237405c0b46b153dccd3ec9913", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1624922035, - "narHash": "sha256-OiIxJQuMRkICxaUwY3xMBbrPPu20de/n7tVYnWzLvS4=", + "lastModified": 1627128856, + "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185", + "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1625403235, - "narHash": "sha256-LMitU5qG4zYAO3+5fJbdjmyn9snflCcq+P9eSghbcBI=", + "lastModified": 1627170405, + "narHash": "sha256-6t7ISnt0Iqc2jxIf5+/su6eFmZNWnPAOA1JeOv9lLRE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f930ea227cecaed1f1bdb047fef54fe4f0721c8c", + "rev": "ecaf3da9340231e5493eccc3db87604a3705da42", "type": "github" }, "original": { diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix index 9b70b0da..9508b3d4 100644 --- a/modules/hardware/audio.nix +++ b/modules/hardware/audio.nix @@ -9,21 +9,6 @@ in { }; config = mkIf cfg.enable { - # HACK Due to alsa-project/alsa-lib#143, ALSA/pulseaudio can't find sound - # devices. The 1.2.5.1 hotfix addresses this, but isn't in nixpkgs yet. - nixpkgs.overlays = [ - (self: super: with super; { - alsa-lib = super.alsa-lib.overrideAttrs (old: rec { - pname = "alsa-lib"; - version = "1.2.5.1"; - src = pkgs.fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-YoQh2VDOyvI03j+JnVIMCmkjMTyWStdR/6wIHfMxQ44="; - }; - }); - }) - ]; - sound.enable = true; hardware.pulseaudio.enable = true;