diff --git a/nixos/modules/services/networking/llama-swap.nix b/nixos/modules/services/networking/llama-swap.nix index c23107a89d58..34303868bbd2 100644 --- a/nixos/modules/services/networking/llama-swap.nix +++ b/nixos/modules/services/networking/llama-swap.nix @@ -48,7 +48,7 @@ in healthCheckTimeout = 60; models = { "some-model" = { - cmd = "$\{llama-server\} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui"; + cmd = "''\${llama-server} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui"; aliases = [ "the-best" ]; diff --git a/nixos/modules/services/web-apps/baikal.nix b/nixos/modules/services/web-apps/baikal.nix index d1be94aa6204..1c3f89c510d2 100644 --- a/nixos/modules/services/web-apps/baikal.nix +++ b/nixos/modules/services/web-apps/baikal.nix @@ -83,11 +83,11 @@ in rewrite ^/.well-known/caldav /dav.php redirect; rewrite ^/.well-known/carddav /dav.php redirect; ''; - "~ /(\.ht|Core|Specific|config)".extraConfig = '' + "~ /(\\.ht|Core|Specific|config)".extraConfig = '' deny all; return 404; ''; - "~ ^(.+\.php)(.*)$".extraConfig = '' + "~ ^(.+\\.php)(.*)$".extraConfig = '' try_files $fastcgi_script_name =404; include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+\.php)(.*)$; diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix index f214d2c1789b..15bc426037ef 100644 --- a/nixos/modules/services/web-apps/drupal.nix +++ b/nixos/modules/services/web-apps/drupal.nix @@ -439,7 +439,7 @@ in index index.php; ''; locations = { - "~ '\.php$|^/update.php'" = { + "~ '\\.php$|^/update\\.php'" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools."drupal-${hostName}".socket}; @@ -470,7 +470,7 @@ in access_log off; ''; }; - "~ \..*/.*\.php$" = { + "~ \\..*/.*\\.php$" = { extraConfig = '' return 403; ''; @@ -480,7 +480,7 @@ in return 403; ''; }; - "~ ^/sites/[^/]+/files/.*\.php$" = { + "~ ^/sites/[^/]+/files/.*\\.php$" = { extraConfig = '' deny all; ''; @@ -500,13 +500,13 @@ in rewrite ^ /index.php; ''; }; - "~ /vendor/.*\.php$" = { + "~ /vendor/.*\\.php$" = { extraConfig = '' deny all; return 404; ''; }; - "~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$" = { + "~* \\.(js|css|png|jpg|jpeg|gif|ico|svg)$" = { extraConfig = '' try_files $uri @rewrite; expires max; @@ -518,7 +518,7 @@ in try_files $uri @rewrite; ''; }; - "~ ^(/[a-z\-]+)?/system/files/" = { + "~ ^(/[a-z\\-]+)?/system/files/" = { extraConfig = '' try_files $uri /index.php?$query_string; ''; diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 8065efb7fcf8..926c44894b17 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -511,7 +511,7 @@ in tryFiles = "$uri /index.php?$args"; }; - "~ \.php$".extraConfig = '' + "~ \\.php$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools."limesurvey".socket}; ''; "/tmp".root = "/var/lib/limesurvey"; diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index 1956a26bb417..17bad0c62da8 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -179,7 +179,7 @@ in sendfile off; ''; }; - "~ \.php$" = { + "~ \\.php$" = { extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi_params ; fastcgi_param SCRIPT_FILENAME $request_filename; diff --git a/nixos/modules/services/web-apps/tuliprox.nix b/nixos/modules/services/web-apps/tuliprox.nix index f7b82ca9b3f6..20709dd43011 100644 --- a/nixos/modules/services/web-apps/tuliprox.nix +++ b/nixos/modules/services/web-apps/tuliprox.nix @@ -60,7 +60,7 @@ in } { name = "not_low_resolution"; - value = "NOT (Title ~ \"(?i).*\(360p|240p\).*\")"; + value = "NOT (Title ~ \"(?i).*(360p|240p).*\")"; } { name = "all_channels"; diff --git a/nixos/tests/web-apps/netbox/default.nix b/nixos/tests/web-apps/netbox/default.nix index e9636b3c6eea..b614b965ae6d 100644 --- a/nixos/tests/web-apps/netbox/default.nix +++ b/nixos/tests/web-apps/netbox/default.nix @@ -157,7 +157,7 @@ import ../../make-test-python.nix ( ''; in builtins.replaceStrings - [ "$\{changePassword}" "$\{testUser}" "$\{testPassword}" "$\{testGroup}" ] + [ "\${changePassword}" "\${testUser}" "\${testPassword}" "\${testGroup}" ] [ "${changePassword}" "${testUser}" "${testPassword}" "${testGroup}" ] (lib.readFile "${./testScript.py}"); } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 21565b7ad221..3628d4089aad 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3508,6 +3508,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + conjure-nvim = buildVimPlugin { + pname = "conjure.nvim"; + version = "2.1-unstable-2025-11-08"; + src = fetchFromGitHub { + owner = "niklasdewally"; + repo = "conjure.nvim"; + rev = "dafc1c512b97a85eddba5e994107598db97d73b9"; + hash = "sha256-VCtnbhwZ8bIOmwUwu+ExU//FNhvsdJrac9Hdy9GKUr4="; + }; + meta.homepage = "https://github.com/niklasdewally/conjure.nvim/"; + meta.hydraPlatforms = [ ]; + }; + context-vim = buildVimPlugin { pname = "context.vim"; version = "0-unstable-2024-07-19"; @@ -17186,6 +17199,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-buffet = buildVimPlugin { + pname = "vim-buffet"; + version = "2.0.1-unstable-2021-09-03"; + src = fetchFromGitHub { + owner = "bagrat"; + repo = "vim-buffet"; + rev = "3ee5c836cd7ded3526902122e06110cd3f8549cb"; + hash = "sha256-cyZN06Dn+qaL5AjbZfBZIj9Est7b+Q8BYemmWpCt7Gs="; + }; + meta.homepage = "https://github.com/bagrat/vim-buffet/"; + meta.hydraPlatforms = [ ]; + }; + vim-bufkill = buildVimPlugin { pname = "vim-bufkill"; version = "0-unstable-2022-04-19"; @@ -18460,6 +18486,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-gml = buildVimPlugin { + pname = "vim-gml"; + version = "0-unstable-2022-10-04"; + src = fetchFromGitHub { + owner = "JafarDakhan"; + repo = "vim-gml"; + rev = "382f7aecf6da88c077f34df2f863e750b4d0fdd3"; + hash = "sha256-xIchBiNEZbrz0LRIWorJEac8y4DBa4akuM4JPqM0Yp4="; + }; + meta.homepage = "https://github.com/JafarDakhan/vim-gml/"; + meta.hydraPlatforms = [ ]; + }; + vim-gnupg = buildVimPlugin { pname = "vim-gnupg"; version = "2.7.1-unstable-2022-05-19"; @@ -20529,6 +20568,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-pythonsense = buildVimPlugin { + pname = "vim-pythonsense"; + version = "0-unstable-2021-06-12"; + src = fetchFromGitHub { + owner = "jeetsukumaran"; + repo = "vim-pythonsense"; + rev = "9200a57629c904ed2ab8c9b2e8c5649d311794ba"; + hash = "sha256-LQTwroaz7Eb/1GMwya1ucEgk74LTMil5Sn64AuT4WNQ="; + }; + meta.homepage = "https://github.com/jeetsukumaran/vim-pythonsense/"; + meta.hydraPlatforms = [ ]; + }; + vim-qf = buildVimPlugin { pname = "vim-qf"; version = "0.2.0-unstable-2025-05-18"; @@ -21505,6 +21557,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-textobj-quote = buildVimPlugin { + pname = "vim-textobj-quote"; + version = "1.0-unstable-2023-10-13"; + src = fetchFromGitHub { + owner = "preservim"; + repo = "vim-textobj-quote"; + rev = "e99ad285c950576a394a64ff334106b32b23418a"; + hash = "sha256-SkQavbxgq9WSeoZZnwRWHaHtku82xdgBjHrTz02kNKk="; + }; + meta.homepage = "https://github.com/preservim/vim-textobj-quote/"; + meta.hydraPlatforms = [ ]; + }; + vim-textobj-user = buildVimPlugin { pname = "vim-textobj-user"; version = "0.7.6-unstable-2020-02-21"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fccd11198d26..42f57650808f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4022,6 +4022,10 @@ assertNoAdditions { }; }); + vim-textobj-quote = super.vim-textobj-quote.overrideAttrs (old: { + dependencies = [ self.vim-textobj-user ]; + }); + vim-tpipeline = super.vim-tpipeline.overrideAttrs { # Requires global variable nvimSkipModules = "tpipeline.main"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 04f7596cc903..783a6c916d7f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -268,6 +268,7 @@ https://github.com/chikatoike/concealedyank.vim/,, https://github.com/rhysd/conflict-marker.vim/,, https://github.com/stevearc/conform.nvim/,HEAD, https://github.com/Olical/conjure/,, +https://github.com/niklasdewally/conjure.nvim/,HEAD, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/banjo/contextfiles.nvim/,HEAD, @@ -1319,6 +1320,7 @@ https://github.com/ConradIrwin/vim-bracketed-paste/,, https://github.com/mtikekar/vim-bsv/,, https://github.com/jeetsukumaran/vim-buffergator/,, https://github.com/bling/vim-bufferline/,, +https://github.com/bagrat/vim-buffet/,HEAD, https://github.com/qpkorr/vim-bufkill/,, https://github.com/ap/vim-buftabline/,HEAD, https://github.com/isobit/vim-caddyfile/,HEAD, @@ -1417,6 +1419,7 @@ https://github.com/itchyny/vim-gitbranch/,, https://github.com/airblade/vim-gitgutter/,, https://github.com/junegunn/vim-github-dashboard/,, https://github.com/tikhomirov/vim-glsl/,, +https://github.com/JafarDakhan/vim-gml/,HEAD, https://github.com/jamessan/vim-gnupg/,, https://github.com/fatih/vim-go/,, https://github.com/habamax/vim-godot/,HEAD, @@ -1576,6 +1579,7 @@ https://github.com/PProvost/vim-ps1/,, https://github.com/digitaltoad/vim-pug/,, https://github.com/rodjek/vim-puppet/,, https://github.com/Vimjas/vim-python-pep8-indent/,, +https://github.com/jeetsukumaran/vim-pythonsense/,HEAD, https://github.com/romainl/vim-qf/,, https://github.com/romainl/vim-qlist/,, https://github.com/peterhoeg/vim-qml/,, @@ -1651,6 +1655,7 @@ https://github.com/kana/vim-textobj-function/,, https://github.com/gibiansky/vim-textobj-haskell/,, https://github.com/kana/vim-textobj-line/,HEAD, https://github.com/osyo-manga/vim-textobj-multiblock/,, +https://github.com/preservim/vim-textobj-quote/,HEAD, https://github.com/kana/vim-textobj-user/,, https://github.com/Julian/vim-textobj-variable-segment/,, https://github.com/thinca/vim-themis/,, diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 6fe449654606..4aae962e8ed0 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -26,7 +26,7 @@ ocamlPackages.buildDunePackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "([0-9]+\.[0-9]+\.[0-9]+)" + "([0-9]+\\.[0-9]+\\.[0-9]+)" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e559948f329a..6f9d8d28ecf3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3327,6 +3327,10 @@ let }; }; + ms-vscode.js-debug = callPackage ./ms-vscode.js-debug { }; + + ms-vscode.js-debug-companion = callPackage ./ms-vscode.js-debug-companion { }; + ms-vscode.hexeditor = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-vscode"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug-companion/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug-companion/default.nix new file mode 100644 index 000000000000..9c78beb483fc --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug-companion/default.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + vsce, + vscode-utils, + nix-update-script, +}: + +let + vsix = stdenvNoCC.mkDerivation (finalAttrs: { + name = "vscode-js-debug-companion-${finalAttrs.version}.vsix"; + pname = "vscode-js-debug-companion-vsix"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode-js-debug-companion"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+w6s6S1Vk99ABEJyQPEZXVPj0aNt6MvrD2nPGbxrsw0="; + }; + + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-npm-deps"; + inherit (finalAttrs) src; + hash = "sha256-yirZRytdOYp7EMYIN6Yc7GC/9EFHONzarj+K/idj3pQ="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + vsce + ]; + + strictDeps = true; + + buildPhase = '' + runHook preBuild + vsce package + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp ./js-debug-companion-$version.vsix $out + runHook postInstall + ''; + }); +in +vscode-utils.buildVscodeExtension (finalAttrs: { + pname = "vscode-js-debug-companion"; + inherit (finalAttrs.src) version; + + vscodeExtPublisher = "ms-vscode"; + vscodeExtName = "js-debug-companion"; + vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}"; + + src = vsix; + + passthru = { + vsix = finalAttrs.src; + updateScript = nix-update-script { + attrPath = "vscode-extensions.ms-vscode.js-debug-companion.vsix"; + }; + }; + + meta = { + description = "Companion extension to js-debug that provides capability for remote debugging"; + homepage = "https://github.com/microsoft/vscode-js-debug-companion"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug-companion"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix new file mode 100644 index 000000000000..6b516d577745 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + pkg-config, + libsecret, + cctools, + clang_20, + vscode-utils, + nix-update-script, +}: + +let + vsix = stdenv.mkDerivation (finalAttrs: { + name = "vscode-js-debug-${finalAttrs.version}.vsix"; + pname = "vscode-js-debug-vsix"; + version = "1.105.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode-js-debug"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dYEINhJGrJFEq5422BEp3ups6vK0lpVW34GaYPMdfXk="; + }; + + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-npm-deps"; + inherit (finalAttrs) src; + hash = "sha256-bBy0u6NaOAkX6vRJrRYYWUxCG6HM3h0PrzN6tZj5pVY="; + }; + makeCacheWritable = true; + + buildInputs = lib.optionals stdenv.isLinux [ + libsecret + ]; + nativeBuildInputs = [ + nodejs + nodejs.python + npmHooks.npmConfigHook + ] + ++ lib.optionals stdenv.isLinux [ + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ + cctools.libtool + clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "playwright install chromium --with-deps --only-shell" "echo playwright install chromium --with-deps --only-shell" + ''; + + buildPhase = '' + runHook preBuild + node --run compile -- package:hoist + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp ./js-debug.vsix $out + runHook postInstall + ''; + }); +in +vscode-utils.buildVscodeExtension (finalAttrs: { + pname = "vscode-js-debug"; + inherit (finalAttrs.src) version; + + vscodeExtPublisher = "ms-vscode"; + vscodeExtName = "js-debug"; + vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}"; + + src = vsix; + + passthru = { + vsix = finalAttrs.src; + updateScript = nix-update-script { + attrPath = "vscode-extensions.ms-vscode.js-debug.vsix"; + }; + }; + + meta = { + description = "An extension for debugging Node.js programs and Chrome"; + homepage = "https://github.com/microsoft/vscode-js-debug"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix index 970df2da34bd..93a7f273c438 100644 --- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.29.0"; - hash = "sha256-cM2yZT/GMHtqPJFlEQZaDWl7YY456mLnw8hNUwgyQ0M="; + version = "5.30.0"; + hash = "sha256-KddqajZBKz6RL4TcO12fLRdCWkd7NONPf2vs4vao3Ng="; }; meta = { description = "Material Design Icons for Visual Studio Code"; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 6dc1150dcb77..cb81e627a1bc 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -14,19 +14,19 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; - version = "3.36.6"; + version = "3.38.0"; src = fetchFromGitHub { owner = "RooCodeInc"; repo = "Roo-Code"; tag = "v${finalAttrs.version}"; - hash = "sha256-bb6IXi88TPqXnC5eCXj7G0y7xO4yOJWSp1frHkLRwH0="; + hash = "sha256-ppgttz+kmhbQMcjO41mRRxEWcVt/xd5pb5XSolK5IpA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-YfDWspdDBiEWiGuitqZLChntVHFly4O2HE/eKVL/ZGY="; + hash = "sha256-92jZZg632IUh88SsnAbEZqczQZ7ytT5NKrv7tJySzyE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ag/agrep/package.nix b/pkgs/by-name/ag/agrep/package.nix deleted file mode 100644 index eab2450765a7..000000000000 --- a/pkgs/by-name/ag/agrep/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - stdenv, -}: -let - # This repository has numbered versions, but not Git tags. - rev = "b7d180fe73636740f694ec60c1ffab52b06e7150"; -in -stdenv.mkDerivation { - pname = "agrep"; - version = "3.41.5-unstable-2022-03-23"; - - src = fetchFromGitHub { - inherit rev; - owner = "Wikinaut"; - repo = "agrep"; - hash = "sha256-2J4bw5BVZgTEcIn9IuD5Q8/L+8tldDbToDefuxDf85g="; - }; - - patches = [ - # Implicit declaration of functions & implicit int - # https://github.com/Wikinaut/agrep/pull/31 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Wikinaut/agrep/pull/31.patch"; - hash = "sha256-9ik2RANq12T/1vCUYTBNomzw+aJVa/LU2RsZovu3r3E="; - }) - ]; - - postPatch = '' - # agrep only doesn't includes for Linux - # Starting from gcc14, this is a compiler error - substituteInPlace checkfil.c recursiv.c \ - --replace-fail '#ifdef __APPLE__ - #include - #endif' '#include ' - - substituteInPlace newmgrep.c \ - --replace-fail '#if defined(_WIN32) || defined(__APPLE__) - #include - #endif' '#include ' - ''; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; - - installPhase = '' - runHook preInstall - - install -Dm 555 agrep -t "$out/bin" - install -Dm 444 docs/* -t "$out/doc" - - runHook postInstall - ''; - - meta = { - description = "Approximate grep for fast fuzzy string searching"; - mainProgram = "agrep"; - homepage = "https://www.tgries.de/agrep/"; - maintainers = with lib.maintainers; [ momeemt ]; - changelog = "https://github.com/Wikinaut/agrep/blob/${rev}/CHANGES"; - license = lib.licenses.isc; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index a94c8219489f..95a5cfb11253 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -6,6 +6,8 @@ nix-update-script, pkg-config, openssl, + installShellFiles, + writableTmpDirAsHomeHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -27,6 +29,12 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config + ] + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + installShellFiles + # When invoked in postInstall, alistral tries to write logfiles to its config dir on invocation, and fails if it can't find a writable one. + # The config dir falls back to a directory relative to $HOME on both Darwin and Linux, so setting a writable $HOME is enough. + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -38,6 +46,13 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { }; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd alistral \ + --bash <($out/bin/alistral --generate bash) \ + --fish <($out/bin/alistral --generate fish) \ + --zsh <($out/bin/alistral --generate zsh) + ''; + meta = { homepage = "https://rustynova016.github.io/Alistral/"; changelog = "https://github.com/RustyNova016/Alistral/blob/${finalAttrs.src.tag}/CHANGELOG.md"; diff --git a/pkgs/by-name/be/beedii/package.nix b/pkgs/by-name/be/beedii/package.nix index 621f7f206c7d..644e1981c54a 100644 --- a/pkgs/by-name/be/beedii/package.nix +++ b/pkgs/by-name/be/beedii/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { # This version does not include font files in the released assets. # https://github.com/webkul/beedii/issues/1 - ignoredVersions = "^1\.2\.0$"; + ignoredVersions = "^1\\.2\\.0$"; }; meta = { diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix index a4e1e7f81294..08cb16425ec1 100644 --- a/pkgs/by-name/bl/bloaty/package.nix +++ b/pkgs/by-name/bl/bloaty/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { substituteInPlace CMakeLists.txt \ --replace "find_package(Python COMPONENTS Interpreter)" "" \ --replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \ - --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}" + --replace "COMMAND \''${Python_EXECUTABLE} \''${LIT_EXECUTABLE}" "COMMAND \''${LIT_EXECUTABLE}" # wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354 rm -rf tests/wasm ''; diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 82d6e19a6bab..95b505c47143 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -44,17 +44,17 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/lib/pkgconfig cat < $out/lib/pkgconfig/libblst.pc prefix=$out - exec_prefix=''\\''${prefix} - libdir=''\\''${exec_prefix}/lib - includedir=''\\''${prefix}/include + exec_prefix=\''${prefix} + libdir=\''${exec_prefix}/lib + includedir=\''${prefix}/include Name: libblst Description: ${finalAttrs.meta.description} URL: ${finalAttrs.meta.homepage} Version: ${finalAttrs.version} - Cflags: -I''\\''${includedir} - Libs: -L''\\''${libdir} -lblst + Cflags: -I \''${includedir} + Libs: -L \''${libdir} -lblst Libs.private: EOF diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 78faba168e37..67a667177183 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.23.2"; + version = "0.24.0"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-dmLR1jMH90axlylkA3m48FK367c67o4CgIc+M6gKz0o="; + hash = "sha256-kR+eGH+AnZbnPp4+WJ/hgccO3T4xevrCaF8KL+8zWr0="; }; - cargoHash = "sha256-g3/SpeqVtNCu35jj7apAg64/R5R/m1Z2jbKMARph7jo="; + cargoHash = "sha256-viLoCQSAGS7Y/FFUsPpW/XaqVNbGtzC2v2ji39GrrBk="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index e017fdf77042..dc250d153678 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2e353c5f5b30150ff7b874dee5a87660693d9de6/linux/x64/Cursor-2.1.42-x86_64.AppImage"; - hash = "sha256-UqHi9QlQSaOJZWW6bmElDrK5GaEGT3kU5LsXg2LUeHg="; + url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/x64/Cursor-2.2.44-x86_64.AppImage"; + hash = "sha256-hit0L6vE893jPq4QQqteT6T08hghX5hE/NZLUWTqqvY="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2e353c5f5b30150ff7b874dee5a87660693d9de6/linux/arm64/Cursor-2.1.42-aarch64.AppImage"; - hash = "sha256-v7m9puw9xQKt36U8+m0n7sGmkoNkVjiDI+Wo6qaN64g="; + url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/arm64/Cursor-2.2.44-aarch64.AppImage"; + hash = "sha256-D2pcfwzRED/TYGABCo83YI4g77tu3xgvqjOo8XsteSA="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2e353c5f5b30150ff7b874dee5a87660693d9de6/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-rQNuGGaONl4BUxrrrI2RVq4iRlDvVxY6TtFq67MLHUA="; + url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-/BD2PMcP20/SDGPCsnkv3PQW7u0FEXuORfDeG/KV0MQ="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2e353c5f5b30150ff7b874dee5a87660693d9de6/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-mwKwOAhwihQTs4gF002BMt4EMF/AvZBV+QSp/UM5D/4="; + url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-qehVIZipBbWOYbf6Zo3GBStS8dp+c4EtgDTGAQz1mzE="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "2.1.42"; + version = "2.2.44"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 713aac13f0bf..0c44ccf9039d 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.50.2"; + version = "0.51.0"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dprint"; repo = "dprint"; tag = finalAttrs.version; - hash = "sha256-pBiMJ+S23J5W+nldW6WpqnvkODcQsEwM2IzDhe6TUlM="; + hash = "sha256-ulOIlRuajUbnow8KelnSeHUTxR7A9HC2LWj3aQZsn4A="; }; - cargoHash = "sha256-doaZlr5B9XhOaEawLGgM3yWJjgJ5f6TLUiqb+Ze+v0I="; + cargoHash = "sha256-/rQoVXrULwgGAEkMROqwASKRcNKwljS7nC35Ve3yk3U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index 60ea99b969a3..d6f42da04d48 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication { # Essentially: all tags from 1.40 onwards start with `debian/`, # then the version, and then an optional suffix (usually reserved for backports). # We want to ignore the backport versions, and strip the `debian/` prefix. - extraArgs = [ "--version-regex=(?:debian\/)?(\d+(?:\.\d+)*)(?:[_\+].*)?" ]; + extraArgs = [ "--version-regex=(?:debian/)?(\\d+(?:\\.\\d+)*)(?:[_+].*)?" ]; }; meta = { diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix index ff523a052d32..02d6fd045f38 100644 --- a/pkgs/by-name/ed/edgetx/package.nix +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - cmakeCommonFlags="$''\{cmakeFlags[@]}" + cmakeCommonFlags="''${cmakeFlags[@]}" # This is the most sensible way to convert target name -> cmake options # aside from manually extracting bash variables from upstream's CI scripts # and converting that to nix expressions. Let's hope upstream doesn't break diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 5691c0f4d2cf..8e7dfcf1e120 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { doInstallCheck = true; passthru = { - updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\..*)" ]; }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\\..*)" ]; }; }; meta = { diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix index 55f3433789b4..0886216122c8 100644 --- a/pkgs/by-name/fs/fstar/package.nix +++ b/pkgs/by-name/fs/fstar/package.nix @@ -105,7 +105,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v(\d{4}\.\d{2}\.\d{2})$" + "v(\\d{4}\\.\\d{2}\\.\\d{2})$" ]; }; z3 = fstarZ3; diff --git a/pkgs/by-name/in/interstellar/package.nix b/pkgs/by-name/in/interstellar/package.nix index 54b4dcf2d63f..5444759a4089 100644 --- a/pkgs/by-name/in/interstellar/package.nix +++ b/pkgs/by-name/in/interstellar/package.nix @@ -15,13 +15,13 @@ let pname = "interstellar"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "interstellar-app"; repo = "interstellar"; tag = "v${version}"; - hash = "sha256-nlzTYLJSFKMdPIZ1WX4ZrT8ZBw3gd3Y2o1mmc1DH9Rs="; + hash = "sha256-5CFl5pvxentbKCPHkPDj4d5i3d2S3UxkQ56OX14Y8gY="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/in/interstellar/pubspec.lock.json b/pkgs/by-name/in/interstellar/pubspec.lock.json index 8ba37da42536..6022292db476 100644 --- a/pkgs/by-name/in/interstellar/pubspec.lock.json +++ b/pkgs/by-name/in/interstellar/pubspec.lock.json @@ -160,6 +160,16 @@ "source": "hosted", "version": "1.4.0" }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "checked_yaml": { "dependency": "transitive", "description": { @@ -201,7 +211,7 @@ "version": "4.11.0" }, "collection": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -260,6 +270,16 @@ "source": "hosted", "version": "3.1.2" }, + "db_viewer": { + "dependency": "transitive", + "description": { + "name": "db_viewer", + "sha256": "5f7e3cfcde9663321797d8f6f0c876f7c13f0825a2e77ec1ef065656797144d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, "dbus": { "dependency": "transitive", "description": { @@ -270,6 +290,46 @@ "source": "hosted", "version": "0.7.11" }, + "drift": { + "dependency": "direct main", + "description": { + "name": "drift", + "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.2" + }, + "drift_db_viewer": { + "dependency": "direct main", + "description": { + "name": "drift_db_viewer", + "sha256": "5ea77858c52b55460a1e8f34ab5f88324621d486717d876fd745765fbc227f3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "drift_dev": { + "dependency": "direct dev", + "description": { + "name": "drift_dev", + "sha256": "4db0eeedc7e8bed117a9f22d867ab7a3a294300fed5c269aac90d0b3545967ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.3" + }, + "drift_flutter": { + "dependency": "direct main", + "description": { + "name": "drift_flutter", + "sha256": "b7534bf320aac5213259aac120670ba67b63a1fd010505babc436ff86083818f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.7" + }, "dynamic_color": { "dependency": "direct main", "description": { @@ -426,6 +486,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_colorpicker": { + "dependency": "direct main", + "description": { + "name": "flutter_colorpicker", + "sha256": "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, "flutter_launcher_icons": { "dependency": "direct dev", "description": { @@ -988,11 +1058,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "direct main", @@ -1214,6 +1284,16 @@ "source": "hosted", "version": "1.5.0" }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "safe_local_storage": { "dependency": "transitive", "description": { @@ -1490,6 +1570,36 @@ "source": "hosted", "version": "7.0.0" }, + "sqlite3": { + "dependency": "direct main", + "description": { + "name": "sqlite3", + "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.4" + }, + "sqlite3_flutter_libs": { + "dependency": "transitive", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "69c80d812ef2500202ebd22002cbfc1b6565e9ff56b2f971e757fac5d42294df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.40" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.41.2" + }, "stack_trace": { "dependency": "transitive", "description": { @@ -1564,11 +1674,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6" + "version": "0.7.7" }, "timezone": { "dependency": "transitive", @@ -1993,6 +2103,6 @@ }, "sdks": { "dart": ">=3.9.0 <4.0.0", - "flutter": "3.35.4" + "flutter": "3.38.4" } } diff --git a/pkgs/by-name/lm/lmath/package.nix b/pkgs/by-name/lm/lmath/package.nix index 9b29d50f552d..76c9c95bba70 100644 --- a/pkgs/by-name/lm/lmath/package.nix +++ b/pkgs/by-name/lm/lmath/package.nix @@ -39,7 +39,7 @@ appimageTools.wrapType2 { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "^r([0-9\.]*)" + "^r([0-9.]*)" ]; }; diff --git a/pkgs/by-name/mo/mop/package.nix b/pkgs/by-name/mo/mop/package.nix index 25b353d5f3ad..b755479797d8 100644 --- a/pkgs/by-name/mo/mop/package.nix +++ b/pkgs/by-name/mo/mop/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "mop"; - version = "1.0.0"; + version = "0-unstable-2025-12-20"; src = fetchFromGitHub { owner = "mop-tracker"; repo = "mop"; - rev = "v${version}"; - sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M="; + rev = "64f37500a195d9c4e01eb3a97199b00515e9fd7a"; + hash = "sha256-j6+bzWfYTBMjgJbyd6JQno2eFTUGHYAv8c4x1Ocp878="; }; - vendorHash = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774="; + vendorHash = "sha256-Jq6SMnCUvuccEP85x1EEYnafUEeBT+AmqeikFvesMYY="; - preConfigure = '' - for i in *.go **/*.go; do - substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go - done - substituteInPlace Makefile --replace mop/cmd mop/mop - mv cmd mop + postPatch = '' + # unsafe.Slice requires go1.17 or later + substituteInPlace go.mod --replace-fail 'go 1.15' 'go 1.17' + # go says: github.com/rivo/uniseg@v0.2.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + # so need to explicitly require it + echo 'require github.com/rivo/uniseg v0.2.0' >> go.mod ''; meta = { diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix index 67fc6827b8b2..e0800c4b5fbe 100644 --- a/pkgs/by-name/ne/necesse-server/package.nix +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -6,7 +6,7 @@ }: let - version = "1.0.3-20875636"; + version = "1.1.1-21292486"; urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; in @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { src = fetchzip { url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; - hash = "sha256-CB8i/0Yr948kCkzQX6xmzt4NKbTPCzi5uYe5O2s5B2o="; + hash = "sha256-KPm11k4wLRraB0u3BwOUofC6dQO2yRra+Rk6M0UKG7U="; }; # removing packaged jre since we use our own diff --git a/pkgs/by-name/pr/prmers/package.nix b/pkgs/by-name/pr/prmers/package.nix index f65034217c82..c6baf240dd69 100644 --- a/pkgs/by-name/pr/prmers/package.nix +++ b/pkgs/by-name/pr/prmers/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prmers"; - version = "4.15.35-alpha"; + version = "4.15.71-alpha"; src = fetchFromGitHub { owner = "cherubrock-seb"; repo = "PrMers"; tag = "v${finalAttrs.version}"; - hash = "sha256-LAbWyz1FT9Zza4gewgKeMvQt8rwkfBhHRWBGpN+DIXE="; + hash = "sha256-2/bRdH/k9btUhXWoDBQ4gKQsUjuUKtfcy9eyzfJShPI="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index 8e65671dd9e7..c6ee9cbc2147 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -60,7 +60,7 @@ buildNpmPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "([0-9]+\.[0-9]+\.[0-9]+)" + "([0-9]+\\.[0-9]+\\.[0-9]+)" ]; }; diff --git a/pkgs/by-name/ro/rofi-bluetooth/package.nix b/pkgs/by-name/ro/rofi-bluetooth/package.nix index b07bcf0a0755..3f84134195d7 100644 --- a/pkgs/by-name/ro/rofi-bluetooth/package.nix +++ b/pkgs/by-name/ro/rofi-bluetooth/package.nix @@ -5,6 +5,7 @@ makeWrapper, bc, bluez, + unstableGitUpdater, }: stdenv.mkDerivation { @@ -37,6 +38,8 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Rofi-based interface to connect to bluetooth devices and display status info"; homepage = "https://github.com/nickclyde/rofi-bluetooth"; diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix new file mode 100644 index 000000000000..1d187ab3e4d4 --- /dev/null +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + pnpm, + nodejs, + pnpmConfigHook, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "slidev-cli"; + version = "52.11.1"; + + src = fetchFromGitHub { + owner = "slidevjs"; + repo = "slidev"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AYU36NsALC4CCZVr+1PmspX6RKZkxI2xpLNUSccEPwY="; + }; + + pnpmWorkspaces = [ "@slidev/cli..." ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + fetcherVersion = 3; + hash = "sha256-nZPyqP4NruVIzONHIT6hx1Px9p8mHTK9Xt5wHEcpwBM="; + }; + + nativeBuildInputs = [ + nodejs + pnpmConfigHook + pnpm + ]; + + buildInputs = [ + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pnpm -r --filter=@slidev/cli... --parallel run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + rm -rf node_modules packages/slidev/node_modules + pnpm install --force --offline --production --ignore-scripts --filter=@slidev/cli... + + mkdir -p $out/lib/node_modules/slidev-cli/ + mkdir $out/bin + mv ./packages ./node_modules ./package.json $out/lib/node_modules/slidev-cli + + ln -s $out/lib/node_modules/slidev-cli/packages/slidev/bin/slidev.mjs $out/bin/slidev + chmod +x $out/bin/slidev + patchShebangs $out/bin/slidev + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/slidevjs/slidev/releases/tag/v${finalAttrs.version}"; + description = "Presentation slides for developers"; + homepage = "https://sli.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pyrox0 + pluiedev + ]; + mainProgram = "slidev"; + }; +}) diff --git a/pkgs/by-name/sl/slob/package.nix b/pkgs/by-name/sl/slob/package.nix new file mode 100644 index 000000000000..338e7bff9b1e --- /dev/null +++ b/pkgs/by-name/sl/slob/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.slob diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index 298ac71f86d6..6add11f7cd82 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { "Audio" "Music" ]; + mimeTypes = [ "x-scheme-handler/orpheus" ]; + extraConfig.X-KDE-Protocols = "orpheus"; }) ]; diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix index 4bda2ee23bc8..68e4b6380fcc 100644 --- a/pkgs/by-name/to/toml-test/package.nix +++ b/pkgs/by-name/to/toml-test/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "toml-test"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "toml-lang"; repo = "toml-test"; tag = "v${finalAttrs.version}"; - hash = "sha256-QJ7rK4zdPN8c728fR9r4vXnSk4Y9T/XQJulO7kQaYFE="; + hash = "sha256-J5+JO+BrHzje3YmEC9WWA7U6fn+Eye4DQj/knVR+QhE="; }; - vendorHash = "sha256-aIGcv6qAQC3URQ/WIvg/+nRyrw1N2q5uBVpRH4fwgXk="; + vendorHash = "sha256-JcTW21Zva/7Uvc5AvW9H1IxAcaw3AU0FAdtI3IOtZAc="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_106/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_106/package.nix new file mode 100644 index 000000000000..dac40d2dc032 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_106/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.106"; + hash = "sha256-M6WuGl7EruNopHZbqBpucu4RWz44/MSdv6f0zkYw+44="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-ElDatyOwdKwHg3bNH/1pcxKI7LXkhsotlDPQjiLHBwA="; + }; +} diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix new file mode 100644 index 000000000000..d418d3fd4144 --- /dev/null +++ b/pkgs/by-name/wi/witr/package.nix @@ -0,0 +1,56 @@ +{ + fetchFromGitHub, + buildGoModule, + installShellFiles, + lib, +}: +buildGoModule (finalAttrs: { + pname = "witr"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "pranshuparmar"; + repo = "witr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RA3dTTprYL6kmSiADqm2uR2QbFebpKPoOE3oyfGiNuI="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = null; + + # temporary, until go 1.25.5 is merged from staging-next to master + postPatch = '' + substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4' + ''; + + ldflags = [ + "-X main.version=v${finalAttrs.version}" + ]; + + preBuild = '' + ldflags+=" -X=main.commit=$(cat COMMIT)" + ldflags+=" -X=main.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage docs/witr.1 + ''; + + meta = { + description = "Command-line tool to find out why processes are running"; + homepage = "https://github.com/pranshuparmar/witr"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thegu5 ]; + mainProgram = "witr"; + }; +}) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 2c76dcdeaa13..69da8b25b3e1 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -4,18 +4,19 @@ ffmpeg_7, lib, versionCheckHook, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.11.28.post1"; + version = "2025.12.26"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-DKlo8Cs7MVfkY8qrVT6NDPTQm6DhGtOHQ1pm3587Hj8="; + hash = "sha256-NRIA8vbkRCkL43p5YkhQtPk58iW1rH0LqBbYAyfyv0I="; }; postPatch = '' @@ -45,6 +46,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; versionCheckProgramArg = "--version"; @@ -55,6 +57,7 @@ python3Packages.buildPythonApplication rec { disabledTests = [ "test_logger_can_be_cleaned_during_execution" + "test_no_config_works" "test_presets_run" "test_thumbnail" ]; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index aeb66255d668..2e2067df61e9 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -318,7 +318,7 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "^v(?!.*(?:-pre|0\.999999\.0|0\.9999-temporary)$)(.+)$" + "^v(?!.*(?:-pre|0\\.999999\\.0|0\\.9999-temporary)$)(.+)$" # use github releases instead of git tags # zed sometimes moves git tags, making them unreliable diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 1804de442d30..c362bb912db1 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex=^v([0-9.]+\.[0-9.]+\.[0-9.])+$" ]; + extraArgs = [ "--version-regex=^v([0-9.]+\\.[0-9.]+\\.[0-9.])+$" ]; }; meta = { diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 76dd7ba163d2..ca6a5fd2d849 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rCLlLxFexk2fzuuSMrJjbwhgU+HgJNX6Ect6uCsuJmo="; }; + postPatch = '' + substituteInPlace src/core.c/CompUnit/Repository/Installation.rakumod \ + --subst-var out + ''; + + patches = [ + ./rakudo-plain-wrapper.patch + ]; + configureScript = "${lib.getExe perl} ./Configure.pl"; configureFlags = [ "--backends=moar" diff --git a/pkgs/development/interpreters/rakudo/rakudo-plain-wrapper.patch b/pkgs/development/interpreters/rakudo/rakudo-plain-wrapper.patch new file mode 100644 index 000000000000..aaab84cd129a --- /dev/null +++ b/pkgs/development/interpreters/rakudo/rakudo-plain-wrapper.patch @@ -0,0 +1,13 @@ +--- a/src/core.c/CompUnit/Repository/Installation.rakumod ++++ b/src/core.c/CompUnit/Repository/Installation.rakumod +@@ -848,6 +848,10 @@ + my $val = $1.Str; + given $op { + when "plain" | "plat-sep" { ++ # use rakudo from our store path and avoid PATH lookups ++ if $val ~~ / ^ "rakudo" / { ++ return '"@out@/bin/' ~ sh-escape($val) ~ '"'; ++ } + return '"' ~ sh-escape($val) ~ '"'; + } + when "cmd-args" { diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 529e493ce82a..83ec38c364ce 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.6.0"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.7.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-rmQYFFfpyUhT9pfQZk1fN5tZWTg40wwtszhPhiZpXs4="; + hash = "sha256-RFvd/j/14YRIcQTpnYPx5edeF3zbHbi90jb32i3ZU/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 4f2bbbf28ef8..f49d88d89d72 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -2,26 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, + + # dependencies pyicu, + + # build-system + setuptools, + + # tests python, }: buildPythonPackage { pname = "slob"; - version = "unstable-2020-06-26"; - format = "setuptools"; - disabled = !isPy3k; + version = "0-unstable-2024-04-19"; + pyproject = true; src = fetchFromGitHub { owner = "itkach"; repo = "slob"; - rev = "018588b59999c5c0eb42d6517fdb84036f3880cb"; - sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh"; + rev = "c21d695707db7d2fe4ec7ec27a018bb7b0fcc209"; + hash = "sha256-dy/EaRLx0LwMklk4h2eL8CsyvWN4swcJNs5cULmh46g="; }; - propagatedBuildInputs = [ pyicu ]; + build-system = [ + setuptools + ]; + dependencies = [ + pyicu + ]; + + # The tests are part of the same slob.py file, so unittestCheckHook which + # runs python -m unittest with the `discover` argument which doesn't discover + # any tests. checkPhase = '' ${python.interpreter} -m unittest slob ''; @@ -33,5 +47,6 @@ buildPythonPackage { description = "Reference implementation of the slob (sorted list of blobs) format"; mainProgram = "slob"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 9f0999136ef0..9de788e5afb8 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -58,7 +58,7 @@ let makeFlags = [ "WITH_OPENAL=${lib.boolToYesNo openalSupport}" "WITH_SYSTEMWIDE=yes" - "WITH_SYSTEMDIR=$\{out}/share/games/quake2" + "WITH_SYSTEMDIR=\${out}/share/games/quake2" ]; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index 5643188690f0..a531d347cd3a 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -215,6 +215,13 @@ stdenv.mkDerivation ( )) ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString (lib.strings.versionOlder version "2.20.0") (toString [ + # std::wstring_convert in src/server/shell/decoration/renderer.cpp is deprecated in C++17, removed in C++26 + # Upstream just disabled the warning for now: https://github.com/canonical/mir/commit/e8d1a2255a48991f20889e5844b0d69f5f75d01f + # File got ripped apart and shuffled around between 2.15 and 2.20, so can't just add as patch + "-Wno-error=deprecated-declarations" + ]); + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; disabledTests = lib.optionals (lib.strings.versionAtLeast version "2.25.0") [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 9b74cede7466..9aa8fba3a442 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.36"; + version = "1.4.37"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-K7grmYROFRwdmYWiWNRv8TnEUpOie1W8Glx9BP6Orzc="; + sha256 = "sha256-cJ5kRz1qu7lmCBjJBS8fBE5YdQMZiISWoK1a2KHZ4cQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f804f83e6dd6..72914913e83d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -145,28 +145,6 @@ lib.makeExtensible ( ]; }; - nixComponents_2_29 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.29.2"; - inherit maintainers teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_29"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-50p2sG2RFuRnlS1/Vr5et0Rt+QDgfpNE2C2WWRztnbQ="; - }; - }).appendPatches - [ - (fetchpatch2 { - name = "nix-2.29-14763-mdbook-0.5-support.patch"; - url = "https://github.com/NixOS/nix/commit/0501ae1e4965549cbf1314e471f92f4226e46ef1.patch"; - hash = "sha256-w8WQfWxMtprDLoZUhrCm4zr6xZXKhoIirq3la0Y7/wU="; - }) - ]; - - nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything; - nixComponents_2_30 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.30.3"; @@ -272,11 +250,13 @@ lib.makeExtensible ( ) (lib.range 4 23) ) // { - nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_git."; - nix_2_24 = throw "nix_2_24 has been removed. use nix_2_28."; - nix_2_26 = throw "nix_2_26 has been removed. use nix_2_28."; - nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28."; - nix_2_25 = throw "nix_2_25 has been removed. use nix_2_28."; + nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_31."; + nixComponents_2_29 = throw "nixComponents_2_29 has been removed. use nixComponents_2_31."; + nix_2_24 = throw "nix_2_24 has been removed. use nix_2_31."; + nix_2_26 = throw "nix_2_26 has been removed. use nix_2_31."; + nix_2_27 = throw "nix_2_27 has been removed. use nix_2_31."; + nix_2_25 = throw "nix_2_25 has been removed. use nix_2_31."; + nix_2_29 = throw "nix_2_29 has been removed. use nix_2_31."; minimum = throw "nixVersions.minimum has been removed. Use a specific version instead."; unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake."; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2ede1a3dc521..888110df1f1d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -274,6 +274,7 @@ mapAliases { adminerneo = throw "'adminerneo' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27 adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # Added 2025-05-31 afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17 + agrep = throw "'agrep' has been removed due to lack of upstream maintenance. Consider using 'tre' or 'ugrep' instead."; # Added 2025-12-28 akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27 akkoma-frontends.admin-fe = throw "'akkoma-frontends.admin-fe' has been renamed to/replaced by 'akkoma-admin-fe'"; # Converted to throw 2025-10-27 akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27 @@ -1710,7 +1711,7 @@ mapAliases { warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03 warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_105; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_106; wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10