Merge master into staging-next

NixOS · Nov 13, 2024 · b3a71c7 · b3a71c7
2 parents d6721ed + 27d7247
commit b3a71c7
Show file tree

Hide file tree

Showing 80 changed files with 792 additions and 1,167 deletions.
diff --git a/lib/licenses.nix b/lib/licenses.nix
@@ -213,6 +213,11 @@ lib.mapAttrs mkLicense ({
     fullName = "BSD 3-Clause Clear License";
   };
 
+  bsd3Lbnl = {
+    spdxId = "BSD-3-Clause-LBNL";
+    fullName = "Lawrence Berkeley National Labs BSD variant license";
+  };
+
   bsdOriginal = {
     spdxId = "BSD-4-Clause";
     fullName = ''BSD 4-clause "Original" or "Old" License'';

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -13474,6 +13474,12 @@
     githubId = 1709273;
     name = "Robin Hack";
   };
+  marnym = {
+    email = "[email protected]";
+    github = "marnym";
+    githubId = 56825922;
+    name = "Markus Nyman";
+  };
   marsupialgutz = {
     email = "[email protected]";
     github = "pupbrained";

diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix
@@ -313,7 +313,9 @@ in
             old.extraPrefsFiles or [ ]
             ++ cfg.autoConfigFiles
             ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ];
-          nativeMessagingHosts = old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages;
+          nativeMessagingHosts = lib.unique (
+            old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages
+          );
           cfg = (old.cfg or { }) // cfg.wrapperConfig;
         }))
       ];

diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
@@ -19,6 +19,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             extraPlugins = ps: [ ps.anonymizer ];
             settings.shared_preload_libraries = [ "anon" ];
           };

diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix
@@ -23,6 +23,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             extraPlugins =
               ps: with ps; [
                 pgjwt

diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix
@@ -24,9 +24,9 @@ let
   '';
 
   makeTestFor =
-    postgresqlPackage:
+    package:
     makeTest {
-      name = "pgvecto-rs-${postgresqlPackage.name}";
+      name = "pgvecto-rs-${package.name}";
       meta = with lib.maintainers; {
         maintainers = [ diogotcorreia ];
       };
@@ -35,8 +35,9 @@ let
         { ... }:
         {
           services.postgresql = {
+            inherit package;
             enable = true;
-            package = postgresqlPackage;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             extraPlugins =
               ps: with ps; [
                 pgvecto-rs

diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix
@@ -50,6 +50,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             enableTCPIP = true;
             ensureUsers = [
               {

diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix
@@ -31,6 +31,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             settings = {
               max_replication_slots = 10;
               max_wal_senders = 10;

diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix
@@ -40,8 +40,9 @@ let
         { ... }:
         {
           services.postgresql = {
-            inherit (package) ;
+            inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
           };
 
           services.postgresqlBackup = {
@@ -158,6 +159,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             ensureUsers = [
               {
                 name = "all-clauses";

diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix
@@ -53,6 +53,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             extraPlugins =
               ps: with ps; [
                 timescaledb

diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix
@@ -20,6 +20,7 @@ let
           services.postgresql = {
             inherit package;
             enable = true;
+            enableJIT = lib.hasInfix "-jit-" package.name;
             extraPlugins =
               ps: with ps; [
                 tsja

diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix
@@ -16,6 +16,7 @@ let
         services.postgresql = {
           inherit package;
           enable = true;
+          enableJIT = lib.hasInfix "-jit-" package.name;
           extraPlugins = with package.pkgs; [ wal2json ];
           settings = {
             wal_level = "logical";

diff --git a/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh b/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh
@@ -0,0 +1,36 @@
+echo "Sourcing to-nvim-treesitter-grammar.sh"
+
+toNvimTreesitterGrammar() {
+    echo "Executing toNvimTreesitterGrammar"
+
+    mkdir -p "$out/parser"
+    ln -s "$origGrammar/parser" "$out/parser/$grammarName.so"
+
+    if [ "$installQueries" != 1 ]; then
+        echo "Installing queries is disabled: installQueries=$installQueries"
+        return
+    fi
+
+    echo "Installing queries for $grammarName"
+
+    mkdir -p "$out/queries/$grammarName"
+    if [ -d "$origGrammar/queries/$grammarName" ]; then
+        echo "Moving queries from neovim queries dir"
+        for file in "$origGrammar/queries/$grammarName/"*; do
+            ln -s "$file" "$out/queries/$grammarName/$(basename "$file")"
+        done
+    else
+        if [ -d "$origGrammar/queries" ]; then
+            echo "Moving queries from standard queries dir"
+
+            for file in "$origGrammar/queries/"*; do
+                ln -s "$file" "$out/queries/$grammarName/$(basename "$file")"
+            done
+        else
+            echo "Missing queries for $grammarName"
+        fi
+    fi
+}
+
+echo "Using toNvimTreesitterGrammar"
+preDistPhases+=" toNvimTreesitterGrammar"
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
@@ -1,14 +1,16 @@
 { lib
+, stdenv
+, makeSetupHook
 , callPackage
 , vimUtils
+, vimPlugins
 , nodejs
 , neovim-unwrapped
 , bundlerEnv
 , ruby
 , lua
 , python3Packages
 , wrapNeovimUnstable
-, runCommand
 }:
 let
   inherit (vimUtils) toVimPlugin;
@@ -173,35 +175,49 @@ let
         (lib.removePrefix "tree-sitter-")
         (lib.replaceStrings [ "-" ] [ "_" ])
       ];
+
+      nvimGrammars = lib.mapAttrsToList (name: value: value.origGrammar) vimPlugins.nvim-treesitter.grammarPlugins;
+      isNvimGrammar = x: builtins.elem x nvimGrammars;
+
+      toNvimTreesitterGrammar = callPackage ({ }:
+        makeSetupHook {
+          name = "to-nvim-treesitter-grammar";
+        } ./to-nvim-treesitter-grammar.sh) {};
     in
 
-    toVimPlugin (runCommand "treesitter-grammar-${name}"
-      {
-        meta = {
-          platforms = lib.platforms.all;
-        } // grammar.meta;
-      }
-      ''
-        mkdir -p "$out/parser"
-        ln -s "${grammar}/parser" "$out/parser/${name}.so"
-
-        mkdir -p "$out/queries/${name}"
-        if [ -d "${grammar}/queries/${name}" ]; then
-          echo "moving queries from neovim queries dir"
-          for file in "${grammar}/queries/${name}"*; do
-            ln -s "$file" "$out/queries/${name}/$(basename "$file")"
-          done
-        else
-          if [ -d "${grammar}/queries" ]; then
-            echo "moving queries from standard queries dir"
-            for file in "${grammar}/queries/"*; do
-              ln -s "$file" "$out/queries/${name}/$(basename "$file")"
-            done
-          else
-            echo "missing queries for ${name}"
-          fi
-        fi
-      '');
+    (toVimPlugin (stdenv.mkDerivation {
+      name = "treesitter-grammar-${name}";
+
+      origGrammar = grammar;
+      grammarName = name;
+
+      # Queries for nvim-treesitter's (not just tree-sitter's) officially
+      # supported languages are bundled with nvim-treesitter
+      # Queries from repositories for such languages are incompatible
+      # with nvim's implementation of treesitter.
+      #
+      # We try our best effort to only include queries for niche languages
+      # (there are grammars for them in nixpkgs, but they're in
+      # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*`
+      # only includes officially supported languages)
+      #
+      # To use grammar for a niche language, users usually do:
+      #   packages.all.start = with final.vimPlugins; [
+      #     (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG)
+      #   ]
+      #
+      # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
+      installQueries = !isNvimGrammar grammar;
+
+      dontUnpack = true;
+      __structuredAttrs = true;
+
+      nativeBuildInputs = [ toNvimTreesitterGrammar ];
+
+      meta = {
+        platforms = lib.platforms.all;
+      } // grammar.meta;
+    }));
 
   /*
     Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that