Commit Graph

6382 Commits

Author SHA1 Message Date
aszlig
8bc8b51375
chromium: Move source package into own subdir.
Next, we're going to refactor update.sh and the first step is to ensure
that we keep everything related to sources into its own subdirectory to
not clutter up the main directory too much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig
202755ca2f
chromium: Properly pass packageName and version.
We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig
eadbf855b0
chromium: Revert back to copying bundled sources.
I'm giving up on this after several attempts to correctly unbundle the
largest part, namely Google's WebKit fork Blink. Right now it's so much
tied into the Chromium source it's going to be fairly hard to do if
you're not working full time on it.

Also, the intermediate steps needed to do this properly would introduce
uneccesary complexity on our side, so we really need to finish this
without leaving it in the "messy" state in order to not make Chromium
even more difficult to maintain than it is already.

However, anyone who wants to proceed on this messy step is free to
revert this commit and continue doing so. In my case I'm going to try
again once https://crbug.com/239107 and https://crbug.com/239181 are
fixed in _stable_ (I don't want to introduce *lots* of conditionals on
the version either).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
c6fa73b26c
chromium: Propagate browser's meta to the wrapper.
We obviously don't want the Hydra job of nixpkgs to fail, so we need to
make sure that we have a proper meta attribute on the outermost
derivation.

For builds based on the Chromium source tree (like for example libcef),
we can still move the wrapper elsewhere when we need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
cce984b324
chromium: Correct tools path in blink_idl_parser.
This is because of our symlink mess, as Chromium's build support scripts
are trying to resolve everything based on absolute paths and we split
off the bundled sources from the main derivation.

Yes, I'm refering to this as a mess, because in the end, we're going to
patch up the gyp files and use references someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
d8ba5b3eff
chromium: Add bundled dependencies for dev/beta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
5021717099
chromium: Split off sandbox from the browser.
Now, we no longer tie the sandbox directly to the browser derivation but
wrap everything together into one derivation at the entry point at
default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
c86d376c82
chromium: Selectively link bundled libraries.
So far we just copied everything from source.* into the build directory
during the prePatch. This somewhat defeated the purpose of the source
splitup because it involved more I/O than just unpacking the entire
source tree.

Now, we're selectively *symlinking* the bundled sources into the build
directory. Even that isn't perfect because in the end we'd just
reference foreign derivations and we're done. But for now, this gets us
at least prepared for a massive reduction of compile time.

Unfortunately, gyp's behaviour when it comes to symlinks is quite
painful to come by, so we need to fix a few references to use absolute
paths.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
16af058ff9
chromium: Move plugins into its own Nix file.
We now no longer pass enablePepperFlash and enablePepperPDF to the
browser package itself and only use plugins.flagsEnabled from there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
1ae328ba86
chromium: Factor out source into its own Nix file.
The name is a bit unfortunate, so it would make sense to rename
"sources.nix" into something else.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig
88a939c2d1
chromium: Decouple browser from default.nix.
This currently only passes through the arguments and is nothing more
than the foundation of the new structure. In essence, I want to have a
really small default.nix which is then going down into the respective
subparts that are isolated from each other.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig
c2abe4da6c
chromium: Add support for ppapi flash and PDF.
This is hardcoded for the dev channel at the moment and we're going to
fetch it along with the main Chromium sources.

Also I'm putting this in default.nix at the moment, because we're going
to tear apart the whole Chromium package into several subparts soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig
c9c9ca38b9
chromium: Build using minizip from nixpkgs.
Well, the gyp flag mentions "zlib" but in reality, minizip is used.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig
5b67290740
chromium: Build using libpng from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig
823b72d0ad
chromium: Build with libwebp from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig
2f23f57b28
chromium: Build beta/dev with v8 from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
aszlig
9f45c2cbba
chromium: Prepare for building the -lite package.
We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
aszlig
e2dba7c6cf
chromium: Use version 3 of libgnome_keyring.
Starting with version 35, version 2 of libgnome_keyring is no longer
supported and it's probably pretty useless to do backports to version 2,
given the assumption that most users on Nix probably don't use it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
Bjørn Forsman
8b666e44fd Unbreak tarball job
Fix undefined variable in pamixer.
2014-04-18 22:48:12 +02:00
Michael Raskin
2ceedb2d64 Merge pull request #2305 from jwiegley/ledger
Update ledger expression, add myself as a maintainer
2014-04-18 10:46:43 -07:00
Michael Raskin
97a3a803e1 Merge pull request #2313 from 1126/master
Adding pamixer.
2014-04-18 10:31:25 -07:00
Michael Raskin
b1fad4ab9b Merge pull request #2279 from kowey/master
megam: New package
2014-04-18 10:19:44 -07:00
Michael Raskin
7231b6b94e Merge pull request #2248 from ehmry/rsync
rsync updated 3.0.9 to 3.1.0, rsyncd service module
2014-04-18 10:17:08 -07:00
Michael Raskin
6cdce9deec Merge pull request #2220 from taku0/thunderbird-bin-24.0.0
add thunderbird-bin: the binary package for Thunderbird mail client
2014-04-18 10:16:35 -07:00
Michael Raskin
d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
_1126
25f7565657 Merge branch 'pamixer' 2014-04-18 16:09:50 +02:00
_1126
96257ea486 Adding pamixer. 2014-04-18 16:09:34 +02:00
John Wiegley
5c18bbe34f Update ledger expression, add myself as a maintainer 2014-04-17 21:47:15 -05:00
Rok Garbas
7aa3790f34 adding development version of weechat (alongside stable) 2014-04-17 22:22:54 +01:00
Ricardo M. Correia
09f0d57842 bitcoin: Update from 0.8.6 -> 0.9.1 2014-04-17 20:47:18 +02:00
Eelco Dolstra
f2cb4def59 qemu: Update to 1.7.1 2014-04-17 15:54:42 +02:00
Domen Kožar
e325926595 Merge pull request #2300 from lethalman/gsettings
Fix gsettings schemas for several gtk3 apps
2014-04-17 14:29:27 +02:00
Luca Bruno
82744e57d6 pitivi: fix gsettings schemas, depend upon gnome-desktop 2014-04-17 13:42:51 +02:00
Luca Bruno
8dbdebb50f gnumeric: fix gsettings schemas 2014-04-17 13:42:51 +02:00
Luca Bruno
64d4b9c3de transmission-remote-gtk: fix gsettings schemas 2014-04-17 13:42:51 +02:00
Luca Bruno
6f61f7dc0d midori: fix gsettings schemas
Could not test it because it does not compile for other reasons.
2014-04-17 13:42:50 +02:00
Luca Bruno
7d64d63a1c spacefm: fix gsettings schemas
Could not test it as the application did not start
for other reasons.
2014-04-17 13:42:50 +02:00
Luca Bruno
4cfe7a7334 transmission-gtk: fix gsettings schemas, closes #2295 2014-04-17 13:42:50 +02:00
Austin Seipp
1a2784ee68 btsync: 1.3.77 -> 1.3.87
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-16 18:56:22 -05:00
Eelco Dolstra
a1af25033a git send-email: Respect $OPENSSL_X509_CERT_FILE 2014-04-16 18:43:39 +02:00
Lluís Batlle i Rossell
edee246684 Updating gnunet to 0.10.1. 2014-04-16 15:22:31 +02:00
Eric Kow
9e457049e4 megam: New package
Maximum Entropy (GA) Model Optimization Package
2014-04-15 14:00:56 +01:00
Peter Simons
3275e47613 Merge pull request #2262 from jwiegley/git
On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds
2014-04-15 10:31:07 +02:00
Bjørn Forsman
c83903069f gnuradio: update 3.7.2.1 -> 3.7.3
Changelog:
http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_3/

(Build tested.)
2014-04-15 07:11:41 +02:00
Austin Seipp
6376ac57d8 emacsPackages: add cryptol-mode
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-14 18:23:51 -05:00
John Wiegley
cfe42425c3 On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds 2014-04-14 14:53:15 -05:00
Domen Kožar
6449bc2f23 Merge pull request #2244 from lethalman/gsettings
audacious, sflphone: find gsettings schemas
2014-04-14 09:43:35 +02:00
Emery Hemingway
93e9154805 rsync updated 3.0.9 to 3.1.0, rsyncd service module 2014-04-13 23:25:28 -04:00
Luca Bruno
57b6ecb799 sflphone: find gsettings schemas 2014-04-13 23:50:21 +02:00
Luca Bruno
091ce87a00 audacious: find gsettings schemas 2014-04-13 23:30:15 +02:00
Bjørn Forsman
2b9c96878c qmmp: update 0.7.5 -> 0.7.6
Changes since 0.7.5:
 * added libav 10 and ffmpeg 2.2 support;
 * fixed url parsing;
 * fixed freezing on playback resume;
 * fixed random freezing in the mplayer plugin;
 * fixed reset selection of tracks when calling context menu;
 * fixed multimedia keys support under win32.
2014-04-13 19:07:06 +02:00
Austin Seipp
2661400d2a cgit: bump git version to 1.9.2
This also updates the download URL to use kernel.org

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-13 00:47:16 -05:00
Ertugrul Söylemez
a0886ae024 keepassx: Renamed KeePassX 2.0 to keepassx2. 2014-04-13 03:28:20 +02:00
Domen Kožar
1988bbd990 Merge pull request #2231 from jwiegley/master
Change several package constraints from linux to unix
2014-04-13 00:24:28 +02:00
John Wiegley
010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
Benno Fünfstück
2fd160f027 haskell: update yi to 0.8.1 2014-04-12 20:33:15 +02:00
taku0
c4eadfbac5 add thunderbird-bin: the binary package for Thunderbird mail client 2014-04-13 00:29:14 +09:00
Cillian de Róiste
02e693c400 synthv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:29 +02:00
Cillian de Róiste
440a174e2d samplv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:13 +02:00
Cillian de Róiste
aee930586f drumkv1: update from 0.4.0 to 0.4.1 2014-04-12 11:57:43 +02:00
Mathijs Kwik
d87ae02fc1 synergy: upgrade to 1.4.17 2014-04-11 14:09:07 +02:00
Peter Simons
b5773eeccb R: update to version 3.1.0 2014-04-11 12:07:00 +02:00
Peter Simons
8392c8ba9f Merge pull request #2195 from linquize/git-1.9.2
git: Update to 1.9.2
2014-04-10 12:42:53 +02:00
Mathijs Kwik
3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Linquize
ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Ricardo M. Correia
8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Domen Kožar
e5e27cfd64 Merge pull request #2153 from lethalman/gnome3
accounts-daemon service, fix gnome-shell, add libgnomekbd, musicbrainz5, sushi, gnome-contacts
2014-04-09 15:01:17 +02:00
Peter Simons
1682bde4e0 gitAndTools.svn2git: update from 2.2.2 to 2.2.5 2014-04-09 12:41:10 +02:00
Peter Simons
c244d6e1b8 gitAndTools.stgit: update from 0.16 to 0.17.1 2014-04-09 12:41:10 +02:00
Luca Bruno
8553993887 telepathy-mission-control: add dbus service, enabled by default on gnome3 2014-04-09 00:36:52 +02:00
Ricardo M. Correia
54a8e0ed0f flashplayer: Update from 11.2.202.346 -> 11.2.202.350 2014-04-08 17:45:52 +02:00
Peter Simons
7f90e454fb ikiwiki: update to version 3.20140227 2014-04-08 12:48:22 +02:00
Peter Simons
79f19f687c flymake-cursor: the sha256 hash of the file has changed
No change was documented on the emacs wiki. Not sure what happened. :-(
2014-04-08 12:48:22 +02:00
Peter Simons
1b1225fb0b flymake-cursor: remove redundant 'meta.platforms = stdenv.lib.platforms.all' setting 2014-04-08 12:48:22 +02:00
Mathijs Kwik
593c633aa8 emacs-idris-mode: upgrade to support idris 0.9.12 2014-04-08 08:38:43 +02:00
Alex Berg
7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 15:08:07 -05:00
Peter Simons
ff49602b17 haskell-git-annex: update to version 5.20140405 2014-04-07 17:06:34 +02:00
Austin Seipp
5aa4495cb5 boolector: add version 1.5 and 1.6
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 09:17:05 -05:00
Peter Simons
9000db8b1e haskell-git-annex: update to version 5.20140402 2014-04-06 21:53:16 +02:00
Domen Kožar
29bc5feb1d Merge pull request #2139 from lethalman/gnome3
Fix gsettings schemas usage for several packages due to #1901
2014-04-06 13:59:46 +02:00
Luca Bruno
35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
2014-04-06 11:02:21 +02:00
Emery Hemingway
09cdc6edf5 f2fs-tools,ncdc: set platform and add myself to maintainers 2014-04-05 21:31:40 -04:00
Shea Levy
5441b1a98b Merge branch 'teamviewer-fix-upgrades' of git://github.com/bjornfor/nixpkgs
teamviewer: fix brokenness after updates / GC
2014-04-05 18:55:48 -04:00
Shea Levy
a68c12d35b git: Remove phony not-supported wrappers.
Fixes #1751
2014-04-05 18:39:53 -04:00
Bjørn Forsman
31ab1fd7ae teamviewer: fix brokenness after updates / GC
Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
paths become garbage collected, teamviewer crashes upon start because of
those broken symlinks. An easy workaround to this behaviour is simply to
delete all symlinks before we start teamviewer. Teamviewer will fixup
the symlinks, just like it did the first time the user ran it.
2014-04-06 00:23:59 +02:00
Michael Raskin
9233723353 Temporary patch for Wireshark build 2014-04-06 00:57:35 +04:00
Shea Levy
12c1321fa4 Merge branch 'master' of git://github.com/urv/nixpkgs
calibre: upgrade from 1.25.0 to 1.31.0
2014-04-05 15:56:55 -04:00
Shea Levy
63d91b75a1 Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs"
It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074f, reversing
changes made to ea9c8d6a13.
2014-04-05 14:43:00 -04:00
Shea Levy
718466074f Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs
Wrap k3b with PATH to required tools
2014-04-05 14:38:06 -04:00
Jaka Hudoklin
413ebfb246 virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
2014-04-05 18:37:05 +02:00
Vladimír Čunát
4ab58240a9 pidgin: adopt the orphan, as I use it daily
CC #992.
2014-04-04 20:29:49 +02:00
Matej Cotman
7df1ce5088 syncthing: new package and nixos module 2014-04-04 10:46:29 +02:00
Arvin Moezzi
f82b678508 calibre: upgrade from 1.25.0 to 1.31.0 2014-04-04 09:25:32 +02:00
Peter Simons
f2cb92f5d4 maxima: update to version 5.33.0 2014-04-03 20:13:35 +02:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
Evgeny Egorochkin
9b4080b7af mercurialFull: update from 2.9.1 to 2.9.2 2014-04-03 10:28:15 +03:00
Evgeny Egorochkin
3830fa8195 add git repositry and meta.branch 2014-04-03 07:55:17 +03:00
ambrop7@gmail.com
0b1e408b6b vlc: Build with VDPAU support (close #2096) 2014-04-02 23:14:18 +02:00
Peter Simons
4e875dd3ff esniper: update to version 2.29.0 2014-04-02 17:44:10 +02:00
Domen Kožar
886320136e bittorrentSync: use versioned url for download 2014-04-01 13:25:48 +02:00
Austin Seipp
010688a763 btsync: 1.2.91 -> 1.3.77
This also does some various cleanup on the build process. In particular,
patchelf was not properly setting the rpath so e.g. librt and libm did
not point into glibc inside the Nix store on my Ubuntu system. This
properly sets the library paths on installation.

Also, the download URL for BitTorrent Sync changed, which is incredibly
annoying, because the URL doesn't encode version information. So maybe
this will fail later. :(

(A final note: this also changes the package name from 'btsync-bin' to
just 'btsync', and cleans up some meta attributes.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 03:52:43 -05:00
aszlig
51e449aabb
chromium: Fix build of beta and dev channels.
Okay, now this time we really broke beta and dev, because python_arch no
longer is in build/common.gypi anymore.

This just adds chrome/chrome_tests.gypi to the list of files to be
changed by sed.

Also, this time I did test at least whether gyp is running fine and
interrupted after the first 1000 build targets, so all channels *should*
now build fine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 09:33:04 +02:00
宋文武
ede097adcb miro: build with webkitgtk2 2014-04-01 11:11:46 +08:00
aszlig
1ae4db3a80
chromium: Fix build of stable channel.
Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 04:01:58 +02:00
Peter Simons
f06bcd84bf Merge pull request #2082 from cpages/update
Updates for maintained packages
2014-03-31 23:13:38 +02:00
Peter Simons
69b53c990a structured-haskell-mode: re-generate with latest cabal2nix 2014-03-31 23:10:56 +02:00
Eelco Dolstra
0fdd641b21 Ensure that slim's theme applies to slimlock 2014-03-30 19:33:28 +02:00
Carles Pagès
66d8a9c725 yafc: update to 1.3.2 2014-03-30 18:32:14 +02:00
Evgeny Egorochkin
c53ae9b462 spaceFM: update from 0.9.2 to 0.9.4 2014-03-30 19:27:19 +03:00
Eelco Dolstra
aaf01268ff Revert "slim: remove duplicate code"
This reverts commit f7d5e83abb.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
2014-03-30 17:06:01 +02:00
Peter Simons
c394d4079d xmonad: fix build with ghc 7.8.1 2014-03-30 16:46:02 +02:00
宋文武
6e7fe59bb1 uzbl: build with webkitgtk2, cleanup 2014-03-30 09:52:36 +08:00
宋文武
59124ddf95 vimprobable2: update to 1.4.2 2014-03-30 07:59:32 +08:00
ambrop7@gmail.com
9a2758f98d Add Printrun. 2014-03-29 23:17:56 +01:00
Moritz Maxeiner
99d639d750 Update Virtualbox and Guest Additions to 4.3.10, Oracle Extensions to 93012 2014-03-29 13:44:50 +01:00
Shea Levy
1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
Shea Levy
1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy
63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy
a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs
z3: version 4.3.1
2014-03-28 23:54:43 -04:00
Shea Levy
8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs
Add mps 1.113.0, fix usage of Sleepycat license
2014-03-28 23:03:20 -04:00
Shea Levy
b574394d70 Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs
Updated dwb to latest revision
2014-03-28 21:42:51 -04:00
Pascal Wittmann
df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
Thomas Tuegel
5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00
Vladimír Čunát
9bde84a75d fix evaluation since 34301c8 2014-03-27 21:33:25 +01:00
Vladimír Čunát
abda7ec36f liferea: maintenance update 2014-03-27 21:33:25 +01:00
宋文武
96d78a2804 pitivi: fix icons 2014-03-27 11:01:24 +08:00
Cillian de Róiste
de3b5b4500 Add simplescreenrecorder: an excellent screen recorder for linux 2014-03-26 23:02:33 +01:00
Cillian de Róiste
b60f8810b2 yoshimi: update from 1.1.0 to 1.2.0 2014-03-26 22:27:02 +01:00
Cillian de Róiste
fc4542c99d qtractor: update from 0.5.12 to 0.6.0 2014-03-26 22:26:43 +01:00
Cillian de Róiste
7381035bc2 blender: update from 2.69 to 2.70 2014-03-26 22:25:40 +01:00
Edward Tjörnhammar
8af6b20856 idea: update 13.0.2 -> 13.1.1
And use buildnumbers only in the buildscript and use more familiar
version numbers in the package name.

[bjorn.forsman@gmail.com: modify commit message]
2014-03-26 21:21:12 +01:00
Evgeny Egorochkin
8cd858b100 ocamlPackages.mldonkey: update from 3.1.3 to 3.1.5 2014-03-26 19:20:11 +02:00
Evgeny Egorochkin
37f8bcc028 kde4_prev.quasselDaemon: update from 0.9.2 to 0.10.0 2014-03-26 19:18:15 +02:00
_1126
34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Peter Simons
0cbf18a1c2 Merge pull request #2037 from ambrop72/cura
Add Cura.
2014-03-26 11:11:56 +01:00
Shea Levy
97a733ae57 Merge branch 'submit/sloane' of git://github.com/akc/nixpkgs
Add sloane -- a command line interface to OEIS
2014-03-26 02:42:22 -04:00
aszlig
a5a5abd2fe
chromium: Fix startup of beta and dev channels.
Since version 34, ICU data files are now created separately and thus
need to be installed as well.

Closes #2016

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f117341ff2de4b95d223b41b36942e2f60ada2a3)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-26 01:33:07 +01:00
Thomas Tuegel
3d08732d12 Wrap k3b with PATH to required tools 2014-03-25 17:25:37 -05:00
ambrop7@gmail.com
5f2167627e Add Cura. 2014-03-25 23:17:17 +01:00
Austin Seipp
289a1c5f06 ike: use stdenv.lib.licenses.sleepycat
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-24 19:58:36 -05:00
Shea Levy
ff6febb75d sox: Update, get rid of composableDerivation 2014-03-24 12:01:20 -04:00
Mathijs Kwik
d8d8606da4 unison: upgrade to 2.40.102 2014-03-24 10:35:51 +01:00
Mathijs Kwik
149dcb2113 conkeror: upgrade to more recent snapshot
needed for scripting Downloads.jsm with Gecko >= 26
2014-03-24 10:35:51 +01:00
Shea Levy
a2b6ec902c Merge branch 'master' of git://github.com/AndersonTorres/nixpkgs
Updating Portuguese and Brazilian language dictionaries for Aspell
2014-03-23 20:52:21 -04:00
Shea Levy
57bbdffe39 Merge branch 'electrum' of git://github.com/ehmry/nixpkgs
electrum: initial expression
2014-03-23 20:47:28 -04:00
Shea Levy
3d8154359a Merge branch 'fix-openbox' of git://github.com/Shados/nixpkgs
Openbox: Added wrapping for XDG_DATA_DIRS
2014-03-23 20:45:26 -04:00
Peter Simons
4c5d093ae0 esniper: add patch to fix unrecognized e-bay log-in page 2014-03-23 22:30:54 +01:00
Matej Cotman
13bc37ed3e vlc: ncurses support (close #2012) 2014-03-23 20:21:16 +01:00
Domen Kožar
eb2992a4c7 Merge pull request #2014 from offlinehacker/pkgs/transmission-remote-gtk/fix_filechooser_schema
transmission-remote-gtk: fix missing schema for gtk3 FileChooser
2014-03-23 18:06:52 +01:00
Jaka Hudoklin
6f44ffc61c transmission-remote-gtk: fix missing schema for gtk3 FileChooser 2014-03-23 18:04:03 +01:00