This gets rid of the patch for newer pulseaudio library versions.
In addition, we now have protobuf and pciutils in default dependencies, as those
are required (or better: optional, but recommended and thus activated by the
default gyp options) by versions >= 25.
Also, we now no longer depend on libpng, but I'm not dropping this, as we want
to get back to libpng from nixpkgs again 'real soon'.
The stack-protector flag is now disabled by default accross all versions, and
probably didn't hurt back in version 24, but at least we're now no longer add it
dependant on a particular version.
And those pesky post/onlyXX version booleans are now pre/postXX, to ensure
better clarity.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
So, after searching for days in the wrong spot, eventually discovering that
postPatch isn't run on Hydra, we're now set to move forward to version 25, YAY!
Build has been tested locally (not that this would mean anything for Hydra, as
we've seen) and the output has been actively used for browsing by me :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This is needed in order to ensure that the postPatch hook is executed, which is
not when the patches list is empty.
It is fixed by 82f94df719 in stdenv-updates.
So as soon as the branch gets merged, we can get rid of this hack as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This reverts commit b7cbb4da11.
The main reason behind this - apart from looking ugly - is that it didn't really
solve anything, see:
http://hydra.nixos.org/build/4198299
So, we need a different and less hacky approach...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
So, chromium 25 is now stable, so we really need to get the build fixed on Hydra
as soon as possible. And let's hope without nasty workarounds.
This commits updates dev and beta channels to version 26.0.1410.12, because
version 27.0.1423.0 seems to be unavailable right now. Build is running
successfully on my machine, and the browser works as well on the sites I usually
visit.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
I'm not sure whether this was by intention, but so far postPatch hooks were
silently skipped whenever the patches list was empty. This change could possibly
change the build results of the following packages:
* gcc
* cmake (264)
* systemtap
* quemu-kvm
These packages all have in common that they have a postPatch hook and the
patches list can be empty when certain conditions are met.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2.60 is the newest of the gtk2-compatible versions. (Transmission >=
2.61 requires gtk3.)
* Add inotify as input to not have transmission-daemon poll the torrent
auto-load directory.
* Add file as input to fix a small build time issue (non-fatal).
* Remove unneeded gtk configure flags (support is auto-detected).
* icon-theme.cache is only generated when building with gtk, so use
rm -f to not error out when building without gtk.
* Use gtk ? null instead of gtkClient flag because it is simpler.
Build and runtime tested with and without gtk support.
Test suite graphviz-testsuite: RUNNING...
This is the test suite for the graphviz library.
If any of these tests fail, please inform the maintainer,
including full output of this test suite.
======================================================================
Running test: "Printing and parsing of Attributes".
The most common source of errors in printing and parsing are for
Attributes.
+++ OK, passed 200 tests.
All tests for "Printing and parsing of Attributes" were successful!
======================================================================
Running test: "Printing generalised Dot code".
When generalising "DotGraph" values to other "DotRepr" values,
the generated Dot code should be identical.
+++ OK, passed 200 tests.
All tests for "Printing generalised Dot code" were successful!
======================================================================
Running test: "Printing and Parsing DotReprs".
The graphviz library should be able to parse back in its own
generated Dot code for any "DotRepr" instance
+++ OK, passed 200 tests.
+++ OK, passed 200 tests.
+++ OK, passed 200 tests.
All tests for "Printing and Parsing DotReprs" were successful!
======================================================================
Running test: "Pre-processing Dot code".
When parsing Dot code, some pre-processing is done to remove items
such as comments and to join together multi-line strings. This
test verifies that this pre-processing doesn't affect actual
Dot code by running the pre-processor on generated Dot code.
This test is not run on generalised Dot graphs as if it works for
normal dot graphs then it should also work for generalised ones.
+++ OK, passed 200 tests.
All tests for "Pre-processing Dot code" were successful!
======================================================================
Running test: "Augmenting FGL Graphs".
The various Graph to Graph functions in Data.GraphViz should
only _augment_ the graph labels and not change the graphs
themselves. This test compares the original graphs to these
augmented graphs and verifies that they are the same.
*** Failed! (after 1 test):
Exception:
Error running utility program: Error messages from neato:
-1:']'->[]
The tests for "Augmenting FGL Graphs" failed!
Not attempting any further tests.
Test suite graphviz-testsuite: FAIL
Test suite logged to: dist/test/graphviz-2999.16.0.0-graphviz-testsuite.log
0 of 1 test suites (0 of 1 test cases) passed.
Running 4 test suites...
Test suite doctests: RUNNING...
### Error in src/Data/Complex/Lens.hs:33: expression `let { a doctests: <stderr>: hPutChar: invalid argument (invalid character)
Test suite doctests: FAIL
Test suite logged to: dist/test/lens-3.8.7.3-doctests.log
Test suite hunit: RUNNING...
Test suite hunit: PASS
Test suite logged to: dist/test/lens-3.8.7.3-hunit.log
Test suite properties: RUNNING...
Test suite properties: PASS
Test suite logged to: dist/test/lens-3.8.7.3-properties.log
Test suite templates: RUNNING...
Test suite templates: PASS
Test suite logged to: dist/test/lens-3.8.7.3-templates.log
3 of 4 test suites (3 of 4 test cases) passed.
Test suite graphviz-testsuite: RUNNING...
This is the test suite for the graphviz library.
If any of these tests fail, please inform the maintainer,
including full output of this test suite.
======================================================================
Running test: "Printing and parsing of Attributes".
The most common source of errors in printing and parsing are for
Attributes.
+++ OK, passed 200 tests.
All tests for "Printing and parsing of Attributes" were successful!
======================================================================
Running test: "Printing generalised Dot code".
When generalising "DotGraph" values to other "DotRepr" values,
the generated Dot code should be identical.
+++ OK, passed 200 tests.
All tests for "Printing generalised Dot code" were successful!
======================================================================
Running test: "Printing and Parsing DotReprs".
The graphviz library should be able to parse back in its own
generated Dot code for any "DotRepr" instance
+++ OK, passed 200 tests.
+++ OK, passed 200 tests.
+++ OK, passed 200 tests.
All tests for "Printing and Parsing DotReprs" were successful!
======================================================================
Running test: "Pre-processing Dot code".
When parsing Dot code, some pre-processing is done to remove items
such as comments and to join together multi-line strings. This
test verifies that this pre-processing doesn't affect actual
Dot code by running the pre-processor on generated Dot code.
This test is not run on generalised Dot graphs as if it works for
normal dot graphs then it should also work for generalised ones.
+++ OK, passed 200 tests.
All tests for "Pre-processing Dot code" were successful!
======================================================================
Running test: "Augmenting FGL Graphs".
The various Graph to Graph functions in Data.GraphViz should
only _augment_ the graph labels and not change the graphs
themselves. This test compares the original graphs to these
augmented graphs and verifies that they are the same.
*** Failed! (after 1 test):
Exception:
Error running utility program: Error messages from neato:
-1:']'->[]
The tests for "Augmenting FGL Graphs" failed!
Not attempting any further tests.
Test suite graphviz-testsuite: FAIL
Test suite logged to: dist/test/graphviz-2999.16.0.0-graphviz-testsuite.log
0 of 1 test suites (0 of 1 test cases) passed.
Running 4 test suites...
Test suite doctests: RUNNING...
### Error in src/Data/Complex/Lens.hs:33: expression `let { a doctests: <stderr>: hPutChar: invalid argument (invalid character)
Test suite doctests: FAIL
Test suite logged to: dist/test/lens-3.8.7.3-doctests.log
Test suite hunit: RUNNING...
Test suite hunit: PASS
Test suite logged to: dist/test/lens-3.8.7.3-hunit.log
Test suite properties: RUNNING...
Test suite properties: PASS
Test suite logged to: dist/test/lens-3.8.7.3-properties.log
Test suite templates: RUNNING...
Test suite templates: PASS
Test suite logged to: dist/test/lens-3.8.7.3-templates.log
3 of 4 test suites (3 of 4 test cases) passed.
Test suite test: RUNNING...
test: SqlError {sqlState = "", sqlNativeError = -1, sqlErrorMsg = "could not connect to server: No such file or directory\n\tIs the server running locally and accepting\n\tconnections on Unix domain socket \"/tmp/.s.PGSQL.5432\"?\n"}
Test suite test: FAIL
Test suite logged to: dist/test/postgresql-simple-0.2.4.1-test.log
0 of 1 test suites (0 of 1 test cases) passed.
tests/Test.hs:3:8:
Could not find module `Happstack.Server.Tests'
Perhaps you meant
Happstack.Server.Types (from happstack-server-7.1.6)
Happstack.Server.Auth (from happstack-server-7.1.6)
Happstack.Server.Client (from happstack-server-7.1.6)
Use -v to see a list of the files searched for.
Running 1 test suites...
Test suite tests: RUNNING...
Tests for all distributions:
Tests for: BetaDistribution:
C.D.F. sanity: [OK, passed 100 tests]
CDF limit at +tests: <stdout>: commitBuffer: invalid argument (invalid character)
Test suite tests: FAIL
Test suite logged to: dist/test/statistics-0.10.2.0-tests.log
Test suite test: RUNNING...
test: SqlError {sqlState = "", sqlNativeError = -1, sqlErrorMsg = "could not connect to server: No such file or directory\n\tIs the server running locally and accepting\n\tconnections on Unix domain socket \"/tmp/.s.PGSQL.5432\"?\n"}
Test suite test: FAIL
Test suite logged to: dist/test/postgresql-simple-0.2.4.1-test.log
0 of 1 test suites (0 of 1 test cases) passed.
Test/Runner.hs:5:8:
Could not find module `Language.Haskell.Exts.Annotated'
Use -v to see a list of the files searched for.
Setup: Pattern match failure in do expression at Setup.hs:6:5-15
Running 1 test suites...
Test suite spec: RUNNING...
Sendfile
sendfile
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an entire file FAILED [1]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a part of file FAILED [2]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if length is over
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if offset is over
- terminates even if the file is truncated FAILED [3]
sendfileWithHeader
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an header and an entire file FAILED [4]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an header and a part of file FAILED [5]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a large header and an entire file FAILED [6]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a large header and a part of file FAILED [7]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if length is over
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if offset is over
- terminates even if the file is truncated FAILED [8]
1) Sendfile.sendfile sends an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
2) Sendfile.sendfile sends a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
3) Sendfile.sendfile terminates even if the file is truncated FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
4) Sendfile.sendfileWithHeader sends an header and an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
5) Sendfile.sendfileWithHeader sends an header and a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
6) Sendfile.sendfileWithHeader sends a large header and an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
7) Sendfile.sendfileWithHeader sends a large header and a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
8) Sendfile.sendfileWithHeader terminates even if the file is truncated FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
Running 1 test suites...
Test suite test-versions: RUNNING...
test-versions: test/queens-ghc-6.12.1.eventlog: openBinaryFile: does not exist (No such file or directory)
Test suite test-versions: FAIL
Test suite logged to: dist/test/ghc-events-0.4.2.0-test-versions.log
0 of 1 test suites (0 of 1 test cases) passed.
tests/Test.hs:3:8:
Could not find module `Happstack.Server.Tests'
Perhaps you meant
Happstack.Server.Types (from happstack-server-7.1.6)
Happstack.Server.Auth (from happstack-server-7.1.6)
Happstack.Server.Client (from happstack-server-7.1.6)
Use -v to see a list of the files searched for.
Running 1 test suites...
Test suite tests: RUNNING...
Tests for all distributions:
Tests for: BetaDistribution:
C.D.F. sanity: [OK, passed 100 tests]
CDF limit at +tests: <stdout>: commitBuffer: invalid argument (invalid character)
Test suite tests: FAIL
Test suite logged to: dist/test/statistics-0.10.2.0-tests.log
In the master branch, doCheck defaults to 'false', which means that no package
will change its hash unless its doCheck field is set to 'true' explicitly. In
the stdenv-updates branch, however, all Haskell packages have a default setting
of 'doCheck=true'. Once that branch has been merged, filtering doCheck is no
longer necessary.
Test/Runner.hs:5:8:
Could not find module `Language.Haskell.Exts.Annotated'
Use -v to see a list of the files searched for.
Setup: Pattern match failure in do expression at Setup.hs:6:5-15
Running 1 test suites...
Test suite spec: RUNNING...
Sendfile
sendfile
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an entire file FAILED [1]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a part of file FAILED [2]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if length is over
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if offset is over
- terminates even if the file is truncated FAILED [3]
sendfileWithHeader
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an header and an entire file FAILED [4]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends an header and a part of file FAILED [5]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a large header and an entire file FAILED [6]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- sends a large header and a part of file FAILED [7]
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if length is over
spec: test/inputFile: openFd: does not exist (No such file or directory)
- terminates even if offset is over
- terminates even if the file is truncated FAILED [8]
1) Sendfile.sendfile sends an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
2) Sendfile.sendfile sends a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
3) Sendfile.sendfile terminates even if the file is truncated FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
4) Sendfile.sendfileWithHeader sends an header and an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
5) Sendfile.sendfileWithHeader sends an header and a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
6) Sendfile.sendfileWithHeader sends a large header and an entire file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
7) Sendfile.sendfileWithHeader sends a large header and a part of file FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
8) Sendfile.sendfileWithHeader terminates even if the file is truncated FAILED (uncaught exception)
IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory))
Running 1 test suites...
Test suite test-versions: RUNNING...
test-versions: test/queens-ghc-6.12.1.eventlog: openBinaryFile: does not exist (No such file or directory)
Test suite test-versions: FAIL
Test suite logged to: dist/test/ghc-events-0.4.2.0-test-versions.log
0 of 1 test suites (0 of 1 test cases) passed.
my-env/default.nix lists an example on how to create an SDL environment
that can be installed with "nix-env -i sdl-env". That is actually wrong
and will not work. The correct command is "nix-env -i env-sdl".
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
So, this is our sledgehammer, forcing -fno-stack-protector for every gcc/g++ in
the univ... Chromium build. Of course this is a somewhat nasty fix and there
should be a real fix somewhere in Chromium 26. But instead of wandering around
and picking cherries, we now go out for the slaughter until someone brings us
the damn cherries because we are FUURRRIII... no well... time for sleep :-)
May the mighty Hydra be with us!
Thanks to our great fellow @cillianderoiste, for joining the battle with his
almighty battle axe, crushing and burning some CPUs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Cillian de Róiste <cillian.deroiste@gmail.com>
This should at least mitigate our build error to only occur in v8 anymore.
Unfortunately we can't use v8 from nixpkgs right now, so we're going to put out
our sledgehammer in the next commit. Meanwhile, it doesn't hurt to get rid of
the bundled protobuf library, so let's do it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Unfortunately, we have build errors for version 25 in the bundled libvpx:
http://hydra.nixos.org/build/4173075http://hydra.nixos.org/build/4173066
As I can't reproduce this on my local system (I've disabled the option
CONFIG_CC_STACKPROTECTOR here), let's just hope that libvpx is the only part
that fails during build because of this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
The upgrade currently doesn't involve the -lite package, as we need to use a few
more dependencies from nixpkgs first before we can finally fully switch over to
the lite package, even though the update script will try to fetch it anyway.
In this update, one particular problem that arises in conjuction with the
seccomp BPF sandbox is caused by this commit:
https://chromiumcodereview.appspot.com/12209029
Which particularily filters flags to the clone() syscall. I've spent (wasted?) a
few hours figuring out the troublesome flag, eventually figuring it out and -
just by curiousity ("Do other distributions have the same problem?") - searched
the web for "chromium CLONE_DETACHED" and BEHOLD...
A post from our OWN mailinglist pops up with the same patch I intended to do:
http://article.gmane.org/gmane.linux.distributions.nixos/10356
So shame on me for not being subscribed to the mailing list, and big thanks to
Ian Farmer for the patch.
As a consequence I'm now subscribed.
So, back to chromium itself, version 26 builds fine and works so far without
much (more to come in later commits) trouble.
We also had to introduce three more dependencies:
* protobuf: This one is because we don't need to use the bundled one anymore,
so we can use the version in nixpkgs.
* speechd: Not sure whether this was bundled or not, but let's use nixpkgs
version as well to keep down build time.
* libXdamage: Needed for screen capturing support.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This involved a bit of patching, because pyglet is searching libraries at
runtime, so we hardcode the library paths into pyglet/lib.py.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
