diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index f709941a8..070f8d3f7 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -127,7 +127,7 @@ in # - dev? # - debugging? consoleUtils = declPackageSet [ - "alsaUtils" # for aplay, speaker-test + "alsa-utils" # for aplay, speaker-test # "cdrtools" # "clinfo" # "dmidecode" @@ -417,10 +417,10 @@ in # INDIVIDUAL PACKAGE DEFINITIONS - # alsaUtils amixer, aplay, speaker-test, ... - alsaUtils.sandbox.whitelistAudio = true; #< not strictly necessary? - alsaUtils.sandbox.extraPaths = [ "/dev/snd" ]; - alsaUtils.sandbox.autodetectCliPaths = "existingFile"; # for `aplay ./file.wav` + # alsa-utils amixer, aplay, speaker-test, ... + alsa-utils.sandbox.whitelistAudio = true; #< not strictly necessary? + alsa-utils.sandbox.extraPaths = [ "/dev/snd" ]; + alsa-utils.sandbox.autodetectCliPaths = "existingFile"; # for `aplay ./file.wav` backblaze-b2 = {}; diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 092156a42..52bc53f5e 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "d0864b0cf7df796aace596126c76b1ef4cffee51"; - sha256 = "sha256-PGY0lnctAIKqZYAY5yhX/x5iGvyRURggYFOdmonCZig="; - version = "0-unstable-2024-10-16"; + rev = "64b2308de14a14ed70e1133f59abe42b3b6e980a"; + sha256 = "sha256-dQ85bJURM14+LCkCUHG+ANoDHzSkEPg3dLQ5tUlnRD0="; + version = "0-unstable-2024-10-21"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index d662a27d1..f6b1f80e9 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "a14c2b963237a5f7f6847eb5f7dd342da2c56c35"; - sha256 = "sha256-twewCHu8RICraLIxyZvCLVVV/e1fBezxcc/S6WMNm+M="; - version = "0-unstable-2024-10-16"; + rev = "557897f89c316b46ba5ac3d7a0014bd42e2782ab"; + sha256 = "sha256-zPTvKD4FjL7TNjt68UYuDHVqKbRfyH1h5ppBSvhClNY="; + version = "0-unstable-2024-10-21"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index b472109ce..7de6822b2 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "0d7fbcdaa1d959bac0ade9eff3c256a5caac050a"; - sha256 = "sha256-mnMu4/shg9JbO/Fc3YOXnVFgbGWNzx0pRJOA4WdfyOA="; - version = "0-unstable-2024-10-16"; + rev = "a6e22b791a49a047ea44b8044d5395ee59d8f540"; + sha256 = "sha256-OSLsEctqhqOjj4ut+sOCv3vG2G0VOi0/QnK9l59nH4I="; + version = "0-unstable-2024-10-21"; branch = "staging"; }