diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/filesystems')
37 files changed, 254 insertions, 214 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index 48e964bf687d..cd6c4302188a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,18 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; - version = "3.9"; + version = "4.0"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3"; + sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; - buildInputs = [ fuse qtbase ]; + buildInputs = [ fuse qtbase qttools ]; meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index c3b1759bcdd5..6e39ff174588 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, utillinux, bash }: +{ stdenv, fetchurl, pkgconfig, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ utillinux ]; + buildInputs = [ util-linux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need # anyway (it's distro specific stuff). diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix index e87cecbf8fd3..bdca893a136c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -1,24 +1,21 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: let - version = "0.6.2"; - sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib"; - - bees = stdenv.mkDerivation { + bees = stdenv.mkDerivation rec { pname = "bees"; - inherit version; + version = "0.6.3"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8="; }; buildInputs = [ btrfs-progs # for btrfs/ioctl.h - utillinux # for uuid.h + util-linux # for uuid.h ]; nativeBuildInputs = [ @@ -58,8 +55,9 @@ let in -runCommand "bees-service-${version}" { - inherit bash bees coreutils utillinux; +runCommand "bees-service" { + inherit bash bees coreutils; + utillinux = util-linux; # needs to be a valid shell variable name btrfsProgs = btrfs-progs; # needs to be a valid shell variable name } '' mkdir -p -- "$out/bin" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index f8968260ce79..e69f76e16304 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.7"; + version = "1.14.8"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8"; + sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; }; dontStrip = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 8ff72421a598..03db1d913e2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.7"; + version = "5.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0p6ycbr8sw5bq3mj84gh9rvh5sk8sjr2l9hb9dhm4j41ij5h8bsw"; + sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq"; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = "sed -i s/-O1/-O2/ configure"; postInstall = '' - install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs + install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch new file mode 100644 index 000000000000..f78c7af9e35a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch @@ -0,0 +1,63 @@ +From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001 +From: David Disseldorp <ddiss@suse.de> +Date: Tue, 1 Sep 2020 13:49:21 +0200 +Subject: [PATCH] cmake: detect and use sigdescr_np() if available + +sys_siglist is deprecated with glibc 2.32. A new thread-safe and +async-signal safe sigdescr_np() function is provided, so use it if +available. + +Fixes: https://tracker.ceph.com/issues/47187 +Signed-off-by: David Disseldorp <ddiss@suse.de> +--- + cmake/modules/CephChecks.cmake | 1 + + src/global/signal_handler.h | 8 +++++--- + src/include/config-h.in.cmake | 3 +++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake +index 23687283a7c6..ca86dcbc73de 100644 +--- a/cmake/modules/CephChecks.cmake ++++ b/cmake/modules/CephChecks.cmake +@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R) + check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT) + check_function_exists(pipe2 HAVE_PIPE2) + check_function_exists(accept4 HAVE_ACCEPT4) ++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP) + + include(CMakePushCheckState) + cmake_push_check_state(RESET) +diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h +index 476724201aa9..c101b2e28733 100644 +--- a/src/global/signal_handler.h ++++ b/src/global/signal_handler.h +@@ -20,10 +20,12 @@ + + typedef void (*signal_handler_t)(int); + +-#ifndef HAVE_REENTRANT_STRSIGNAL +-# define sig_str(signum) sys_siglist[signum] +-#else ++#ifdef HAVE_SIGDESCR_NP ++# define sig_str(signum) sigdescr_np(signum) ++#elif HAVE_REENTRANT_STRSIGNAL + # define sig_str(signum) strsignal(signum) ++#else ++# define sig_str(signum) sys_siglist[signum] + #endif + + void install_sighandler(int signum, signal_handler_t handler, int flags); +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 1ea3703f620c..59bd4273511a 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -220,6 +220,9 @@ + /* Define to 1 if you have sched.h. */ + #cmakedefine HAVE_SCHED 1 + ++/* Define to 1 if you have sigdescr_np. */ ++#cmakedefine HAVE_SIGDESCR_NP 1 ++ + /* Support SSE (Streaming SIMD Extensions) instructions */ + #cmakedefine HAVE_SSE + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 9b9fe9a5aaf0..b75a902681e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -1,4 +1,5 @@ { stdenv, runCommand, fetchurl +, fetchpatch , ensureNewerSourcesHook , cmake, pkgconfig , which, git @@ -27,7 +28,7 @@ , nss ? null, nspr ? null # Linux Only Dependencies -, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c +, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c , libaio ? null, libxfs ? null, zfs ? null , ... }: @@ -121,10 +122,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.5"; + version = "15.2.6"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; + sha256 = "093pphgqrkrbv3484ayl0vac6a6s53zxa01yad0cbvnx0kyj55hh"; }; in rec { ceph = stdenv.mkDerivation { @@ -133,6 +134,7 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + ./ceph-glibc-2-32-sigdescr_np.patch ]; nativeBuildInputs = [ @@ -147,7 +149,7 @@ in rec { malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ optionals stdenv.isLinux [ - linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs + linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c ] ++ optionals hasRadosgw [ @@ -207,12 +209,12 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices"; } '' - mkdir -p $out/{bin,etc,${sitePackages}} + mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin cp -r ${ceph}/${sitePackages} $out/${sitePackages} - cp -r ${ceph}/etc/bash_completion.d $out/etc + cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix index 46635aa67412..1c639dfc29ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "cpcfs"; version = "0.85.4"; - + src = fetchFromGitHub { owner = "derikz"; repo = "cpcfs"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/derikz/cpcfs/" ; license = licenses.bsd2; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index 43823e5b51a3..42853eb8ff97 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : +{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }: stdenv.mkDerivation rec { pname = "darling-dmg"; - version = "1.0.4+git20180914"; + version = "1.0.4+git20200427"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling-dmg"; - rev = "97a92a6930e43cdbc9dedaee62716e3223deb027"; - sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj"; + rev = "71cc76c792db30328663272788c0b64aca27fdb0"; + sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ]; + buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ]; - # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 - CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + CXXFLAGS = [ + "-DCOMPILE_WITH_LZFSE=1" + "-llzfse" + ]; - meta = { + meta = with stdenv.lib; { homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch new file mode 100644 index 000000000000..0e31725936fa --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch @@ -0,0 +1,42 @@ +From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Wed, 11 Nov 2020 11:58:25 +0100 +Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked + +--- + src/dav_fuse.c | 2 +- + src/umount_davfs.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dav_fuse.c b/src/dav_fuse.c +index 734bc1f..4501433 100644 +--- a/src/dav_fuse.c ++++ b/src/dav_fuse.c +@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, + unmounting = 1; + pid_t pid = fork(); + if (pid == 0) { +- execl("/bin/umount", "umount", "-il", mountpoint, NULL); ++ execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL); + _exit(EXIT_FAILURE); + } + } +diff --git a/src/umount_davfs.c b/src/umount_davfs.c +index b7019c3..75e3b4b 100644 +--- a/src/umount_davfs.c ++++ b/src/umount_davfs.c +@@ -122,9 +122,9 @@ main(int argc, char *argv[]) + + char *umount_command = NULL; + if (mpoint) { +- umount_command = ne_concat("umount -i '", mpoint, "'", NULL); ++ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL); + } else { +- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL); ++ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL); + error(0, 0, + _("\n" + " can't evaluate PID file name;\n" +-- +2.28.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 4f818ed213b7..02536a13d15b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,42 +1,32 @@ { stdenv , fetchurl , fetchpatch -, autoreconfHook , neon , procps , substituteAll , zlib +, wrapperDir ? "/run/wrappers/bin" }: stdenv.mkDerivation rec { - name = "davfs2-1.5.6"; + name = "davfs2-1.6.0"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; + sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; }; - nativeBuildInputs = [ - autoreconfHook # neon-0.31.patch requires reconfiguration - ]; - buildInputs = [ neon zlib ]; patches = [ - ./isdir.patch ./fix-sysconfdir.patch (substituteAll { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; }) - - # Fix build with neon 0.31 - # http://savannah.nongnu.org/bugs/?58101 - (fetchpatch { - name = "neon-0.31.patch"; - url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737"; - sha256 = "117x9rql6wk230pl1nram3pp8svll9wzfs5nf407z4jnrdr1zm0j"; - extraPrefix = ""; # empty means add 'a/' and 'b/' + (substituteAll { + src = ./0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch; + inherit wrapperDir; }) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index 10e6e2f9c801..e1f28a0f2792 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dislocker"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "aorimn"; repo = "dislocker"; rev = "v${version}"; - sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb"; + sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix index 53ebbb2f8d44..3d70f2f73c7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - sha256 = "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z"; + sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix index e8d60f835bf0..b9817ecb05c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "f3"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "AltraMayor"; repo = pname; rev = "v${version}"; - sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; + sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix index c1d048889c70..c8366a96f075 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchurl, parted, utillinux }: +{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.1.0"; pname = "fatresize"; - src = fetchurl { - url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; - sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; + src = fetchFromGitHub { + owner = "ya-mouse"; + repo = "fatresize"; + rev = "v${version}"; + sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2"; }; - buildInputs = [ parted utillinux ]; + buildInputs = [ parted util-linux ]; + nativeBuildInputs = [ pkg-config ]; - # This patch helps this unmantained piece of software to be built against recent parted - # It basically modifies the detection scheme for parted version (the current one has no micro version defined) - # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted - # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params - patches = [ ./fatresize_parted_nix.patch ]; - - preConfigure = '' - echo "Replacing calls to ped_free with free ..." - substituteInPlace ./fatresize.c --replace ped_free free - ''; - - # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives - # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG - makeFlags = [ "LDFLAGS=-lparted-fs-resize" ]; - - propagatedBuildInputs = [ parted utillinux ]; + propagatedBuildInputs = [ parted util-linux ]; meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = "https://sourceforge.net/projects/fatresize"; + homepage = "https://github.com/ya-mouse/fatresize"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl3; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch deleted file mode 100644 index e9aa87a2d564..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index 18e8176..2e75592 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -88,8 +88,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/configure b/configure -index ed31457..e5f1705 100755 ---- a/configure -+++ b/configure -@@ -4793,8 +4793,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/fatresize.c b/fatresize.c -index 424d5d2..e439102 100644 ---- a/fatresize.c -+++ b/fatresize.c -@@ -30,6 +30,7 @@ - #include <inttypes.h> - #include <parted/parted.h> - #include <parted/debug.h> -+#include <parted/filesys.h> - #include <parted/unit.h> - - #include "config.h" -@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex) - static int - snap(PedSector* sector, PedSector new_sector, PedGeometry* range) - { -- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0); -+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector)); - if (!ped_geometry_test_sector_inside(range, new_sector)) - return 0; - -@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom, - end_part->geom.end, end_part->geom.start - 1, -1); - } - -- PED_ASSERT (start <= end, return); -+ PED_ASSERT (start <= end); - ped_geometry_set (new_geom, start, end - start + 1); - } - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 7e6bd7440b30..4aafe8d6d628 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y"; + sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index 89fa3ebe33b6..d820e5e68e2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0"; + sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc"; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index e7028ec12494..f495b56e3252 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, - openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, + openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc }: let @@ -24,7 +24,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper utillinux libtirpc + acl sqlite liburcu attr makeWrapper util-linux libtirpc (python3.withPackages (pkgs: [ pkgs.flask pkgs.prettytable @@ -56,7 +56,7 @@ let openssh # ssh rsync # rsync, e.g. for geo-replication systemd # systemctl - utillinux # mount umount + util-linux # mount umount which # which xfsprogs # xfs_info ]; @@ -76,9 +76,9 @@ stdenv.mkDerivation substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ --replace '/sbin/' '${lvm2}/bin/' substituteInPlace libglusterfs/src/glusterfs/compat.h \ - --replace '/bin/umount' '${utillinux}/bin/umount' + --replace '/bin/umount' '${util-linux}/bin/umount' substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ - --replace '/bin/mount' '${utillinux}/bin/mount' + --replace '/bin/mount' '${util-linux}/bin/mount' ''; # Note that the VERSION file is something that is present in release tarballs diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index d97b05abb6c7..23edb8175799 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "HTTPFS2, a FUSE-based HTTP file system for Linux"; + description = "FUSE-based HTTP filesystem for Linux"; homepage = "http://httpfs.sourceforge.net/"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix index 6de0d586ad94..a8e2cc3f0974 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/cpcsdk/idsk" ; license = licenses.mit; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix index fb90c3b0aebb..dfa7530ac64f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -51,6 +51,6 @@ with stdenv; homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index a7c9421f46ad..60670708f4bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,25 +2,28 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.28.3"; + version = "2.32.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "1w6p3svc2yknp6swqg8lax6n9b31lyplb3j7r8nv14hbq4hymylx"; + sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; }; nativeBuildInputs = [ automake autoconf pkgconfig gettext libtool pandoc which ]; + prePatch = '' + sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile + ''; buildInputs = [ attr libiconv ]; preConfigure = '' echo "${version}" > VERSION ''; - makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "XATTR_AVAILABLE=1" "PREFIX=/" "SBINDIR=/bin" ]; enableParallelBuilding = true; postFixup = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index df3dd661d75e..48c005e1caaf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -10,24 +10,22 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.114"; + version = "3.0.115"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0bilrzzlg599xy21cm7r0xb2sanngr74j3z03xgybcm10kl97i7j"; + sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = - [ fuse libpcap zlib ]; + [ fuse libpcap zlib python ]; postInstall = '' substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" - wrapProgram $out/sbin/mfscgiserv \ - --prefix PATH ":" "${python}/bin" ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index 58bd9340c5b0..5f78b3c379d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.24"; + pname = "mtools"; + version = "4.0.26"; src = fetchurl { - url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"; + url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; + sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix index f7732cd76fd7..6abad445517b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl -, ed, glibc, libevent +, ed, libtirpc, libevent }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { /^afpd_LDADD /am__append_2 a - ${glibc.static}/lib/librpcsvc.a \\ + ${libtirpc}/lib/libtirpc.so \\ . w EOF diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 6ba29cb98d40..15d6686fbc33 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,7 +1,7 @@ # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix. { stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock -, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, libselinux, cryptsetup, multipath_tools, lsof, util-linux , useNixUdev ? true, systemd ? null # useNixUdev is here for bw compatibility }: @@ -24,11 +24,11 @@ buildPythonApplication rec { sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { - s|wipefs|${utillinux.bin}/sbin/wipefs| + s|wipefs|${util-linux.bin}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py + sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix index 1f672701d382..703d918f92a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -13,7 +13,7 @@ let inherit stdenv fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; - inherit (pkgs) lsof utillinux systemd; + inherit (pkgs) lsof util-linux systemd; }; cryptsetup = import ./cryptsetup.nix { @@ -27,7 +27,7 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils; + inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { @@ -37,7 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2; + inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index fc0005a14d45..4369d659034e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }: let v = "2.02.106"; @@ -60,7 +60,7 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ - --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid + --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 16f3a57ea147..7fe1b7454668 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline -, utillinux, check, enableStatic ? false }: +, util-linux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; - checkInputs = [ check utillinux ]; + checkInputs = [ check util-linux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix index abe171170d41..2065e31e97a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, utillinux, libuuid +{stdenv, fetchurl, util-linux, libuuid , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' substituteInPlace libfuse-lite/mount_util.c \ - --replace /bin/mount ${utillinux}/bin/mount \ - --replace /bin/umount ${utillinux}/bin/umount + --replace /bin/mount ${util-linux}/bin/mount \ + --replace /bin/umount ${util-linux}/bin/umount ''; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix index 816aa1498cc6..889f075645a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx"; + sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix index 96389214c7e0..040889903480 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ genesis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix new file mode 100644 index 000000000000..e89012b76f63 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "sftpman"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "spantaleev"; + repo = pname; + rev = version; + sha256 = "04awwwfw51fi1q18xdysp54jyhr0rhb4kfyrgv0vhhrlpwwyhnqy"; + }; + + checkPhase = '' + $out/bin/sftpman help + ''; + + meta = with lib; { + homepage = "https://github.com/spantaleev/sftpman"; + description = "Application that handles sshfs/sftp file systems mounting"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ contrun ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 27335a9cf5da..9f9c4a605c6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -8,14 +8,6 @@ stdenv.mkDerivation rec { pname = "squashfuse"; version = "0.1.103"; - meta = { - description = "FUSE filesystem to mount squashfs archives"; - homepage = "https://github.com/vasi/squashfuse"; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - license = "BSD-2-Clause"; - }; - # platforms.darwin should be supported : see PLATFORMS file in src. # we could use a nix fuseProvider, and let the derivation choose the OS # specific implementation. @@ -29,4 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; buildInputs = [ lz4 xz zlib lzo zstd fuse ]; + + meta = { + description = "FUSE filesystem to mount squashfs archives"; + homepage = "https://github.com/vasi/squashfuse"; + maintainers = [ ]; + platforms = platforms.linux; + license = "BSD-2-Clause"; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix index 018dfe7858e3..3922851af331 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub -, meson, pkgconfig, ninja, docutils, makeWrapper +, meson, pkg-config, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages , openssh }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.7.1"; pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv"; + sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17"; }; - nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ]; + nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ]; buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index 334aa6ad9c60..152fd1d7a71e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -32,12 +32,13 @@ stdenv.mkDerivation rec { cd unpacked ${rpmextract}/bin/rpmextract $src + mkdir -p $out/share/bash-completion/completions cp -r -t $out/bin usr/bin/* cp -r -t $out/share usr/share/* - cp -r -t $out/etc etc/* + cp -r -t $out/share/bash-completion/completions etc/bash_completion.d/* sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \ - $out/etc/bash_completion.d/yandex-disk-completion.bash + $out/share/bash-completion/completions/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ |