public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2020-12-24 06:23:13 +00:00
committed by GitHub
parent 5962ac3709 27c608148e
commit 1bf7a72105
7 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/alsa-firmware/default.nix
+2 -7
View File
@@ -1,18 +1,13 @@
{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "alsa-firmware-1.2.1";
name = "alsa-firmware-1.2.4";
src = fetchurl {
url = "mirror://alsa/firmware/${name}.tar.bz2";
sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
patches = [ (fetchpatch {
url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
}) ];
nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
configureFlags = [
pkgs/os-specific/linux/alsa-lib/default.nix
+4 -3
View File
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.2.3";
pname = "alsa-lib";
version = "1.2.4";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02";
url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc=";
};
patches = [