Merge pull request #30 from trofi/nix-2.25

dwarffs.cc: port to nix-2.25 (`ignoreException` rename)
edolstra · Dec 2, 2024 · 09f5b6d · 09f5b6d
2 parents 8198868 + d85f990
commit 09f5b6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/dwarffs.cc b/dwarffs.cc
@@ -326,7 +326,7 @@ static int dwarffs_getattr(const char * path_, struct stat * stbuf)
         return res;
 
     } catch (std::exception & e) {
-        ignoreException();
+        ignoreExceptionExceptInterrupt();
         return -EIO;
     }
 }
@@ -375,7 +375,7 @@ static int dwarffs_open(const char * path_, struct fuse_file_info * fi)
         return 0;
 
     } catch (std::exception & e) {
-        ignoreException();
+        ignoreExceptionExceptInterrupt();
         return -EIO;
     }
 }
@@ -417,7 +417,7 @@ static int dwarffs_read(const char * path_, char * buf, size_t size, off_t offse
             return -ENOENT;
 
     } catch (std::exception & e) {
-        ignoreException();
+        ignoreExceptionExceptInterrupt();
         return -EIO;
     }
 }

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "A filesystem that fetches DWARF debug info from the Internet on demand";
 
-  inputs.nix.url = "https://flakehub.com/f/NixOS/nix/2.20.tar.gz";
+  inputs.nix.url = "https://flakehub.com/f/NixOS/nix/2.25.tar.gz";
   inputs.nixpkgs.follows = "nix/nixpkgs";
 
   outputs = { self, nix, nixpkgs }: