Commit graph

6667 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
宋文武
513165fc9a add xmp 4.0.7 2014-06-10 12:07:41 +08:00
John Wiegley
d0365a6cde git-annex: build on Darwin, and rely on cabal to set flags
Fixes #2519
2014-06-10 02:28:23 +00:00
Domen Kožar
fb9c0d53b2 xbmc: 13.0 -> 13.1 2014-06-09 20:42:57 +02:00
Vladimír Čunát
97006eb5ed Merge #2638: fix weechat build on darwin
Conflicts (trivial):
	pkgs/development/python-modules/pycrypto/default.nix
2014-06-09 19:37:06 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Peter Simons
1a1c1ba734 haskell-git-annex: update to version 5.20140606 2014-06-09 10:26:59 +02:00
Peter Simons
8c14496987 haskell-git-annex: update to version 5.20140529 2014-06-09 10:26:53 +02:00
Peter Simons
f6eddf9e72 Merge pull request #2863 from Fuuzetsu/yi
yi: improve expression
2014-06-09 10:08:54 +02:00
Michael Raskin
2884f2c273 Merge pull request #2507 from lovek323/sup
sup: update to 0.18.0
2014-06-09 11:25:48 +04:00
Michael Raskin
ba0cc81737 Merge pull request #2858 from offlinehacker/nixos/atom/add
Add github atom, a hackable text editor for the 21st Century
2014-06-09 09:47:09 +04:00
cillianderoiste
fc91b87dd3 Merge pull request #2762 from pSub/llpp
Added llpp, a mupdf based pdf pager written in ocaml.
2014-06-08 11:17:15 +02:00
John Wiegley
c6261157f8 prooftree: new expression 0.12 2014-06-08 05:35:49 +00:00
John Wiegley
6a3a9589e2 macvim: add missing call to ensureDir 2014-06-07 20:22:58 +00:00
John Wiegley
c06613a3af macvim: move the .app bundle to $out/Applications 2014-06-07 20:18:27 +00:00
John Wiegley
03bd5f9f44 Merge pull request #2856 from cstrahan/macvim
add MacVim
2014-06-07 15:16:48 -05:00
Mateusz Kowalczyk
a91a4e9db2 yi: improve expression
Disable Haddock docs so that it actually builds (bug in GHC 7.6.3), make
pango optional (OSX people often complain), tell the binary where to
find various libraries needed at runtime (currently it could not find
even its own library).
2014-06-07 21:33:46 +02:00
Charles Strahan
72cd8ce56c add MacVim 2014-06-07 15:26:01 -04:00
Pascal Wittmann
b40ce8a1f1 Update feh from 2.11 to 2.12.
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
2014-06-07 15:22:20 +02:00
Pascal Wittmann
91b2021782 feh: Set the default theme explicitly to 'feh'
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
2014-06-07 15:18:09 +02:00
Jaka Hudoklin
905081c029 Add github atom, a hackable text editor for the 21st Century 2014-06-07 12:46:51 +02:00
Peter Simons
80a60810ca emacs-sbt-mode: add initial version 2014-06-05 14:34:32 +02:00
Peter Simons
1fc21bd6a9 emacs-scala-mode: package version 2 2014-06-05 14:34:31 +02:00
Eelco Dolstra
1da6a7d4a9 Remove illegal meta.src attributes 2014-06-05 13:04:18 +02:00
Pascal Wittmann
86b7cf8bb4 Added llpp, a mupdf based pdf pager written in ocaml.
Updated lablgl to 1.05 and mupdf to 1.4.
Added myself as maintainer for lablgl.
2014-06-04 22:15:06 +02:00
Emery Hemingway
6306d81e8a ncdc: update to 1.19.1 for security fixes 2014-06-04 09:47:00 -04:00
Austin Seipp
a470fcff8c Merge pull request #2807 from cstrahan/vim-update
update vim to v7.4.316
2014-06-03 20:34:18 -05:00
Austin Seipp
62b35c2c22 Merge pull request #2779 from ttuegel/znc
update znc 1.2 -> 1.4
2014-06-03 20:33:24 -05:00
Austin Seipp
c7f93873db Merge pull request #2805 from edwtjo/idea-13.1.3
IDEA 13.1.2 -> 13.1.3
2014-06-03 20:31:20 -05:00
Austin Seipp
da3c03f6f8 Merge pull request #2819 from jagajaga/dwb_update
dwb: update
2014-06-03 20:30:49 -05:00
Arseniy Seroka
26c50cd60f dwb: update 2014-06-04 00:06:14 +04:00
Philip Lykke Carlsen
e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Eelco Dolstra
36f5ede37a geeqie: Fix incorrect longDescription formatting
Note that longDescription should not be formatted as:

  longDescription =
    '' Bla bla
       bla bla
    '';

because this will cause the second line to have more preceding
whitespace. It should be:

  longDescription =
    ''
      Bla bla
      bla bla
    '';
2014-06-03 11:47:39 +02:00
Charles Strahan
0ec25c6f94 update vim to v7.4.316 2014-06-01 21:09:55 -04:00
Jason "Don" O'Conal
58ade1d1db sup: update to 0.18.0 2014-06-02 08:33:29 +10:00
Jason "Don" O'Conal
9b080f87e4 weechat: fix pythonpath 2014-06-02 08:10:38 +10:00
Edward Tjörnhammar
05dbaa9a17 IDEA 13.1.2 -> 13.1.3 2014-06-01 18:29:27 +02:00
Rok Garbas
db8ba58402 tig: update to 2.0.2 2014-06-01 14:39:55 +01:00
Rok Garbas
9c3d455c0b jsmeter: update to 2.11 2014-06-01 14:37:48 +01:00
Rok Garbas
693219f1b7 weechatDevel: update to latest (few nice bugfixes) 2014-06-01 14:37:08 +01:00
Rok Garbas
8e72c1ef71 vifm: update to 0.7.7 2014-06-01 14:36:45 +01:00
John Wiegley
32c3bcaa80 emacs24Macport: new expression
This is "Mac port" addition to GNU Emacs 24. This provides a native GUI
support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later already
contain the official GUI support via the NS (Cocoa) port for Mac OS X
10.4 and later. So if it is good enough for you, then you don't need to
try this.
2014-05-31 20:39:48 +00:00
Bjørn Forsman
91d40ef2ea avrdudess: new package
AVRDUDESS is a GUI for AVRDUDE. In other words, it is a GUI for
programming AVR microcontrollers.
2014-05-31 19:31:35 +02:00
Bjørn Forsman
61b79d2eee pulseview: new package
PulseView is a Qt-based LA/scope/MSO GUI for sigrok (a signal analysis
software suite).

http://sigrok.org/
2014-05-31 15:49:13 +02:00
Eelco Dolstra
61befa0451 git: Update to 1.9.4 2014-05-31 09:47:21 +02:00
Rickard Nilsson
11ac14f31b spotify: Update from 0.9.4.183.g644e24e.428 to 0.9.10.17.g4129e1c.78 (only for x86_64) 2014-05-30 10:18:39 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Lluís Batlle i Rossell
9df4bb9d67 ocropus: it was still missing a package: lxml
Now "./run-tests" passes. But it can't be run without DISPLAY, so
I don't run it in the builder.
2014-05-29 10:13:31 +02:00
Lluís Batlle i Rossell
caa9007e84 Making ocropus-hocr run (matplotlib + gdk backend)
I added the gtk backend to matplotlib; if these added dependencies are
too much, we can make this optional.
2014-05-29 09:46:03 +02:00
Lluís Batlle i Rossell
338969701c Fixing upnp in syncthing 2014-05-28 15:23:36 +02:00
Lluís Batlle i Rossell
6a35958936 Adding missing dependencies. There is still a matplotlib problem running ocropus-hocr. 2014-05-28 12:39:54 +02:00