3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2049 commits

Author SHA1 Message Date
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Jaka Hudoklin 7f467aeeb2 Merge pull request #3315 from fignuts/master
Add SpiderOak secure backup service.
2014-07-26 02:19:51 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra 5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 21c7ed54e3 firefox: Update to 31.0
Also boldly re-enable parallel building.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 97ced6f718 firefox-3.6: Remove
This version is ancient.
2014-07-23 12:56:53 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát adc2edd5cf thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra
2014-07-22 22:18:24 +02:00
Andrew Morsillo 7f96fff12b Add SpiderOak secure backup service. 2014-07-18 16:21:48 -04:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Ricardo M. Correia dd41c19ab1 flashplayer: Update from 11.2.202.378 -> 11.2.202.394 2014-07-14 14:36:35 +02:00
aszlig 4086f7c978
twister: Add new package, version 0.9.22.
This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-13 23:56:11 +02:00
lethalman 1e806db8db Merge pull request #3174 from pSub/dconf-issue
Fixed settings issue.
2014-07-10 11:17:10 +02:00
Lluís Batlle i Rossell 8aca2c5fa0 Adding retroshare 0.6 (unstable) 2014-07-09 22:24:28 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Benno Fünfstück 52c8df4ad3 dwb: add wrapper and use GTK2 for plugin support 2014-07-07 21:00:53 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Luca Bruno 873832ab6d telepathy-gabble: build on hydra 2014-07-06 11:50:30 +02:00
John Wiegley 67e4df75dd Revert "mutt: update to 1.5.23"
This reverts commit 6a7d60c01a.
2014-07-04 15:48:14 -05:00
Pascal Wittmann a628da8b64 Update dwb to latest revision 2014-07-04 15:20:08 +02:00
Pascal Wittmann 6d13d1e521 Fixed settings issue.
The following warning was shown when I clicked on links:
'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
2014-07-03 23:19:15 +02:00
Ricardo M. Correia 3614b34c6a transmission: Update from 2.83 -> 2.84 2014-07-03 11:39:11 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
_1126 61c200391a mutt: added mailpath.patch. 2014-07-02 17:14:20 +02:00
_1126 6a7d60c01a mutt: update to 1.5.23
This commit rewrites the expression somewhat:

- it tries to simplify the expression.
- it changes from fetchurl to fetchhg.
- a patch to configure.ac is added in order to enable configuring the
  source on NixOS.
2014-07-02 17:08:45 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin ce623950ad Update bip 2014-07-01 12:08:07 +04:00
Michael Raskin 0733404aca Update baresip 2014-07-01 11:54:09 +04:00
Oliver Charles e11813c8fe Merge pull request #3142 from pSub/dwb-dconf-issue
Fixed dwb startup issue
2014-07-01 08:43:50 +01:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Pascal Wittmann eb851b6a19 Fixed dwb startup issue 2014-06-30 14:36:51 +02:00
Michael Raskin 3a197214f9 Merge pull request #3068 from taku0/firefox-bin-30.0
add firefox-bin: the binary package for Firefox web browser
2014-06-30 10:31:43 +04:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Nikita Mikhailov e2ff019965 skype: 4.2.0.13 -> 4.3.0.37 2014-06-26 22:42:21 +07:00
Ricardo M. Correia 11d6964c74 flashplayer: Update from 11.2.202.359 -> 11.2.202.378 2014-06-23 15:50:24 +02:00
taku0 64016c57e7 add firefox-bin: the binary package for Firefox web browser 2014-06-23 22:03:11 +09:00
Lluís Batlle i Rossell 6edfe3e470 Making retroshare bootstrap the DHT fine. 2014-06-23 15:02:22 +02:00
Lluís Batlle i Rossell 116807aa55 retroshare: place plugins at proper place
Now they can be used.
2014-06-21 15:53:57 +02:00
Austin Seipp 4d0d891644 Merge pull request #3019 from matejc/syncthing0815
syncthing: update from 0.8.11 to 0.8.15
2014-06-20 16:41:09 -05:00
Vladimír Čunát 3ec2cea214 Merge master into x-updates
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
Vladimír Čunát a00c345343 telepathy_mission_control: minor update, doCheck
Also add meta, and support upower.
2014-06-19 23:44:50 +02:00
Vladimír Čunát 87ef13ee80 telepathy-gabble: major update 0.17.2 -> 0.18.2
Also doCheck, enableParallelBuilding, and add meta attributes.
2014-06-19 23:44:50 +02:00
aszlig ca545ac8ec
chromium: Update beta channel to v36.0.1985.84.
Tested and successfully built on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 19:54:34 +02:00
Matej Cotman 25785270b7 syncthing: update from 0.8.11 to 0.8.15 2014-06-19 18:04:18 +02:00
aszlig 3ae3f3272f
chromium: Don't add sources as runtime dependency.
This is because of a single file that symlinks to the source output
path:

libexec/chromium/resources/extension/demo/library.js

Target within source output path:

chrome/browser/resources/extension_resource/demo/library.js

So we just need to ensure that the cp command follows symlinks during
installPhase and we should no longer have this unnecessary dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:36 +02:00
aszlig 0c50978cb8
chromium: Hardcode dlopen() path for libexif.
This is needed for Chromium version 36 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:35 +02:00
aszlig 47214207b9
chromium/update: Fix fetching previous version.
After refactoring the updater we no longer did properly propagate the
exit code from the nix-prefetch-url call to the main script. So if the
newest version could not be fetched it didn't even bother to try the
previous release and we would end up with an empty hash.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:35 +02:00
aszlig 4cbedd7322
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 35.0.1916.114 -> 35.0.1916.153
beta:   35.0.1916.86  -> 36.0.1985.67
dev:    36.0.1964.2   -> 37.0.2054.3

All builds successfully tested on my machine, however in order to update
the beta and dev channels, a few additional modifications were
necessary:

 * Update/rebase USER_NS sandbox patch for version 36 and higher.
 * Create address_input_strings.grdp before running gyp in version 37.
 * Remove an empty string leftover from 0517041.
 * Add patch for building bundled Angle for version 37.

The patch for Angle is to remove reliance on git being present during
build and is from https://chromium-review.googlesource.com/202048 but
with own modifications to remove/fix Windows-specific parts within the
patch file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:34 +02:00
aszlig 3d665679c1
chromium: Properly implement mksnapshot target.
Let's ensure we do all architecture-dependant stuff inside
mkChromiumDerivation and not pass archInfo around, so we can properly
decouple it from the main function.

This partially reverts 8d54dc6d13.

The main reason for doing this is because the architecture information
is no longer required in Chromium 37, so let's uglify and XXX it in
common.nix and remove it once version 37 hits the stable channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:34 +02:00