diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/tools/filesystems | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
| download | nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/xtreemfs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/yandex-disk/default.nix | 54 |
2 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 6d1f863fdeaa..81be62b5159a 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -69,6 +69,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.bsd3; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix new file mode 100644 index 000000000000..31b1471fb7fc --- /dev/null +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: +let + p = if stdenv.is64bit then { + arch = "x86_64"; + gcclib = "${stdenv.gcc.gcc}/lib64"; + sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim"; + } + else { + arch = "i386"; + gcclib = "${stdenv.gcc.gcc}/lib"; + sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f"; + }; +in +stdenv.mkDerivation rec { + + name = "yandex-disk-0.1.2.481"; + + src = fetchurl { + url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + sha256 = p.sha256; + }; + + builder = writeText "builder.sh" '' + . $stdenv/setup + mkdir -pv $out/bin + mkdir -pv $out/share + mkdir -pv $out/etc + + mkdir -pv unpacked + cd unpacked + ${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd + + cp -r -t $out/bin usr/bin/* + cp -r -t $out/share usr/share/* + cp -r -t $out/etc etc/* + + sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + $out/etc/bash_completion.d/yandex-disk-completion.bash + + ${patchelf}/bin/patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${zlib}/lib:${p.gcclib}" \ + $out/bin/yandex-disk + ''; + + meta = { + homepage = http://help.yandex.com/disk/cli-clients.xml; + description = "Yandex.Disk is a free cloud file storage service"; + maintainers = with stdenv.lib.maintainers; [smironov]; + platforms = ["i686-linux" "x86_64-linux"]; + license = stdenv.lib.licenses.unfree; + }; +} + |