Merge pull request #30 from trofi/nix-2.25

edolstra · web-flow · commit 09f5b6d21ce3 · 2024-12-02T14:32:34.000+01:00
dwarffs.cc: port to nix-2.25 (`ignoreException` rename)
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 }:

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ static int dwarffs_getattr(const char * path_, struct stat * stbuf)`
`326`	`326`	`return res;`
`327`	`327`
`328`	`328`	`} catch (std::exception & e) {`
`329`		`- ignoreException();`
	`329`	`+ ignoreExceptionExceptInterrupt();`
`330`	`330`	`return -EIO;`
`331`	`331`	`}`
`332`	`332`	`}`
`@@ -375,7 +375,7 @@ static int dwarffs_open(const char * path_, struct fuse_file_info * fi)`
`375`	`375`	`return 0;`
`376`	`376`
`377`	`377`	`} catch (std::exception & e) {`
`378`		`- ignoreException();`
	`378`	`+ ignoreExceptionExceptInterrupt();`
`379`	`379`	`return -EIO;`
`380`	`380`	`}`
`381`	`381`	`}`
`@@ -417,7 +417,7 @@ static int dwarffs_read(const char * path_, char * buf, size_t size, off_t offse`
`417`	`417`	`return -ENOENT;`
`418`	`418`
`419`	`419`	`} catch (std::exception & e) {`
`420`		`- ignoreException();`
	`420`	`+ ignoreExceptionExceptInterrupt();`
`421`	`421`	`return -EIO;`
`422`	`422`	`}`
`423`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`description = "A filesystem that fetches DWARF debug info from the Internet on demand";`
`3`	`3`
`4`		`- inputs.nix.url = "https://flakehub.com/f/NixOS/nix/2.20.tar.gz";`
	`4`	`+ inputs.nix.url = "https://flakehub.com/f/NixOS/nix/2.25.tar.gz";`
`5`	`5`	`inputs.nixpkgs.follows = "nix/nixpkgs";`
`6`	`6`
`7`	`7`	`outputs = { self, nix, nixpkgs }:`