1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Commit graph

6335 commits

Author SHA1 Message Date
aszlig cad411f61d
chromium/plugins: Use Debian package from sources.
This now uses the Debian package from the sources derivation instead of
hardcoding it, so we finally should have proper PepperAPI plugin support
without crashing plugins and whatnot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 6184ee89fe
chromium/update: Update Debian binaries as well.
This cases the Debian binaries to be fetched from Google's official APT
repository. If we aren't able to find a package from the APT repository,
it's very likely that it already got deleted upstream and we need to
fallback to mirrors instead.

Unfortunately, we can't use mirrors for updating, because Google doesn't
sign the Debian packages themselves and only the release files.

We're going to hook it into a Chromium updater soon, making the sha256
hashes publicly available, so if it is missing, we can still put the
sha256 manually into sources.nix, without risking anything by blindly
fetching from one of the provided mirrors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 2741523926
chromium: Remove URL in sources.nix and updater.
The updater is now splitted between a shellscript and a Nix expression
file which contains helpers and lookup functions to reconstruct all
information needed in order to fetch the source tarballs.

This means, that the sources.nix now doesn't contain URLs and only
versions and the corresponding SHA256 hashes. Of course, right now this
sounds like it's unnecessary, but we're going to fetch binaries soon so
it's a good idea to not unnecessarily clutter up sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
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
Bjørn Forsman 2b9c96878c qmmp: update 0.7.5 -> 0.7.6
Changes since 0.7.5:
 * added libav 10 and ffmpeg 2.2 support;
 * fixed url parsing;
 * fixed freezing on playback resume;
 * fixed random freezing in the mplayer plugin;
 * fixed reset selection of tracks when calling context menu;
 * fixed multimedia keys support under win32.
2014-04-13 19:07:06 +02:00
Austin Seipp 2661400d2a cgit: bump git version to 1.9.2
This also updates the download URL to use kernel.org

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-13 00:47:16 -05:00
Ertugrul Söylemez a0886ae024 keepassx: Renamed KeePassX 2.0 to keepassx2. 2014-04-13 03:28:20 +02:00
Domen Kožar 1988bbd990 Merge pull request #2231 from jwiegley/master
Change several package constraints from linux to unix
2014-04-13 00:24:28 +02:00
John Wiegley 010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
Benno Fünfstück 2fd160f027 haskell: update yi to 0.8.1 2014-04-12 20:33:15 +02:00
taku0 c4eadfbac5 add thunderbird-bin: the binary package for Thunderbird mail client 2014-04-13 00:29:14 +09:00
Cillian de Róiste 02e693c400 synthv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:29 +02:00
Cillian de Róiste 440a174e2d samplv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:13 +02:00
Cillian de Róiste aee930586f drumkv1: update from 0.4.0 to 0.4.1 2014-04-12 11:57:43 +02:00
Mathijs Kwik d87ae02fc1 synergy: upgrade to 1.4.17 2014-04-11 14:09:07 +02:00
Peter Simons b5773eeccb R: update to version 3.1.0 2014-04-11 12:07:00 +02:00
Peter Simons 8392c8ba9f Merge pull request #2195 from linquize/git-1.9.2
git: Update to 1.9.2
2014-04-10 12:42:53 +02:00
Mathijs Kwik 3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Linquize ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Ricardo M. Correia 8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Domen Kožar e5e27cfd64 Merge pull request #2153 from lethalman/gnome3
accounts-daemon service, fix gnome-shell, add libgnomekbd, musicbrainz5, sushi, gnome-contacts
2014-04-09 15:01:17 +02:00
Peter Simons 1682bde4e0 gitAndTools.svn2git: update from 2.2.2 to 2.2.5 2014-04-09 12:41:10 +02:00
Peter Simons c244d6e1b8 gitAndTools.stgit: update from 0.16 to 0.17.1 2014-04-09 12:41:10 +02:00
Luca Bruno 8553993887 telepathy-mission-control: add dbus service, enabled by default on gnome3 2014-04-09 00:36:52 +02:00
Ricardo M. Correia 54a8e0ed0f flashplayer: Update from 11.2.202.346 -> 11.2.202.350 2014-04-08 17:45:52 +02:00
Peter Simons 7f90e454fb ikiwiki: update to version 3.20140227 2014-04-08 12:48:22 +02:00
Peter Simons 79f19f687c flymake-cursor: the sha256 hash of the file has changed
No change was documented on the emacs wiki. Not sure what happened. :-(
2014-04-08 12:48:22 +02:00
Peter Simons 1b1225fb0b flymake-cursor: remove redundant 'meta.platforms = stdenv.lib.platforms.all' setting 2014-04-08 12:48:22 +02:00
Mathijs Kwik 593c633aa8 emacs-idris-mode: upgrade to support idris 0.9.12 2014-04-08 08:38:43 +02:00
Alex Berg 7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 15:08:07 -05:00
Peter Simons ff49602b17 haskell-git-annex: update to version 5.20140405 2014-04-07 17:06:34 +02:00
Austin Seipp 5aa4495cb5 boolector: add version 1.5 and 1.6
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 09:17:05 -05:00
Peter Simons 9000db8b1e haskell-git-annex: update to version 5.20140402 2014-04-06 21:53:16 +02:00
Domen Kožar 29bc5feb1d Merge pull request #2139 from lethalman/gnome3
Fix gsettings schemas usage for several packages due to #1901
2014-04-06 13:59:46 +02:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
2014-04-06 11:02:21 +02:00
Emery Hemingway 09cdc6edf5 f2fs-tools,ncdc: set platform and add myself to maintainers 2014-04-05 21:31:40 -04:00
Shea Levy 5441b1a98b Merge branch 'teamviewer-fix-upgrades' of git://github.com/bjornfor/nixpkgs
teamviewer: fix brokenness after updates / GC
2014-04-05 18:55:48 -04:00
Shea Levy a68c12d35b git: Remove phony not-supported wrappers.
Fixes #1751
2014-04-05 18:39:53 -04:00
Bjørn Forsman 31ab1fd7ae teamviewer: fix brokenness after updates / GC
Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
paths become garbage collected, teamviewer crashes upon start because of
those broken symlinks. An easy workaround to this behaviour is simply to
delete all symlinks before we start teamviewer. Teamviewer will fixup
the symlinks, just like it did the first time the user ran it.
2014-04-06 00:23:59 +02:00
Michael Raskin 9233723353 Temporary patch for Wireshark build 2014-04-06 00:57:35 +04:00
Shea Levy 12c1321fa4 Merge branch 'master' of git://github.com/urv/nixpkgs
calibre: upgrade from 1.25.0 to 1.31.0
2014-04-05 15:56:55 -04:00
Shea Levy 63d91b75a1 Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs"
It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074f, reversing
changes made to ea9c8d6a13.
2014-04-05 14:43:00 -04:00
Shea Levy 718466074f Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs
Wrap k3b with PATH to required tools
2014-04-05 14:38:06 -04:00
Jaka Hudoklin 413ebfb246 virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
2014-04-05 18:37:05 +02:00
Vladimír Čunát 4ab58240a9 pidgin: adopt the orphan, as I use it daily
CC #992.
2014-04-04 20:29:49 +02:00
Matej Cotman 7df1ce5088 syncthing: new package and nixos module 2014-04-04 10:46:29 +02:00
Arvin Moezzi f82b678508 calibre: upgrade from 1.25.0 to 1.31.0 2014-04-04 09:25:32 +02:00
Peter Simons f2cb92f5d4 maxima: update to version 5.33.0 2014-04-03 20:13:35 +02:00
Evgeny Egorochkin 5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
Evgeny Egorochkin 9b4080b7af mercurialFull: update from 2.9.1 to 2.9.2 2014-04-03 10:28:15 +03:00
Evgeny Egorochkin 3830fa8195 add git repositry and meta.branch 2014-04-03 07:55:17 +03:00