Commit Graph

6632 Commits

Author SHA1 Message Date
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
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
Pascal Wittmann
41e5fd84c3 Updated dwb to latest revision. 2014-06-17 16:25:53 +02:00
Paul Woolcock
88b5578a57 add OPENSSL_X509_CERT_FILE to the git command environment 2014-06-16 21:55:43 -04:00
Mathijs Kwik
ff995adb0d emacs-idris-mode: upgrade to 0.9.13.1 2014-06-16 22:43:51 +02:00
Mathijs Kwik
b193dd5d77 emacs-org2blog: upgrade to 0.8.1 2014-06-16 22:43:11 +02:00
Mathijs Kwik
ab8337e4fc add emacs-metaweblog 2014-06-16 22:43:10 +02:00
Mathijs Kwik
69492796ef conkeror: upgrade to latest snapshot 2014-06-16 22:43:01 +02:00
Vladimir Kirillov
2dfb036a30 rsync: sha256 for the patch was updated 2014-06-16 23:20:24 +03:00
Pascal Wittmann
63ee29b808 Org-mode 8.2.7 depends on texlive-cm-super. 2014-06-16 21:58:59 +02:00
Peter Simons
c5b7e2a2f2 haskell-git-annex: update to version 5.20140613 2014-06-16 16:12:36 +02:00
third3ye
a322687423 Application.ini does not refer correctly
The "Application.ini" provided with Thunderbird does not correctly set the path to the icon location. Visa vi it refers to '$out/lib/thunderbird-17.0.11esr', which doesn't exist, but '$out/lib/thunderbird-17.0.11' does. To remedy this problem I added a new variable called 'verName" which adds 'esr' after the variable '$version'. Then change the variables necessary so that the build process sets working references.

Fuuzetsu suggested putting the verName variable inside of mkDerivation. I cannot surmise.
2014-06-16 05:24:24 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Bjørn Forsman
7911072947 sweethome3d: remove '.' at end of description 2014-06-15 13:49:55 +02:00
Edward Tjörnhammar
97f45b1e11 Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor 2014-06-15 13:04:59 +02:00
Peter Simons
fd61a8fce2 Merge pull request #2929 from pSub/org-mode
Update org-mode from 8.2.6 to 8.2.7 and add myself as a maintainer.
2014-06-13 15:47:41 +02:00
Peter Simons
1380b62fdb haskell-sloane: update to version 1.8 2014-06-13 15:41:25 +02:00
Pascal Wittmann
19110c9a53 Update org-mode from 8.2.6 to 8.2.7 and add myself as a maintainer. 2014-06-13 14:21:39 +02:00
Michael Raskin
566ef0e31a Adding an auto-updater script for qiv and updating it to 2.3.1 2014-06-13 13:37:12 +04:00
Michael Raskin
64274e9981 MuPDF: Add an auto-updater script and update to the latest version. 2014-06-13 13:37:12 +04:00
Michael Raskin
ed7b509fbf Oops. Fix the permissions on initialized persistence file for Dia 2014-06-13 01:33:18 +04:00
Michael Raskin
6b35f37005 Fix dia when run not from $PATH 2014-06-13 01:22:56 +04:00
Austin Seipp
1dbc7c4567 Merge pull request #2882 from iyzsong/n/xmp
add xmp, a extended module player
2014-06-12 08:51:33 -05:00
Michael Raskin
80b701ca94 Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691. 2014-06-12 15:02:49 +04:00
Michael Raskin
8dca1caeb9 Merge pull request #2479 from urv/master
upgraded calibre & scummvm and added haskel-monad-parallel nix expression
2014-06-12 12:59:15 +04:00
Michael Raskin
23869e0006 Merge pull request #2907 from falsifian/firefox_30
Firefox 30.0
2014-06-12 12:19:03 +04:00
Arvin Moezzi
0dfd7efd36 calibre: upgrade from 1.31.0 to 1.35.0 2014-06-12 09:30:39 +02:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00