3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

11474 commits

Author SHA1 Message Date
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
Alexander Kjeldaas f67015cae4 Make initrd and the kernel builds repeatable. 2014-04-05 08:41:06 +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
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
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 13f40aea33 libpwquality: factor out from gnome-control-center 2014-04-04 16:14:59 +02:00
Arseniy Seroka ece01ad65f vacuum-graphviz: add pkg 2014-04-04 16:35:44 +04:00
Matej Cotman 7df1ce5088 syncthing: new package and nixos module 2014-04-04 10:46:29 +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 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
vi 5150da8a5c Added a derivation for Goerzen's ftphs. 2014-04-03 13:41:36 +08:00
Evgeny Egorochkin 8654b6b51c perlPackages.GD: update from 2.50 to 2.53 2014-04-03 07:36:35 +03:00
Evgeny Egorochkin 7973471c7b perlPackages.IOSocketInet6: update from 2.71 to 2.72 2014-04-03 07:03:26 +03:00
Cillian de Róiste 0119561d99 nodePackages: add react.js and update node-packages-generated.nix 2014-04-02 21:07:30 +02:00
Vladimír Čunát 8146737127 Merge #2090: add new lockdep tool from Linux 3.14 2014-04-02 20:55:30 +02:00
Vladimír Čunát 457fdb3842 texinfo: move ncurses support into texinfoInteractive
This, for example, drops the stdenv dependency on ncurses.
2014-04-02 19:05:56 +02:00
Vladimír Čunát 11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Domen Kožar 80a03f665d Merge branch 'x-updates' 2014-04-02 15:30:52 +02:00
Ricardo M. Correia 52d233af22 grsecurity: Update stable patch from 3.0-3.2.55-201403300851 -> 3.0-3.2.56-201404012135 2014-04-02 15:11:33 +02:00
Ricardo M. Correia 407a6857c6 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403252026 -> 3.0-3.2.55-201403300851
test:   3.0-3.13.7-201403252047 -> 3.0-3.13.8-201404011912
2014-04-02 02:16:59 +02:00
Domen Kožar 75fb34eb6d add pythonPackages.gunicorn 2014-04-01 13:44:37 +00:00
Vladimír Čunát 6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Austin Seipp 4202a9315a grsecurity: add myself to maintainer list
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 02:59:53 -05:00
Austin Seipp bdff718c5b kernel: add lockdep expression
Lockdep is the kernel's locking validation/debugging tool and has seen
heavy pro-active usage and development. In Linux 3.14, it's now
available directly to userspace for the same purpose. It comes with a
convenient utility to LD_PRELOAD a shared library for validation, or a
user-space API to link to directly.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 01:20:46 -05:00
Austin Seipp 9493159017 kernel: remove 3.11 series (EOL)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 00:56:23 -05:00
Shea Levy 304fd16d95 Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs
concurrencykit: version 0.4.1
2014-03-31 21:50:42 -04:00
Austin Seipp 92192847fc concurrencykit: version 0.4.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 20:49:50 -05:00
Shea Levy 2d4ce25b5b Add linux 3.14 2014-03-31 20:54:47 -04:00
Sander van der Burg 073eab850a slasp: Add nodejs package + update other nodejs packages 2014-04-01 00:28:23 +02:00
Peter Simons a20d5da92e Merge pull request #2084 from thoughtpolice/security
Add tools: p0f & hashcat
2014-03-31 23:06:10 +02:00
Peter Simons c6da40c42f haskell-haddock: add version 2.14.1 2014-03-31 21:39:24 +02:00
Peter Simons 305531cbd9 haskell-case-insensitive: add version 1.2.0.0 2014-03-31 21:39:24 +02:00
Peter Simons 98b82062b0 haskell-stm: add version 2.4.3 2014-03-31 21:39:24 +02:00
Peter Simons 372e6f7f83 haskell-conduit-extra: add version 1.0.0 2014-03-31 21:39:24 +02:00
Peter Simons 9109cff1a1 haskell-streaming-commons: add version 0.1.0.2 2014-03-31 21:39:24 +02:00
Peter Simons 4a70bdf5e4 haskell-mtl: update to version 2.1.3.1 2014-03-31 21:39:24 +02:00
Domen Kožar c6ebbd29e5 add v4l2loopback: a kernel module to create V4L2 loopback devices 2014-03-31 20:02:53 +02:00
Austin Seipp 3ef0a880cb p0f: version 3.06b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 11:22:50 -05:00
Austin Seipp cff179f829 hashcat: version 0.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 10:56:02 -05:00
Vladimir Kirillov f733eb899a remove the unbreak-syntax-highlight hack 2014-03-31 15:52:44 +08:00
Vladimir Kirillov 46ef4f6910 import thumbor and dependencies:
derpconf, backports_ssl_match_hostname_3_4_0_2, thumborPexif,
upgrade tornado to 3.2 (that contains security fixes)
2014-03-31 15:41:55 +08:00
Peter Simons e825c6ac38 haskell-cake3: add version 0.3.0.1 2014-03-30 23:26:21 +02:00
Peter Simons aa86cc8a7c haskell-monadloc: add version 0.7.1 2014-03-30 23:26:11 +02:00
Evgeny Egorochkin d084be9965 perlPackages.HTMLTiny: update from 1.03 to 1.05 2014-03-30 19:29:17 +03:00
Joachim Schiele b894dfffb3 added mtpfs to mount MTP devices via usb using FUSE 2014-03-30 13:00:25 +02:00
Vladimir Kirillov bad9de86b6 buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 9186f0b5dd haskell: import persistent-mysql 1.3.0.2 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 390a4b9164 haskell: import git-date 0.2.1 2014-03-30 14:51:36 +08:00
Rickard Nilsson 61ecf919e1 New package: wal-e
A Postgres WAL-shipping disaster recovery and replication toolkit
2014-03-30 04:34:38 +02:00
Shea Levy fd5d6044c0 Merge branch 'printrun' of git://github.com/ambrop72/nixpkgs
Add Printrun.
2014-03-29 22:19:29 -04:00
Austin Seipp 925cce304f cb0cat is now cb1cat
Submissions for CAESAR are now over, so CBEAMr0 has become CBEAMr1 with
some minor alterations.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 18:48:16 -05:00
ambrop7@gmail.com 9a2758f98d Add Printrun. 2014-03-29 23:17:56 +01:00
ambrop7@gmail.com 090ee41e6b gvfs: Fix build with lightWeight=false (close #2068)
Needed for SMB backend.
2014-03-29 21:51:16 +01:00
Emery Hemingway 6c77690b28 rippled: initial pkg and module expressions
rippled is the Ripple P2P payment network reference server
https://ripple.com
2014-03-29 15:31:37 -04:00
宋文武 5668a70a49 widelands: update to build-18 (close #2062)
@vcunat enabled parallelBuilding.
2014-03-29 18:38:46 +01:00
Shea Levy ee65278d54 Merge branch 'add_n-djbdns' of git://github.com/msackman/nixpkgs
Add New-DJBDNS
2014-03-29 13:06:08 -04:00
ambrop7@gmail.com 8b94e22f33 Add gcc-arm-embedded.
These are packages for precompiled ARM microcontroller compilers from
https://launchpad.net/gcc-arm-embedded.

[Bjørn: modify commit message (add paragraph).]
2014-03-29 17:57:45 +01:00
Shea Levy ac68dc6dc6 Merge branch 'minecraft-server' of git://github.com/thoughtpolice/nixpkgs
nixpkgs: add Minecraft Server & a service module
2014-03-29 12:51:49 -04:00
Matthew Sackman be6a16ccbc Add New-DJBDNS 2014-03-29 16:47:23 +00:00
Maxim Ivanov f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01:00
Austin Seipp d60af7f34d minecraft-server: version 1.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:24 -05:00
Shea Levy f6ca125548 buildLocalCabal: Jailbreak by default.
buildLocalCabal is for local convenience anyway
2014-03-29 05:01:50 -04:00
Michael Raskin 1eb42d9d79 Merge pull request #2048 from echaozh/master
add julia 0.2.1 release
2014-03-28 23:03:04 -07: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 4428ed66a2 Merge branch 'webkit' of git://github.com/iyzsong/nixpkgs
webkit: update to 2.4.0, add gtk2 version
2014-03-29 00:41:34 -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 701cb6b099 Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
2014-03-28 23:39:01 -04:00
Shea Levy f3e9e3dea5 Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs
icedtea7, icedtea7_web: New packages
2014-03-28 23:25:25 -04:00
Shea Levy e0341475dc Merge branch 'master' of git://github.com/fmap/nixpkgs
Add Mnemosyne 2.2.1
2014-03-28 23:09:25 -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
Sander van der Burg 7c2d4be437 deepmerge: Add nodejs package 2014-03-28 15:17:17 +01:00
Zhang Yichao 10511b4712 add julia 0.2.1 release 2014-03-28 18:39:26 +08: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 576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Peter Simons e5725d35c1 haskell-bmp: require a recent version of 'binary' 2014-03-27 13:13:14 +01:00
Peter Simons a46352aad1 haskell-bmp: use version 1.2.5.2 on all platforms 2014-03-27 13:12:54 +01:00
Peter Simons 7f9558896f haskell-tls: update to version 1.2.6 2014-03-27 13:12:51 +01:00
Peter Simons da7fe3fe8a haskell-QuickCheck: update to version 2.7.3 2014-03-27 13:12:51 +01:00
宋文武 2cf7678fc0 webkitgtk: add gtk2 version 2014-03-27 17:16:15 +08:00
宋文武 96d78a2804 pitivi: fix icons 2014-03-27 11:01:24 +08:00
Shea Levy e16595f149 Build all ghcs on hydra 2014-03-26 22:46:05 -04:00
Ricardo M. Correia 897bbc3702 grsecurity: Add myself as a maintainer 2014-03-26 23:07:57 +00:00
Ricardo M. Correia 911f332279 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403202347 -> 3.0-3.2.55-201403252026
test:   3.0-3.13.6-201403202349 -> 3.0-3.13.7-201403252047
2014-03-26 23:07:57 +00:00
Cillian de Róiste de3b5b4500 Add simplescreenrecorder: an excellent screen recorder for linux 2014-03-26 23:02:33 +01:00
Ricardo M. Correia 5fbc63be35 icedtea7_web: New package
Java web browser plugin and an implementation of Java Web Start.
2014-03-26 21:07:36 +01:00
Ricardo M. Correia 2d821edb92 npapi-sdk: New package
NPAPI-SDK is a bundle of NPAPI headers by Mozilla.
2014-03-26 21:07:36 +01:00
Ricardo M. Correia 72d457de2f icedtea7: New package
Free Java environment based on OpenJDK 7.0 and the IcedTea project.
2014-03-26 21:07:36 +01:00
_1126 34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Peter Simons 637a571b4e Merge pull request #2029 from ashalkhakov/master
Adding ATS1, updating ATS2 package.
2014-03-26 11:22:04 +01:00
Peter Simons 0cbf18a1c2 Merge pull request #2037 from ambrop72/cura
Add Cura.
2014-03-26 11:11:56 +01:00
Peter Simons aaf414cb09 Merge pull request #2034 from ambrop72/pyopengl
pyopengl: Bump to 3.0.2 and hack the library loading to make it work.
2014-03-26 11:10:48 +01:00
Peter Simons 078f064e9c Merge pull request #2036 from ambrop72/wxpython3
Add wxPython-3.0 with OpenGL support.
2014-03-26 11:10:15 +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
Jaka Hudoklin 72d8c4225b Add seyren, an alerting dashboard for Graphite 2014-03-25 23:45:11 +00:00
ambrop7@gmail.com 4121f9d745 python-packages: Add power-1.2. 2014-03-25 23:38:25 +00:00
ambrop7@gmail.com 5f2167627e Add Cura. 2014-03-25 23:17:17 +01:00
ambrop7@gmail.com 93d313c0ed Add wxPython-3.0 with OpenGL support. 2014-03-25 22:35:25 +01:00
ambrop7@gmail.com be46ca4882 pyopengl: Bump to 3.0.2 and hack the library loading to make it work. 2014-03-25 22:20:21 +01:00
vi b5acc84ff3 Mnemosyne: provide capacity to override dependencies at the fidelity of a Python package. 2014-03-26 00:37:14 +08:00
Artyom Shalkhakov 0242b3c6ac Adding ATS1, updating ATS2 package. 2014-03-25 04:53:13 +01:00
Austin Seipp 33e4adc325 mps: version 1.113.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-24 20:32:39 -05:00
Jaka Hudoklin 70a4c7b1df nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
- Make dhcp work, use dhcpcd without udev in container
- Make login shell work, patch getty to not wait for /dev/tty0
- Make ssh work, sshd/pam do not start session
2014-03-24 23:59:50 +01:00
vi ed7c311876 Include Mnemosyne in nix packages collection. 2014-03-25 02:58:21 +08:00
Shea Levy 84fba566f1 quickcheck-instances: jailbreak to work with newer QuickCheck 2014-03-24 09:48:23 -04:00
Shea Levy 5221cfdda9 Add memcached php module.
Yes, it's different from memcache. Yes, we need both
2014-03-24 09:23:10 -04:00
Shea Levy d4c711ee1d Add memcache php module 2014-03-24 08:37:36 -04:00
Shea Levy d4b28df8a2 Merge branch 'mplayer_vdpau' of git://github.com/matejc/nixpkgs
mplayer: add option config.mplayer.vdpauSupport
2014-03-23 20:54:59 -04:00
Vladimír Čunát 11492176d5 xorg: add "intel-testing" video driver, currently 2.99.911 2014-03-23 22:10:56 +01:00
Matej Cotman 6c9ecc1573 mplayer: add option config.mplayer.vdpauSupport 2014-03-23 17:27:55 +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
Shea Levy ae8a8b5deb Add buildLocalCabal helper function 2014-03-22 22:40:35 -04:00
Shea Levy be821ba0bf Merge branch 'f2fs-tools' of git://github.com/ehmry/nixpkgs
f2fs-tools: initial expression
2014-03-22 21:53:07 -04:00
Emery Hemingway d306441360 f2fs-tools: initial expression 2014-03-22 21:47:37 -04: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 fc0ea57efc Merge branch 'misc-gvolicon' of git://github.com/bennofs/nixpkgs
new expression: gvolicon
2014-03-22 20:56:00 -04:00
Peter Simons 65e3713630 haskell-tls: update to version 1.2.3 2014-03-22 17:08:47 +01:00
Peter Simons 3cb4ddb3d5 haskell-QuickCheck: update to version 2.7.1 2014-03-22 17:08:47 +01:00
宋文武 6a981b5141 add pitivi 0.93 2014-03-22 23:09:39 +08:00
Peter Simons d294dd7774 Merge pull request #1996 from jacobhinkle/slrn
Add slrn: command-line newsreader
2014-03-22 14:34:24 +01:00
Benno Fünfstück 3f2b74bf08 new expression: gvolicon 2014-03-22 12:50:45 +01:00
Shea Levy 451bc020e1 Add libsystemd-journal haskell package 2014-03-22 06:20:36 -04:00
Peter Simons bf653a2a05 git-annex: Crypto build input (propagated by hS3) needs to be compiled with QuickCheck 2.7 2014-03-22 09:04:47 +01:00
Peter Simons 9f5063a7a4 haskell-hspec-meta: require QuickCheck 2.7 or later 2014-03-22 09:04:46 +01:00
Peter Simons f62b4c6251 haskell-hspec: require QuickCheck 2.7 or later 2014-03-22 09:04:46 +01:00
Peter Simons 638d238d95 haskell-tasty-quickcheck: require QuickCheck 2.7 or later some more 2014-03-22 09:04:46 +01:00
Peter Simons d225486c0b haskell-tasty-quickcheck: require QuickCheck 2.7 or later 2014-03-22 09:04:46 +01:00
Peter Simons 19c328d28f haskell-llvm-general: update to version 3.4.2.2 2014-03-22 09:04:45 +01:00
Peter Simons 56259ddd89 haskell-llvm-general-pure: update to version 3.4.2.2 2014-03-22 09:04:45 +01:00
Peter Simons 34ed797ecf haskell-QuickCheck: add version 2.7 2014-03-22 09:04:44 +01:00
Peter Simons 9b135f8372 haskell-tf-random: add version 0.4 2014-03-22 09:04:44 +01:00
Peter Simons 763bdd7ed5 haskell-llvm-general: update to version 3.4.2.1 2014-03-22 09:04:43 +01:00
Peter Simons 1b6b1b8f87 haskell-llvm-general-pure: update to version 3.4.2.1 2014-03-22 09:04:43 +01:00
Peter Simons a88067e6da haskell-dlist-instances: add version 0.1 2014-03-22 09:04:42 +01:00
Peter Simons a18d18a424 haskell-cryptohash-conduit: add version 0.1.0 2014-03-22 09:04:42 +01:00
Peter Simons ac40eeb9b3 haskell-tagshare: add version 0.0 2014-03-22 09:04:42 +01:00
Peter Simons b722d4f3ff haskell-testing-feat: add version 0.4.0.1 2014-03-22 09:04:42 +01:00
Jacob Hinkle 774d179790 Started default.nix for slrn. Not finding slang 2014-03-21 12:07:56 -06:00
Vladimír Čunát 1941168c3d Merge branch master into x-updates (fix eval) 2014-03-21 13:46:56 +01:00
Vladimír Čunát f3f6f04c7d fix eval after e4961c6 2014-03-21 13:46:31 +01:00
Moritz Ulrich 8edc5f9999 weechat: Backport fix for freeze with gnutls 3.2.
Fixes /exit when using gnutls 3.2. This is a temporary solution as 3.1
isn't building right now. The next release of weechat will include this
fix.
2014-03-21 13:26:23 +01:00
Lluís Batlle i Rossell 23464b3241 Making more programs use readline63.
Specially those I use.
2014-03-21 11:59:57 +01:00
Vladimír Čunát ad8adf12a4 mesa: major update to 10.0.4, seems to work finally 2014-03-21 10:34:19 +01:00
Shea Levy e4961c63f7 Remove sec_perm patch that was needed by AUFS
Now the kernel is unpatched by default on non-MIPS!
2014-03-21 04:37:23 -04:00
Austin Seipp 2646eac8b2 z3: version 4.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-21 02:50:54 -05:00
Vladimír Čunát 20696f1620 libchop: builds with gnutls32 now 2014-03-21 07:23:43 +01:00
Shea Levy f4c989ede4 Merge branch 'master' of git://github.com/hrdinka/nixpkgs
conky: add config options
2014-03-20 20:14:14 -04:00