commit 351f5fc58519be059f9d6703f2f90a39ba2d1839 · pyrox.dev/nixpkgs

nixos/modules/profiles/base.nix

···

       20
       20
        
       

     

       21
       21
        
           # Some networking tools.

     

       22
       22
        
           pkgs.fuse

     

       23
       23
       +
           pkgs.fuse3

     

       23
       24
        
           pkgs.sshfs-fuse

     

       24
       25
        
           pkgs.socat

     

       25
       26
        
           pkgs.screen

+4 -1

nixos/modules/security/wrappers/default.nix

···

       155
       155
        
         ###### implementation

     

       156
       156
        
         config = {

     

       157
       157
        
       

     

       158
       158
       -
           security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";

     

       158
       158
       +
           security.wrappers = {

     

       159
       159
       +
             fusermount.source = "${pkgs.fuse}/bin/fusermount";

     

       160
       160
       +
             fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";

     

       161
       161
       +
           };

     

       159
       162
        
       

     

       160
       163
        
           boot.specialFileSystems.${parentWrapperDir} = {

     

       161
       164
        
             fsType = "tmpfs";

+1 -1

nixos/modules/tasks/filesystems.nix

···

       217
       217
        
           # Add the mount helpers to the system path so that `mount' can find them.

     

       218
       218
        
           system.fsPackages = [ pkgs.dosfstools ];

     

       219
       219
        
       

     

       220
       220
       -
           environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages;

     

       220
       220
       +
           environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;

     

       221
       221
        
       

     

       222
       222
        
           environment.etc.fstab.text =

     

       223
       223
        
             let

+72

pkgs/os-specific/linux/fuse/common.nix

···

       1
       1
       +
       { version, sha256Hash, maintainers }:

     

       2
       2
       +
       

     

       3
       3
       +
       { stdenv, fetchFromGitHub, fetchpatch

     

       4
       4
       +
       , utillinux, autoconf, automake, libtool, gettext

     

       5
       5
       +
       , fusePackages }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         isFuse3 = stdenv.lib.hasPrefix "3" version;

     

       9
       9
       +
       in stdenv.mkDerivation rec {

     

       10
       10
       +
         name = "fuse-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "libfuse";

     

       14
       14
       +
           repo = "libfuse";

     

       15
       15
       +
           rev = name;

     

       16
       16
       +
           sha256 = sha256Hash;

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = stdenv.lib.optional

     

       20
       20
       +
           (!isFuse3 && stdenv.isAarch64)

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";

     

       23
       23
       +
             sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";

     

       24
       24
       +
         });

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [ libtool autoconf automake ];

     

       27
       27
       +
         buildInputs = [ gettext utillinux ];

     

       28
       28
       +
       

     

       29
       29
       +
         outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";

     

       30
       30
       +
       

     

       31
       31
       +
         preConfigure = ''

     

       32
       32
       +
           export MOUNT_FUSE_PATH=$out/sbin

     

       33
       33
       +
           export INIT_D_PATH=$TMPDIR/etc/init.d

     

       34
       34
       +
           export UDEV_RULES_PATH=$out/etc/udev/rules.d

     

       35
       35
       +
       

     

       36
       36
       +
           # Ensure that FUSE calls the setuid wrapper, not

     

       37
       37
       +
           # $out/bin/fusermount. It falls back to calling fusermount in

     

       38
       38
       +
           # $PATH, so it should also work on non-NixOS systems.

     

       39
       39
       +
           export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""

     

       40
       40
       +
       

     

       41
       41
       +
           sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c

     

       42
       42
       +
           sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh

     

       43
       43
       +
       

     

       44
       44
       +
           ./makeconf.sh

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         postFixup = if isFuse3 then ''

     

       48
       48
       +
           cd $out

     

       49
       49
       +
       

     

       50
       50
       +
           mv bin/mount.fuse3 bin/mount.fuse

     

       51
       51
       +
           mv etc/udev/rules.d/99-fuse3.rules etc/udev/rules.d/99-fuse.rules

     

       52
       52
       +
       

     

       53
       53
       +
           install -D -m555 bin/mount.fuse $common/bin/mount.fuse

     

       54
       54
       +
           install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules

     

       55
       55
       +
           install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz

     

       56
       56
       +
         '' else ''

     

       57
       57
       +
           cd $out

     

       58
       58
       +
       

     

       59
       59
       +
           cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse

     

       60
       60
       +
           cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules

     

       61
       61
       +
           cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         enableParallelBuilding = true;

     

       65
       65
       +
       

     

       66
       66
       +
         meta = {

     

       67
       67
       +
           inherit (src.meta) homepage;

     

       68
       68
       +
           description = "Kernel module and library that allows filesystems to be implemented in user space";

     

       69
       69
       +
           platforms = stdenv.lib.platforms.linux;

     

       70
       70
       +
           inherit maintainers;

     

       71
       71
       +
         };

     

       72
       72
       +
       }

+15 -42

pkgs/os-specific/linux/fuse/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, fetchpatch, utillinux

     

       2
       2
       -
       , autoconf, automake, libtool, gettext }:

     

       1
       1
       +
       { stdenv, callPackage, utillinux }:

     

       3
       2
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "fuse-${version}";

     

       6
       6
       -
         version = "2.9.7";

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchFromGitHub {

     

       9
       9
       -
           owner = "libfuse";

     

       10
       10
       -
           repo = "libfuse";

     

       11
       11
       -
           rev = name;

     

       12
       12
       -
           sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";

     

       3
       3
       +
       let

     

       4
       4
       +
         mkFuse = args: callPackage (import ./common.nix args) {

     

       5
       5
       +
           inherit utillinux;

     

       6
       6
       +
         };

     

       7
       7
       +
         maintainers = stdenv.lib.maintainers;

     

       8
       8
       +
       in {

     

       9
       9
       +
         fuse_2 = mkFuse {

     

       10
       10
       +
           version = "2.9.7";

     

       11
       11
       +
           sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";

     

       12
       12
       +
           maintainers = [ maintainers.mornfall ];

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ utillinux autoconf automake libtool gettext ];

     

       16
       16
       -
       

     

       17
       17
       -
         patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {

     

       18
       18
       -
           url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";

     

       19
       19
       -
           sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";

     

       20
       20
       -
         });

     

       21
       21
       -
       

     

       22
       22
       -
         preConfigure =

     

       23
       23
       -
           ''

     

       24
       24
       -
             export MOUNT_FUSE_PATH=$out/sbin

     

       25
       25
       -
             export INIT_D_PATH=$TMPDIR/etc/init.d

     

       26
       26
       -
             export UDEV_RULES_PATH=$out/etc/udev/rules.d

     

       27
       27
       -
       

     

       28
       28
       -
             # Ensure that FUSE calls the setuid wrapper, not

     

       29
       29
       -
             # $out/bin/fusermount. It falls back to calling fusermount in

     

       30
       30
       -
             # $PATH, so it should also work on non-NixOS systems.

     

       31
       31
       -
             export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""

     

       32
       32
       -
       

     

       33
       33
       -
             sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c

     

       34
       34
       -
             sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh

     

       35
       35
       -
       

     

       36
       36
       -
             ./makeconf.sh

     

       37
       37
       -
           '';

     

       38
       38
       -
       

     

       39
       39
       -
         enableParallelBuilding = true;

     

       40
       40
       -
       

     

       41
       41
       -
         meta = with stdenv.lib; {

     

       42
       42
       -
           homepage = https://github.com/libfuse/libfuse;

     

       43
       43
       -
           description = "Kernel module and library that allows filesystems to be implemented in user space";

     

       44
       44
       -
           platforms = platforms.linux;

     

       45
       45
       -
           maintainers = [ maintainers.mornfall ];

     

       15
       15
       +
         fuse_3 = mkFuse {

     

       16
       16
       +
           version = "3.1.1";

     

       17
       17
       +
           sha256Hash = "14mazl2i55fp4vjphwgcmk3mp2x3mhqwh9nci0rd0jl5lhpdmpq6";

     

       18
       18
       +
           maintainers = [ maintainers.primeos ];

     

       46
       19
        
         };

     

       47
       20
        
       }

+4 -1

pkgs/top-level/all-packages.nix

···

       12052
       12052
        
           inherit (linuxPackages) kernel;

     

       12053
       12053
        
         };

     

       12054
       12054
        
       

     

       12055
       12055
       -
         fuse = callPackage ../os-specific/linux/fuse {

     

       12055
       12055
       +
         fusePackages = callPackage ../os-specific/linux/fuse {

     

       12056
       12056
        
           utillinux = utillinuxMinimal;

     

       12057
       12057
        
         };

     

       12058
       12058
       +
         fuse = lowPrio fusePackages.fuse_2;

     

       12059
       12059
       +
         fuse3 = fusePackages.fuse_3;

     

       12060
       12060
       +
         fuse-common = hiPrio fusePackages.fuse_3.common;

     

       12058
       12061
        
       

     

       12059
       12062
        
         fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { };

     

       12060
       12063