Nixpkgs 26.05

.aliases/dev-update-default-nix-to-match-flake

@@ -16,7 +16,8 @@ escape_for_sed() {
     echo "$string"
 }
 
-for input in nixpkgs nixpkgs-master; do
+# for input in nixpkgs nixpkgs-master; do
+for input in nixpkgs; do
     echo "Processing input: $input"
 
     # Update rev

.aliases/dev-update-nixpkgs-master

@@ -1,11 +1,11 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p nix gnused
-
-set -e
-
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$SCRIPTDIR/.."
-
-nix flake update nixpkgs-master
-
-dev-update-default-nix-to-match-flake
+#
+# set -e
+#
+# SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# cd "$SCRIPTDIR/.."
+#
+# nix flake update nixpkgs-master
+#
+# dev-update-default-nix-to-match-flake

.aliases/dev-verify-default-nix

@@ -9,24 +9,24 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPTDIR/.."
 
 FLAKE_NIXPKGS_REV=$(nix flake metadata --json | jq -r .locks.nodes.nixpkgs.locked.rev)
-FLAKE_NIXPKGS_MASTER_REV=$(nix flake metadata --json | jq -r '.locks.nodes["nixpkgs-master"].locked.rev')
+# FLAKE_NIXPKGS_MASTER_REV=$(nix flake metadata --json | jq -r '.locks.nodes["nixpkgs-master"].locked.rev')
 
 echo "FLAKE_NIXPKGS_REV: '$FLAKE_NIXPKGS_REV'"
-echo "FLAKE_NIXPKGS_MASTER_REV: '$FLAKE_NIXPKGS_MASTER_REV'"
+# echo "FLAKE_NIXPKGS_MASTER_REV: '$FLAKE_NIXPKGS_MASTER_REV'"
 
 DEFAULT_NIXPKGS_REV=$(cat default.nix | grep nixpkgs-rev | cut -d'"' -f2)
-DEFAULT_NIXPKGS_MASTER_REV=$(cat default.nix | grep nixpkgs-master-rev | cut -d'"' -f2)
+# DEFAULT_NIXPKGS_MASTER_REV=$(cat default.nix | grep nixpkgs-master-rev | cut -d'"' -f2)
 
 echo "DEFAULT_NIXPKGS_REV: '$DEFAULT_NIXPKGS_REV'"
-echo "DEFAULT_NIXPKGS_MASTER_REV: '$DEFAULT_NIXPKGS_MASTER_REV'"
+# echo "DEFAULT_NIXPKGS_MASTER_REV: '$DEFAULT_NIXPKGS_MASTER_REV'"
 
 
 if [ "$FLAKE_NIXPKGS_REV" != "$DEFAULT_NIXPKGS_REV" ]; then
     echo "nixpkgs rev differed between flake and default.nix"
     exit 1
 fi
 
-if [ "$FLAKE_NIXPKGS_MASTER_REV" != "$DEFAULT_NIXPKGS_MASTER_REV" ]; then
-    echo "nixpkgs-master rev differed between flake and default.nix"
-    exit 1
-fi
+# if [ "$FLAKE_NIXPKGS_MASTER_REV" != "$DEFAULT_NIXPKGS_MASTER_REV" ]; then
+#     echo "nixpkgs-master rev differed between flake and default.nix"
+#     exit 1
+# fi

FEATURE-MATRIX.md

@@ -40,7 +40,7 @@ Which languages support which notebook and editor features. The graphic version
 | Julia | ✅ | ✅ | ✅ | ✅ | ✅ | – | ✅ |
 | Octave | – | – | – | – | – | – | – |
 | PostgreSQL | – | – | – | – | – | – | – |
-| PyPy | ✅ | ? | ? | ? | ? | ? | ? |
+| PyPy | ✅ | ✅ | ✅ | ✅ | ✅ | – | – |
 | Python | ✅ | ✅ | ✅ | ✅ | ✅ | – | – |
 | R | ✅ | ✅ | ✅ | ✅ | ✅ | – | – |
 | R (Ark) | – | – | – | – | – | – | – |
@@ -60,7 +60,7 @@ Which languages support which notebook and editor features. The graphic version
 | Julia | ✅ | – | ✅ | ✅ | ✅ | ✅ |
 | Octave | – | – | – | – | – | – |
 | PostgreSQL | – | – | – | – | – | – |
-| PyPy | ? | ? | ? | ? | ? | ? |
+| PyPy | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | Python | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | R | ✅ | – | ✅ | ✅ | ✅ | ✅ |
 | R (Ark) | – | – | – | – | – | – |
@@ -80,7 +80,7 @@ Which languages support which notebook and editor features. The graphic version
 | Julia | ✅ | ✅ | ✅ |
 | Octave | – | – | – |
 | PostgreSQL | – | – | – |
-| PyPy | ? | ? | ? |
+| PyPy | – | ✅ | ✅ |
 | Python | – | ✅ | ✅ |
 | R | ✅ | ✅ | ✅ |
 | R (Ark) | – | – | – |

OPTIONS.md

@@ -748,7 +748,7 @@ string
 
 
 *Type:*
-one of “go”, “go_1_23”, “go_1_24”, “go_1_25”, “go_1_26”, “go_latest”
+one of “go”, “go_1_23”, “go_1_25”, “go_1_26”, “go_1_27”, “go_latest”
 
 
 
@@ -1936,7 +1936,7 @@ false
 
 
 *Type:*
-one of “python3”, “python311”, “python312”, “python313”
+one of “python3”, “python312”, “python313”, “python314”
 
 
 
@@ -2254,11 +2254,80 @@ one of “rust”, “rust_1_95”
 
 
 
-## language-servers\.spellchecker\.enable
+## language-servers\.spellchecker\.markdown\.enable
 
 
 
-Enable the Markdown spellchecker\.
+**Check Markdown**
+
+Include the Markdown spellchecker (\.md, \.ipynb)\.
+
+
+
+*Type:*
+boolean
+
+
+
+*Default:*
+
+```nix
+true
+```
+
+
+
+## language-servers\.spellchecker\.typst\.enable
+
+
+
+**Check Typst**
+
+Include the Typst spellchecker (\.typ)\.
+
+
+
+*Type:*
+boolean
+
+
+
+*Default:*
+
+```nix
+true
+```
+
+
+
+## language-servers\.spellchecker\.typst\.checkBlockComments
+
+
+
+**Check Typst block comments**
+
+Spellcheck the prose inside Typst block comments (/\* … \*/)\.
+
+
+
+*Type:*
+boolean
+
+
+
+*Default:*
+
+```nix
+false
+```
+
+
+
+## language-servers\.spellchecker\.typst\.checkLineComments
+
+**Check Typst line comments**
+
+Spellcheck the prose inside Typst line comments (// …)\.
 
 
 
@@ -2298,6 +2367,8 @@ string
 
 ## shells\.bash\.enable
 
+
+
 Enable the Bash shell\.
 
 

codedown.nix

@@ -1,7 +1,7 @@
 { pkgsStableSrc
 , pkgsStable
-, pkgsMasterSrc
-, pkgsMaster
+# , pkgsMasterSrc
+# , pkgsMaster
 , requiredPackages ? []
 , system ? "x86_64-linux"
 }:
@@ -29,7 +29,8 @@ rec {
   settingsSchemas = lib.mapAttrs (attr: value: value.meta.settingsSchema or []) kernels;
 
   evaluateConfig = callPackage ./nix/evaluate-config.nix {
-    inherit pkgsStable pkgsMaster;
+    inherit pkgsStable;
+    # inherit pkgsMaster;
   };
 
   everythingConfig = let
@@ -60,7 +61,8 @@ rec {
   exporters = everythingEnv.config.builtExporters;
 
   makeEnvironment = callPackage ./nix/makeEnvironment.nix {
-    inherit pkgsStable pkgsMaster;
+    inherit pkgsStable;
+    # inherit pkgsMaster;
   };
 
   # Which languages support which features, derived from the module evaluation.
@@ -101,5 +103,6 @@ rec {
   ;
 
   # Exposed so it's easier to compute build dependencies in the presence of IFD
-  inherit pkgsStableSrc pkgsStable pkgsMasterSrc pkgsMaster requiredPackages;
+  inherit pkgsStableSrc pkgsStable requiredPackages;
+  # inherit pkgsMasterSrc pkgsMaster;
 }

default.nix

@@ -6,43 +6,24 @@
 }:
 
 let
-  stableRev = "f5190b692864072e79a2fb7c52d72d1d57fcb269"; # nixpkgs-rev
+  stableRev = "ca23145d9899c9d4b7f035339e2f21cf3106aa79"; # nixpkgs-rev
   stableFetchFromGitHub = fetchFromGitHub {
     owner = "NixOS";
     repo = "nixpkgs";
     rev = stableRev;
-    hash = "sha256-6mqKLf7ukajFOrVjO7EH1i37CQOVG22AnuU3wR84xK0="; # nixpkgs-hash
+    hash = "sha256-UxFzpSVQ7zZdd9bPc/sgCkbtSMwJkAKi82tas5FXgFI="; # nixpkgs-hash
   };
   stableBuiltins = builtins.fetchTarball {
     url = ''https://github.com/NixOS/nixpkgs/archive/${stableRev}.tar.gz'';
-    sha256 = "1bf470gw2dz5ks06s6wm0c4znbfn0yqknqxm7b2si4gfzqnqlspa"; # nixpkgs-sha256
+    sha256 = "0ll0ay8v6nkbyfi05409ri4fsiha43xp7kynfxfkdvsh4njp64ak"; # nixpkgs-sha256
   };
   pkgsStableSrc = if fetchFromGitHub != null then stableFetchFromGitHub else stableBuiltins;
   pkgsStable = import pkgsStableSrc ({
     inherit overlays;
   } // (if system == null then {} else { inherit system; }));
 
-  masterRev = "f4d46d85b687293bc8d872010fb66a4f23c23139"; # nixpkgs-master-rev
-  masterFetchFromGitHub = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = masterRev;
-    hash = "sha256-j0P9+h7HX67KNlGki6puFfx8xO6wx4Jz23jXg3dpfCw="; # nixpkgs-master-hash
-  };
-  masterBuiltins = builtins.fetchTarball {
-    url = ''https://github.com/NixOS/nixpkgs/archive/${masterRev}.tar.gz'';
-    sha256 = "0b3wd5vq7mvqvdrq5ixhxv27rz0mdsm8p92i6v5awpy73vxgshwg"; # nixpkgs-master-sha256
-  };
-  pkgsMasterSrc = if fetchFromGitHub != null then masterFetchFromGitHub else masterBuiltins;
-  pkgsMaster = import pkgsMasterSrc ({
-    inherit overlays;
-  } // (if system == null then {} else { inherit system; }));
-
 in
 
 pkgsStable.callPackage ./codedown.nix {
-  inherit
-    pkgsStableSrc pkgsStable
-    pkgsMasterSrc pkgsMaster
-  ;
+  inherit pkgsStableSrc pkgsStable;
 }