3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6678 commits

Author SHA1 Message Date
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
Oliver Charles 37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes
Source missing fixes
2014-07-01 08:43:27 +01:00
Mihaly Barasz c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
Michael Raskin 7caec74142 Merge pull request #3118 from NixOS/libreoffice-update-4.2.5
Libreoffice update 4.2.5
2014-06-30 17:39:12 +04: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
John Wiegley 79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
2014-06-28 17:04:04 -07:00
Michael Raskin a72bb396a2 Do not create unneeded local-scope packages; disable a failing test
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
2014-06-28 23:33:42 +04:00
Cillian de Róiste 009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
John Wiegley bf610b79ff structured-haskell-mode: 1.0.2 > 1.0.3 2014-06-28 09:23:22 -07:00
Rok Garbas 71812277d3 git-remote-add: new package added 2014-06-28 14:15:31 +01:00
John Wiegley 34de04149e twelf: Fix the source URL 2014-06-27 10:46:24 -07:00
Michael Raskin 7788afd571 Libreoffice update: not succesful yet 2014-06-27 16:37:34 +04:00
Luca Bruno f5eb0f2883 Merge pull request #3052 with some additional changes 2014-06-27 11:38:00 +02:00
Jos van den Oever 6c20d83263 transcode: new package
Suite of command line utilities for transcoding video and audio codecs,
and for converting beween different container formats.

http://www.transcoding.org/
2014-06-27 11:34:29 +02:00
John Wiegley ad96cc8bf9 twelf: new expression; prover for PL theory and logic 2014-06-26 15:54:45 -07:00
Shea Levy 731288059c Merge branch 'skype43' of git://github.com/nslqqq/nixpkgs
skype: 4.2.0.13 -> 4.3.0.37
2014-06-26 12:02:23 -04:00
Nikita Mikhailov e2ff019965 skype: 4.2.0.13 -> 4.3.0.37 2014-06-26 22:42:21 +07:00
Georges Dubus bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +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
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
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
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