diff options
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch | 157 | ||||
-rw-r--r-- | pkgs/tools/filesystems/bonnie/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/davfs2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/dislocker/cmake_dirfix.patch | 13 | ||||
-rw-r--r-- | pkgs/tools/filesystems/dislocker/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/filesystems/e2tools/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/filesystems/extundelete/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/grive/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/lizardfs/check-includes.patch | 30 | ||||
-rw-r--r-- | pkgs/tools/filesystems/lizardfs/default.nix | 48 | ||||
-rw-r--r-- | pkgs/tools/filesystems/zerofree/default.nix | 11 |
12 files changed, 322 insertions, 14 deletions
diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch new file mode 100644 index 000000000000..e4903143f11c --- /dev/null +++ b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch @@ -0,0 +1,157 @@ +Copyright 2009-2016 Homebrew contributors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +# Changes included in this patchset: +# 1) Explicitly use clang/clang++ in Makefile +# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol" +# Remove the construct in favor of macro targets min()/max() provided by the library +# Files affected: port.h.in port.h duration.cpp bonnie++.cpp +# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of +# splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place. +# The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked. +# Files affected: bonnie++.cp + +diff --git i/Makefile w/Makefile +index 4bb5103..8f7ed41 100644 +--- i/Makefile ++++ w/Makefile +@@ -10,8 +10,8 @@ eprefix=${prefix} + #MORE_WARNINGS=-Weffc++ + WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) + CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) +-CXX=g++ $(CFLAGS) +-LINK=g++ ++CXX=clang++ $(CFLAGS) ++LINK=clang++ + THREAD_LFLAGS=-lpthread + + INSTALL=/usr/bin/install -c +diff --git i/bonnie++.cpp w/bonnie++.cpp +index 8c5a43a..8a4b3dc 100644 +--- i/bonnie++.cpp ++++ w/bonnie++.cpp +@@ -73,7 +73,7 @@ public: + void set_io_chunk_size(int size) + { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } + void set_file_chunk_size(int size) +- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } ++ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } + + // Return the page-aligned version of the local buffer + char *buf() { return m_buf_pa; } +@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag) + , m_buf(NULL) + , m_buf_pa(NULL) + { +- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); ++ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); + SetName("."); + } + +@@ -294,11 +294,7 @@ int main(int argc, char *argv[]) + { + char *sbuf = _strdup(optarg); + char *size = strtok(sbuf, ":"); +-#ifdef _LARGEFILE64_SOURCE + file_size = size_from_str(size, "gt"); +-#else +- file_size = size_from_str(size, "g"); +-#endif + size = strtok(NULL, ""); + if(size) + { +@@ -384,17 +380,8 @@ int main(int argc, char *argv[]) + if(file_size % 1024 > 512) + file_size = file_size + 1024 - (file_size % 1024); + } +-#ifndef _LARGEFILE64_SOURCE +- if(file_size == 2048) +- file_size = 2047; +- if(file_size > 2048) +- { +- fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size); +- usage(); +- } +-#endif +- globals.byte_io_size = __min(file_size, globals.byte_io_size); +- globals.byte_io_size = __max(0, globals.byte_io_size); ++ globals.byte_io_size = min(file_size, globals.byte_io_size); ++ globals.byte_io_size = max(0, globals.byte_io_size); + + if(machine == NULL) + { +@@ -465,14 +452,6 @@ int main(int argc, char *argv[]) + && (directory_max_size < directory_min_size || directory_max_size < 0 + || directory_min_size < 0) ) + usage(); +-#ifndef _LARGEFILE64_SOURCE +- if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) ) +- { +- fprintf(stderr +- , "The small chunk size and large IO size make this test impossible in 32bit.\n"); +- usage(); +- } +-#endif + if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) + { + fprintf(stderr +diff --git i/duration.cpp w/duration.cpp +index efa3fd3..f943155 100644 +--- i/duration.cpp ++++ w/duration.cpp +@@ -38,7 +38,7 @@ double Duration_Base::stop() + getTime(&tv); + double ret; + ret = tv - m_start; +- m_max = __max(m_max, ret); ++ m_max = max(m_max, ret); + return ret; + } + +diff --git i/port.h w/port.h +index 8d53622..2e1f112 100644 +--- i/port.h ++++ w/port.h +@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; + #endif + + typedef int FILE_TYPE; +-#define __min min +-#define __max max + typedef unsigned int UINT; + typedef unsigned long ULONG; + typedef const char * PCCHAR; +diff --git i/port.h.in w/port.h.in +index 69c8f24..8359d72 100644 +--- i/port.h.in ++++ w/port.h.in +@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; + #endif + + typedef int FILE_TYPE; +-#define __min min +-#define __max max + typedef unsigned int UINT; + typedef unsigned long ULONG; + typedef const char * PCCHAR; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index 684a8311a746..fb25446d2e31 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "bonnie++-1.03e"; + name = "bonnie++-1.97"; src = fetchurl { - url = http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz; - sha256 = "1jz2l8dz08c7vxvchigisv5a293yz95bw1k81dv6bgrlcq8ncf6b"; + url = http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz; + sha256 = "10jrqgvacvblyqv38pg5jb9jspyisxaladcrp8k6b2k46xcs1xa4"; }; + + patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch; + enableParallelBuilding = true; + meta = { homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index a7470384ad4e..a58f2b5504b5 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.5.3"; in +let version = "4.6.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6"; + sha256 = "06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index b2246e73328f..a5cd54bf74d9 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; - description = "mount WebDAV shares like a typical filesystem"; + description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch new file mode 100644 index 000000000000..829666bfe7a4 --- /dev/null +++ b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 365903a..f126ade 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -149,7 +149,7 @@ if(NOT DEFINED bindir) + endif() + + string (TOLOWER "${CMAKE_SYSTEM_NAME}" SYSNAME) +-set (DIS_MAN ../man/${SYSNAME}) ++set (DIS_MAN ${PROJECT_SOURCE_DIR}/man/${SYSNAME}) + + # RPATH handling + if(POLICY CMP0042) diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix new file mode 100644 index 000000000000..57676e7a89a2 --- /dev/null +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub +, cmake +, polarssl , fuse +}: +with stdenv.lib; +let + version = "0.6.1"; +in +stdenv.mkDerivation rec { + name = "dislocker-${version}"; + + src = fetchFromGitHub { + owner = "aorimn"; + repo = "dislocker"; + rev = "v${version}"; + sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d"; + }; + + buildInputs = [ cmake fuse polarssl ]; + + patches = [ ./cmake_dirfix.patch ]; + + meta = { + description = "Read BitLocker encrypted partitions in Linux"; + homepage = https://github.com/aorimn/dislocker; + license = licenses.gpl2; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix new file mode 100644 index 000000000000..dcaad81a5a3f --- /dev/null +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, e2fsprogs }: + +stdenv.mkDerivation rec { + pname = "e2tools"; + version = "0.0.16"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz"; + sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ e2fsprogs ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/; + description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.leenaars ]; + }; +} diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 5b33e31958c5..a30709d4c920 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; meta = with stdenv.lib; { - description = "utility that can recover deleted files from an ext3 or ext4 partition"; + description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index e9a7204f0e6c..63d3bbc3373a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an open source (experimental) Linux client for Google Drive"; + description = "An open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/lizardfs/check-includes.patch b/pkgs/tools/filesystems/lizardfs/check-includes.patch new file mode 100644 index 000000000000..49aa0375762a --- /dev/null +++ b/pkgs/tools/filesystems/lizardfs/check-includes.patch @@ -0,0 +1,30 @@ +From 60f64d7077ebd2b29b18faa3b25ee593e126e347 Mon Sep 17 00:00:00 2001 +From: Dmitry Smirnov <onlyjob@member.fsf.org> +Date: Sun, 20 Dec 2015 14:03:20 +1100 +Subject: [PATCH] build: Fix FTBFS with CMake-3.4 + +Closes: #363 + +~~~~ + CMake Error at CheckIncludes.cmake:4 (check_include_files): + Unknown CMake command "check_include_files". + Call Stack (most recent call first): + CMakeLists.txt:113 (check_includes) +~~~~ + +Change-Id: I70f03d829c40ae560083a98c2bcf6344dbac3ad6 +Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org> +--- + CheckIncludes.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CheckIncludes.cmake b/CheckIncludes.cmake +index 19ed485..f51075a 100644 +--- a/CheckIncludes.cmake ++++ b/CheckIncludes.cmake +@@ -1,3 +1,5 @@ ++include(CheckIncludeFiles) ++ + function(check_includes INCLUDES) + set(INCLUDE_MISSING FALSE) + foreach(INCLUDE_FILE ${INCLUDES}) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix new file mode 100644 index 000000000000..7b6f2e17dcf5 --- /dev/null +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, python +, fuse +# The following are required for manpages +#, asciidoc, libxml2 +, boost +, pkgconfig +, judy +, pam +, zlib # optional +}: + +stdenv.mkDerivation rec { + name = "lizardfs-${version}"; + version = "3.9.4"; + + src = fetchFromGitHub { + owner = "lizardfs"; + repo = "lizardfs"; + rev = "v.${version}"; + sha256 = "1vg33jy280apm4lp5dn3x51pkf7035ijqjm8wbmyha2g35gfjrlx"; + }; + + # Manpages don't build in the current release + buildInputs = [ cmake fuse /* asciidoc libxml2.bin */ zlib boost pkgconfig judy pam makeWrapper ]; + + # Fixed in upcoming 3.10.0 + patches = [ ./check-includes.patch ]; + + postInstall = '' + wrapProgram $out/sbin/lizardfs-cgiserver \ + --prefix PATH ":" "${python}/bin" + + # mfssnapshot and mfscgiserv are deprecated + rm -f $out/bin/mfssnapshot $out/sbin/mfscgiserv + ''; + + meta = with stdenv.lib; { + homepage = https://lizardfs.com; + description = "A highly reliable, scalable and efficient distributed file system"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index fa0349689119..994777680dbd 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation rec { - name = "zerofree-1.0.3"; + name = "zerofree-${version}"; + version = "1.0.4"; src = fetchurl { - url = "http://intgat.tigress.co.uk/rmy/uml/zerofree-1.0.3.tgz"; - sha256 = "3acfda860be0f0ddcb5c982ff3b4475b1ee8cc35a90ae2a910e93261dbe0ccf6"; + url = "http://frippery.org/uml/${name}.tgz"; + sha256 = "0f38mvn3wfacapayl54q04qlz4in417pfm6gapgm7dhyjs9y5yd7"; }; buildInputs = [ e2fsprogs ]; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://intgat.tigress.co.uk/rmy/uml/index.html; - description = "zero free blocks from ext2, ext3 and ext4 file-systems"; + homepage = http://frippery.org/uml/index.html; + description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; }; |