diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems')
8 files changed, 140 insertions, 50 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index aa049682b834..e5325b1f9887 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-03-09"; + version = "unstable-2022-03-22"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5"; - sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554"; + rev = "f3cdace86c8b60a4efaced23b2d31c16dc610da9"; + sha256 = "1hg4cjrs4yr0mx3mmm1jls93w1skpq5wzp2dzx9rq4w5il2xmx19"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix index 14d054364fd9..75a39fdfe92e 100644 --- a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,21 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv, gettext, xxd }: stdenv.mkDerivation rec { pname = "dosfstools"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "dosfstools"; repo = "dosfstools"; rev = "v${version}"; - sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; + sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional stdenv.isDarwin libiconv; + # configure.ac:75: error: required file './config.rpath' not found + # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh + postPatch = '' + cp ${gettext}/share/gettext/config.rpath config.rpath + ''; + configureFlags = [ "--enable-compat-symlinks" ]; + checkInputs = [ xxd ]; + doCheck = true; + meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; diff --git a/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix b/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix new file mode 100644 index 000000000000..1e676dea77c7 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, stdenv +, acl +, gnome +, gtkmm3 +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "eiciel"; + version = "0.9.13.1"; + + outputs = [ "out" "nautilusExtension" ]; + + src = fetchFromGitHub { + owner = "rofirrim"; + repo = "eiciel"; + rev = version; + sha256 = "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + acl + gtkmm3 + gnome.nautilus + ]; + + mesonFlags = [ + "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + ]; + + postPatch = '' + substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" + chmod +x img/install_icons.sh + patchShebangs img/install_icons.sh + ''; + + meta = with lib; { + description = "Graphical editor for ACLs and extended attributes"; + homepage = "https://rofi.roger-ferrer.org/eiciel/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sersorrel ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix index bd6e0fe67fc2..6a05d71d0218 100644 --- a/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,20 +1,20 @@ -{ pkg-config, libusb1, buildGoPackage, fetchgit }: +{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-mtpfs"; - version = "2018-02-09"; - rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; + version = "unstable-2018-02-09"; goPackagePath = "github.com/hanwen/go-mtpfs"; + src = fetchFromGitHub { + owner = "hanwen"; + repo = "go-mtpfs"; + rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; + sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - src = fetchgit { - inherit rev; - url = "https://github.com/hanwen/go-mtpfs"; - sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk"; - }; - goDeps = ./deps.nix; } diff --git a/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix new file mode 100644 index 000000000000..daec12b50411 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, fuse }: + +stdenv.mkDerivation rec { + pname = "littlefs-fuse"; + version = "2.4.1"; + src = fetchFromGitHub { + owner = "littlefs-project"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+EUZluBtgZiziTEIfXIhkRIBu/Pe78qmL18TQHkfHO4="; + }; + buildInputs = [ fuse ]; + installPhase = '' + runHook preInstall + install -D lfs $out/bin/${pname} + ln -s $out/bin/${pname} $out/bin/mount.littlefs + ln -s $out/bin $out/sbin + runHook postInstall + ''; + meta = src.meta // { + description = "A FUSE wrapper that puts the littlefs in user-space"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ehmry ]; + inherit (fuse.meta) platforms; + }; +} diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch index 5f2e0b072998..657971c5b0ab 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch @@ -5,7 +5,7 @@ with BSD-specific changes omitted. See also https://github.com/plougher/squashfs-tools/pull/69. diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index 4b06ccb..3cad2ab 100644 +index ea2f604..9c979f8 100644 --- a/squashfs-tools/action.c +++ b/squashfs-tools/action.c @@ -39,6 +39,10 @@ @@ -19,7 +19,7 @@ index 4b06ccb..3cad2ab 100644 #include "squashfs_fs.h" #include "mksquashfs.h" #include "action.h" -@@ -2414,9 +2418,12 @@ static char *get_start(char *s, int n) +@@ -2415,9 +2419,12 @@ static char *get_start(char *s, int n) static int subpathname_fn(struct atom *atom, struct action_data *action_data) { @@ -34,7 +34,7 @@ index 4b06ccb..3cad2ab 100644 /* diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index fe23d78..5c2f835 100644 +index 216b979..eea2ec9 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c @@ -144,31 +144,22 @@ void dump_state() @@ -89,7 +89,7 @@ index fe23d78..5c2f835 100644 } diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index a45b77f..3607448 100644 +index 843f9f4..ed2c3a6 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -35,7 +35,12 @@ @@ -117,7 +117,7 @@ index a45b77f..3607448 100644 #ifndef linux #include <sys/sysctl.h> -@@ -5022,6 +5030,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, +@@ -5064,6 +5072,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); @@ -125,7 +125,7 @@ index a45b77f..3607448 100644 if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) BAD_ERROR("Failed to set signal mask in intialise_threads\n"); -@@ -5760,6 +5769,35 @@ static int get_physical_memory() +@@ -5802,6 +5811,35 @@ static int get_physical_memory() long long page_size = sysconf(_SC_PAGESIZE); int phys_mem; @@ -161,7 +161,7 @@ index a45b77f..3607448 100644 if(num_pages == -1 || page_size == -1) { struct sysinfo sys; int res = sysinfo(&sys); -@@ -5772,6 +5810,7 @@ static int get_physical_memory() +@@ -5814,6 +5852,7 @@ static int get_physical_memory() } phys_mem = num_pages * page_size >> 20; @@ -170,7 +170,7 @@ index a45b77f..3607448 100644 if(phys_mem < SQUASHFS_LOWMEM) BAD_ERROR("Mksquashfs requires more physical memory than is " diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c -index 4debedf..3257c30 100644 +index 2067f80..ca8b7f4 100644 --- a/squashfs-tools/read_xattrs.c +++ b/squashfs-tools/read_xattrs.c @@ -31,13 +31,13 @@ @@ -186,11 +186,11 @@ index 4debedf..3257c30 100644 -#include <stdlib.h> - - extern int read_fs_bytes(int, long long, int, void *); + extern int read_fs_bytes(int, long long, long long, void *); extern int read_block(int, long long, long long *, int, void *); diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index 727f1d5..c1a6183 100644 +index d434b42..1208e45 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c @@ -32,8 +32,12 @@ @@ -206,7 +206,7 @@ index 727f1d5..c1a6183 100644 #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> -@@ -1175,7 +1179,7 @@ int create_inode(char *pathname, struct inode *i) +@@ -1182,7 +1186,7 @@ int create_inode(char *pathname, struct inode *i) break; case SQUASHFS_SYMLINK_TYPE: case SQUASHFS_LSYMLINK_TYPE: { @@ -215,7 +215,7 @@ index 727f1d5..c1a6183 100644 { i->time, 0 }, { i->time, 0 } }; -@@ -1194,8 +1198,7 @@ int create_inode(char *pathname, struct inode *i) +@@ -1201,8 +1205,7 @@ int create_inode(char *pathname, struct inode *i) goto failed; } @@ -225,7 +225,7 @@ index 727f1d5..c1a6183 100644 if(res == -1) { EXIT_UNSQUASH_STRICT("create_inode: failed to" " set time on %s, because %s\n", -@@ -2683,6 +2686,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ +@@ -2687,6 +2690,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); @@ -234,7 +234,7 @@ index 727f1d5..c1a6183 100644 EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n"); diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index 934618b..0e680ab 100644 +index 1099678..5b6a038 100644 --- a/squashfs-tools/unsquashfs.h +++ b/squashfs-tools/unsquashfs.h @@ -46,6 +46,10 @@ @@ -249,7 +249,7 @@ index 934618b..0e680ab 100644 #include "squashfs_fs.h" #include "unsquashfs_error.h" diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c -index c8e2b9b..7d4f7af 100644 +index e906eaf..f1e68c2 100644 --- a/squashfs-tools/unsquashfs_info.c +++ b/squashfs-tools/unsquashfs_info.c @@ -96,31 +96,22 @@ void dump_state() @@ -304,7 +304,7 @@ index c8e2b9b..7d4f7af 100644 } diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c -index 7742dfe..f8cd3b6 100644 +index 61910e1..73e0090 100644 --- a/squashfs-tools/unsquashfs_xattr.c +++ b/squashfs-tools/unsquashfs_xattr.c @@ -27,6 +27,11 @@ @@ -320,7 +320,7 @@ index 7742dfe..f8cd3b6 100644 extern int root_process; diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c -index 64dfd82..d82d186 100644 +index b1c0089..6d7ed98 100644 --- a/squashfs-tools/xattr.c +++ b/squashfs-tools/xattr.c @@ -22,6 +22,14 @@ @@ -353,5 +353,5 @@ index 64dfd82..d82d186 100644 #include "squashfs_swap.h" #include "mksquashfs.h" -- -2.23.0 +2.35.1 diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index ee6a9d9a4c39..340c5add295e 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -2,44 +2,43 @@ , stdenv , fetchFromGitHub , fetchpatch -, zlib -, xz +, help2man , lz4 , lzo -, zstd , nixosTests +, which +, xz +, zlib +, zstd }: stdenv.mkDerivation rec { pname = "squashfs"; - version = "4.5"; + version = "4.5.1"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; rev = version; - sha256 = "1nanwz5qvsakxfm37md5i7xqagv69nfik9hpj8qlp6ymw266vgxr"; + sha256 = "sha256-Y3ZPjeE9HN1F+NtGe6EchYziWrTPVQ4SuKaCvNbXMKI="; }; patches = [ # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch - # Otherwise sizes of some files may break in our ISO; see - # https://github.com/NixOS/nixpkgs/issues/132286 - (fetchpatch { - url = "https://github.com/plougher/squashfs-tools/commit/19b161c1cd3e31f7a396ea92dea4390ad43f27b9.diff"; - sha256 = "15ng8m2my3a6a9hnfx474bip2vwdh08hzs2k0l5gwd36jv2z1h3f"; - }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 lzo ]; + buildInputs = [ zlib xz zstd lz4 lzo which help2man ]; preBuild = '' cd squashfs-tools '' ; - installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; + installFlags = [ + "INSTALL_DIR=${placeholder "out"}/bin" + "INSTALL_MANPAGES_DIR=${placeholder "out"}/share/man/man1" + ]; makeFlags = [ "XZ_SUPPORT=1" diff --git a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index 730932141b54..91225e6b97c6 100644 --- a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config -, icu, libuuid, readline, inih +, icu, libuuid, readline, inih, liburcu }: stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.13.0"; + version = "5.14.2"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "sha256-ThQtS6vghq35AW2MYGyAWCnaCORjiaRDP0A0YgT5DNs="; + sha256 = "sha256-AczT753yg3dTpdh2uNqE6pV9E9ekYbjEbor6TrCaq8g="; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoconf automake libtool gettext pkg-config libuuid # codegen tool uses libuuid ]; - buildInputs = [ readline icu inih ]; + buildInputs = [ readline icu inih liburcu ]; propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h> enableParallelBuilding = true; |