diff --git a/nix/nix-versions.json b/nix/nix-versions.json
index 97e0207fd..b5e851652 100644
--- a/nix/nix-versions.json
+++ b/nix/nix-versions.json
@@ -1,13 +1,18 @@
 {
+  "2.26": {
+    "url": "https://github.com/nixos/nix/tarball/1dda07eef2f45a7c1205ae367a9ccd3050044c6c",
+    "version": "2.26.3",
+    "sha256": "10imsxhbb3gxazjkdzlh8v9jx8hk6ivpf5k3rr7kmx7yldiq5wc9"
+  },
   "2.25": {
-    "url": "https://github.com/nixos/nix/tarball/218cd6c16c0981cc32a45e3a15be1d3c1a68eb85",
-    "version": "2.25.3",
-    "sha256": "1h51fcdhfkjzl09rl30ib3xp76hvn7xrh5rc4m3cm3ywdlr0bv2g"
+    "url": "https://github.com/nixos/nix/tarball/40f33b5e1719dd190233865c53d31007f4a3503d",
+    "version": "2.25.6",
+    "sha256": "1mhgydvirsgkbqdcaya92bgpnc87ck2cjrxw7yk1mwmrydn1015c"
   },
   "2.24": {
-    "url": "https://github.com/nixos/nix/tarball/fc11659148587742a9b7b4f45927e16dd436b892",
-    "version": "2.24.11",
-    "sha256": "0svnxjjj8b8dfd3q0sxnp8pyz5ls8rch1di2g82nis31s8awfch8"
+    "url": "https://github.com/nixos/nix/tarball/79828c12e03b1bf22c4d2b6929cb6bd485604961",
+    "version": "2.24.13",
+    "sha256": "17r49q545kcvrmrlysyh035706mxl2fdsbmavvsd4xw9chzz7siq"
   },
   "2.23": {
     "url": "https://github.com/nixos/nix/tarball/f50d7186917b441c3165fe85fc5d703c04ad41a4",
@@ -35,9 +40,9 @@
     "sha256": "1vljpsa4vmzp0k72psdl1w41jsidm1phrj7f2ld6vsfs79wyyg5y"
   },
   "2.18": {
-    "url": "https://github.com/nixos/nix/tarball/266d76cf99cb82c96c91231f7a9a554ec69b67fb",
+    "url": "https://github.com/nixos/nix/tarball/f708fd2cef23792aeb8a904971c34471e0547a7e",
     "version": "2.18.10",
-    "sha256": "0nnv36bwv1amk5c73ji1c2cpf2bglxiz1an9r9fgnbm7v9chbfsz"
+    "sha256": "08kn3qsrnilj3a2azrqw1fk8kzqfw6q9dx5x4k72mfzxlc0p53v6"
   },
   "2.17": {
     "url": "https://github.com/nixos/nix/tarball/800f9c6dbac71594e2c250ff2b5f900268c4e522",
@@ -110,4 +115,3 @@
     "sha256": "0kzn3ggmir8iv1nk4yds6676x8y4q72xv06ks5p2nrvazhdarl8y"
   }
 }
-
diff --git a/nix/sources.json b/nix/sources.json
index 701ab65b7..292b765b7 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -140,9 +140,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixos-24.05",
-      "revision": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
-      "url": "https://github.com/nixos/nixpkgs/archive/7e1ca67996afd8233d9033edd26e442836cc2ad6.tar.gz",
-      "hash": "03pdf5wrpxwmr37p3xn45vm6cz1m7bzvif2v8xhqpmm09m40zb7j"
+      "revision": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+      "url": "https://github.com/nixos/nixpkgs/archive/b134951a4c9f3c995fd7be05f3243f8ecd65d798.tar.gz",
+      "hash": "0zydsqiaz8qi4zd63zsb2gij2p614cgkcaisnk11wjy3nmiq0x1s"
     },
     "24.11": {
       "type": "Git",
diff --git a/nix/update-nix-releases.nix b/nix/update-nix-releases.nix
index e8fac73b1..bb0cafc1d 100644
--- a/nix/update-nix-releases.nix
+++ b/nix/update-nix-releases.nix
@@ -46,13 +46,9 @@ writeShellApplication {
         fi
         fullVersion="$(<"$source"/.version)"
 
-        # Only try versions recent enough to have the same structure, this filter out versions before 2.4
-        if ! drvPath=$(nix-instantiate "$source" --argstr system "x86_64-linux" -A default 2> /dev/null); then
-          echo >&2 "No default.nix supporting -A default"
-          break
-        fi
-        # We need a doc output, this is always the case for >= 2.4
-        if ! docOutput=$(nix-store --query --binding doc "$drvPath"); then
+        # Only try versions recent enough to have the same structure, in particular a `doc` output
+        # This is always the case for >= 2.4
+        if ! docOutput=$(nix-instantiate --eval -E "(import $source).default.doc.outPath" | tr -d \"); then
           echo >&2 "No doc output"
           break
         fi
diff --git a/npins/sources.json b/npins/sources.json
index 3797b7399..15cda801f 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -8,9 +8,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixpkgs-unstable",
-      "revision": "31d66ae40417bb13765b0ad75dd200400e98de84",
-      "url": "https://github.com/nixos/nixpkgs/archive/31d66ae40417bb13765b0ad75dd200400e98de84.tar.gz",
-      "hash": "0fwsqd05bnk635niqnx9vqkdbinjq0ffdrbk66xllfyrnx4fvmpc"
+      "revision": "3a05eebede89661660945da1f151959900903b6a",
+      "url": "https://github.com/nixos/nixpkgs/archive/3a05eebede89661660945da1f151959900903b6a.tar.gz",
+      "hash": "0n56l6v5k3lmrr4vjnp6xk1s46shkwdkvai05dzcbcabpl29yb9g"
     },
     "poetry2nix": {
       "type": "Git",