diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 4d01d4533f67..822e455ea50b 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -336,31 +336,27 @@ in config = let - wrappedSlurm = pkgs.stdenv.mkDerivation { - name = "wrappedSlurm"; + wrappedSlurm = pkgs.runCommand "wrappedSlurm" { } '' + mkdir -p $out/bin + find ${lib.getBin cfg.package}/bin -type f -executable | while read EXE + do + exename="$(basename $EXE)" + wrappername="$out/bin/$exename" + cat > "$wrappername" < "$wrappername" < +Date: Wed, 17 Dec 2025 17:44:21 -0800 +Subject: [PATCH] Remove compatibility fixes for very old LO/OO. + +--- + unoconv | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/unoconv b/unoconv +index 6aa1bfa..ae2159f 100755 +--- a/unoconv ++++ b/unoconv +@@ -16,7 +16,6 @@ + + from __future__ import print_function + +-from distutils.version import LooseVersion + import getopt + import glob + import os +@@ -857,10 +856,7 @@ class Convertor: + info(3, "Launching our own listener using %s." % office.binary) + try: + product = self.svcmgr.createInstance("com.sun.star.configuration.ConfigurationProvider").createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", UnoProps(nodepath="/org.openoffice.Setup/Product")) +- if product.ooName not in ('LibreOffice', 'LOdev') or LooseVersion(product.ooSetupVersion) <= LooseVersion('3.3'): +- args = [office.binary, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection] +- else: +- args = [office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--accept=%s" % op.connection] ++ args = [office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--accept=%s" % op.connection] + if op.userProfile: + args.append("-env:UserInstallation=file://" + realpath(op.userProfile)) + info(2, '%s listener arguments are %s.' % (product.ooName, args)) +@@ -1287,10 +1283,7 @@ def die(ret, msg=None): + if convertor.desktop.getCurrentFrame(): + info(2, 'Trying to stop %s GUI listener.' % product.ooName) + try: +- if product.ooName != "LibreOffice" or product.ooSetupVersion <= 3.3: +- subprocess.Popen([office.binary, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection], env=os.environ) +- else: +- subprocess.Popen([office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection], env=os.environ) ++ subprocess.Popen([office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection], env=os.environ) + ooproc.wait() + info(2, '%s listener successfully disabled.' % product.ooName) + except Exception as e: +-- +2.51.2 + diff --git a/pkgs/by-name/un/unoconv/package.nix b/pkgs/by-name/un/unoconv/package.nix index fe979220cee4..b40f15cdc03e 100644 --- a/pkgs/by-name/un/unoconv/package.nix +++ b/pkgs/by-name/un/unoconv/package.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr"; }; + patches = [ ./0001-Remove-compatibility-fixes-for-very-old-LO-OO.patch ]; + nativeBuildInputs = [ asciidoc makeWrapper diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index cd0c0a9ffadb..9c5dc4671b56 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -104,9 +104,9 @@ major = "3"; minor = "15"; patch = "0"; - suffix = "a2"; + suffix = "a3"; }; - hash = "sha256-2KCi9Kfz1wkM8ZXoGBTv6V9wVUlVVX9A4UnYaUpmJ1E="; + hash = "sha256-arAs2sJFBXeYd7sdkYlDLWfpDd8qm4t7Nz6tVKwHtgc="; inherit passthruFun; }; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 73cc6d35221a..7b6a5af3aedf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -19,7 +19,7 @@ bitbake = { version = "1.1.0"; - url = "github:amaanq/tree-sitter-bitbake"; + url = "github:tree-sitter-grammars/tree-sitter-bitbake"; hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0="; }; @@ -61,7 +61,7 @@ commonlisp = { version = "0.4.1"; - url = "github:thehamsta/tree-sitter-commonlisp"; + url = "github:tree-sitter-grammars/tree-sitter-commonlisp"; hash = "sha256-wHVdRiorBgxQ+gG+m/duv9nt5COxz6XK0AcKQ5FX43U="; }; @@ -85,7 +85,7 @@ cuda = { version = "0.21.1"; - url = "github:thehamsta/tree-sitter-cuda"; + url = "github:tree-sitter-grammars/tree-sitter-cuda"; hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ="; }; @@ -114,15 +114,15 @@ }; dot = { - version = "0-unstable-2022-08-25"; - url = "github:rydesun/tree-sitter-dot/9ab85550c896d8b294d9b9ca1e30698736f08cea"; - hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ="; + version = "0-unstable-2025-10-21"; + url = "github:rydesun/tree-sitter-dot/80327abbba6f47530edeb0df9f11bd5d5c93c14d"; + hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y="; }; earthfile = { - version = "0-unstable-2025-05-13"; - url = "github:glehmann/tree-sitter-earthfile/a37c5ee95ce401ca311c0ae1369d9cfb953e151d"; - hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4="; + version = "0.6.0-unstable-2025-10-27"; + url = "github:glehmann/tree-sitter-earthfile/5baef88717ad0156fd29a8b12d0d8245bb1096a8"; + hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k="; }; eex = { @@ -132,9 +132,9 @@ }; elisp = rec { - version = "1.3.0"; + version = "1.6.1"; url = "github:wilfred/tree-sitter-elisp?ref=${version}"; - hash = "sha256-hmPJtB0pEBqc9rbnQ5YZzs9kHCqXWfbjRWN6WoFZ1NQ="; + hash = "sha256-ixZKsQtRk5ykR6miQ5JicI3xn/Bp9t4WGAIoNTC/gbY="; }; elixir = { @@ -180,9 +180,9 @@ }; fortran = { - version = "0.4.0"; + version = "0.5.1"; url = "github:stadelmanma/tree-sitter-fortran"; - hash = "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY="; + hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs="; }; gdscript = { @@ -205,13 +205,13 @@ glimmer = { version = "1.4.0"; - url = "github:alexlafroscia/tree-sitter-glimmer?ref=v1.4.0-tree-sitter-glimmer"; + url = "github:ember-tooling/tree-sitter-glimmer?ref=v1.4.0-tree-sitter-glimmer"; hash = "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w="; }; glsl = { version = "0.2.0"; - url = "github:thehamsta/tree-sitter-glsl"; + url = "github:tree-sitter-grammars/tree-sitter-glsl"; hash = "sha256-S0Yr/RQE4uLpazphTKLUoHgPEOUbOBDGCkkRXemsHjQ="; }; @@ -260,13 +260,13 @@ hcl = { version = "1.1.0"; - url = "github:MichaHoffmann/tree-sitter-hcl"; + url = "github:tree-sitter-grammars/tree-sitter-hcl"; hash = "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs="; }; heex = { version = "0.8.0"; - url = "github:connorlay/tree-sitter-heex"; + url = "github:phoenixframework/tree-sitter-heex"; hash = "sha256-rifYGyIpB14VfcEZrmRwYSz+ZcajQcB4mCjXnXuVFDQ="; }; @@ -284,7 +284,7 @@ http = { version = "3.0.0"; - url = "github:ntbbloodbath/tree-sitter-http?ref=v3.0"; + url = "github:rest-nvim/tree-sitter-http?ref=v3.0"; hash = "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw="; }; @@ -399,7 +399,7 @@ markdown = { version = "0.3.2"; - url = "github:MDeiml/tree-sitter-markdown"; + url = "github:tree-sitter-grammars/tree-sitter-markdown"; hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; location = "tree-sitter-markdown"; }; @@ -407,7 +407,7 @@ markdown-inline = { language = "markdown_inline"; version = "0.3.2"; - url = "github:MDeiml/tree-sitter-markdown"; + url = "github:tree-sitter-grammars/tree-sitter-markdown"; hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; location = "tree-sitter-markdown-inline"; }; @@ -463,7 +463,7 @@ org-nvim = { version = "0-unstable-2023-06-19"; - url = "github:milisims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1"; + url = "github:emiasims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1"; hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA="; }; @@ -529,7 +529,7 @@ query = { version = "0.8.0"; - url = "github:nvim-treesitter/tree-sitter-query"; + url = "github:tree-sitter-grammars/tree-sitter-query"; hash = "sha256-0y8TbbZKMstjIVFEtq+9Fz44ueRup0ngNcJPJEQB/NQ="; }; @@ -621,14 +621,14 @@ }; solidity = { - version = "1.2.3"; + version = "1.2.13"; url = "github:JoranHonig/tree-sitter-solidity"; - hash = "sha256-BN3a/gEZxOgRWm/H3CEFk4eTKhoZrBAFlUnZiLs9RUE="; + hash = "sha256-b+DHy7BkkMg88kLhirtCzjF3dHlCFkXea65aGC18fW0="; }; sparql = { version = "0-unstable-2024-06-26"; - url = "github:bonabeavis/tree-sitter-sparql/d853661ca680d8ff7f8d800182d5782b61d0dd58"; + url = "github:GordianDziwis/tree-sitter-sparql/d853661ca680d8ff7f8d800182d5782b61d0dd58"; hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; @@ -664,9 +664,9 @@ }; templ = { - version = "0-unstable-2025-09-14"; - url = "github:vrischmann/tree-sitter-templ/27a1fc62c8dd4c49669e03629491f66449c6c435"; - hash = "sha256-2h1NPQtutTmdVKjydq/ZRvBCJ3YEiT+ZVcL72fb2m9M="; + version = "1.0.0-unstable-2025-12-03"; + url = "github:vrischmann/tree-sitter-templ/3057cd485f7f23a8ad24107c6adc604f8c5ce3db"; + hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0="; }; tera = { @@ -676,7 +676,7 @@ }; tiger = { - version = "0-unstable-2025-03-13"; + version = "0.3.0-unstable-2025-03-13"; url = "github:ambroisie/tree-sitter-tiger/4a77b2d7a004587646bddc4e854779044b6db459"; hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ="; }; @@ -703,7 +703,7 @@ }; tsq = { - version = "0-unstable-2024-02-24"; + version = "0.19.0-unstable-2024-02-24"; url = "github:tree-sitter/tree-sitter-tsq/49da6de661be6a07cb51018880ebe680324e7b82"; hash = "sha256-md4xynJx9F/l6N+JZYU8CLXmz50fV13L8xGJVUqk6do="; }; @@ -716,7 +716,7 @@ turtle = { version = "0-unstable-2024-07-02"; - url = "github:bonabeavis/tree-sitter-turtle/7f789ea7ef765080f71a298fc96b7c957fa24422"; + url = "github:GordianDziwis/tree-sitter-turtle/7f789ea7ef765080f71a298fc96b7c957fa24422"; hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA="; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c6a532d19f53..22b68970679e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1585,6 +1585,7 @@ mapAliases { terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27 testVersion = throw "'testVersion' has been renamed to/replaced by 'testers.testVersion'"; # Converted to throw 2025-10-27 tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12 + tewi-font = throw "'tewi-font' has been removed because it was removed from upstream"; # Added 2025-12-18 texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08 texinfo6 = throw "'texinfo6' has been removed in favor of the latest version"; # Added 2025-12-17 textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10