1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

6281 commits

Author SHA1 Message Date
aszlig 8bc8b51375
chromium: Move source package into own subdir.
Next, we're going to refactor update.sh and the first step is to ensure
that we keep everything related to sources into its own subdirectory to
not clutter up the main directory too much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig 202755ca2f
chromium: Properly pass packageName and version.
We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig eadbf855b0
chromium: Revert back to copying bundled sources.
I'm giving up on this after several attempts to correctly unbundle the
largest part, namely Google's WebKit fork Blink. Right now it's so much
tied into the Chromium source it's going to be fairly hard to do if
you're not working full time on it.

Also, the intermediate steps needed to do this properly would introduce
uneccesary complexity on our side, so we really need to finish this
without leaving it in the "messy" state in order to not make Chromium
even more difficult to maintain than it is already.

However, anyone who wants to proceed on this messy step is free to
revert this commit and continue doing so. In my case I'm going to try
again once https://crbug.com/239107 and https://crbug.com/239181 are
fixed in _stable_ (I don't want to introduce *lots* of conditionals on
the version either).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig c6fa73b26c
chromium: Propagate browser's meta to the wrapper.
We obviously don't want the Hydra job of nixpkgs to fail, so we need to
make sure that we have a proper meta attribute on the outermost
derivation.

For builds based on the Chromium source tree (like for example libcef),
we can still move the wrapper elsewhere when we need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig cce984b324
chromium: Correct tools path in blink_idl_parser.
This is because of our symlink mess, as Chromium's build support scripts
are trying to resolve everything based on absolute paths and we split
off the bundled sources from the main derivation.

Yes, I'm refering to this as a mess, because in the end, we're going to
patch up the gyp files and use references someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig d8ba5b3eff
chromium: Add bundled dependencies for dev/beta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 5021717099
chromium: Split off sandbox from the browser.
Now, we no longer tie the sandbox directly to the browser derivation but
wrap everything together into one derivation at the entry point at
default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig c86d376c82
chromium: Selectively link bundled libraries.
So far we just copied everything from source.* into the build directory
during the prePatch. This somewhat defeated the purpose of the source
splitup because it involved more I/O than just unpacking the entire
source tree.

Now, we're selectively *symlinking* the bundled sources into the build
directory. Even that isn't perfect because in the end we'd just
reference foreign derivations and we're done. But for now, this gets us
at least prepared for a massive reduction of compile time.

Unfortunately, gyp's behaviour when it comes to symlinks is quite
painful to come by, so we need to fix a few references to use absolute
paths.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 16af058ff9
chromium: Move plugins into its own Nix file.
We now no longer pass enablePepperFlash and enablePepperPDF to the
browser package itself and only use plugins.flagsEnabled from there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 1ae328ba86
chromium: Factor out source into its own Nix file.
The name is a bit unfortunate, so it would make sense to rename
"sources.nix" into something else.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig 88a939c2d1
chromium: Decouple browser from default.nix.
This currently only passes through the arguments and is nothing more
than the foundation of the new structure. In essence, I want to have a
really small default.nix which is then going down into the respective
subparts that are isolated from each other.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig c2abe4da6c
chromium: Add support for ppapi flash and PDF.
This is hardcoded for the dev channel at the moment and we're going to
fetch it along with the main Chromium sources.

Also I'm putting this in default.nix at the moment, because we're going
to tear apart the whole Chromium package into several subparts soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig c9c9ca38b9
chromium: Build using minizip from nixpkgs.
Well, the gyp flag mentions "zlib" but in reality, minizip is used.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig 5b67290740
chromium: Build using libpng from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig 823b72d0ad
chromium: Build with libwebp from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig 2f23f57b28
chromium: Build beta/dev with v8 from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
aszlig 9f45c2cbba
chromium: Prepare for building the -lite package.
We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
aszlig e2dba7c6cf
chromium: Use version 3 of libgnome_keyring.
Starting with version 35, version 2 of libgnome_keyring is no longer
supported and it's probably pretty useless to do backports to version 2,
given the assumption that most users on Nix probably don't use it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
Bjørn Forsman 8b666e44fd Unbreak tarball job
Fix undefined variable in pamixer.
2014-04-18 22:48:12 +02:00
Michael Raskin 2ceedb2d64 Merge pull request #2305 from jwiegley/ledger
Update ledger expression, add myself as a maintainer
2014-04-18 10:46:43 -07:00
Michael Raskin 97a3a803e1 Merge pull request #2313 from 1126/master
Adding pamixer.
2014-04-18 10:31:25 -07:00
Michael Raskin b1fad4ab9b Merge pull request #2279 from kowey/master
megam: New package
2014-04-18 10:19:44 -07:00
Michael Raskin 7231b6b94e Merge pull request #2248 from ehmry/rsync
rsync updated 3.0.9 to 3.1.0, rsyncd service module
2014-04-18 10:17:08 -07:00
Michael Raskin 6cdce9deec Merge pull request #2220 from taku0/thunderbird-bin-24.0.0
add thunderbird-bin: the binary package for Thunderbird mail client
2014-04-18 10:16:35 -07:00
Michael Raskin d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
_1126 25f7565657 Merge branch 'pamixer' 2014-04-18 16:09:50 +02:00
_1126 96257ea486 Adding pamixer. 2014-04-18 16:09:34 +02:00
John Wiegley 5c18bbe34f Update ledger expression, add myself as a maintainer 2014-04-17 21:47:15 -05:00
Rok Garbas 7aa3790f34 adding development version of weechat (alongside stable) 2014-04-17 22:22:54 +01:00
Ricardo M. Correia 09f0d57842 bitcoin: Update from 0.8.6 -> 0.9.1 2014-04-17 20:47:18 +02:00
Eelco Dolstra f2cb4def59 qemu: Update to 1.7.1 2014-04-17 15:54:42 +02:00
Domen Kožar e325926595 Merge pull request #2300 from lethalman/gsettings
Fix gsettings schemas for several gtk3 apps
2014-04-17 14:29:27 +02:00
Luca Bruno 82744e57d6 pitivi: fix gsettings schemas, depend upon gnome-desktop 2014-04-17 13:42:51 +02:00
Luca Bruno 8dbdebb50f gnumeric: fix gsettings schemas 2014-04-17 13:42:51 +02:00
Luca Bruno 64d4b9c3de transmission-remote-gtk: fix gsettings schemas 2014-04-17 13:42:51 +02:00
Luca Bruno 6f61f7dc0d midori: fix gsettings schemas
Could not test it because it does not compile for other reasons.
2014-04-17 13:42:50 +02:00
Luca Bruno 7d64d63a1c spacefm: fix gsettings schemas
Could not test it as the application did not start
for other reasons.
2014-04-17 13:42:50 +02:00
Luca Bruno 4cfe7a7334 transmission-gtk: fix gsettings schemas, closes #2295 2014-04-17 13:42:50 +02:00
Austin Seipp 1a2784ee68 btsync: 1.3.77 -> 1.3.87
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-16 18:56:22 -05:00
Eelco Dolstra a1af25033a git send-email: Respect $OPENSSL_X509_CERT_FILE 2014-04-16 18:43:39 +02:00
Lluís Batlle i Rossell edee246684 Updating gnunet to 0.10.1. 2014-04-16 15:22:31 +02:00
Eric Kow 9e457049e4 megam: New package
Maximum Entropy (GA) Model Optimization Package
2014-04-15 14:00:56 +01:00
Peter Simons 3275e47613 Merge pull request #2262 from jwiegley/git
On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds
2014-04-15 10:31:07 +02:00
Bjørn Forsman c83903069f gnuradio: update 3.7.2.1 -> 3.7.3
Changelog:
http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_3/

(Build tested.)
2014-04-15 07:11:41 +02:00
Austin Seipp 6376ac57d8 emacsPackages: add cryptol-mode
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-14 18:23:51 -05:00
John Wiegley cfe42425c3 On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds 2014-04-14 14:53:15 -05:00
Domen Kožar 6449bc2f23 Merge pull request #2244 from lethalman/gsettings
audacious, sflphone: find gsettings schemas
2014-04-14 09:43:35 +02:00
Emery Hemingway 93e9154805 rsync updated 3.0.9 to 3.1.0, rsyncd service module 2014-04-13 23:25:28 -04:00
Luca Bruno 57b6ecb799 sflphone: find gsettings schemas 2014-04-13 23:50:21 +02:00
Luca Bruno 091ce87a00 audacious: find gsettings schemas 2014-04-13 23:30:15 +02:00