Commit Graph

6175 Commits

Author SHA1 Message Date
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
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
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
Emery Hemingway
e91daf327d electrum: initial expression
Electrum is a Bitcoin thin-wallet.
https://electrum.org
2014-03-23 11:22:57 -04:00
AndersonTorres
d8648c47cf Merge remote-tracking branch 'upstream/master' 2014-03-23 11:52:03 -03:00
Alexei Robyn
a7070743a3 Openbox: Added wrapping for XDG_DATA_DIRS
Fixes issue with Openbox failing to start due to not finding its default
theme
2014-03-23 21:48:36 +11:00
Shea Levy
5fca5a4435 Merge branch 'ncdc' of git://github.com/ehmry/nixpkgs
ncdc: initial expression
2014-03-22 21:36:24 -04:00
Emery Hemingway
ed7f95be88 ncdc: initial expression
http://dev.yorhel.nl/ncdc
2014-03-22 21:21:24 -04:00
Shea Levy
5c7e77d1a9 Merge branch 'master' of git://github.com/zopa/nixpkgs
newsbeuter: Update to 2.8
2014-03-22 20:40:59 -04:00