JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,695 Commits 2 Branches 0 Tags 13 GiB
333f145d76
Commit Graph

6612 Commits

Author SHA1 Message Date
Eelco Dolstra
68493cd8dc Revert "curl: propagate inputs instead of patching pkgconfig" 
This reverts commit 206d63edac.
 2015-06-04 14:54:51 +02:00
Eelco Dolstra
5d8fe045b6 Revert "Refactor mkFlag out of old packages" 
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
17b6a597fb Revert "ceph: Now evaluate on darwin" 
This reverts commit 54963fb5b7.
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
660e85a0d9 Revert "ceph: Add development version" 
This reverts commit 81f705e98c.
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
24390ab377 Revert "ceph: Update git" 
This reverts commit 2154348ba0.
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
1e6e52c2ac Revert "krb5: 1.13.1 -> 1.13.2" 
This reverts commit 85932bc5a9.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra
80ebb879cd Revert "e2fsprogs: 1.14.12 -> 1.14.13" 
This reverts commit 3f4f90b58b.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra
98a4eabd99 Revert "qemu: 2.2.2 -> 2.3.0" 
This reverts commit 19c259161b.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" 
This reverts commit 25a148fa19.
 2015-06-04 14:54:48 +02:00
lethalman
1e744d9005 Merge pull request #8149 from clefru/xsettingsd 
Add xsettingsd package
 2015-06-04 12:19:42 +02:00
Clemens Fruhwirth
1db87a34e9 Add xsettingsd. 2015-06-04 09:16:05 +00:00
Tobias Geerinckx-Rice
a714ddcbd5 signing-party: Americanise licence -> license 2015-06-03 22:40:10 +02:00
Pascal Wittmann
b55e54694e Merge pull request #7666 from qknight/clamav_security 
clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222 CVE-2015-2305 CVE-2015...
 2015-06-03 22:13:48 +02:00
Peter Simons
e7f898a17c Merge pull request #8158 from DamienCassou/add-signing-party 
Add signing-party (aka., gpg-tools)
 2015-06-03 17:11:48 +02:00
Damien Cassou
a4ac0caa52 Add signing-party (aka., gpg-tools) 2015-06-03 17:08:45 +02:00
Tobias Geerinckx-Rice
3467aa462a stress-ng 0.04.04 -> 0.04.05 
Changes:
- Ensure maximum sizes don't exceed 4GB-1 for 32 bit systems
- stress-crypt: only use re-entrant crypt_r on Linux for now
- Add perf reference in manual, update date
- stress-vm-rw: zero msg_wr just to be totally safe
- stress-crypt: use reentrant crypt_r to avoid any memory leaks
- stress-zombie: free items on list head on exit
- stress-lockf: free items on list head on exit
- stress-wcstr: fix incorrect wide string size
- Add int8, int16, int32 and int64 versions of mwc*()
- Increase various stressors upper memory limits
- Make --aggressive force more CPU migrations and context switches
- Fix comment for stress_get_ticks_per_second
- perf: enable inherit flag to trace children
- Add the new --getrandom stressor
- Fix sigq options, missing because not using STRESS_SIGQUEUE
- Fix help -h option, was --h, should be -h
- avoid builtins when libs shall be tested
- add stressor for wide character sting operations
- fix string names
- avoid compiler error in stress-vector
- fix EPOLL build
 2015-06-03 12:44:07 +02:00
Domen Kožar
23c845f526 Merge pull request #8119 from mbbx6spp/fix-dd-agent-package 
Fix dd-agent buildInputs to include pythonPackages.psutil
 2015-06-03 09:11:10 +02:00
Shea Levy
33a1b14b06 nixopsUnstable: Bring in quick fix 2015-06-02 16:23:46 -04:00
Shea Levy
99bf7f5698 nixopsUnstable: Bump 2015-06-02 15:50:44 -04:00
Arseniy Seroka
eb2c3c6681 Merge pull request #8124 from pmahoney/skarnet-update 
Skarnet update
 2015-06-02 19:25:37 +03:00
lethalman
f9c6921f0a Merge pull request #8128 from monocell/add-crackxls 
fix crackxls libgsf dependency and naming problem
 2015-06-02 15:02:28 +02:00
Emil Rangden
6eb4fdeb4d fix crackxls libgsf dependency 2015-06-02 13:21:53 +02:00
Tobias Geerinckx-Rice
7db1aa06a5 nxproxy & libxcomp: use lite instead of full nx-libs 2015-06-02 01:46:05 +02:00
Patrick Mahoney
74964c255e Update skarnet.org software 
execline           2.1.2.0
s6-dns             2.0.0.3
s6-networking      2.1.0.1
s6-portable-utils  2.0.5.0
skalibs            2.3.4.0
 2015-06-01 15:20:56 -05:00
Patrick Mahoney
9835f18fbd Add myself as maintainer for skarnet software 2015-06-01 15:20:56 -05:00
Susan Potter
727565279f Fix dd-agent buildInputs to include pythonPackages.psutil 
When deploying current master version journalctl showed ImportErrors in the logs with message:
'No module named psutil' and systemctl dd-agent service failed to start. To fix I added
pythonPackages.psutil as a buildInputs entry and this fixed the issue.

See this Gist for journalctl errors for reference:
https://gist.github.com/mbbx6spp/59eefabbe708c335a31f
 2015-06-01 13:54:13 -05:00
Pascal Wittmann
314c6847aa cpuminer: update from 2.4.1 to 2.4.2 2015-06-01 20:33:43 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
lethalman
3935379089 Merge pull request #8117 from monocell/add-crackxls 
new package: crackxls
 2015-06-01 18:51:58 +02:00
lethalman
80dd602c48 Merge pull request #7479 from bobvanderlinden/hwinfo 
added hwinfo
 2015-06-01 17:09:00 +02:00
Emil Rangden
ee8ac51986 add linux to platforms 2015-06-01 16:59:09 +02:00
Emil Rangden
10acbd6716 new package: crackxls 2015-06-01 16:15:19 +02:00
Emil Rangden
51bb5e85dc hashcat: fix build and update to 0.49 2015-06-01 15:58:07 +02:00
codyopel
3400fa038f rtmpdump_gnutls: add missing lib nettle & use git date format 
Close #8112.
 2015-06-01 13:19:08 +02:00
codyopel
dd6946dcbb beets: 1.3.11 -> 1.3.13 2015-05-31 23:51:04 -04:00
Tobias Geerinckx-Rice
13cc88f273 netsniff-ng -> 0.5.9-5-g107456c 
Provides more detailed rtnl dumps.
 2015-06-01 04:09:30 +02:00
Tobias Geerinckx-Rice
cf8ea81fe4 dpkg 1.18.0 -> 1.18.1 2015-06-01 04:04:33 +02:00
Tobias Geerinckx-Rice
fbf7ff8b7f stress-ng 0.04.03 -> 0.04.03 2015-06-01 04:04:33 +02:00
Tobias Geerinckx-Rice
0c65324995 Merge pull request #8102 from codyopel/tcpdump 
tcpdump: 4.7.3 -> 4.7.4
 2015-06-01 03:08:14 +02:00
codyopel
987fb76dc1 youtube-dl: 2015.05.20 -> 2015.05.29 2015-05-31 20:45:42 -04:00
codyopel
75f64a8bc4 tcpdump: 4.7.3 -> 4.7.4 2015-05-31 20:28:31 -04:00
Arseniy Seroka
db56961236 Merge pull request #8096 from rycee/update/svtplay-dl 
Bump 'svtplay-dl' to version 0.10.2015.05.24.
 2015-06-01 01:46:27 +03:00
William A. Kennington III
f99ec984d7 gnupg21: 2.1.3 -> 2.1.4 2015-05-31 13:55:18 -07:00
Robert Helgesson
e9f9d1c029 Bump 'svtplay-dl' to version 0.10.2015.05.24. 
Also switch to `fetchFromGitHub` from plain `fetchurl`.
 2015-05-31 22:41:26 +02:00
Pascal Wittmann
e0cc3efca2 hevea: update from 1.07 to 2.23 
add meta-information and adopt it
 2015-05-31 16:30:24 +02:00
Cillian de Róiste
36985e8b5a aespipe: update from 2.4c to 2.4d 2015-05-31 13:12:39 +02:00
Tobias Geerinckx-Rice
d904b54c0e lz4: fix make test 
I'll assume this is an oversight due to hasty releasing and can be
reverted in version 131.
 2015-05-30 21:09:26 +02:00
Tobias Geerinckx-Rice
3c6d34a5d9 dpkg 1.17.25 -> 1.18.0 2015-05-30 21:09:25 +02:00
Tobias Geerinckx-Rice
cbbd7230ac lz4 129 -> 130 
Hotfix, solving issues with lz4cat.

- Fixed: incompatibility sparse mode vs console (#105)
- Fixed: LZ4IO exits too early when frame crc not present (#106)
- Fixed: incompatibility sparse mode vs append mode (#110)
- Performance fix: big compression speed boost for clang (+30%)
- New: cross-version test
 2015-05-30 21:09:25 +02:00
Vladimír Čunát
6bc372af69 inadyn: fix build and typo in name 
/cc maintainer @viric.
 2015-05-30 19:34:55 +02:00
William A. Kennington III
2154348ba0 ceph: Update git 2015-05-29 20:50:12 -07:00
William A. Kennington III
81f705e98c ceph: Add development version 2015-05-29 20:50:12 -07:00
Jascha Geerds
2e583a4963 Add jgeerds to maintainers of khal and vdirsyncer 2015-05-30 01:26:45 +02:00
Jascha Geerds
2a0b05a238 vdirsyncer: Propagate dependencies and use requests2 2015-05-30 01:07:14 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
William A. Kennington III
cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Pascal Wittmann
e928a5379f ncdu: update from 1.10 to 1.11 2015-05-29 22:17:02 +02:00
William A. Kennington III
f51d38214d nixUnstable: Bump 2015-05-29 11:48:58 -07:00
codyopel
ce62e1c77f youtube-dl: refactor 
Closes https://github.com/NixOS/nixpkgs/pull/8039.
 2015-05-29 20:26:31 +02:00
Pascal Wittmann
2927efe62e cabextract: update from 1.4 to 1.6 2015-05-29 19:52:03 +02:00
William A. Kennington III
023f0f7992 ceph: 0.94.1.1 -> 0.94.1.2 2015-05-29 10:36:55 -07:00
Pascal Wittmann
86e6e490ff nzbget: update from 14.2 to 15.0 2015-05-29 19:07:52 +02:00
Shea Levy
0ad7204c3d nixopsUnstable: bump 2015-05-29 13:05:48 -04:00
Tobias Geerinckx-Rice
0761f81da7 debian-devscripts -> 2.15.4 
Temporarily drop bash completions until fixed.
 2015-05-29 01:52:33 +02:00
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master 
Don't use "with licenses;" for single licences
 2015-05-28 22:14:53 +02:00
Gabriel Ebner
77c790fc0e Bump ibus, ibus-anthy, and ibus-qt to their latest versions. 2015-05-28 22:07:36 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Pascal Wittmann
3ae285976e parallel: update from 20150322 to 20150522 2015-05-28 19:02:41 +02:00
Rok Garbas
08b5686cd7 cygwin: tetex patch to make it build on cygwin 2015-05-28 14:15:47 +02:00
William A. Kennington III
85932bc5a9 krb5: 1.13.1 -> 1.13.2 2015-05-28 02:20:08 -07:00
Florian Friesdorf
12b781a945 cygwin: zip 2015-05-28 10:53:36 +02:00
Florian Friesdorf
7f7aca4e16 cygwin: asciidoc otherwise tries to install to //nix and fails on cygwin 
'//' on cygwin is the beginning of a SAMBA path
 2015-05-28 10:53:36 +02:00
Florian Friesdorf
2876b726bd cygwin: currently no libsigsegv for x86_64-cygwin 2015-05-28 10:53:36 +02:00
Marko Durkovic
af5484a630 cygwin: opensp 2015-05-28 10:53:36 +02:00
Florian Friesdorf
15952587a0 cygwin gnugrep: disable check due to multibyte-white-space 2015-05-28 10:53:36 +02:00
Florian Friesdorf
387ad260c0 cygwin: cpio fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf
3961eb8a6c cygwin: gnutar fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf
6756d7cdf8 cygwin: gzip fpending 2015-05-28 10:53:35 +02:00
Marko Durkovic
221b5a5be5 cygwin: findutils fpending and coreutils patch 2015-05-28 10:53:35 +02:00
Arseniy Seroka
98d160e1f0 Merge pull request #7966 from benley/cli53 
New package: cli53 (AWS Route53 admin CLI tool)
 2015-05-28 04:40:21 +03:00
Austin Seipp
6fbc62419b nixpkgs: afl 1.67b -> 1.80b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Pascal Wittmann
9e0763dd8a Add lolcat, a rainbow version of cat 
Closes #3399
 2015-05-27 17:02:36 +02:00
Rob Vermaas
49b5acc3d9 Upgrade dhcpcd to 6.9.0. Version 6.8.1 caused issues on GCE, making the instances unavailable. 2015-05-27 11:43:14 +00:00
lethalman
af4d6468b2 Merge pull request #7959 from ikervagyok/darkice 
New Package: Darkice
 2015-05-27 10:51:59 +02:00
Arseniy Seroka
43690ae4ee Merge pull request #7987 from magnetophon/das_watchdog-master 
add das_watchdog: a realtime watchdog
 2015-05-27 11:47:15 +03:00
Tobias Geerinckx-Rice
dda255f938 jmtpfs: fix changed sha256 hash 
...by switching to fetchFromGitHub. Also clean up (some
dependencies are no longer needed).
 2015-05-27 02:56:39 +02:00
Benjamin Staffin
a9b9856c37 New package: cli53 (AWS Route53 admin CLI tool) 2015-05-26 10:29:27 -07:00
Lengyel Balázs
aa1ce46281 Inital commit for Darkice 2015-05-26 15:20:53 +02:00
Mateusz Kowalczyk
164a5ef32a Merge pull request #8006 from DamienCassou/update-offlineimap-6.5.7 
Update offlineimap 6.5.6 -> 6.5.7
 2015-05-26 14:16:06 +01:00
Bart Brouns
c3b7a8b053 add das_watchdog: a realtime watchdog 2015-05-26 15:13:59 +02:00
Damien Cassou
5f92dcce36 Update offlineimap 6.5.6 -> 6.5.7 2015-05-26 15:12:40 +02:00
Tobias Geerinckx-Rice
02e693e1b9 Remove w3c-css-validator 
Depends on missing tarballs. Broken since 2013.
 2015-05-26 11:46:41 +02:00
William A. Kennington III
1b82194892 dos2unix: 7.2.1 -> 7.2.2 2015-05-26 01:36:35 -07:00
William A. Kennington III
c2a32a689d nbd: 3.10 -> 3.11 2015-05-26 01:36:35 -07:00
William A. Kennington III
96178127c5 aria2: 1.18.10 -> 1.19.0 2015-05-26 01:36:35 -07:00
lethalman
b53f144c0d Merge pull request #7976 from mdorman/master-updates 
Fix SHA for pasystray.
 2015-05-26 10:35:38 +02:00
Herwig Hochleitner
3df28a32f5 debootstrap: update to current stable 
makedev 2.3.1-89 -> 2.3.1-93
debootstrap 1.0.66 -> 1.0.67
 2015-05-26 09:52:07 +02:00
Thomas Tuegel
255c0903a1 gnuplot: requires Qt 4 2015-05-25 21:04:01 -05:00
Michael Alan Dorman
1a4c952422 And now try fetchFromGitHub 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
e81c6bd654 Use fetchzip to retrieve new pasystray. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
bc1b8cb33a Update pasystray to current version. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
fb655dce4c Fix SHA for pasystray. 
I presume there's something about how github creates the .zip files such
that they can change SHA.

Please note: this is a very outdated version of pasystray---I don't know
if that's intentional, but perhaps a better strategy would be to update
it wholesale.
 2015-05-25 17:13:37 -04:00
Edward Tjörnhammar
161fdec0f5 tidy-html5: added package, also provides libtidy5 2015-05-25 15:05:05 +02:00
Bob van der Linden
2f4dc083d5 added hwinfo 2015-05-25 14:17:46 +02:00
Tobias Geerinckx-Rice
c4a2f4f4b1 darkstat 3.0.718 -> 3.0.719 
- Implement tracking of remote ports: shows which ports the host
  is making outgoing connections to. Long time feature request.
- Bugfix: when the capture interface goes down, exit instead of
  busy-looping forever.
- Fix "clock error" due to machine reboot.
- SIGUSR1 now resets the time and bytes reported on the graphs
  page.
- Account for all IP protocols.
- Change the default ports_max to only twice the default
  ports_keep.
 2015-05-25 13:35:54 +02:00
Domen Kožar
bbc1df3092 Merge branch 'staging' 2015-05-25 11:33:05 +02:00
William A. Kennington III
580032914f dhcp: Add proper bind dependency 2015-05-24 15:05:25 -07:00
Domen Kožar
649ce300e3 Merge pull request #7587 from dezgeg/pr-refind 
refind: Fix build on i686
 2015-05-24 23:43:10 +02:00
Vladimír Čunát
f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Bjørn Forsman
b217d9a4dd fail2ban: fix broken download/hash 
The (dynamically generated) compressed archive has changed. Switch from
fetchurl to fetchzip to not get bitten by that again.
 2015-05-24 20:31:52 +02:00
William A. Kennington III
1efd5f0fdf ccid: 1.4.18 -> 1.4.19 2015-05-24 01:53:14 -07:00
William A. Kennington III
cdd93463c0 gawk: 4.1.2 -> 4.1.3 2015-05-24 00:19:35 -07:00
William A. Kennington III
171904e873 Merge pull request #7965 from benley/awscli-1.7.29 
awscli: update to 1.7.29
 2015-05-23 22:45:17 -07:00
William A. Kennington III
4d3c1caa7b Merge pull request #7963 from benley/riemann-c-client-1.7.0 
riemann-c-client: update to 1.7.0
 2015-05-23 22:44:37 -07:00
William A. Kennington III
384d8a79d0 Merge pull request #7717 from stephenmw/gcloud 
Add the google-cloud-sdk package
 2015-05-23 22:14:47 -07:00
Stephen Weinberg
da2aef3685 Add the google-cloud-sdk package 2015-05-24 06:20:45 +02:00
William A. Kennington III
3f4f90b58b e2fsprogs: 1.14.12 -> 1.14.13 2015-05-23 19:07:13 -07:00
Benjamin Staffin
50cb206cd5 awscli: update to 1.7.29 
Includes updates to bcdoc and botocore.
 2015-05-23 18:29:44 -07:00
Benjamin Staffin
f996306527 riemann-c-client: update to 1.7.0 2015-05-23 18:01:51 -07:00
Peter Simons
b7dd802f6c Merge pull request #7948 from magnetophon/fasd-fixup-master 
fasd: remove pandoc dep (==haskell), update revision
 2015-05-22 23:40:40 +02:00
William A. Kennington III
54963fb5b7 ceph: Now evaluate on darwin 2015-05-22 14:20:29 -07:00
William A. Kennington III
3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Bart Brouns
177cbf7348 fasd: remove pandoc dep (==haskell), update revision 2015-05-22 21:50:17 +02:00
Arseniy Seroka
adfc77fcdf Merge pull request #7935 from doublec/tor 
Update tor to 0.2.6.8
 2015-05-22 14:48:04 +03:00
Tobias Geerinckx-Rice
87b27c9da5 stress-ng 0.04.02 -> 0.04.03 2015-05-22 10:39:28 +02:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
Damien Cassou
188a067d8e Merge pull request #7929 from DamienCassou/update-networkmanager-1.0.2 
networkmanager 1.0.0 -> 1.0.2
 2015-05-22 10:19:48 +02:00
Damien Cassou
3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
Chris Double
276bd7f16e Update tor to 0.2.6.8 2015-05-22 11:20:10 +12:00
Pascal Wittmann
f3867899ee tightvnc: replace occurences to /usr/bin/ssh 
closes #3669
 2015-05-21 18:53:45 +02:00
Pascal Wittmann
691b98fc28 tightvnc: refactoring 2015-05-21 18:53:45 +02:00
Michael Raskin
9ce93b6c29 Update TigerVNC to Git version; needed for GNU TLS compatibility 2015-05-21 19:48:25 +03:00
William A. Kennington III
19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
William A. Kennington III
737d77db75 btrfsprogs: 4.0 -> 4.0.1 2015-05-20 18:30:22 -07:00
Pascal Wittmann
c2dd7622c5 Merge pull request #7914 from pjones/pkg/mpdris2 
New package: mpDris2, MPRIS 2 support for mpd
 2015-05-20 23:45:35 +02:00
Peter Jones
05a6c34e04 New package: mpDris2, MPRIS 2 support for mpd 2015-05-20 15:37:25 -06:00
Nikolay Amiantov
dbcfd854c8 Merge pull request #7104 from gebner/mozc 
Add mozc, a Japanese input method from Google.
 2015-05-20 22:20:32 +03:00
Pascal Wittmann
2043857a73 youtube-dl: update from 2015-05-15 to 2015-05-20 2015-05-20 21:14:45 +02:00
Gabriel Ebner
64ecc21b9a Add mozc and its dependency zinnia. 2015-05-20 20:25:23 +02:00
Thomas Tuegel
49fa221c62 Update libbluedevil to 2.1 
The bluedevil build has been failing since it was updated to
2.1.1. Bluedevil and libbluedevil must be kept at the same major version!
 2015-05-20 07:25:13 -05:00
Luca Bruno
404608478d networkmanagerapplet: fix VPN plugins path. Closes #7908 2015-05-20 11:57:42 +00:00
William A. Kennington III
0bc84ecccd gummiboot: 45 -> 48 2015-05-20 00:27:03 -07:00
William A. Kennington III
ef7c804a6f openresolv: 3.5.7 -> 3.7.0 2015-05-20 00:03:48 -07:00
Mateusz Kowalczyk
5c8ea1958d youtube-dl: update to 2015.05.15 2015-05-20 06:58:09 +01:00
William A. Kennington III
35da884667 ceph: Support newer versions 2015-05-19 22:56:47 -07:00
Daniel Pfile
7c9d5eeee5 Upgrade Ansible to 1.9.1 2015-05-19 16:27:25 -05:00
Pascal Wittmann
65f1e8e048 ploticus: update from 2.41 to 2.42 2015-05-19 22:06:32 +02:00
Arseniy Seroka
b28d29ba0b fix missing argument 2015-05-19 21:09:34 +03:00
Pascal Wittmann
7761b0454d rddtool: update from 1.4.9 to 1.5.3 2015-05-19 20:08:15 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Chris Double
609002cc94 Update tor-browser to 4.5.1 2015-05-19 14:52:52 +12:00
Chris Double
49d9476608 Update to tor 0.2.6.7 2015-05-19 14:19:15 +12:00
Patrick Mahoney
02e46cacc6 keychain: fixup shebang, use upstream builder, install manpage 
fixup shebang - build was not running fixupPhase, and shebang was pointing to
/bin/sh. On a system where /bin/sh links to dash, this results in errors:

    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 59: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: shopt: not found
    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 686: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: Syntax error: "(" unexpected (expecting ")")

use upstream builder - the include Makefile uses perl to generate a manpage and
insert the same text into the keychain script for '--help' output, which was
otherwise missing:

    $ keychain --help

     * keychain 2.8.0 ~ http://www.funtoo.org

    [snip]

    INSERT_POD_OUTPUT_HERE

install manpage - self explanatory
 2015-05-18 15:26:06 -05:00
Nikolay Amiantov
ab7d2f7f39 network-manager-l2tp: add homepage 2015-05-18 17:21:08 +03:00
lethalman
efed756e67 Merge pull request #7849 from mschristiansen/mongo-tools-2 
MongoDB Tools and Go dependencies
 2015-05-18 10:52:49 +02:00
Mikkel Christiansen
734bc9f2e5 Add MongoDB tools and build dependencies. 2015-05-18 10:29:22 +02:00
Jascha Geerds
2b1802fec1 Merge pull request #7868 from eikek/master 
storebackup 3.4 -> 3.5
 2015-05-17 13:05:42 +02:00
Eike Kettner
699adbf6f9 storebackup 3.4 -> 3.5 2015-05-17 12:37:44 +02:00
Eric Seidel
c9d50c0128 Revert "man-db: dont use libpipeline on darwin, causes build failure" 
This reverts commit ef66f1536d.
 2015-05-16 17:27:25 -07:00
Domen Kožar
ea2c17571d miniupnp{c,d}: bump 2015-05-16 20:34:40 +02:00
Edward Tjörnhammar
3b4152f7e1 gtkvnc: add libgpgerror as dependency 2015-05-16 19:58:29 +02:00
Pascal Wittmann
496371321b atomicparsely: fixed build 2015-05-16 14:00:19 +02:00
William A. Kennington III
484a7be844 grub2: 2015-04-24 -> 2015-05-14 2015-05-15 18:38:15 -07:00
William A. Kennington III
da719f19a6 inetutils: 1.9.2 -> 1.9.3 2015-05-15 18:38:13 -07:00
William A. Kennington III
52587b9f81 tinc-pre: 2015-03-14 -> 2015-05-15 2015-05-15 18:38:12 -07:00
William A. Kennington III
3913d03890 ttylog: Add derivation 2015-05-15 18:38:12 -07:00
Vladimír Čunát
69a6848b57 rtmpdump: propagate build inputs according to *.pc 
This fixes ffmpeg-full build.
 2015-05-15 21:39:41 +02:00
Eric Seidel
ef66f1536d man-db: dont use libpipeline on darwin, causes build failure 2015-05-15 10:28:06 -07:00
Henry Till
8b580fb9d1 smartmontools: clean up meta, add darwin to meta.platforms 2015-05-15 12:41:33 -04:00
Spencer Whitt
2f6e9000e8 ent: clang fix 2015-05-15 11:58:21 -04:00
Spencer Whitt
e17dfe13e8 bandwidth: clang fix 2015-05-15 11:58:21 -04:00
Spencer Whitt
4c76dda4dd curl 7.15: Disable on Darwin 
Build is failing and this version of curl is not used for anything
useful on Darwin, so it's not worth fixing.
 2015-05-15 11:58:21 -04:00
Spencer Whitt
3f6b56812c bwm_ng: clang fix 2015-05-15 11:58:20 -04:00
Pascal Wittmann
9ac11fb2ef inadyn: fix & update from 1.99.10 to 1.99.13 2015-05-14 19:36:09 +02:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eric Seidel
67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Oliver Charles
aef701babc opentsdb: Update 2.1.0 (official release) 2015-05-14 11:50:22 +01:00
Lluís Batlle i Rossell
53b6a4f063 Hack for btrfsProgs in ARM, due to a gcc bug. 
It fails to build otherwise:
/tmp/nix-build-btrfs-progs-4.0.drv-4/ccUNrySY.s:4014: Error: invalid operands (.text and *UND* sections) for `-'
 2015-05-13 21:24:48 +00:00
Eelco Dolstra
94389cb8c6 xdg-utils, libclc: Use fetchzip 2015-05-13 18:17:26 +02:00
Eelco Dolstra
0cc883f2ee groff: Mark as unsafe for parallel building 2015-05-13 18:17:25 +02:00
Eelco Dolstra
5a9ac9fed7 Use gcc 4.9 by default 2015-05-13 18:17:24 +02:00
Charles Strahan
7021988dd1 Merge pull request #7818 from cstrahan/nmtui2 
networkmanager: enable nmtui, the curses interface
 2015-05-13 00:46:04 -04:00
Moritz Ulrich
24d5eb262d Pass: Add pwgen to wrapper. 2015-05-12 23:38:28 +02:00
Shea Levy
206d63edac curl: propagate inputs instead of patching pkgconfig 2015-05-12 13:07:58 -04:00
Shea Levy
f168973bfd Revert "curl: Improve .pc and .la patching" 
This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73.
 2015-05-12 12:49:36 -04:00
Tobias Geerinckx-Rice
a989b629d9 lz4 128 -> 129 
- New: LZ4_compress_fast()
- Changed: New lz4 and lz4hc compression API. Previous function
  prototypes still supported.
- Changed: Sparse file support enabled by default
- New: LZ4 CLI improved performance compressing/decompressing multiple
  files
- Added: LZ4_compress_destSize()
- Fixed: GCC 4.9+ vector optimization
- Changed: Enums converted to LZ4F_ namespace convention
- Added: AppVeyor CI environment, for Visual tests
- Modified:Obsolete functions generate warnings
- Fixed : Bug #75 (unfinished stream)
- Updated: Documentation converted to MarkDown format
 2015-05-12 18:13:05 +02:00
Pascal Wittmann
e504a9301d bgs: update from 0.7 to 0.7.1 2015-05-12 17:24:50 +02:00
Tobias Geerinckx-Rice
5144f01d4f stress-ng 0.04.00 -> 0.04.02 2015-05-12 08:45:47 +02:00
Charles Strahan
1677b33162 networkmanager: enable nmtui, the curses interface 2015-05-11 20:54:17 -04:00
William A. Kennington III
bd69c51ddf trousers: Fix darwin build 2015-05-11 15:58:17 -07:00
William A. Kennington III
26c37ded73 curl: Improve .pc and .la patching 2015-05-11 15:12:38 -07:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Tobias Geerinckx-Rice
c7c10f28ad netsniff-ng -> 0.5.9 2015-05-11 23:12:09 +02:00
Pascal Wittmann
d9383746e6 bgs: update from 0.6 to 0.7 2015-05-11 18:16:12 +02:00
Wout Mertens
c7893e960d efibootmgr/var: upgrade 2015-05-11 14:25:17 +00:00
William A. Kennington III
1199d23a39 ceph: 0.94.1 -> 0.94.1.1 2015-05-11 01:29:17 -07:00
Michael Raskin
de02c8e880 Update Pipelight to use wine-staging 2015-05-10 13:46:32 +02:00
Michael Raskin
3dab0e11ee Update GlusterFS 2015-05-10 13:46:31 +02:00
Michael Raskin
b51dbb22dd Update badvpn 2015-05-10 13:46:31 +02:00
Michael Raskin
87eb733e5b Update IPMIutil 2015-05-10 13:46:31 +02:00
Michael Raskin
986a949a42 Update XDaliClock 2015-05-10 13:46:30 +02:00
Michael Raskin
3ed214e53c Update ZPAQ 2015-05-10 13:46:30 +02:00
William A. Kennington III
3da4a55ac4 screenfetch: 3.6.2 -> 2015-04-20 2015-05-10 13:46:29 +02:00
rushmorem
a7a0fcfbd2 Add s3ql package 
S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
 2015-05-10 13:46:01 +02:00
koral
839f3c3ab7 rmlint: 2.0.0 -> 2.1.0 2015-05-10 13:46:00 +02:00
Lluís Batlle i Rossell
282354a6cf Updating cjdns to latest master. 
It has important stability fixes.
 2015-05-09 20:22:58 +00:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
William A. Kennington III
c17b2144b4 tmux: 1.9a -> 2.0 2015-05-08 05:50:21 -07:00
Luca Bruno
eb98989cf0 Add libcrafter and tracebox 2015-05-08 13:20:27 +02:00
Domen Kožar
25408d4146 Merge pull request #7753 from Lassulus/my-15.05pre61665.4c01e6d 
s3fs: fix typo in name
 2015-05-08 10:42:07 +02:00
lassulus
d62204a1d2 s3fs: fix typo in name 2015-05-07 22:47:58 +02:00
Tobias Geerinckx-Rice
0db1bb5bda wget: verify cookie domains with libpsl 
Reduces vulnerability to "supercookie" attacks:
<http://comments.gmane.org/gmane.comp.web.wget.general/12820>
 2015-05-07 17:30:20 +02:00
Peter Simons
8ea440b59b Merge pull request #7600 from jraygauthier/jrg/add_diagrambuilder_stdalone_pkg 
Added standalone diagram-builder haskell package.
 2015-05-07 11:16:01 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Arseniy Seroka
901849eca4 less: fix sha 2015-05-06 20:19:54 +03:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Tobias Geerinckx-Rice
7a94848638 stress-ng 0.04.00 -> 0.04.01 2015-05-05 19:44:46 +02:00
William A. Kennington III
00d108e4f5 pciutils: 3.3.0 -> 3.3.1 2015-05-04 23:27:52 -07:00
William A. Kennington III
08ffb05c7e gawk: 4.1.1 -> 4.1.2 2015-05-04 23:22:57 -07:00
William A. Kennington III
faf57b2d05 radvd: 2.10 -> 2.11 2015-05-04 23:20:34 -07:00
Paulus Esterhazy
4d8d25e4b3 Merge branch 'master' into fix/ansible-ec2 2015-05-04 08:57:57 +02:00
Paulus Esterhazy
cecae8262a Add "six" as dependency 
Ansible's official dynamic inventory script for AWS, ec2.py, requires
python library `six` to work properly. This commit adds the library as
a dependency.
 2015-05-04 08:55:12 +02:00
Tobias Geerinckx-Rice
aaef57d4c2 netsniff-ng -> v0.5.9-rc5-22-gdafb89c 
- Show the packet number as part of the dissector output
- Reorder packet number output
- Print 'IE:' prefix before each mgmt IE parameter
- Print probe request IEs info
- Alias lb to rr as well
 2015-05-03 22:29:13 +02:00
Joachim Schiele
00cbf82c01 clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222 CVE-2015-2305 CVE-2015-2668 2015-05-03 02:28:13 +02:00
Thomas Tuegel
5c0512aca0 ceph: add zlib to buildInputs 2015-05-02 10:58:10 -05:00
Ricardo M. Correia
b526c0fbb2 attic: Update hash 
It seems to have happened the same thing as in
2c89d0b82d: the hash changed but
apparently no new commit was added...
 2015-05-02 13:48:20 +02:00
William A. Kennington III
d5584b9698 opensc: Use libassuan2 2015-05-01 17:47:52 -07:00
William A. Kennington III
5e3fe3916a curl: Modernize build 2015-05-01 15:57:14 -07:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III
1d15063768 rtmpdump: Use openssl by default 2015-05-01 15:06:39 -07:00
William A. Kennington III
9d5a3e62cf curl: 7.42.0 -> 7.42.1 2015-05-01 15:06:39 -07:00
William A. Kennington III
c5081bd603 btrfsprogs: 3.19.1 -> 4.0 2015-05-01 15:06:39 -07:00
William A. Kennington III
c46e1049aa expect: Refactor and add maintainer 2015-04-30 18:49:27 -07:00
Jascha Geerds
6823b5e657 Merge pull request #7636 from bramd/brltty 
Added BRLTTY package
 2015-05-01 00:21:49 +02:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel
66b66e8302 openconnect: depend on zlib 2015-04-30 11:14:24 -05:00
Jascha Geerds
dd6ddfaf0c dvdisaster: Fix description 2015-04-30 12:08:54 +02:00
Raymond Gauthier
6119355c9c Simplify standalone diagrams-builder expression. 2015-04-29 21:46:39 -04:00
Thomas Tuegel
487310e921 usbmuxd: update to 1.1.0 2015-04-29 17:46:14 -05:00
Jascha Geerds
7e25c4ed7f Merge pull request #7592 from geerds/dvdisaster 
dvdisaster: Apply debian's patches, fix desktop file and icons
 2015-04-29 23:16:54 +02:00
Bram Duvigneau
9a535b9023 Added BRLTTY package 2015-04-29 23:02:09 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Chris Double
d941d4c26e Update tor-browser to 4.5 2015-04-29 11:58:52 +12:00
Edward Tjörnhammar
b9b8e3acba {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src: use mirrors, https and fetchFromSavannah to enable better availability for proxied users 2015-04-28 22:50:57 +02:00
Herwig Hochleitner
9754783b06 i2p: fix compilation 
- use system jdk instead of hardcoded openjdk
- remove backgrounding of service launcher
 2015-04-28 15:17:58 +02:00
Herwig Hochleitner
c6562348b8 i2p: update 0.9.18 -> 0.9.19 2015-04-28 14:35:36 +02:00
Peter Simons
44447fdd17 Merge pull request #7598 from jraygauthier/jrg/add_innoextract_pkg 
Added innoextract package.
 2015-04-28 13:23:14 +02:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Raymond Gauthier
c45bc8c2b4 Added innoextract package. 
Allows to extract inno installer packages.
 2015-04-27 23:03:18 -04:00
Raymond Gauthier
76a8089d96 Added standalone diagram-builder haskell package. 
Simple wrapper over `haskellng`'s `diagram-builder`
package that allows for simpler install.
 2015-04-27 23:02:37 -04:00
William A. Kennington III
4463bad2dd grub: Update from 2015-2-21 -> 2015-04-24 2015-04-27 18:25:56 -07:00
Tobias Geerinckx-Rice
f401b3cf0b httping 2.3.4 -> 2.4 
Also add support for the fancy ncurses interface.
 2015-04-28 02:22:25 +02:00
Tobias Geerinckx-Rice
999241a907 Add aha 0.4.8: quick & dirty ANSI-to-HTML converter 2015-04-28 00:10:14 +02:00
Jascha Geerds
1b3fb2709e dvdisaster: Add icons and desktop file 2015-04-28 00:01:58 +02:00
Jascha Geerds
00ab10de74 dvdisaster: Apply debian's patches to allow ROM type and encrypted DVDs 2015-04-28 00:01:49 +02:00
Tobias Geerinckx-Rice
7e3b44b205 stress-ng 0.03.22 -> 0.04.00 2015-04-27 23:02:02 +02:00
Tuomas Tynkkynen
f44add6911 refind: Fix build on i686 
Use the correct linker script filename on i686 to fix this build error:

/.../ld: cannot open linker script file /nix/store/...-gnu-efi_3.0u/lib/elf_x86_64_efi.lds: No such file or directory

Only compile tested.
 2015-04-27 15:24:24 +03:00
lethalman
9807dbc142 Merge pull request #7486 from oxij/actkbd-and-media-keys 
add actkbd; nixos: add support for volume control with media keys
 2015-04-27 12:31:15 +02:00
lethalman
458ea6d506 Merge pull request #7480 from dezgeg/pr-ddclient-line-buffering 
ddclient: Force line buffering on stdout
 2015-04-27 12:16:50 +02:00
William A. Kennington III
6a366d535a eggdrop: Refactor 2015-04-26 21:30:28 -07:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Michael Raskin
52b47982ff Abandon separate TeXLive-associated PGF package, make it a reference to pgf3 2015-04-26 21:49:21 +03:00
William A. Kennington III
bcbda5d95b ntp: Refactor and add signing support 2015-04-25 21:27:53 -07:00
John Chee
5717d5e09e curl: ldap and libidn support as curlFull 2015-04-25 14:01:36 -07:00
Jaka Hudoklin
245b45f798 Merge pull request #7561 from offlinehacker/pkgs/fluentd/record_reformer 
fluentd: add record_reformer plugin
 2015-04-25 16:22:28 +02:00
Jaka Hudoklin
a77ef79e5c fluentd: add record_reformer plugin 2015-04-25 15:48:47 +02:00
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Luca Bruno
38d6aec3f6 network-manager: update to 1.0 2015-04-25 11:51:57 +02:00
Luca Bruno
6b6183125e gnutls, trousers: fix .la and .pc files, remove propagated build inputs 
cc @vcunat @wkennington
 2015-04-25 11:43:08 +02:00
Pascal Wittmann
8e86ec5bf0 Merge pull request #7529 from joachifm/trivial-builderDefs 
Some trivial builderDefs->mkDerivation translations
 2015-04-25 11:32:12 +02:00
Edward Tjörnhammar
1f47ec29ff Merge pull request #7462 from codyopel/cuetools 
cuetools: 1.3.1 -> 2014-11-30
 2015-04-24 16:58:53 +02:00
Joachim Fasting
290c217577 ioping: reimplement using mkDerivation 
Also
- set platform unix (upstream claims to support bsd and sun as well)
- fetch source from GitHub
 2015-04-24 11:54:38 +02:00
codyopel
2fa244e4da cuetools: 1.3.1 -> 1.4.1 
+ Fix autoreconf
+ Add support for cuetag.sh
 2015-04-24 05:21:40 -04:00
William A. Kennington III
4277d71a83 bandwidth: Add package 2015-04-23 14:45:39 -07:00
Vladimír Čunát
ccc1ccf983 ceph: fix eval because of typo 2015-04-23 21:45:13 +02:00
Daniel Peebles
465a8c6238 Merge pull request #7471 from spwhitt/darwin_misc 
Enable some libs on Darwin
 2015-04-23 12:21:47 -04:00
Edward Tjörnhammar
c26ed5adc9 Merge pull request #7522 from edwtjo/nix-bump-1 
nixUnstable: Update to 1.9pre4100_4bbcfaf
 2015-04-23 17:29:59 +02:00
Eelco Dolstra
6bfc1f7380 fio: Update to 2.2.7 2015-04-23 15:45:45 +02:00
Edward Tjörnhammar
87b0558101 nixUnstable: Update to 1.9pre4100_4bbcfaf 2015-04-23 13:52:44 +02:00
Tobias Geerinckx-Rice
b7135f496e suid-chroot 1.0.1 -> 1.0.2 (and refactor) 
More of a conversion excercise than anything, but here you go.
 2015-04-23 01:52:18 +02:00
William A. Kennington III
781d77d507 rsyslog: Use libmysql instead of mysql 2015-04-22 16:08:53 -07:00
William A. Kennington III
618c051985 bareos: Use libmysql instead of mysql 2015-04-22 16:03:20 -07:00
William A. Kennington III
88b8333750 bareos: Correctly fix libceph 2015-04-22 16:01:50 -07:00
Moritz Ulrich
b8f33f1147 Fix evaluation by re-adding ceph to bareos. 2015-04-23 00:58:07 +02:00
William A. Kennington III
e074268230 stunnel: 5.14 -> 5.16 2015-04-22 14:47:09 -07:00
William A. Kennington III
dc3f962f64 curl: 7.41.0 -> 7.42.0 2015-04-22 14:37:53 -07:00
William A. Kennington III
fe69e24330 ceph: More refactoring 2015-04-22 14:32:41 -07:00
William A. Kennington III
05d7fb2054 ceph: Add git derivation 2015-04-22 12:35:21 -07:00
William A. Kennington III
9f55b2de6a ceph: More refactoring 2015-04-22 12:35:21 -07:00
Lluís Batlle i Rossell
5a21c015c7 Updating cjdns to 20150422. 2015-04-22 17:11:10 +02:00
Tobias Geerinckx-Rice
e4f0c4a494 netsniff-ng -> v0.5.9-rc5 2015-04-22 12:32:59 +02:00
William A. Kennington III
96101d07db ceph: Xio is only supported in 0.94 and newer 2015-04-22 01:24:50 -07:00
William A. Kennington III
5a573862a2 ceph: Major refactoring 2015-04-22 01:17:55 -07:00
William A. Kennington III
7761112e37 Use some of the library shortcuts 2015-04-21 20:59:42 -07:00
William A. Kennington III
dea5f168f7 ceph: Add 0.80 LTS 2015-04-21 20:57:58 -07:00
William A. Kennington III
6ac4bbd007 ceph: Refactor into a generic expression 2015-04-21 20:57:57 -07:00