diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/libvorbis | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvorbis')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvorbis/default.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvorbis/default.nix b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix index 28c5536d626d..2a9f97cf67f5 100644 --- a/nixpkgs/pkgs/development/libraries/libvorbis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix @@ -1,28 +1,15 @@ -{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: +{ stdenv, fetchurl, libogg, pkgconfig }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.6"; + name = "libvorbis-1.3.7"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g"; + sha256 = "0jwmf87x5sdis64rbv0l87mdpah1rbilkkxszipbzg128f9w8g5k"; }; outputs = [ "out" "dev" "doc" ]; - patches = [ - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch"; - sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj"; - name = "CVE-2017-14160+CVE-2018-10393.patch"; - }) - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff"; - sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; - name = "CVE-2018-10392.patch"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg ]; |