From e4019400087ca6050c8c8587f1a4e4d1c8e74556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:05:29 +0200 Subject: [PATCH 01/19] haskell-abstract-deque: disable test suite to avoid bug in GHC 7.4.2 --- pkgs/development/libraries/haskell/abstract-deque/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 6a97c6372e0..263cd049a3d 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb"; buildDepends = [ HUnit random testFramework testFrameworkHunit ]; testDepends = [ HUnit random testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; From 07c3591ddb5cd2c979a7a6ed6fa7184f66a41bb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 02/19] haskell-SDL: update to version 0.6.5 --- pkgs/development/libraries/haskell/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 62731657e82..2fd9c3e0fb6 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL"; - version = "0.6.4"; - sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0"; + version = "0.6.5"; + sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb"; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; From 26dd59b8b4cbf74965c4c11b78e2e5b0ca038d1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 03/19] haskell-acid-state: update to version 0.11.4 --- pkgs/development/libraries/haskell/acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index ed31aaed000..28d8def56cf 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.11.3"; - sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j"; + version = "0.11.4"; + sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; From 1ae62db2e0acd4f83c98f3a05e8f0471d4a6572e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 04/19] haskell-bindings-posix: update to version 1.2.3 --- pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 23994140d6c..1475be90039 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,10 +1,11 @@ -{ cabal, bindingsDSL }: +{ cabal, bindingsDSL, pthread }: cabal.mkDerivation (self: { pname = "bindings-posix"; version = "1.2.3"; sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; buildDepends = [ bindingsDSL ]; + extraLibraries = [ pthread ]; meta = { description = "Low level bindings to posix"; license = self.stdenv.lib.licenses.bsd3; From b193bd0db30b16bc96d6e9a582ea3ba1cdf51a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 05/19] haskell-comonad: update to version 3.1 --- pkgs/development/libraries/haskell/comonad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 86a8a5c2c30..472e4e315c1 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,10 +1,10 @@ -{ cabal, doctest, filepath, semigroups, transformers }: +{ cabal, doctest, filepath, semigroups, tagged, transformers }: cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.3"; - sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l"; - buildDepends = [ semigroups transformers ]; + version = "3.1"; + sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv"; + buildDepends = [ semigroups tagged transformers ]; testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/comonad/"; From 3602951e6fecd6118822e67320f1350a4dc50c27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 06/19] haskell-comonads-fd: update to version 3.0.3 --- pkgs/development/libraries/haskell/comonads-fd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index 08032cb60ab..aac28ff0871 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonads-fd"; - version = "3.0.2"; - sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa"; + version = "3.0.3"; + sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww"; buildDepends = [ comonad comonadTransformers mtl semigroups transformers ]; From 7923a212f70a716ae5b31b441df585c7f9f6b73a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 07/19] haskell-monad-par-extras: update to version 0.3.3 --- .../libraries/haskell/monad-par-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index fb877337221..6b9ca0e7553 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par-extras"; - version = "0.3.2"; - sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b"; + version = "0.3.3"; + sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2"; buildDepends = [ abstractPar cereal deepseq mtl random transformers ]; From bdcc7b7d1822c5cebfc59f662211c1633c73f8b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 08/19] haskell-pipes-concurrency: update to version 1.2.1 --- .../libraries/haskell/pipes-concurrency/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index d931845f16e..970321bf286 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "1.2.0"; - sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq"; + version = "1.2.1"; + sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl"; buildDepends = [ pipes stm ]; meta = { description = "Concurrency for the pipes ecosystem"; From dca0df536458648bfec84841b4e99fec63842c6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 09/19] haskell-shelly: update to version 1.3.0.7 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 61342c09084..dc9367b4463 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.6"; - sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj"; + version = "1.3.0.7"; + sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 0bdc4a1a94d2867ee040f6905fba592f337e2a21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 10/19] haskell-th-orphans: update to version 0.7 --- pkgs/development/libraries/haskell/th-orphans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index da14adfe339..d7b7c42b6c8 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-orphans"; - version = "0.6"; - sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj"; + version = "0.7"; + sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80"; buildDepends = [ thLift ]; noHaddock = true; meta = { From 913685d0ac1d3f5f3dafdd983dd1025774299fa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:11:29 +0200 Subject: [PATCH 11/19] haskell-snap: jailbreak to fix build with recent versions of comonad --- pkgs/development/libraries/haskell/snap/snap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 80cdf575d70..966a298fd3b 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From b71c382f6fdb2d7f23c0729efa878d784ea0897e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:22:57 +0200 Subject: [PATCH 12/19] haskell-bindings-posix: fix bogus change committed earlier --- pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 1475be90039..23994140d6c 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,11 +1,10 @@ -{ cabal, bindingsDSL, pthread }: +{ cabal, bindingsDSL }: cabal.mkDerivation (self: { pname = "bindings-posix"; version = "1.2.3"; sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; buildDepends = [ bindingsDSL ]; - extraLibraries = [ pthread ]; meta = { description = "Low level bindings to posix"; license = self.stdenv.lib.licenses.bsd3; From 2741391fda1d8081be600024636f592b1a840f59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:32:33 +0200 Subject: [PATCH 13/19] Partially revert commit 075796e0531506fa106be1d2f47a9c866b70b99c. The commit downgraded the german language dictionary from version 20030222-1 to 20120607 (and broke the build in the process). That change was probably not intended? --- pkgs/development/libraries/aspell/dictionaries.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 100960ef8e8..bf7a9de9a2a 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -29,11 +29,11 @@ let in { de = buildDict { - shortName = "de-20120607"; + shortName = "de-20030222-1"; fullName = "German"; src = fetchurl { - url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2; - sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5"; + url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; + sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; From 84d43394c691437b23c67c790b2d84f5686d0fe1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:32:47 +0200 Subject: [PATCH 14/19] pkgs/development/libraries/aspell/dictionaries.nix: strip trailing whitespace --- .../libraries/aspell/dictionaries.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index bf7a9de9a2a..131da4112e8 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -36,7 +36,7 @@ in { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; - + en = buildDict { shortName = "en-7.1-0"; fullName = "English"; @@ -45,7 +45,7 @@ in { sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz"; }; }; - + es = buildDict { shortName = "es-1.11-2"; fullName = "Spanish"; @@ -54,7 +54,7 @@ in { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; - + eo = buildDict { shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; @@ -72,7 +72,7 @@ in { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; }; - + it = buildDict { shortName = "it-2.2_20050523-0"; fullName = "Italian"; @@ -81,7 +81,7 @@ in { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; - + la = buildDict { shortName = "la-20020503-0"; fullName = "Latin"; @@ -90,7 +90,7 @@ in { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; }; - + nl = buildDict { shortName = "nl-0.50-2"; fullName = "Dutch"; @@ -103,7 +103,7 @@ in { echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; }; - + pl = buildDict { shortName = "pl-6.0_20061121-0"; fullName = "Polish"; @@ -112,7 +112,7 @@ in { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; }; - + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; @@ -121,5 +121,5 @@ in { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; }; - + } From dc988c815b4aa703f20d8160dc1ca3a95338efc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:51:37 +0200 Subject: [PATCH 15/19] haskell-src-meta: jailbreak to fix build with recent versions of th-orphans --- pkgs/development/libraries/haskell/haskell-src-meta/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 7b6ccb69633..98dfff8505a 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.2"; sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; + jailbreak = true; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; From 206706503a7ebf99229888f3fae5d819cc23a9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Jul 2013 18:57:03 +0200 Subject: [PATCH 16/19] cromfs: update to 1.5.10.1. --- pkgs/tools/archivers/cromfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 3512d62223f..fdba02d12b7 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10"; + name = "cromfs-1.5.10.1"; src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j"; + sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2"; }; patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; From 6a13cd01ac76465f7ce6397075ea8edeab434a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 14 Jul 2013 22:27:16 +0200 Subject: [PATCH 17/19] libva: update (fix h264encode) --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad..6c13297b38c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.1.1"; + name = "libva-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; + sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; From ec786d59d84e589b9d9124c16227829dbcc11409 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 23:49:28 +0200 Subject: [PATCH 18/19] firefox-wrapper: remove the 'lowPrio' attribute that was accidentally added in an earlier commit --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a656cdf1c41..4d273a7e3d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7536,7 +7536,7 @@ let libpng = libpng.override { apngSupport = true; }; }; - firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; }); + firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; }; flac = callPackage ../applications/audio/flac { }; From a01ab33e03fce3b89f6a8fff343c96d7e8e0b34b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Jul 2013 01:10:20 +0200 Subject: [PATCH 19/19] chromium: Enable pulseaudio by default. If no config.pulseaudio is explicitely set to false, build with pulse support, because even if there is no pulse server available, chromium will fall back to using ALSA. And we definitely want to avoid that users have to build chromium for themselves just for the sake of having pulse support. Thanks to @devhell for actually helping me discovering this (I for myself do always rebuild Chromium, so I won't notice those kind of things). Signed-off-by: aszlig --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d273a7e3d9..f942843eef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7181,7 +7181,7 @@ let chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { channel = "stable"; gconf = gnome.GConf; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or true; }); chromiumBeta = lowPrio (chromium.override { channel = "beta"; });