BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
68751 commits 1 branch 0 tags 3.8 GiB
Commit graph

447 commits

Author SHA1 Message Date
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
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Vladimír Čunát
ccc1ccf983 ceph: fix eval because of typo 2015-04-23 21:45:13 +02: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
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
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
Tobias Geerinckx-Rice
e5e2de874e zfstools 0.3.1 -> 0.3.2 2015-04-21 02:40:50 +02:00
William A. Kennington III
5233fef635 ntfs-3g: 2014.2.15 -> 2015.3.14 2015-04-19 00:37:55 -07:00
Tobias Geerinckx-Rice
ea5999cd77 reiser4progs 1.0.6 -> 1.0.9 2015-04-19 02:13:30 +02:00
Tobias Geerinckx-Rice
3a627a7fb0 reiserfsprogs 3.6.21 -> 3.6.24 2015-04-19 02:13:30 +02:00
Tobias Geerinckx-Rice
5bc5c6896e mp3fs: fix interoperation with samba 
Ship and apply patch manually because building mp3fs from git is hell.

Also change meta.homepage to the one mentioned in the README.
 2015-04-17 15:54:16 +02:00
Arseniy Seroka
d83f950f71 unionfs-fuse: fix sha 2015-04-16 03:28:34 +03:00
Arseniy Seroka
dada4fb4bf unionfs-fuse: update 0.26 -> 1.0 2015-04-16 03:20:32 +03:00
William A. Kennington III
33e1cd6c38 ceph: 0.94 -> 0.94.1 2015-04-13 18:05:31 -07:00
Pascal Wittmann
e4f8ea6739 tmsu: update from 0.5.1 to 0.5.2 2015-04-09 16:17:19 +02:00
William A. Kennington III
74ea55a175 ceph: 0.93 -> 0.94 2015-04-07 18:22:26 -07:00
Tobias Geerinckx-Rice
1926a7aa32 Tidy nckx-maintained packages 
- Use fetchFromGitHub when possible
- Build in parallel if supported
 2015-04-08 02:29:42 +02:00
Arseniy Seroka
46ce3823d1 yandex-disk: update 0.1.4.504 -> 0.1.5.870 2015-04-07 23:12:23 +03:00
Christian Theune
c61a1d2562 Package zerofree. 2015-04-06 12:33:34 +02:00
Lengyel Balázs
9e7d4d881e nilfs-utils: package hash changed, probably related to: 10528d9d21 2015-04-05 18:01:14 +02:00
Tobias Geerinckx-Rice
69b0873647 duff, nxproxy, libxcomp: use autoreconfHook 2015-04-04 02:28:01 +02:00
Vladimír Čunát
b6fb62fd22 fatsort: meta nitpick 2015-03-28 08:22:26 +01:00
=
6dc86cea5d fatsort: add version number (close #7025) 
Website monitor.nixos.org reported it as out of date when in reality it
just had no version number.
@vcunat refactored meta a bit.
 2015-03-28 08:17:03 +01:00
Tobias Geerinckx-Rice
eff3fa7949 encfs 1.8 -> 1.8.1 2015-03-26 00:29:42 +01:00
William A. Kennington III
985e15007d btrfs-progs: 3.19 -> 3.19.1 2015-03-25 15:11:21 -07:00
William A. Kennington III
fff38f354a btrfsProgs: 3.18.2 -> 3.19 2015-03-20 15:44:51 -07:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Tobias Geerinckx-Rice
e19ab84435 encfs 1.8-rc1 -> 1.8 2015-03-12 11:18:58 +01:00
Michael Raskin
44b608f64e update nilfs utils 2015-03-09 01:03:01 +03:00
Tobias Geerinckx-Rice
7886bd9545 encfs: fix typo 2015-03-03 06:46:30 +01:00
William A. Kennington III
9d79aa18d3 ceph: 0.92 -> 0.93 2015-03-02 21:10:33 -08:00
Tobias Geerinckx-Rice
1db0e77efe encfs 1.7.4 -> 1.8-rc1 (fix timing vulnerability) + clean up 
Many other flaws remain: <https://defuse.ca/audits/encfs.htm>
 2015-03-03 04:48:54 +01:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
Wout Mertens
f80ae41a7d rdfind: Add new package 
refined is a very fast duplicate file finder/remover/hardlinker.
 2015-02-14 23:19:46 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
 2015-02-11 19:37:22 -05:00
Bjørn Forsman
c42d36de1a genext2fs: add meta.{platforms,license,maintainers} 2015-02-11 20:06:14 +01:00
Sander van der Burg
4c7adddcb7 s3fs: Add package 2015-02-11 13:23:58 +00:00
Pascal Wittmann
5478bcffae tmsu: update from 0.5.0 to 0.5.1 2015-02-09 19:26:28 +01:00
Pascal Wittmann
97049ccf80 tmsu: update from 0.4.3 to 0.5.0 2015-02-08 11:45:11 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go 
Go packages, buildGoPackage
 2015-02-07 21:30:30 +01:00
William A. Kennington III
10390a17e4 btrfs-progs: 3.18.0 -> 3.18.2 2015-02-06 12:53:10 -08:00
William A. Kennington III
967ad3fbc3 ceph: 0.91 -> 0.92 2015-02-06 12:17:43 -08:00
Tobias Geerinckx-Rice
4994c859ab boxfs: use fetchFromGitHub 2015-02-06 02:00:35 +01:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Luca Bruno
8fd42c55a9 Port go-mtpfs to buildGoPackage 2015-02-04 15:53:59 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Michael Raskin
a8e7a3ac86 Update glusterfs 2015-02-01 18:41:32 +03:00
lethalman
22244aba42 Merge pull request #5972 from nckx/update-exfat 
Update fuse-exfat 1.0.1 -> 1.1.0
 2015-01-28 14:44:43 +01:00
Tobias Geerinckx-Rice
3ea2b48fe6 Update fuse-exfat 1.0.1 -> 1.1.0 2015-01-26 04:43:55 +01:00
Tobias Geerinckx-Rice
65c21a71bb Add exfat-utils 1.1.1: free exFAT file system utilities 2015-01-26 04:24:15 +01:00
Ozan Sener
df08df795b New package: avfs-1.0.2 2015-01-20 17:04:52 +02:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Michael Raskin
f5954364e7 smbnetfs: 0.5.3b -> 0.6.0 2015-01-18 18:20:09 +03:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
William A. Kennington III
57b35f979d ceph: 0.90-pre -> 0.91 2015-01-14 13:18:00 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
lethalman
5bc68e1a0e Merge pull request #5656 from nckx/boxfs2 
Add boxfs: FUSE file system for box.com accounts
 2015-01-09 15:39:02 +01:00
Tobias Geerinckx-Rice
bec3dd5dd5 Add boxfs: FUSE file system for box.com accounts 2015-01-09 10:24:18 +01:00
Tobias Geerinckx-Rice
8e5b02d847 Add mp3fs: FUSE FS that transparently transcodes to MP3 2015-01-09 04:49:18 +01:00
William A. Kennington III
3005a9506b btrfsProgs: 3.17.3 -> 3.18 2015-01-08 13:19:46 -08:00
Benno Fünfstück
acadc608a9 go-mtpfs: new package 2015-01-07 20:19:23 +01:00
William A. Kennington III
e0a6beef87 Revert "ceph: 0.90 final" 
This reverts commit ebfd21de84.
 2015-01-03 17:55:40 -08:00
Tobias Geerinckx-Rice
773c0d2a81 duff: fix syntax error causing ugly error message (no failures) 2015-01-02 22:45:39 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
William A. Kennington III
ebfd21de84 ceph: 0.90 final 2014-12-23 10:52:49 -08:00
Michael Raskin
13fbe8150a GlusterFS; 3.6.0 → 3.6.1 2014-12-21 11:14:25 +03:00
Arseniy Seroka
c08149c6a4 Merge pull request #5384 from ts468/glusterfs 
FIX: Change local state dir
 2014-12-20 02:09:08 +03:00
Thomas Strobel
d07154b3bc FIX: Change local state dir, which must be writable, from "/nix/store/...glusterfs..." to "/var" 2014-12-18 11:20:03 +01:00
Kovacsics Robert (rmk35)
6f608967f4 Added package 'fatsort'. 
Fatsort sorts partition table on FAT12/16/32 partitions for devices that
don't sort the files for themselves (e.g. some media players).
 2014-12-17 13:54:13 +00:00
Domen Kožar
9de5eb6ade remove btrfsProgs-3_16, not needed anymore 2014-12-17 01:20:05 +01:00
William A. Kennington III
02f75f91f1 xfsprogs: 3.2.1 -> 3.2.2 2014-12-16 15:22:53 -08:00
William A. Kennington III
0cfd61bdea btrfs-progs: 3.17.2 -> 3.17.3 2014-12-16 14:25:27 -08:00
William A. Kennington III
cbe467ef99 ceph: 0.89 -> 0.90-pre 2014-12-16 11:44:08 -08:00
Pascal Wittmann
1f0fdd7c28 added tmsu, a tool for tagging your files 2014-12-13 23:50:49 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Tobias Geerinckx-Rice
51ccf09ba2 Add duff: find duplicate files from the command line 2014-12-06 00:10:08 +01:00
William A. Kennington III
d2a2c77643 ceph: 0.88 -> 0.89 2014-12-04 15:17:58 -08:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
William A. Kennington III
17a1b67cb6 btrfsprogs: 3.17.1 -> 3.17.2 2014-11-26 15:47:43 -08:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
William A. Kennington III
596a46caf7 btrfs-progs: 3.17 -> 3.17.1 2014-11-14 22:46:59 -08:00
William A. Kennington III
f4249e7f5a ceph: 0.87 -> 0.88 2014-11-14 21:59:32 -08:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra
65221567c1 glibc: Include a copy of libgcc_s.so.1 
This prevents failures like "libgcc_s.so.1 must be installed for
pthread_cancel to work" that occur because Glibc assumes libgcc_s.so.1
to be in Glibc's libdir.

This solution is pretty hacky, because the libgcc_s.so.1 from
bootstrap-tools might be too old. So if we update GCC, programs might
end up using an outdated libgcc_s.so.1. Ideally, we would build
libgcc_s.so.1 *before* Glibc, which might not be impossible...

Fixes #3548.
 2014-11-11 10:23:26 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mathijs Kwik
d0e0d62e61 add duperemove: btrfs deduplication tool 2014-11-06 00:02:45 +01:00
Michael Raskin
aeb032044d Readd BtrFS-progs 3.16 for snapper build 2014-11-06 00:32:31 +03:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Michael Raskin
eca021ccc5 Fix NILFS-utils source 2014-11-05 09:23:25 +03:00
Michael Raskin
5854eb09eb Update NILFS2 utils 2014-11-04 12:04:42 +03:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
William A. Kennington III
b94f27b846 ceph: 0.86 -> 0.87 2014-11-02 17:22:27 -08:00
William A. Kennington III
5ae216558f jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
William A. Kennington III
674a588b0a btrfs-progs: 3.16.2 -> 3.17 2014-11-02 17:18:50 -08:00
Michael Raskin
815bbfb852 Update GlusterFS 2014-11-02 23:51:58 +03:00
lethalman
560fd3a5b7 Merge pull request #4742 from abbradar/bcache-stage1 
Support bcache volumes in initrd
 2014-11-02 17:29:38 +01:00
Nikolay Amiantov
92f94e901a bcache-tools: don't use probe-bcache and bcache-register 
This allows us not to include any additional binaries for bcache
support in initrd; just an udev rule.
 2014-11-02 19:03:41 +03:00
Kosyrev Serge
b3ebe093b0 ifuse: new expression 2014-10-30 12:11:24 +03:00
William A. Kennington III
578d77ae0e jfsrec: Undelete and fix evaluation 2014-10-29 09:23:08 -07:00
William A. Kennington III
06f8885609 libusb: 1.0.18 -> 1.0.19 2014-10-29 02:05:17 -07:00
aszlig
eea4fce4a5
btrfsprogs: Revert update to version 3.17. 
This reverts commit 249e417677.

Breaks snapper:

http://hydra.nixos.org/build/16420291

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 18:12:12 +02:00
Domen Kožar
c01af09401 squashfs: -lgcc_s 2014-10-22 15:06:05 +02:00
Domen Kožar
b3a4c3c2d0 squashfs: 4.3 -> 4.4, hopefully fixes http://hydra.nixos.org/build/16422733 2014-10-22 14:36:56 +02:00
aszlig
78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir. 
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:59 +02:00
aszlig
16371fce91
nixpart: Bump version to 1.0.0 and mark as broken. 
We don't want Hydra to even try and build this, because we're going to
fill in the right sha256 as soon as the the new nixpart version is
released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
aszlig
cb2c34f1bb
blivet: Update to new upstream version 0.67. 
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
aszlig
7deadbb55f
nixpart: Copy package expression to 0.4.nix. 
Update the nixpart0 pointer to point to this version, because we're
going to update blivet as well and NixOps still points to nixpart0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:48 +02:00
aszlig
249e417677
btrfsprogs: Update to new upstream version 3.17. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-21 18:29:55 +02:00
Nikolay Amiantov
307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Aristid Breitkreuz
56fa7ec87f squashfsTools: update from 4.2 to 4.3, potentially fixes CVE-2012-4024, CVE-2012-4025 2014-10-08 20:23:25 +02:00
William A. Kennington III
58b621bc35 ceph: Fix Hash 2014-10-07 18:24:00 -07:00
William A. Kennington III
d6e5c6ddea ceph: 0.85 -> 0.86 2014-10-07 18:13:22 -07:00
Aristid Breitkreuz
82cd0a66e6 btrfsProgs: update from 3.16.1 to 3.16.2 2014-10-06 21:48:24 +02:00
William A. Kennington III
03ab965209 btrfsprogs: 3.16 -> 3.16.1 2014-09-30 11:36:21 -07:00
William A. Kennington III
134e74dbc7 ceph: Add missing python libraries and wrap mising python binaries 2014-09-29 22:52:17 -07:00
Pascal Wittmann
d346a9cc07 fixed some meta.maintainers attributes 2014-09-26 23:44:29 +02:00
William A. Kennington III
32aa544fb6 ceph: Add zfs support 2014-09-25 01:24:54 -07:00
Eelco Dolstra
98010275e6 e2fsprogs: Update to 1.42.12 2014-09-23 11:51:46 +02:00
koral
19907d3abd Upgraded mtd-utils to v1.5.1 2014-09-22 19:56:49 +02:00
William A. Kennington III
3ff5532a82 ceph: 0.79 -> 0.85 2014-09-21 20:27:12 -07:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III
2c40aca91d xfsprogs: Add missing patch 2014-09-19 18:21:05 -07:00
William A. Kennington III
acaf6b4334 xfsprogs: Actually fix library rpath 2014-09-19 16:14:50 -07:00
William A. Kennington III
9d1acf8559 xfsprogs: 3.1.11 -> 3.2.1 2014-09-19 15:34:36 -07:00
Pascal Wittmann
cf3d549402 bashmount: use fetchFromGitHub instead of fetchurl 2014-09-16 14:37:14 +02:00
koral
cc664a4640 Fixed URL in bashmount package. 2014-09-16 08:58:00 +02:00
koral
ce0dd9e335 Added bashmount package. 2014-09-15 18:29:47 +02:00
Sergey Mironov
2b72edad9b yandex-disk: fix the url; introduce systemd.service #2228 2014-09-03 12:36:29 +04:00
Michael Raskin
74343ca3ab Fix handling of paths with multuple mounts — for example rootfs first mount for / 2014-09-03 10:11:41 +04:00
Michael Raskin
23b3495a25 Merge pull request #3876 from wkennington/master.btrfsProgs 
btrfsProgs: 3.14.2 -> 3.16.0
 2014-09-02 01:00:22 +04:00
Michael Raskin
fc83dfbc49 Update smbnetfs 2014-08-31 22:54:37 +04:00
William A. Kennington III
86d72b2c30 btrfsProgs: 3.14.2 -> 3.16.0 
Additionally, add myself as a maintainer.
 2014-08-30 16:23:50 -07:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Eelco Dolstra
2d6d43c02c Fix tarball build 2014-08-24 18:52:50 +02:00
Vladimír Čunát
44a0db4f0f ntfs3g: update to latest stable (2-year bump) 2014-08-16 18:47:20 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Jason \"Don\" O'Conal
297599a299 bindfs: add expression 2014-08-07 01:07:34 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Michael Raskin
1fa783f55a Update glusterfs 2014-08-03 22:29:41 +04:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Austin Seipp
67d992c100 ceph: fix libatomic_ops dependency 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-30 12:03:08 -05:00