Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | treewide: Mass replace 'libusb}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libusb1}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libtiff}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libsndfile}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libsamplerate}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libpulseaudio}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libpng}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'gmp}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'glibc}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'freetype}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'fftwFloat}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'fftwLongDouble}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'fftw}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'expat}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'cups}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'cairo}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'bzip2}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'boehmgc}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'binutils-raw}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'binutils}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | treewide: Mass replace 'attr}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | brackets: Fix udev reference in multiple-outputs branch | Tuomas Tynkkynen | 2016-01-24 |
| | |||
* | qt55.qtbase: fix syntax error | Thomas Tuegel | 2016-01-23 |
| | |||
* | qt54.qtbase: fix evaluation error | Thomas Tuegel | 2016-01-23 |
| | |||
* | chntpw: fix #11474, build with multiple-output glibc | Vladimír Čunát | 2016-01-20 |
| | |||
* | mdadm: fixup build with multiple-outputs | Vladimír Čunát | 2016-01-20 |
| | | | | Needed after 011c149ed5e5. | ||
* | Merge branch 'staging' into closure-size | Vladimír Čunát | 2016-01-19 |
|\ | |||
| * | refactor to use autoreconfHook where possible | Robin Gloster | 2016-01-18 |
| | | | | | | | | Close #12446. | ||
| * | Merge branch 'master' into staging | Vladimír Čunát | 2016-01-18 |
| |\ | |||
| | * | Merge pull request #12064 from FlorentBecker/eliom42 | vbgl | 2016-01-18 |
| | |\ | | | | | | | | | Eliom42 | ||
| | | * | cohttp: 0.17.1 -> 0.19.3 | Florent Becker | 2016-01-12 |
| | | | | |||
| | | * | js_of_ocaml: Allow caml >= 4.02 to find camlp4 | Florent Becker | 2016-01-08 |
| | | | | |||
| | | * | eliom: 4.1.0 -> 4.2.0 | Florent Becker | 2016-01-01 |
| | | | | |||
| | | * | js_of_ocaml: 2.5 -> 2.6 | Florent Becker | 2016-01-01 |
| | | | | |||
| | | * | ocsigen-server: 2.5 -> 2.6 | Florent Becker | 2016-01-01 |
| | | | | |||
| | | * | lwt: 2.4.6 -> 2.5.0 | Florent Becker | 2016-01-01 |
| | | | | |||
| | | * | ocaml-ssl: 0.4.7 -> 0.5.2 | Florent Becker | 2016-01-01 |
| | | | | |||
| | * | | Merge pull request #12450 from eduarrrd/pshs | Tobias Geerinckx-Rice | 2016-01-18 |
| | |\ \ | | | | | | | | | | | pshs: 0.2.6 -> 0.3 | ||
| | | * | | pshs: 0.2.6 -> 0.3 | Eduard Bachmakov | 2016-01-17 |
| | | | | | |||
| | * | | | simple-scan: 3.19.3 -> 3.19.4 | Tobias Geerinckx-Rice | 2016-01-18 |
| | | | | | |||
| | * | | | mdadm: Set allowedReferences to only include libc. | aszlig | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updates we had in the past (7719f7f and 1faf610) broke the mdadm installer test and systems in the wild using mdraid because newer mdadm versions contained a self-referenc to its own store path. Instead of putting a big warning about updating in the package expression, let's just add allowedReferences so the build immediately fails if there is a self-reference. Signed-off-by: aszlig <aszlig@redmoonstudios.org> | ||
| | * | | | mdadm: Clean up package expression. | aszlig | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use makeFlags directly instead of stitching together a makeFlagsArray in preBuild. This should make the expression much more readable and clean. Signed-off-by: aszlig <aszlig@redmoonstudios.org> | ||
| | * | | | mdadm: 3.3 -> 3.3.4 | aszlig | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Okay, this update is a bit more tricky and the patch I've included is not very nice to be honest. So the patch causes "mdadm --udev-rules" to search for the right store path using /proc/self/exec. This has the disadvantage that we could end up having /run/current-system/bin/mdadm in the rule file. But on the other hand, when we're on NixOS, we don't need to use that command *at*all*, so we should be safe. The patch also sets BINDIR to /sbin, which causes the included rule and systemd files to not work out of the box on NixOS. But we have a substituteInPlace where we do rewrite /sbin/mdadm to the right store path in our udev rule generator, so that shouldn't be an issue. I've tested this using the mdraid installer test and it succeeded. Signed-off-by: aszlig <aszlig@redmoonstudios.org> | ||
| | * | | | Merge pull request #12448 from jb55/terra-patch | Tobias Geerinckx-Rice | 2016-01-18 |
| | |\ \ \ | | | | | | | | | | | | | terra: init at git-2016-01-06 | ||
| | | * | | | terra: init at git-2016-01-06 | William Casarin | 2016-01-17 |
| | | | | | | |||
| | * | | | | chromium: Remove myself from maintainers | aszlig | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working on Chromium really drives me nuts due to its build time, also I really don't have quite a lot of time these days to properly maintain it anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org> | ||
| | * | | | | chromium: Do not rely on import-from-derivation | aszlig | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been introduced by me in 690a845 and discovered by @vcunat in his comment over at: https://github.com/NixOS/nixpkgs/commit/690a845de93a49e85480ad5fae492fa14658ce85#commitcomment-14209868 It's really a bit ugly to have builds running during evaluation, but back when I made that commit the reason was to avoid having to shell quote the hell out of it (see the comment in mkPluginInfo for the reason). Now we propagate plugin flags and environment variables as a list of arguments in a plain file that's appended verbatim to makeWrapper, so it shouldn't do any builds anymore during instantiation. I have tested this with both just WideVine and just Flash enabled as well as both in combination and none of the plugins and the output seems correct. However I didn't test to run Chromium with the new implementation. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Reported-by: Vladimír Čunát <vcunat@gmail.com> | ||
| | * | | | | tldr: use fetchFromGitHub; pkgconfig | Tobias Geerinckx-Rice | 2016-01-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkgconfig is unrelated, but trivial (removes a harmless but distracting error message) and doesn't warrant its own commit. | ||
| | * | | | | hack-font: 2.018 -> 2.019 | Tobias Geerinckx-Rice | 2016-01-18 |
| | | | | | |