Commit graph

6617 commits

Author SHA1 Message Date
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
taku0 22b0306976 thunderbird-bin: update to version 24.6.0 2014-06-11 22:33:26 +02:00
System administrator dbf92db3b9 teamviewer: fix broken links (close #2901) 2014-06-11 20:19:03 +02:00
James Cook 2fec892959 firefox: bump to 30.0. 2014-06-11 11:02:28 -07:00
Peter Simons 9b899d8600 esniper: update to version 2.31.0 2014-06-11 12:05:06 +02:00
Austin Seipp faa58159e1 Merge pull request #2885 from wmertens/pgadmin-1.18.1
pgadmin: bump to 1.18.1
2014-06-10 18:13:26 -05:00
Austin Seipp 6fe363e8c2 Merge pull request #2886 from madjar/master
davmail: update to 4.5.0
2014-06-10 18:13:10 -05:00
Austin Seipp fe9133d522 verifast: 14.5, x86_64 linux only
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-10 16:38:45 -05:00
Vladimír Čunát f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Georges Dubus e1267f48a6 davmail: update to 4.5.0 2014-06-10 16:34:07 +02:00
Wout Mertens 84b8a9ceb0 pgadmin: bump to 1.18.1 2014-06-10 15:31:48 +02:00
Rickard Nilsson 2e3c0f2d30 vimb: Upgrade from 2.2 to 2.4 2014-06-10 14:40:16 +02:00
Rob Vermaas 3d2091b9fa filezilla: update from 3.8.0 to 3.8.1, potentially fixes CVE-2013-4668 2014-06-10 13:19:57 +02:00
John Wiegley 0085a1aae3 potrace: allow building on any unix 2014-06-10 08:57:41 +00:00
Michael Raskin 26c8490ea1 Install libpotrace 2014-06-10 11:24:43 +04:00
Michael Raskin f4987a0edc Update Monotone and add source-updater script 2014-06-10 09:21:26 +04:00