Commit Graph

41380 Commits

Author SHA1 Message Date
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
9d544e633a mailutils is broken.
#887
2014-04-05 15:55:16 -04:00
Shea Levy
ad4965f54c Merge branch 'master.xauth' of git://github.com/wkennington/nixpkgs
ssh: Don't set xuth if not running xserver
2014-04-05 15:32:31 -04:00
Shea Levy
50a0b55a01 Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs
Update ffmpeg dependency to 0.10 in oraclejdk7
2014-04-05 15:23:02 -04:00
Shea Levy
a46d2e3150 Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs
nixos: add Murmur module (Mumble chat)

Conflicts:
	nixos/modules/misc/ids.nix
2014-04-05 15:18:14 -04:00
Shea Levy
bd1a95ee60 Remove superfluous newline 2014-04-05 15:01:05 -04:00
Shea Levy
0fda39ee3e Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs
added mtpfs to mount MTP devices via usb using FUSE
2014-04-05 15:00:38 -04:00
Sander van der Burg
dc614aff92 libresample: Add package 2014-04-05 20:54:47 +02: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
Shea Levy
ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
2014-04-05 14:23:29 -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
85b1ede2bf glib gschemas hook: fixup #1901
- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
2014-04-05 13:01:51 +02:00
Domen Kožar
13bef7f403 Merge pull request #2127 from lethalman/gnome3
Gnome3 session changes, gnome-control-center icons
2014-04-05 00:35:06 +02:00
Luca Bruno
750d5e4a83 gnome-control-center: show icons 2014-04-05 00:32:19 +02:00
Peter Simons
6df2b09015 haskell-ghc-mod: revert update to version 4.x
flymake-mode no longer works in the new version. This needs further
testing before we can upgrade.
2014-04-05 00:21:12 +02:00
Peter Simons
7b7d06f91e Merge pull request #2123 from jagajaga/haskell_add_pkgs
Haskell add pkgs
2014-04-04 23:52:13 +02:00
Luca Bruno
671e346eb2 gnome3: add glib-networking gio modules
With glib-networking, epiphany and other gnome apps
can access https and other networking protocols.
2014-04-04 23:45:06 +02:00
Shea Levy
c6797b373f Turn on user-controlled wpa-cli on the livecd
Fixes #1204
2014-04-04 17:05:57 -04:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
2014-04-04 21:33:55 +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
Domen Kožar
9f96b8e43d Merge pull request #2125 from lethalman/gnome-disk-utility
Gnome disk utility, libpwquality, libdvdread
2014-04-04 19:04:33 +02:00
Bjørn Forsman
d2ca851c04 python-autopep8: new package
autopep8 is a tool that automatically formats Python code to conform to
the PEP 8 style guide.

https://pypi.python.org/pypi/autopep8/
2014-04-04 16:48:10 +02:00
Luca Bruno
a86c688e66 gnome-disk-utility: new package
A udisks graphical front-end

http://en.wikipedia.org/wiki/GNOME_Disks
2014-04-04 16:17:57 +02:00
Luca Bruno
13f40aea33 libpwquality: factor out from gnome-control-center 2014-04-04 16:14:59 +02:00
Luca Bruno
1abd4b2264 libdvdread: update to 4.2.1 2014-04-04 16:04:26 +02:00
Arseniy Seroka
d89138f6ac vacuum-graphviz: add jailbreak 2014-04-04 17:04:32 +04:00
Arseniy Seroka
ece01ad65f vacuum-graphviz: add pkg 2014-04-04 16:35:44 +04:00
Eelco Dolstra
6905aa1cf4 Merge pull request #2095 from geo-kollias/master
Added MonetDB NixOS module.
2014-04-04 13:55:24 +02:00
Domen Kožar
f530ead0ba syncthing: add preStart script to create dataDir 2014-04-04 10:46:30 +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
Shea Levy
8b5c617237 Add fuse to env by default
Fixes #458
2014-04-03 21:36:13 -04:00
Domen Kožar
52fbaee8d7 solr: add extraJars option 2014-04-03 22:46:45 +02:00
William A. Kennington III
6c6d7dc11d ssh: Don't set xauth if not running xserver 2014-04-03 14:28:45 -05:00
Eelco Dolstra
6e086caa8a xterm: Don't enable unless X11 is enabled 2014-04-03 20:44:57 +02:00
Peter Simons
f2cb92f5d4 maxima: update to version 5.33.0 2014-04-03 20:13:35 +02:00
Oliver Charles
c4339a029e haskellPackages.twitterConduit: New expression
I've had to patch authenticate-oauth to get this working. The patch
comes from a commit that's already in master, so future versions will
have this and it's ok if cabal2nix ends up discarding this information.
2014-04-03 14:25:37 +01:00
Shea Levy
9a396b3840 Merge branch 'haskell-ftphs' of git://github.com/fmap/nixpkgs
Added a derivation for Goerzen's `ftphs`
2014-04-03 05:08:47 -04:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
Evgeny Egorochkin
91dd38ab79 perlPackages.TermReadLineGnu: update from 1.20 to 1.24 2014-04-03 10:42:27 +03:00
Evgeny Egorochkin
dd01251657 perlPackages.TestWarn: update from 0.24 to 0.30 2014-04-03 10:40:05 +03:00
Evgeny Egorochkin
586d19d787 mc: update from 4.8.11 to 4.8.12 2014-04-03 10:32:28 +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
9cc46ebd92 ipmiutil: update from 2.9.2 to 2.9.3 2014-04-03 10:26:55 +03:00
Evgeny Egorochkin
bf8991175a global: update from 6.2.9 to 6.2.12 2014-04-03 10:22:59 +03:00
Vladimír Čunát
685d5a02a2 mesa: disable tests again
Still affected by https://bugs.freedesktop.org/show_bug.cgi?id=67672
2014-04-03 09:13:54 +02:00
vi
5150da8a5c Added a derivation for Goerzen's ftphs. 2014-04-03 13:41:36 +08:00
Evgeny Egorochkin
901a2fc581 manpages: update from 3.62 to 3.63 2014-04-03 07:59:39 +03:00
Evgeny Egorochkin
3830fa8195 add git repositry and meta.branch 2014-04-03 07:55:17 +03:00