Commit Graph

6660 Commits

Author SHA1 Message Date
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
4e39e578f2 lmms: fix build with freetype-2.5 2014-06-26 21:56:47 +02:00
Austin Seipp
2711f5772c gitolite: fix default update hooks
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-26 00:24:05 -05:00
Austin Seipp
13162e8cdb Fix gitolite docs
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp
ec4cd43ca8 gitolite: 3.6.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00
John Wiegley
d3790c569f Merge pull request #3067 from cstrahan/camlistore
add camlistore package
2014-06-24 15:21:12 -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
Lluís Batlle i Rossell
6edfe3e470 Making retroshare bootstrap the DHT fine. 2014-06-23 15:02:22 +02:00
Bjørn Forsman
e395f91607 zile: fix description (don't repeat package name) 2014-06-23 13:36:21 +02:00
Bjørn Forsman
654f9e38e6 zynaddsubfx: fix description (capitalize first word) 2014-06-23 13:04:57 +02:00
Bjørn Forsman
ba9254fcf3 abiword: add to channel 2014-06-23 12:54:46 +02:00
Bjørn Forsman
5dea7f0ed5 abiword: fix typo in description (Microsof -> Microsoft) 2014-06-23 12:45:13 +02:00
Charles Strahan
79e805e281 add camlistore package 2014-06-23 06:26:56 -04:00
Austin Seipp
f8d9d0e5bf Merge pull request #3045 from nslqqq/master
st: 0.4.1 -> 0.5
2014-06-22 19:09:31 -05:00
Austin Seipp
c2d33f05d0 Merge pull request #3046 from nslqqq/i3update
i3: 4.7.2 -> 4.8
2014-06-22 19:08:57 -05:00
Bjørn Forsman
4a5cf73caa cinelerra: don't repeat package name in meta.description 2014-06-22 22:49:32 +02:00
Bjørn Forsman
a14365b568 alchemy: add meta.longDescription 2014-06-22 21:46:34 +02:00
Vladimír Čunát
6ca980f0b4 llpp: fix freetype include path
Fixes build, probably after freetype-2.5 update.
2014-06-22 14:11:46 +02:00
Nikita Mikhailov
724fbd81ff i3: 4.7.2 -> 4.8 2014-06-22 18:17:09 +07:00
Nikita Mikhailov
d851ce331d st: 0.4.1 -> 0.5 2014-06-22 17:25:49 +07:00
Cillian de Róiste
15166ca5c2 Add KDE Connect: A tool to connect and sync your devices with KDE 2014-06-22 10:56:43 +02:00
Charles Strahan
ffc485547f enable bazaar on darwin 2014-06-22 02:57:05 -04:00
Bjørn Forsman
ba048baaff tig: enable command line history/completion support
Since version 2.0, tig can use readline for history/completion support,
so add readline as a build input.

Increases closure size from 53 MiB to 54 MiB.
2014-06-21 19:57:36 +02:00
John Wiegley
3b267d77a8 Merge pull request #3031 from jwiegley/proofgeneral
proofgeneral_4_3_pre: Add expression needed for current prooftree
2014-06-21 09:22:29 -07:00
John Wiegley
476700d56f git-annex: Build on Darwin, let Cabal determine proper flags 2014-06-21 09:20:46 -07: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
Peter Simons
92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment"
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
2014-06-21 13:15:50 +02:00
John Wiegley
bfe77718d4 emacs-modes-emms, emacs-modes-org: Relax platform qualifier 2014-06-20 22:37:09 -07:00
John Wiegley
073933101e proofgeneral: Delete default.nix for proofgeneral 2014-06-20 22:36:06 -07:00
John Wiegley
0cf6e55a70 proofgeneral_4_3_pre: Add expression needed for current prooftree 2014-06-20 22:31:55 -07: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
Thomas Tuegel
e07fde4017 Update zotero 4.0.20 -> 4.0.21.1 2014-06-20 08:00:06 -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
Austin Seipp
85c70f642f Merge pull request #2977 from bluescreen303/emacs-org2blog
Emacs org2blog - bring up to date - now works with org-8.* again
2014-06-18 16:21:02 -05:00
Austin Seipp
d349481e8b Merge pull request #2960 from third3ye/patch-2
Application.ini does not refer correctly
2014-06-18 16:18:54 -05:00
Austin Seipp
f72e9c1090 Merge pull request #2975 from bluescreen303/conkeror
conkeror: upgrade to latest snapshot
2014-06-18 16:09:52 -05:00
Austin Seipp
ae8e54c64b Merge pull request #2989 from pwoolcoc/git-cacert-path
add OPENSSL_X509_CERT_FILE to the `git` command environment
2014-06-18 16:09:22 -05:00
Austin Seipp
1e23c251e7 Merge pull request #2995 from pSub/dwb-update
Updated dwb to latest revision.
2014-06-18 16:08:52 -05:00
John Wiegley
4643126d10 Merge pull request #2938 from pSub/org-mode
Org-mode 8.2.7 depends on texlive-cm-super.
2014-06-18 09:42:12 -07:00
Peter Simons
f7c7282964 Merge pull request #2979 from bluescreen303/idris
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
2014-06-18 10:00:00 +02:00
Wout Mertens
d619f0ef6d sublime3: fix plugin_host (close #2804)
Also move the binaries in their own package, so it doesn't pollute the
profile.
2014-06-17 21:15:37 +02:00