diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4bf4b58bfec3..8139f3fb6d84 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -310,3 +310,6 @@ c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt # treewide: clean up 'meta = with' pattern 567e8dfd8eddc5468e6380fc563ab8a27422ab1d + +# nixfmt 1.2.0 +28096cc5e3d8334fbe1845925f000f8c8c5e0aac # !autorebase nix-shell --run treefmt diff --git a/ci/default.nix b/ci/default.nix index 5c4b5034b8f8..540a0faea0ab 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -87,22 +87,30 @@ let "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" ]; - programs.nixf-diagnose.enable = true; - settings.formatter.nixf-diagnose = { - # Ensure nixfmt cleans up after nixf-diagnose. - priority = -1; - options = [ - "--auto-fix" + programs.nixf-diagnose = { + enable = true; + ignore = [ # Rule names can currently be looked up here: # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py # TODO: Remove the following and fix things. - "--ignore=sema-unused-def-lambda-noarg-formal" - "--ignore=sema-unused-def-lambda-witharg-arg" - "--ignore=sema-unused-def-lambda-witharg-formal" - "--ignore=sema-unused-def-let" + "sema-unused-def-lambda-noarg-formal" + "sema-unused-def-lambda-witharg-arg" + "sema-unused-def-lambda-witharg-formal" + "sema-unused-def-let" # Keep this rule, because we have `lib.or`. - "--ignore=or-identifier" + "or-identifier" + # TODO: remove after outstanding prelude diagnostics issues are fixed: + # https://github.com/nix-community/nixd/issues/761 + # https://github.com/nix-community/nixd/issues/762 + "sema-primop-removed-prefix" + "sema-primop-overridden" + "sema-constant-overridden" + "sema-primop-unknown" ]; + }; + settings.formatter.nixf-diagnose = { + # Ensure nixfmt cleans up after nixf-diagnose. + priority = -1; excludes = [ # Auto-generated; violates sema-extra-with # Can only sensibly be removed when --auto-fix supports multiple fixes at once: diff --git a/ci/pinned.json b/ci/pinned.json index 6feb67129b34..9e039136a160 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "ee09932cedcef15aaf476f9343d1dea2cb77e261", - "url": "https://github.com/NixOS/nixpkgs/archive/ee09932cedcef15aaf476f9343d1dea2cb77e261.tar.gz", - "hash": "1xz5pa6la2fyj5b1cfigmg3nmml11fyf9ah0rnr4zfgmnwimn2gn" + "revision": "bde09022887110deb780067364a0818e89258968", + "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz", + "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l" }, "treefmt-nix": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, - "revision": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", - "url": "https://github.com/numtide/treefmt-nix/archive/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4.tar.gz", - "hash": "0cr6aj9bk7n3y09lwmfjr7xg1f069332xf4q99z3kj1c1mp0wl82" + "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz", + "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb" } }, "version": 5 diff --git a/doc/hooks/udevCheckHook.section.md b/doc/hooks/udevCheckHook.section.md index 42ea097b530b..eb9e975c563f 100644 --- a/doc/hooks/udevCheckHook.section.md +++ b/doc/hooks/udevCheckHook.section.md @@ -10,7 +10,7 @@ The hook runs in `installCheckPhase`, requiring `doInstallCheck` is enabled for lib, stdenv, udevCheckHook, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index f2fa14bb07a5..202492484dec 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -9,7 +9,7 @@ You use it like this: lib, stdenv, versionCheckHook, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index 9e3c6716285b..ca35be4dee2e 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -112,7 +112,7 @@ For example, to propagate a dependency on SDL2 for lockfiles that select the Nim lib, # … SDL2, -# … + # … }: { diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 32bc00a227b3..8cbc886fb4f6 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -191,7 +191,7 @@ in if isStringLike path then throw ''lib.fileset.maybeMissing: Argument ("${toString path}") is a string-like value, but it should be a path instead.'' else - throw ''lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then _emptyWithoutBase else @@ -443,7 +443,7 @@ in lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else - throw ''lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead.'' + throw "lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead." # Currently all Nix paths have the same filesystem root, but this could change in the future. # See also ../path/README.md else if !fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then @@ -453,7 +453,7 @@ in `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" Different filesystem roots are not supported.'' else if !pathExists root then - throw ''lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' + throw "lib.fileset.toSource: `root` (${toString root}) is a path that does not exist." else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: @@ -619,7 +619,7 @@ in unions = filesets: if !isList filesets then - throw ''lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' + throw "lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead." else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors @@ -808,16 +808,16 @@ in fileFilter = predicate: path: if !isFunction predicate then - throw ''lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' + throw "lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead." else if !isPath path then if path._type or "" == "fileset" then throw '' lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' else - throw ''lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then - throw ''lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' + throw "lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist." else _fileFilter predicate path; @@ -896,9 +896,9 @@ in lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' else - throw ''lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then - throw ''lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' + throw "lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist." else if isFiltered then _fromSourceFilter path source.filter else diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 342b284e1f71..4579831c2e05 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -211,7 +211,7 @@ rec { ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead. Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else - error ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.'' + error "${context} is of type ${typeOf value}, but it should be a file set or a path instead." else if !pathExists value then error '' ${context} (${toString value}) is a path that does not exist. diff --git a/lib/path/default.nix b/lib/path/default.nix index 6736e7ab5beb..512d65d1978d 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -239,7 +239,7 @@ in # The subpath string to append subpath: assert assertMsg (isPath path) - ''lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected''; + "lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected"; assert assertMsg (isValid subpath) '' lib.path.append: Second argument is not a valid subpath string: ${subpathInvalidReason subpath}''; diff --git a/lib/tests/checkAndMergeCompat.nix b/lib/tests/checkAndMergeCompat.nix index f21c9789e8b6..422853dfe34e 100644 --- a/lib/tests/checkAndMergeCompat.nix +++ b/lib/tests/checkAndMergeCompat.nix @@ -331,7 +331,7 @@ in testAttrs = { expectedError = { type = "ThrownError"; - msg = ''A definition for option `foo' is not of type `string or signed integer convertible to it.*''; + msg = "A definition for option `foo' is not of type `string or signed integer convertible to it.*"; }; }; }; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 0a5c2ace0832..d4bdc344deb9 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -867,7 +867,7 @@ runTests { testEscapeNixIdentifierNoQuote = { expr = strings.escapeNixIdentifier "foo"; - expected = ''foo''; + expected = "foo"; }; testEscapeNixIdentifierNumber = { @@ -2634,7 +2634,7 @@ runTests { sections = { }; }; - expected = ''''; + expected = ""; }; testToINIWithGlobalSectionGlobalEmptyIsTheSameAsToINI = @@ -3002,12 +3002,12 @@ runTests { testToLuaEmptyAttrSet = { expr = generators.toLua { } { }; - expected = ''{}''; + expected = "{}"; }; testToLuaEmptyList = { expr = generators.toLua { } [ ]; - expected = ''{}''; + expected = "{}"; }; testToLuaListOfVariousTypes = { @@ -3052,7 +3052,7 @@ runTests { 41 43 ]; - expected = ''{ 41, 43 }''; + expected = "{ 41, 43 }"; }; testToLuaEmptyBindings = { diff --git a/lib/types.nix b/lib/types.nix index 1a98b12bd5ca..4a859694a6e8 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1412,7 +1412,7 @@ rec { else if builtins.isBool v then boolToString v else - ''<${builtins.typeOf v}>''; + "<${builtins.typeOf v}>"; in mkOptionType rec { name = "enum"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4459836b0219..7b15ab55565e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4584,6 +4584,12 @@ githubId = 52875777; name = "Channing He"; }; + chansuke = { + email = "chansuke0@gmail.com"; + github = "chansuke"; + githubId = 501052; + name = "chansuke"; + }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index fb66174cf621..f9e8a19aea82 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -46,7 +46,7 @@ in maintainers = mkOption { type = listOfMaintainers; default = [ ]; - example = lib.literalExpression ''[ lib.maintainers.alice lib.maintainers.bob ]''; + example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]"; description = '' List of maintainers of each module. This option should be defined at most once per module. diff --git a/nixos/README-modular-services.md b/nixos/README-modular-services.md index f6e933173b2c..588ccaf6d1f7 100644 --- a/nixos/README-modular-services.md +++ b/nixos/README-modular-services.md @@ -82,7 +82,7 @@ Example: { stdenv, nixosTests, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { pname = "example"; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index d8bf715b5e51..eb186b0f3e24 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -7,7 +7,7 @@ let common = import ./common.nix; inherit (common) outputPath indexPath; devmode = pkgs.devmode.override { - buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}''; + buildArgs = "${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}"; open = "/${outputPath}/${indexPath}"; }; nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" ''${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file '${toString ./redirects.json}' "$@"''; diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index 55e54b3b2f0d..69d05ab004f6 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -347,7 +347,7 @@ let --no-root-passwd \ --system ${config.system.build.toplevel} \ --substituters "" \ - ${lib.optionalString includeChannel ''--channel ${channelSources}''} + ${lib.optionalString includeChannel "--channel ${channelSources}"} df -h diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index dbd68a768847..7e47be6d00d9 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -330,7 +330,7 @@ let --no-root-passwd \ --system ${config.system.build.toplevel} \ --substituters "" \ - ${lib.optionalString includeChannel ''--channel ${channelSources}''} + ${lib.optionalString includeChannel "--channel ${channelSources}"} df -h diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 1f562a5f4f26..721a3c88b369 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -164,7 +164,7 @@ in ''; type = types.bool; default = config.node.pkgs != null; - defaultText = literalExpression ''node.pkgs != null''; + defaultText = literalExpression "node.pkgs != null"; }; node.specialArgs = mkOption { diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 5a3e09261059..0a1c2fe50cdd 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -410,7 +410,7 @@ let stringOrDefault (concatStringsSep " | " ( imap1 ( index: name: - ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' + "${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})" ) (attrNames secrets) )) "." ) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index defde2707ae7..5efc19004afc 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -62,9 +62,9 @@ let "*" # password unset ]); - overrideOrderMutable = ''{option}`initialHashedPassword` -> {option}`initialPassword` -> {option}`hashedPassword` -> {option}`password` -> {option}`hashedPasswordFile`''; + overrideOrderMutable = "{option}`initialHashedPassword` -> {option}`initialPassword` -> {option}`hashedPassword` -> {option}`password` -> {option}`hashedPasswordFile`"; - overrideOrderImmutable = ''{option}`initialHashedPassword` -> {option}`hashedPassword` -> {option}`initialPassword` -> {option}`password` -> {option}`hashedPasswordFile`''; + overrideOrderImmutable = "{option}`initialHashedPassword` -> {option}`hashedPassword` -> {option}`initialPassword` -> {option}`password` -> {option}`hashedPasswordFile`"; overrideOrderText = isMutable: '' If the option {option}`users.mutableUsers` is diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 617a342c1a70..eb4fbaebb8dd 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -37,7 +37,7 @@ in options.xdg.portal = { enable = - mkEnableOption ''[xdg desktop integration](https://github.com/flatpak/xdg-desktop-portal)'' + mkEnableOption "[xdg desktop integration](https://github.com/flatpak/xdg-desktop-portal)" // { default = false; }; diff --git a/nixos/modules/hardware/inputmodule.nix b/nixos/modules/hardware/inputmodule.nix index a563de4006dd..edef0d15e715 100644 --- a/nixos/modules/hardware/inputmodule.nix +++ b/nixos/modules/hardware/inputmodule.nix @@ -6,7 +6,7 @@ }: { - options.hardware.inputmodule.enable = lib.mkEnableOption ''Support for Framework input modules''; + options.hardware.inputmodule.enable = lib.mkEnableOption "Support for Framework input modules"; config = lib.mkIf config.hardware.inputmodule.enable { environment.systemPackages = [ pkgs.inputmodule-control ]; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 0e7f0f783b7b..4e107833f6f9 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -228,7 +228,7 @@ in cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001 else elaborated; - defaultText = lib.literalExpression ''config.nixpkgs.hostPlatform''; + defaultText = lib.literalExpression "config.nixpkgs.hostPlatform"; description = '' Specifies the platform on which NixOS should be built. By default, NixOS is built on the system where it runs, but you can @@ -252,7 +252,7 @@ in # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = lib.literalExpression ''config.nixpkgs.system''; + defaultText = lib.literalExpression "config.nixpkgs.system"; description = '' Systems with a recently generated `hardware-configuration.nix` do not need to specify this option, unless cross-compiling, in which case diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix index fa372d13e545..88669bf78ef4 100644 --- a/nixos/modules/misc/nixpkgs/read-only.nix +++ b/nixos/modules/misc/nixpkgs/read-only.nix @@ -24,7 +24,7 @@ in nixpkgs = { pkgs = mkOption { type = lib.types.pkgs; - description = ''The pkgs module argument.''; + description = "The pkgs module argument."; }; config = mkOption { internal = true; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2a7c028a2b38..c563ce901dca 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -28,7 +28,7 @@ let escapeIfNecessary = s: if needsEscaping s then s else ''"${lib.escape [ "$" "\"" "\\" "`" ] s}"''; attrsToText = attrs: - concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${escapeIfNecessary (toString v)}'') attrs) + concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${escapeIfNecessary (toString v)}") attrs) + "\n"; osReleaseContents = diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 84eff22a4d34..15c4d6237c01 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,15 +27,15 @@ let chromium: concatStringsSep " " [ ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' - ''${chromium}/bin/chromium'' - ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + "${chromium}/bin/chromium" + "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''--proxy-server="socks5://$PROXY"'' ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - ''--no-first-run'' - ''--new-window'' - ''--incognito'' - ''-no-default-browser-check'' - ''http://cache.nixos.org/'' + "--no-first-run" + "--new-window" + "--incognito" + "-no-default-browser-check" + "http://cache.nixos.org/" ]; desktopItem = pkgs.makeDesktopItem { diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index e41742ac7e0d..3277d5fd5b16 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -22,7 +22,7 @@ in { meta.maintainers = [ lib.maintainers.mic92 ]; options.programs.nix-ld = { - enable = lib.mkEnableOption ''nix-ld, Documentation: ''; + enable = lib.mkEnableOption "nix-ld, Documentation: "; package = lib.mkPackageOption pkgs "nix-ld" { }; libraries = lib.mkOption { type = lib.types.listOf lib.types.package; diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d7e9ab7ab162..6b059c2bd522 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -154,7 +154,7 @@ in '' + lib.concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages; # For aa-logprof - environment.etc."apparmor/apparmor.conf".text = ''''; + environment.etc."apparmor/apparmor.conf".text = ""; # For aa-logprof environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db"; environment.etc."apparmor/logprof.conf".source = diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index bc05c75669a3..44abf5a06410 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -290,12 +290,12 @@ in ] ( _: - ''${cfg.tctiEnvironment.interface}:${ + "${cfg.tctiEnvironment.interface}:${ if cfg.tctiEnvironment.interface == "tabrmd" then cfg.tctiEnvironment.tabrmdConf else cfg.tctiEnvironment.deviceConf - }'' + }" ) ); } diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 1bf0723126ef..b6cbe78d414b 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -411,7 +411,7 @@ in lib.concatStringsSep "\n" ( lib.imap0 ( i: c: - ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf'' + "${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf" ) cfg.credentials ) ); diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix index cd874f000b3a..0be358f93fbd 100644 --- a/nixos/modules/services/audio/mpdscribble.nix +++ b/nixos/modules/services/audio/mpdscribble.nix @@ -64,7 +64,7 @@ let secretFile: placeholder: targetFile: lib.optionalString ( secretFile != null - ) ''${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' ''; + ) "${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' "; preStart = pkgs.writeShellScript "mpdscribble-pre-start" '' cp -f "${cfgTemplate}" "${cfgFile}" diff --git a/nixos/modules/services/audio/pulseaudio.nix b/nixos/modules/services/audio/pulseaudio.nix index d6afa095fc3e..214fb0e56139 100644 --- a/nixos/modules/services/audio/pulseaudio.nix +++ b/nixos/modules/services/audio/pulseaudio.nix @@ -35,7 +35,7 @@ let let a = cfg.tcp.anonymousClients.allowedIpRanges; in - lib.optional (a != [ ]) ''auth-ip-acl=${lib.concatStringsSep ";" a}''; + lib.optional (a != [ ]) "auth-ip-acl=${lib.concatStringsSep ";" a}"; port = lib.optional (!(isNull cfg.tcp.port)) "port=${toString cfg.tcp.port}"; in pkgs.writeTextFile { diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 63d35d7583de..c95f7cb16713 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -255,7 +255,7 @@ in runCheck = lib.mkOption { type = lib.types.bool; default = builtins.length config.services.restic.backups.${name}.checkOpts > 0; - defaultText = lib.literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0''; + defaultText = lib.literalExpression "builtins.length config.services.backups.${name}.checkOpts > 0"; description = "Whether to run the `check` command with the provided `checkOpts` options."; example = true; }; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index beaa18c29680..4fda57e8214c 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -240,7 +240,7 @@ in ''; }; - recursive = lib.mkEnableOption ''the transfer of child datasets''; + recursive = lib.mkEnableOption "the transfer of child datasets"; sshKey = lib.mkOption { type = with lib.types; nullOr (coercedTo path toString str); diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index 247174028adc..8c683f212161 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -246,8 +246,8 @@ in --datadir ${cfg.beacon.dataDir}/${cfg.network} \ --execution-endpoint http://${cfg.beacon.execution.address}:${toString cfg.beacon.execution.port} \ --execution-jwt ''${CREDENTIALS_DIRECTORY}/LIGHTHOUSE_JWT \ - ${lib.optionalString cfg.beacon.http.enable ''--http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \ - ${lib.optionalString cfg.beacon.metrics.enable ''--metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \ + ${lib.optionalString cfg.beacon.http.enable "--http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}"} \ + ${lib.optionalString cfg.beacon.metrics.enable "--metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}"} \ ${cfg.extraArgs} ${cfg.beacon.extraArgs} ''; serviceConfig = { @@ -292,7 +292,7 @@ in --network ${cfg.network} \ --beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \ --datadir ${cfg.validator.dataDir}/${cfg.network} \ - ${lib.optionalString cfg.validator.metrics.enable ''--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}''} \ + ${lib.optionalString cfg.validator.metrics.enable "--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}"} \ ${cfg.extraArgs} ${cfg.validator.extraArgs} ''; diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index cc1cc0b9574a..0a7a7496f26a 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -17,7 +17,7 @@ in enable = lib.mkEnableOption "flannel networking"; openFirewallPorts = lib.mkOption { - description = ''Whether to open the Flannel UDP ports in the firewall on all interfaces.''; + description = "Whether to open the Flannel UDP ports in the firewall on all interfaces."; type = lib.types.bool; default = true; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 569709373376..42e88e9ddbe3 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -116,7 +116,7 @@ in type = lib.types.path; description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; - defaultText = lib.literalMD ''generated configuration file''; + defaultText = lib.literalMD "generated configuration file"; example = "/etc/nixos/buildbot/master.cfg"; }; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix index 8361ce7f71d4..b95d30ceea4a 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix @@ -728,7 +728,7 @@ in mapAttrsToList ( name: serviceConfig: - ''`services.gitlab-runner.services.${name}.protected` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.protected` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -740,7 +740,7 @@ in mapAttrsToList ( name: serviceConfig: - ''`services.gitlab-runner.services.${name}.runUntagged` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.runUntagged` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -752,7 +752,7 @@ in mapAttrsToList ( name: v: - ''`services.gitlab-runner.services.${name}.maximumTimeout` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.maximumTimeout` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -764,7 +764,7 @@ in mapAttrsToList ( name: v: - ''`services.gitlab-runner.services.${name}.tagList` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.tagList` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 7e4fd63b19f5..ed2826951910 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -191,7 +191,7 @@ in // { NIX_REMOTE = "daemon"; AGENT_WORK_DIR = cfg.workDir; - AGENT_STARTUP_ARGS = ''${lib.concatStringsSep " " cfg.startupOptions}''; + AGENT_STARTUP_ARGS = "${lib.concatStringsSep " " cfg.startupOptions}"; LOG_DIR = cfg.workDir; LOG_FILE = "${cfg.workDir}/go-agent-start.log"; } diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 46de0df0ee61..1c261fcf4aa0 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -205,10 +205,10 @@ in ''; environment = { - ERL_FLAGS = ''-couch_ini ${lib.concatStringsSep " " configFiles}''; + ERL_FLAGS = "-couch_ini ${lib.concatStringsSep " " configFiles}"; # 5. the vm.args file - COUCHDB_ARGS_FILE = ''${cfg.argsFile}''; - HOME = ''${cfg.databaseDir}''; + COUCHDB_ARGS_FILE = "${cfg.argsFile}"; + HOME = "${cfg.databaseDir}"; }; serviceConfig = { diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix index 18b183d65c01..2797a55a0023 100644 --- a/nixos/modules/services/databases/influxdb2.nix +++ b/nixos/modules/services/databases/influxdb2.nix @@ -312,7 +312,7 @@ in settings = mkOption { default = { }; - description = ''configuration options for influxdb2, see for details.''; + description = "configuration options for influxdb2, see for details."; type = format.type; }; diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix index 984b4a9ecc52..4ef38dee65a2 100644 --- a/nixos/modules/services/development/athens.nix +++ b/nixos/modules/services/development/athens.nix @@ -272,7 +272,7 @@ in filterFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - description = ''Filename for the include exclude filter.''; + description = "Filename for the include exclude filter."; default = null; example = lib.literalExpression '' pkgs.writeText "filterFile" ''' @@ -285,7 +285,7 @@ in robotsFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - description = ''Provides /robots.txt for net crawlers.''; + description = "Provides /robots.txt for net crawlers."; default = null; example = lib.literalExpression ''pkgs.writeText "robots.txt" "# my custom robots.txt ..."''; }; @@ -956,7 +956,7 @@ in serviceConfig = { Restart = "on-abnormal"; Nice = 5; - ExecStart = ''${cfg.package}/bin/athens -config_file=${configFile}''; + ExecStart = "${cfg.package}/bin/athens -config_file=${configFile}"; KillMode = "mixed"; KillSignal = "SIGINT"; diff --git a/nixos/modules/services/games/freeciv.nix b/nixos/modules/services/games/freeciv.nix index ad9b9d2101d1..08eea105aa32 100644 --- a/nixos/modules/services/games/freeciv.nix +++ b/nixos/modules/services/games/freeciv.nix @@ -47,7 +47,7 @@ in { options = { services.freeciv = { - enable = lib.mkEnableOption ''freeciv''; + enable = lib.mkEnableOption "freeciv"; settings = lib.mkOption { description = '' Parameters of freeciv-server. diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index 73bc586451e6..2f2c77c19981 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -17,9 +17,9 @@ let command, ... }: - ''${ + "${ lib.concatMapStringsSep "+" toString keys - }:${lib.concatStringsSep "," events}:${lib.concatStringsSep "," attributes}:${command}'' + }:${lib.concatStringsSep "," events}:${lib.concatStringsSep "," attributes}:${command}" ) cfg.bindings} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/hardware/amdgpu.nix b/nixos/modules/services/hardware/amdgpu.nix index 0958ef58b4b0..5c98a0db50ad 100644 --- a/nixos/modules/services/hardware/amdgpu.nix +++ b/nixos/modules/services/hardware/amdgpu.nix @@ -23,7 +23,7 @@ in ''; overdrive = { - enable = lib.mkEnableOption ''`amdgpu` overdrive mode for overclocking''; + enable = lib.mkEnableOption "`amdgpu` overdrive mode for overclocking"; ppfeaturemask = lib.mkOption { type = lib.types.str; @@ -39,7 +39,7 @@ in }; }; - opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library''; + opencl.enable = lib.mkEnableOption "OpenCL support using ROCM runtime library"; }; config = { diff --git a/nixos/modules/services/hardware/keyd.nix b/nixos/modules/services/hardware/keyd.nix index db48e19dde4f..53fa97484ec6 100644 --- a/nixos/modules/services/hardware/keyd.nix +++ b/nixos/modules/services/hardware/keyd.nix @@ -65,10 +65,10 @@ in { imports = [ (lib.mkRemovedOptionModule [ "services" "keyd" "ids" ] - ''Use keyboards..ids instead. If you don't need a multi-file configuration, just add keyboards.default before the ids. See https://github.com/NixOS/nixpkgs/pull/243271.'' + "Use keyboards..ids instead. If you don't need a multi-file configuration, just add keyboards.default before the ids. See https://github.com/NixOS/nixpkgs/pull/243271." ) (lib.mkRemovedOptionModule [ "services" "keyd" "settings" ] - ''Use keyboards..settings instead. If you don't need a multi-file configuration, just add keyboards.default before the settings. See https://github.com/NixOS/nixpkgs/pull/243271.'' + "Use keyboards..settings instead. If you don't need a multi-file configuration, just add keyboards.default before the settings. See https://github.com/NixOS/nixpkgs/pull/243271." ) ]; diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index abcacf917cca..965ba4e4be3b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -198,7 +198,7 @@ assertion = ((builtins.length config.hardware.nvidia-container-toolkit.csv-files) > 0) -> config.hardware.nvidia-container-toolkit.discovery-mode == "csv"; - message = ''When CSV files are provided, `config.hardware.nvidia-container-toolkit.discovery-mode` has to be set to `csv`.''; + message = "When CSV files are provided, `config.hardware.nvidia-container-toolkit.discovery-mode` has to be set to `csv`."; } ]; diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index 5e66afea9ea6..bb7d4f0febeb 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -18,7 +18,7 @@ let cmd, ... }: - ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ + "${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ toString { press = 1; @@ -26,7 +26,7 @@ let release = 0; } .${event} - } ${cmd}'' + } ${cmd}" ) cfg.bindings} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 94e92d233786..af91440c6a3f 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -134,7 +134,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} - ${optionalString cfg.enableDHE ''ssl_dh = <${config.security.dhparams.params.dovecot2.path}''} + ${optionalString cfg.enableDHE "ssl_dh = <${config.security.dhparams.params.dovecot2.path}"} disable_plaintext_auth = yes '' ) diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index b086f319c136..0bd3a0c2bd99 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -176,7 +176,7 @@ in hostname = lib.mkOption { default = "localhost"; type = with lib.types; uniq str; - example = ''example.com''; + example = "example.com"; description = '' Hostname to use. It should be FQDN. ''; @@ -185,7 +185,7 @@ in primaryDomain = lib.mkOption { default = "localhost"; type = with lib.types; uniq str; - example = ''mail.example.com''; + example = "mail.example.com"; description = '' Primary MX domain to use. It should be FQDN. ''; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 67a97f6a244f..62ba64fcaaa1 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -202,9 +202,9 @@ in if cfg.socket ? path then "--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}" else - ''--inet=${ + "--inet=${ optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":") - }${toString cfg.socket.port}''; + }${toString cfg.socket.port}"; in { description = "Postfix Greylisting Service"; diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index ab6b580b5ef9..27a7b1c3ea82 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -223,7 +223,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.mjolnir}/bin/mjolnir --mjolnir-config ./config/default.yaml''; + ExecStart = "${pkgs.mjolnir}/bin/mjolnir --mjolnir-config ./config/default.yaml"; ExecStartPre = [ generateConfig ]; WorkingDirectory = cfg.dataPath; StateDirectory = "mjolnir"; diff --git a/nixos/modules/services/matrix/pantalaimon.nix b/nixos/modules/services/matrix/pantalaimon.nix index 120baab41fb0..edab3dbf39e4 100644 --- a/nixos/modules/services/matrix/pantalaimon.nix +++ b/nixos/modules/services/matrix/pantalaimon.nix @@ -40,7 +40,7 @@ let wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.pantalaimon-headless}/bin/pantalaimon --config ${mkConfigFile name instanceConfig} --data-path ${instanceConfig.dataPath}''; + ExecStart = "${pkgs.pantalaimon-headless}/bin/pantalaimon --config ${mkConfigFile name instanceConfig} --data-path ${instanceConfig.dataPath}"; Restart = "on-failure"; DynamicUser = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/matrix/synapse-auto-compressor.nix b/nixos/modules/services/matrix/synapse-auto-compressor.nix index 6dcb3af8d600..7c531490ca6f 100644 --- a/nixos/modules/services/matrix/synapse-auto-compressor.nix +++ b/nixos/modules/services/matrix/synapse-auto-compressor.nix @@ -37,9 +37,9 @@ in args = synapseConfig.settings.database.args; in if synapseConfig.enable then - ''postgresql://${args.user}${lib.optionalString (args ? password) (":" + args.password)}@${ + "postgresql://${args.user}${lib.optionalString (args ? password) (":" + args.password)}@${ lib.escapeURL (if (args ? host) then args.host else "/run/postgresql") - }${lib.optionalString (args ? port) (":" + args.port)}/${args.database}'' + }${lib.optionalString (args ? port) (":" + args.port)}/${args.database}" else null; defaultText = lib.literalExpression '' diff --git a/nixos/modules/services/misc/anki-sync-server.nix b/nixos/modules/services/misc/anki-sync-server.nix index 908adbf74e76..f5e7d10bd7c9 100644 --- a/nixos/modules/services/misc/anki-sync-server.nix +++ b/nixos/modules/services/misc/anki-sync-server.nix @@ -31,7 +31,7 @@ let # export passwords in environment variables in plaintext. ${concatMapStringsSep "\n" ( x: - ''export SYNC_USER${toString x.i}=${escapeShellArg x.user.username}:${escapeShellArg x.user.password}'' + "export SYNC_USER${toString x.i}=${escapeShellArg x.user.username}:${escapeShellArg x.user.password}" ) usersWithIndexesNoFile} exec ${lib.getExe cfg.package} ''; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 1937be8a26b6..5b52ee478560 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -166,15 +166,15 @@ in imports = [ (lib.mkRenamedOptionModule [ "services" "apache-kafka" "brokerId" ] - [ "services" "apache-kafka" "settings" ''broker.id'' ] + [ "services" "apache-kafka" "settings" "broker.id" ] ) (lib.mkRenamedOptionModule [ "services" "apache-kafka" "logDirs" ] - [ "services" "apache-kafka" "settings" ''log.dirs'' ] + [ "services" "apache-kafka" "settings" "log.dirs" ] ) (lib.mkRenamedOptionModule [ "services" "apache-kafka" "zookeeper" ] - [ "services" "apache-kafka" "settings" ''zookeeper.connect'' ] + [ "services" "apache-kafka" "settings" "zookeeper.connect" ] ) (lib.mkRemovedOptionModule [ diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix index 53f872d3e040..fed0e2c9a06a 100644 --- a/nixos/modules/services/misc/autosuspend.nix +++ b/nixos/modules/services/misc/autosuspend.nix @@ -136,7 +136,7 @@ in ''; }; wakeup_cmd = mkOption { - default = ''sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' ''; + default = "sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' "; type = with types; str; description = '' The command to execute for scheduling a wake up of the system. The given string is @@ -232,7 +232,7 @@ in after = [ "network.target" ]; path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); serviceConfig = { - ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon''; + ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon"; }; }; @@ -242,7 +242,7 @@ in wantedBy = [ "sleep.target" ]; after = [ "sleep.target" ]; serviceConfig = { - ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend''; + ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend"; }; }; }; diff --git a/nixos/modules/services/misc/evdevremapkeys.nix b/nixos/modules/services/misc/evdevremapkeys.nix index 122afda2f86c..c2bf8e10a5dd 100644 --- a/nixos/modules/services/misc/evdevremapkeys.nix +++ b/nixos/modules/services/misc/evdevremapkeys.nix @@ -11,7 +11,7 @@ let in { options.services.evdevremapkeys = { - enable = lib.mkEnableOption ''evdevremapkeys, a daemon to remap events on linux input devices''; + enable = lib.mkEnableOption "evdevremapkeys, a daemon to remap events on linux input devices"; settings = lib.mkOption { type = format.type; diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index 230e61b57f2b..e1276c1937bf 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -11,19 +11,19 @@ in meta.maintainers = [ lib.maintainers.camillemndn ]; options.services.jellyseerr = { - enable = lib.mkEnableOption ''Jellyseerr, a requests manager for Jellyfin''; + enable = lib.mkEnableOption "Jellyseerr, a requests manager for Jellyfin"; package = lib.mkPackageOption pkgs "jellyseerr" { }; openFirewall = lib.mkOption { type = lib.types.bool; default = false; - description = ''Open port in the firewall for the Jellyseerr web interface.''; + description = "Open port in the firewall for the Jellyseerr web interface."; }; port = lib.mkOption { type = lib.types.port; default = 5055; - description = ''The port which the Jellyseerr web UI should listen to.''; + description = "The port which the Jellyseerr web UI should listen to."; }; configDir = lib.mkOption { diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index d2a7f0bf433e..a2aad33b310d 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -79,7 +79,7 @@ in assertions = [ { assertion = cfg.automatic -> config.nix.enable; - message = ''nix.gc.automatic requires nix.enable''; + message = "nix.gc.automatic requires nix.enable"; } ]; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 2af1727b75e3..29e246026cc8 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -58,7 +58,7 @@ in assertions = [ { assertion = cfg.automatic -> config.nix.enable; - message = ''nix.optimise.automatic requires nix.enable''; + message = "nix.optimise.automatic requires nix.enable"; } ]; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index e396ccad5494..0affcbf4588a 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -109,9 +109,9 @@ in description = "Synergy client"; wantedBy = lib.optional cfgC.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${ + serviceConfig.ExecStart = "${pkgs.synergy}/bin/synergyc -f ${ lib.optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}" - } ${cfgC.serverAddress}''; + } ${cfgC.serverAddress}"; serviceConfig.Restart = "on-failure"; }; }) @@ -124,13 +124,13 @@ in description = "Synergy server"; wantedBy = lib.optional cfgS.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${ + serviceConfig.ExecStart = "${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${ lib.optionalString (cfgS.address != "") " -a ${cfgS.address}" }${ lib.optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}" }${lib.optionalString cfgS.tls.enable " --enable-crypto"}${ lib.optionalString (cfgS.tls.cert != null) " --tls-cert ${cfgS.tls.cert}" - }''; + }"; serviceConfig.Restart = "on-failure"; }; }) diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 9c975336315a..f4607cf3fa8c 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -48,7 +48,9 @@ in users = { groups.weechat = { }; users.weechat = { + createHome = true; group = "weechat"; + home = cfg.root; isSystemUser = true; }; }; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 07134b58b90e..f9aa855909c2 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -93,7 +93,7 @@ in options = { services.nagios = { - enable = lib.mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network''; + enable = lib.mkEnableOption "[Nagios](https://www.nagios.org/) to monitor your system or network"; objectDefs = lib.mkOption { description = '' diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix index 5a2b2ab47ccd..e1015b3ce764 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -63,7 +63,7 @@ in "${pkgs.prometheus-mysqld-exporter}/bin/mysqld_exporter" "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" "--web.telemetry-path=${cfg.telemetryPath}" - (optionalString (cfg.configFile != null) ''--config.my-cnf=''${CREDENTIALS_DIRECTORY}/config'') + (optionalString (cfg.configFile != null) "--config.my-cnf=\${CREDENTIALS_DIRECTORY}/config") (escapeShellArgs cfg.extraFlags) ]; RestrictAddressFamilies = [ diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 9b61d44a0f11..5eed8d2a2740 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -30,12 +30,12 @@ let sedExpr = '':x /^>\(${localCellsRegex}\) / { n; :y /^>/! { n; by }; bx }; p''; globalCommand = if cfg.cellServDB != { } then - ''sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}'' + "sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}" else - ''cat ${cfg.globalCellServDBFile}''; + "cat ${cfg.globalCellServDBFile}"; in pkgs.runCommand "CellServDB" { preferLocalBuild = true; } '' - ${lib.optionalString (cfg.globalCellServDBFile != null) ''${globalCommand} > $out''} + ${lib.optionalString (cfg.globalCellServDBFile != null) "${globalCommand} > $out"} cat ${clientServDB} >> $out ''; diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index bfa624986d35..37889c7308da 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -395,7 +395,7 @@ in }; environment = { - TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) ''%d/cert.pem''; + TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) "%d/cert.pem"; TUNNEL_EDGE_IP_VERSION = tunnel.edgeIPVersion; }; } diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix index 49ffbb02c232..7ca9be490632 100644 --- a/nixos/modules/services/networking/firezone/server.nix +++ b/nixos/modules/services/networking/firezone/server.nix @@ -110,12 +110,12 @@ let concatLines ( forEach relevantSecrets ( secret: - ''export ${secret}=$(< ${ + "export ${secret}=$(< ${ if cfg.settingsSecret.${secret} == null then "secrets/${secret}" else "\"$CREDENTIALS_DIRECTORY/${secret}\"" - })'' + })" ) ); diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix index 6d69090744be..b71190d6f464 100644 --- a/nixos/modules/services/networking/gns3-server.nix +++ b/nixos/modules/services/networking/gns3-server.nix @@ -31,7 +31,7 @@ in type = lib.types.nullOr lib.types.str; default = null; example = "gns3"; - description = ''Username used to access the GNS3 Server.''; + description = "Username used to access the GNS3 Server."; }; passwordFile = lib.mkOption { @@ -68,7 +68,7 @@ in file = lib.mkOption { type = lib.types.nullOr lib.types.path; default = "/var/log/gns3/server.log"; - description = ''Path of the file GNS3 Server should log to.''; + description = "Path of the file GNS3 Server should log to."; }; debug = lib.mkEnableOption "debug logging"; @@ -96,17 +96,17 @@ in }; dynamips = { - enable = lib.mkEnableOption ''Dynamips support''; + enable = lib.mkEnableOption "Dynamips support"; package = lib.mkPackageOption pkgs "dynamips" { }; }; ubridge = { - enable = lib.mkEnableOption ''uBridge support''; + enable = lib.mkEnableOption "uBridge support"; package = lib.mkPackageOption pkgs "ubridge" { }; }; vpcs = { - enable = lib.mkEnableOption ''VPCS support''; + enable = lib.mkEnableOption "VPCS support"; package = lib.mkPackageOption pkgs "vpcs" { }; }; }; diff --git a/nixos/modules/services/networking/go-autoconfig.nix b/nixos/modules/services/networking/go-autoconfig.nix index b7ed11405003..f709bc135187 100644 --- a/nixos/modules/services/networking/go-autoconfig.nix +++ b/nixos/modules/services/networking/go-autoconfig.nix @@ -56,7 +56,7 @@ in serviceConfig = { ExecStart = "${pkgs.go-autoconfig}/bin/go-autoconfig -config ${configFile}"; Restart = "on-failure"; - WorkingDirectory = ''${pkgs.go-autoconfig}/''; + WorkingDirectory = "${pkgs.go-autoconfig}/"; DynamicUser = true; }; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index ef0094cf1aa7..c9deeb7753b2 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1363,13 +1363,13 @@ in # see https://github.com/openwrt/openwrt/blob/539cb5389d9514c99ec1f87bd4465f77c7ed9b93/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh#L158 { assertion = length (filter (bss: bss == radio) (attrNames radioCfg.networks)) == 1; - message = ''hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd.''; + message = "hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd."; } { assertion = (radioCfg.wifi4.enable && builtins.elem "HT40-" radioCfg.wifi4.capabilities) -> radioCfg.channel != 0; - message = ''hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd''; + message = "hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd"; } ] # BSS warnings @@ -1391,42 +1391,42 @@ in } { assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null); - message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.''; + message = "hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS."; } { assertion = countWpaPasswordDefinitions <= 1; - message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)''; + message = "hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)"; } { assertion = auth.wpaPassword != null -> (stringLength auth.wpaPassword >= 8 && stringLength auth.wpaPassword <= 63); - message = ''hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63]).''; + message = "hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63])."; } { assertion = auth.saePasswords == [ ] || auth.saePasswordsFile == null; - message = ''hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)''; + message = "hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)"; } { assertion = auth.mode == "wpa3-sae" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null); - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option"; } { assertion = auth.mode == "wpa3-sae-transition" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null) && countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option"; } { assertion = (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option"; } ] ++ optionals (auth.saePasswords != [ ]) ( imap1 (i: entry: { assertion = (entry.password == null) != (entry.passwordFile == null); - message = ''hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`''; + message = "hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`"; }) auth.saePasswords ) ) radioCfg.networks diff --git a/nixos/modules/services/networking/inadyn.nix b/nixos/modules/services/networking/inadyn.nix index 384c6932aefa..fd6f14da9512 100644 --- a/nixos/modules/services/networking/inadyn.nix +++ b/nixos/modules/services/networking/inadyn.nix @@ -221,7 +221,7 @@ in startAt = cfg.interval; serviceConfig = { Type = "oneshot"; - ExecStart = ''${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir ''${CACHE_DIRECTORY} -1 --foreground -l ${cfg.logLevel}''; + ExecStart = "${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir \${CACHE_DIRECTORY} -1 --foreground -l ${cfg.logLevel}"; LoadCredential = "config:${configFile}"; CacheDirectory = "inadyn"; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 7c7641b4c4ed..5c1dd50a30b4 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -301,7 +301,7 @@ in ui.enable = mkOption { type = bool; default = nixosConfig.services.netbird.ui.enable; - defaultText = literalExpression ''client.ui.enable''; + defaultText = literalExpression "client.ui.enable"; description = '' Controls presence of `netbird-ui` wrapper for this NetBird client. ''; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6100f71563f4..c45039458b26 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -148,7 +148,7 @@ let ''; maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"''; - maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}''; + maybeToString = prefix: x: optionalString (x != null) "${prefix} ${toString x}"; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; keyConfigFile = concatStrings ( diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index 8f5b78ec7e11..302867adee3d 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -554,7 +554,6 @@ in meta.maintainers = with lib.maintainers; [ jackr - sigmasquadron water-sucks ]; } diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix index 66690d699537..89695ce46d8f 100644 --- a/nixos/modules/services/networking/robustirc-bridge.nix +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -18,7 +18,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = [ ]; - description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details.''; + description = "Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details."; example = [ "-network robustirc.net" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f34b8ca2a190..2624827d72c8 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -826,13 +826,13 @@ in "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}" "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}" ] - ++ lib.map (port: ''Port ${toString port}'') cfg.ports + ++ lib.map (port: "Port ${toString port}") cfg.ports ++ lib.map ( { port, addr, ... }: - ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}'' + "ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}" ) cfg.listenAddresses ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}" - ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}'' + ++ lib.optional cfg.allowSFTP "Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}" ++ [ "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}" ] @@ -901,7 +901,7 @@ in in { assertion = lib.length duplicates == 0; - message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}''; + message = "Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}"; } ) ] diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix index a5fd0c3c1f6d..1fd0e2cfb1c0 100644 --- a/nixos/modules/services/printing/cups-pdf.nix +++ b/nixos/modules/services/printing/cups-pdf.nix @@ -90,7 +90,7 @@ let type = with lib.types; nullOr path; default = lib.getExe pkgs.ghostscript; defaultText = lib.literalExpression "lib.getExe pkgs.ghostscript"; - example = lib.literalExpression ''''${pkgs.ghostscript}/bin/ps2pdf''; + example = lib.literalExpression "\${pkgs.ghostscript}/bin/ps2pdf"; description = "location of GhostScript binary"; }; }; diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix index cbedb5630d0e..58814cc91b45 100644 --- a/nixos/modules/services/search/manticore.nix +++ b/nixos/modules/services/search/manticore.nix @@ -26,7 +26,7 @@ let ${sectName} { '' + lib.generators.toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } sectValues - + ''}''; + + "}"; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix index aae9c9683e6e..856efd81b483 100644 --- a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix +++ b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix @@ -45,7 +45,7 @@ in instead. ''; default = config.services.crowdsec.enable; - defaultText = lib.literalExpression ''config.services.crowdsec.enable''; + defaultText = lib.literalExpression "config.services.crowdsec.enable"; }; bouncerName = mkOption { type = types.nonEmptyStr; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index c0a992376f51..87f991a4c7e9 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -442,7 +442,7 @@ in // { # Miscellaneous options inherit (cfg) banaction maxretry bantime; - ignoreip = ''127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}''; + ignoreip = "127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}"; backend = "systemd"; # Actions banaction_allports = cfg.banaction-allports; diff --git a/nixos/modules/services/torrent/cross-seed.nix b/nixos/modules/services/torrent/cross-seed.nix index 3db8b84071c3..ed25edbb2f8c 100644 --- a/nixos/modules/services/torrent/cross-seed.nix +++ b/nixos/modules/services/torrent/cross-seed.nix @@ -107,7 +107,7 @@ in outputDir = mkOption { type = types.path; default = "${cfg.configDir}/output"; - defaultText = ''''${cfg.configDir}/output''; + defaultText = "\${cfg.configDir}/output"; description = "Directory where cross-seed will place torrent files it finds."; }; diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index a3ed9a96b970..7a59859c5e4c 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -300,7 +300,7 @@ in type = lib.types.str; default = if cfg.hostname == "localhost" then "http://${cfg.hostname}" else "https://${cfg.hostname}"; - defaultText = ''http(s)://''${config.services.bookstack.hostname}''; + defaultText = "http(s)://\${config.services.bookstack.hostname}"; description = '' The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value. It is used to validate specific diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index e7cdf6a8277b..feb13b8bf87c 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -134,8 +134,8 @@ in ); default = { }; - example = ''''; - description = ''''; + example = ""; + description = ""; }; adminLogin = lib.mkOption { diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d1c0d2103522..caf819c30910 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -556,7 +556,7 @@ in "/" = { priority = 1; index = "doku.php"; - extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + extraConfig = "try_files $uri $uri/ @dokuwiki;"; }; "@dokuwiki" = { diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 2544bd846424..93306104c630 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -359,10 +359,10 @@ in let isUserAuth = cfg.authType == "form" || cfg.authType == "none"; - userScriptArgs = ''--user ${cfg.defaultUser} ${ + userScriptArgs = "--user ${cfg.defaultUser} ${ optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"'' - }''; - mkUserScript = name: optionalString isUserAuth ''./cli/${name}.php ${userScriptArgs}''; + }"; + mkUserScript = name: optionalString isUserAuth "./cli/${name}.php ${userScriptArgs}"; updateUserScript = mkUserScript "update-user"; createUserScript = mkUserScript "create-user"; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index cc6e6af64051..2a63b06a8fab 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -217,7 +217,7 @@ in excalidraw.port = mkOption { type = types.port; default = 3002; - description = ''The port which the Excalidraw backend for Jitsi should listen to.''; + description = "The port which the Excalidraw backend for Jitsi should listen to."; }; secureDomain = { @@ -225,7 +225,7 @@ in authentication = mkOption { type = types.str; default = "internal_hashed"; - description = ''The authentication type to be used by jitsi''; + description = "The authentication type to be used by jitsi"; }; }; }; diff --git a/nixos/modules/services/web-apps/lanraragi.nix b/nixos/modules/services/web-apps/lanraragi.nix index 35e7e28e0308..e7b701099255 100644 --- a/nixos/modules/services/web-apps/lanraragi.nix +++ b/nixos/modules/services/web-apps/lanraragi.nix @@ -88,7 +88,7 @@ in { redis_address => "127.0.0.1:${toString cfg.redis.port}", redis_password => "${ - lib.optionalString (cfg.redis.passwordFile != null) ''$(head -n1 ${cfg.redis.passwordFile})'' + lib.optionalString (cfg.redis.passwordFile != null) "$(head -n1 ${cfg.redis.passwordFile})" }", redis_database => "0", redis_database_minion => "1", diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 412a36c29c90..cbec4ca230bf 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -411,7 +411,7 @@ in path = mkOption { type = types.path; default = "${cfg.dataDir}/mattermost.sock"; - defaultText = ''''${config.mattermost.dataDir}/mattermost.sock''; + defaultText = "\${config.mattermost.dataDir}/mattermost.sock"; description = '' Default location for the Mattermost control socket used by `mmctl`. ''; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 085108df28c3..cb0c60315ef6 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -473,7 +473,7 @@ in nginx.hostName = mkOption { type = types.str; - example = literalExpression ''wiki.example.com''; + example = literalExpression "wiki.example.com"; default = "localhost"; description = '' The hostname to use for the nginx virtual host. diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix index 0aae8e558825..9b126b7fa97c 100644 --- a/nixos/modules/services/web-apps/peertube-runner.nix +++ b/nixos/modules/services/web-apps/peertube-runner.nix @@ -188,7 +188,7 @@ in --runner-name ${lib.escapeShellArg instance.runnerName} \ ${lib.optionalString ( instance.runnerDescription != null - ) ''--runner-description ${lib.escapeShellArg instance.runnerDescription}''} + ) "--runner-description ${lib.escapeShellArg instance.runnerDescription}"} # Kill the server kill $! diff --git a/nixos/modules/services/web-apps/privatebin.nix b/nixos/modules/services/web-apps/privatebin.nix index d498ffe3af71..5fff838b26dd 100644 --- a/nixos/modules/services/web-apps/privatebin.nix +++ b/nixos/modules/services/web-apps/privatebin.nix @@ -13,11 +13,11 @@ let mkValueString = v: if v == true then - ''true'' + "true" else if v == false then - ''false'' + "false" else if builtins.isInt v then - ''${toString v}'' + "${toString v}" else if builtins.isPath v then ''"${toString v}"'' else if builtins.isString v then diff --git a/nixos/modules/services/web-apps/rutorrent.nix b/nixos/modules/services/web-apps/rutorrent.nix index d1c3c2eafe38..82684f884980 100644 --- a/nixos/modules/services/web-apps/rutorrent.nix +++ b/nixos/modules/services/web-apps/rutorrent.nix @@ -248,9 +248,9 @@ in cp -r ${pkgs.rutorrent}/php ${cfg.dataDir}/ ${optionalString (cfg.plugins != [ ]) - ''cp -r ${ + "cp -r ${ concatMapStringsSep " " (p: "${pkgs.rutorrent}/plugins/${p}") cfg.plugins - } ${cfg.dataDir}/plugins/'' + } ${cfg.dataDir}/plugins/" } chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}/{conf,share,logs,plugins} diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 7b8f55b55c9d..818aea70a039 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -403,7 +403,7 @@ in locations = { "/" = { index = "index.php"; - extraConfig = ''try_files $uri $uri/ /index.php?$query_string;''; + extraConfig = "try_files $uri $uri/ /index.php?$query_string;"; }; "~ \\.php$" = { extraConfig = '' diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix index 72d4d67cd6cf..e4e1c65d0932 100644 --- a/nixos/modules/services/web-apps/stash.nix +++ b/nixos/modules/services/web-apps/stash.nix @@ -126,7 +126,7 @@ let stash_boxes = mkOption { type = types.listOf stashBoxType; default = [ ]; - description = ''Stash-box facilitates automated tagging of scenes and performers based on fingerprints and filenames''; + description = "Stash-box facilitates automated tagging of scenes and performers based on fingerprints and filenames"; example = literalExpression '' { stash_boxes = [ diff --git a/nixos/modules/services/web-apps/szurubooru.nix b/nixos/modules/services/web-apps/szurubooru.nix index e1bfbfe27e8b..d7c8926536c2 100644 --- a/nixos/modules/services/web-apps/szurubooru.nix +++ b/nixos/modules/services/web-apps/szurubooru.nix @@ -83,7 +83,7 @@ in type = types.int; default = 4; example = 6; - description = ''Number of waitress threads to start.''; + description = "Number of waitress threads to start."; }; settings = mkOption { @@ -94,13 +94,13 @@ in type = types.str; default = "szurubooru"; example = "Szuru"; - description = ''Name shown in the website title and on the front page.''; + description = "Name shown in the website title and on the front page."; }; domain = mkOption { type = types.str; example = "http://example.com"; - description = ''Full URL to the homepage of this szurubooru site (with no trailing slash).''; + description = "Full URL to the homepage of this szurubooru site (with no trailing slash)."; }; # NOTE: this is not a real upstream option @@ -119,7 +119,7 @@ in ]; default = "no"; example = "yes"; - description = ''Whether to delete thumbnails and source files on post delete.''; + description = "Whether to delete thumbnails and source files on post delete."; }; smtp = { @@ -127,21 +127,21 @@ in type = types.nullOr types.str; default = null; example = "localhost"; - description = ''Host of the SMTP server used to send reset password.''; + description = "Host of the SMTP server used to send reset password."; }; port = mkOption { type = types.nullOr types.port; default = null; example = 25; - description = ''Port of the SMTP server.''; + description = "Port of the SMTP server."; }; user = mkOption { type = types.nullOr types.str; default = null; example = "bot"; - description = ''User to connect to the SMTP server.''; + description = "User to connect to the SMTP server."; }; # NOTE: this is not a real upstream option @@ -149,7 +149,7 @@ in type = types.nullOr types.path; default = null; example = "/run/secrets/szurubooru-smtp-pass"; - description = ''File containing the password associated to the given user for the SMTP server.''; + description = "File containing the password associated to the given user for the SMTP server."; }; }; @@ -158,7 +158,7 @@ in default = "${cfg.server.settings.domain}/data/"; defaultText = lib.literalExpression ''"''${services.szurubooru.server.settings.domain}/data/"''; example = "http://example.com/content/"; - description = ''Full URL to the data endpoint.''; + description = "Full URL to the data endpoint."; }; data_dir = mkOption { @@ -166,21 +166,21 @@ in default = "${cfg.dataDir}/data"; defaultText = lib.literalExpression ''"''${services.szurubooru.dataDir}/data"''; example = "/srv/szurubooru/data"; - description = ''Path to the static files.''; + description = "Path to the static files."; }; debug = mkOption { type = types.int; default = 0; example = 1; - description = ''Whether to generate server logs.''; + description = "Whether to generate server logs."; }; show_sql = mkOption { type = types.int; default = 0; example = 1; - description = ''Whether to show SQL in server logs.''; + description = "Whether to show SQL in server logs."; }; }; }; @@ -203,13 +203,13 @@ in type = types.str; default = "localhost"; example = "192.168.1.2"; - description = ''Host on which the PostgreSQL database runs.''; + description = "Host on which the PostgreSQL database runs."; }; port = mkOption { type = types.port; default = 5432; - description = ''The port under which PostgreSQL listens to.''; + description = "The port under which PostgreSQL listens to."; }; name = mkOption { @@ -217,20 +217,20 @@ in default = cfg.database.user; defaultText = lib.literalExpression "szurubooru.database.name"; example = "szuru"; - description = ''Name of the PostgreSQL database.''; + description = "Name of the PostgreSQL database."; }; user = mkOption { type = types.str; default = "szurubooru"; example = "szuru"; - description = ''PostgreSQL user.''; + description = "PostgreSQL user."; }; passwordFile = mkOption { type = types.path; example = "/run/secrets/szurubooru-db-password"; - description = ''A file containing the password for the PostgreSQL user.''; + description = "A file containing the password for the PostgreSQL user."; }; }; }; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index f313804a6d28..1ff1e0c8bdab 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -151,7 +151,7 @@ in WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.lib.getExe pkgs.nodejs-slim} ${pkgs.wiki-js}/server"; }; }; }; diff --git a/nixos/modules/services/web-apps/your_spotify.nix b/nixos/modules/services/web-apps/your_spotify.nix index 393726b22b01..9c177be2f001 100644 --- a/nixos/modules/services/web-apps/your_spotify.nix +++ b/nixos/modules/services/web-apps/your_spotify.nix @@ -114,7 +114,7 @@ in }; MONGO_ENDPOINT = mkOption { type = str; - description = ''The endpoint of the Mongo database.''; + description = "The endpoint of the Mongo database."; default = "mongodb://localhost:27017/your_spotify"; }; PORT = mkOption { diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 83491c1f789e..1fcf5ef6de5f 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -421,9 +421,9 @@ in serviceConfig = let - runOptions = ''--config ${configPath} ${ + runOptions = "--config ${configPath} ${ optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}" - }''; + }"; in { # Override the `ExecStart` line from upstream's systemd unit file by our own: @@ -431,7 +431,7 @@ in # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect. ExecStart = [ "" - ''${lib.getExe cfg.package} run ${runOptions} ${optionalString cfg.resume "--resume"}'' + "${lib.getExe cfg.package} run ${runOptions} ${optionalString cfg.resume "--resume"}" ]; # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration ExecReload = [ diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix index 72306ebd003d..108c9190cc53 100644 --- a/nixos/modules/services/web-servers/h2o/default.nix +++ b/nixos/modules/services/web-servers/h2o/default.nix @@ -262,12 +262,12 @@ let ); # Executing H2O with our generated configuration; `mode` added as needed - h2oExe = ''${lib.getExe cfg.package} ${ + h2oExe = "${lib.getExe cfg.package} ${ lib.strings.escapeShellArgs [ "--conf" "${h2oConfig}" ] - }''; + }"; in { options = { diff --git a/nixos/modules/services/web-servers/static-web-server.nix b/nixos/modules/services/web-servers/static-web-server.nix index c999bb161f82..9069d602cb01 100644 --- a/nixos/modules/services/web-servers/static-web-server.nix +++ b/nixos/modules/services/web-servers/static-web-server.nix @@ -13,7 +13,7 @@ in { options = { services.static-web-server = { - enable = lib.mkEnableOption ''Static Web Server''; + enable = lib.mkEnableOption "Static Web Server"; listen = lib.mkOption { default = "[::]:8787"; type = lib.types.str; diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix index 6a90f0f4a54f..5867a02b9576 100644 --- a/nixos/modules/system/boot/clevis.nix +++ b/nixos/modules/system/boot/clevis.nix @@ -59,7 +59,7 @@ in || (fs.fsType == "zfs" && lib.hasPrefix "${device}/" fs.device) ) config.system.build.fileSystems) || (lib.hasAttr device config.boot.initrd.luks.devices); - message = ''No filesystem or LUKS device with the name ${device} is declared in your configuration.''; + message = "No filesystem or LUKS device with the name ${device} is declared in your configuration."; }) cfg.devices ) ); diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 9a4818d874dd..d5272ff4da95 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -12,7 +12,7 @@ in options.boot.kexec = { enable = lib.mkEnableOption "kexec" // { default = lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools; - defaultText = lib.literalExpression ''lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools''; + defaultText = lib.literalExpression "lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools"; }; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index c4275d0410c3..2b2fc7194e45 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -244,7 +244,7 @@ in installDeviceTree = mkOption { default = with config.hardware.deviceTree; enable && name != null; - defaultText = ''with config.hardware.deviceTree; enable && name != null''; + defaultText = "with config.hardware.deviceTree; enable && name != null"; description = '' Install the devicetree blob specified by `config.hardware.deviceTree.name` to the ESP and instruct systemd-boot to pass this DTB to linux. diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index e3b0f2656b6a..daac975e1c96 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -31,9 +31,9 @@ let ${lib.concatLines ( lib.mapAttrsToList ( groupname: opts: - ''g ${groupname} ${ + "g ${groupname} ${ if opts.gid == null then "/var/lib/nixos/gid/${groupname}" else toString opts.gid - }'' + }" ) userCfg.groups )} diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index c51b40325cfd..9caa1156b9fd 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -12,13 +12,13 @@ in { options.boot.initrd.unl0kr = { enable = lib.mkEnableOption "unl0kr in initrd" // { - description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.''; + description = "Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS."; }; package = lib.mkPackageOption pkgs "buffybox" { }; allowVendorDrivers = lib.mkEnableOption "load optional drivers" // { - description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)''; + description = "Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)"; }; settings = lib.mkOption { @@ -56,10 +56,10 @@ in warnings = lib.mkMerge [ (lib.mkIf (config.hardware.amdgpu.initrd.enable) [ - ''Use early video loading at your risk. It's not guaranteed to work with unl0kr.'' + "Use early video loading at your risk. It's not guaranteed to work with unl0kr." ]) (lib.mkIf (config.boot.plymouth.enable) [ - ''Upstream clearly intends unl0kr to not run with Plymouth. Good luck'' + "Upstream clearly intends unl0kr to not run with Plymouth. Good luck" ]) ]; diff --git a/nixos/modules/system/service/README.md b/nixos/modules/system/service/README.md index fa4d0204611e..70c08e706577 100644 --- a/nixos/modules/system/service/README.md +++ b/nixos/modules/system/service/README.md @@ -104,7 +104,7 @@ The modular service infrastructure avoids exposing `pkgs` as a module argument t lib, writeScript, runtimeShell, - # ... other dependencies + # ... other dependencies }: stdenv.mkDerivation (finalAttrs: { # ... package definition diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 92c151142215..8e087017d7e7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -205,7 +205,7 @@ let tempAddress = mkOption { type = types.enum (lib.attrNames tempaddrValues); default = cfg.tempAddresses; - defaultText = literalExpression ''config.networking.tempAddresses''; + defaultText = literalExpression "config.networking.tempAddresses"; description = '' When IPv6 is enabled with SLAAC, this option controls the use of temporary address (aka privacy extensions) on this diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index c43db34dbf99..1ba7117aa245 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -89,9 +89,9 @@ in ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { - ExecStart = ''${pkgs.containerd}/bin/containerd ${ + ExecStart = "${pkgs.containerd}/bin/containerd ${ lib.concatStringsSep " " (lib.cli.toCommandLineGNU { } cfg.args) - }''; + }"; Delegate = "yes"; KillMode = "process"; Type = "notify"; diff --git a/nixos/modules/virtualisation/guest-networking-options.nix b/nixos/modules/virtualisation/guest-networking-options.nix index fb450cfa09ba..817ccc4e6370 100644 --- a/nixos/modules/virtualisation/guest-networking-options.nix +++ b/nixos/modules/virtualisation/guest-networking-options.nix @@ -71,7 +71,7 @@ in virtualisation.vlans = lib.mkOption { type = types.listOf types.ints.unsigned; default = if cfg.interfaces == { } then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if cfg.interfaces == {} then [ 1 ] else [ ]''; + defaultText = lib.literalExpression "if cfg.interfaces == {} then [ 1 ] else [ ]"; example = [ 1 2 diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 8a46d022633a..9f67f937c2f1 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -216,7 +216,7 @@ let ${ optionalString ( cfg.tmpfs != null && cfg.tmpfs != [ ] - ) ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' + ) "--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}" } \ ''${EXTRA_NSPAWN_FLAGS-} \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 21a0e083d871..63cc4c5e3f63 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -123,7 +123,7 @@ in type = with types; listOf package; # keep the default in sync with the podman package default = lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]; - defaultText = lib.literalExpression ''lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]''; + defaultText = lib.literalExpression "lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]"; example = lib.literalExpression '' [ pkgs.gvisor diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 762349a39753..5f001e05aa47 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -438,7 +438,7 @@ in virtualisation.bootLoaderDevice = mkOption { type = types.path; default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; - defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; + defaultText = literalExpression "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; example = "/dev/disk/by-id/virtio-boot-loader-device"; description = '' The path (inside th VM) to the device to boot from when legacy booting. @@ -470,7 +470,7 @@ in virtualisation.rootDevice = mkOption { type = types.nullOr types.path; default = "/dev/disk/by-label/${rootFilesystemLabel}"; - defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; + defaultText = literalExpression "/dev/disk/by-label/${rootFilesystemLabel}"; example = "/dev/disk/by-label/nixos"; description = '' The path (inside the VM) to the device containing the root filesystem. diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index 27c1e27083c8..39a8139c085c 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -27,7 +27,7 @@ in enable = lib.mkEnableOption "Waydroid"; package = lib.mkPackageOption pkgs "waydroid" { } // { default = if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid; - defaultText = lib.literalExpression ''if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid''; + defaultText = lib.literalExpression "if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid"; }; }; diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix index 77a4a32a3747..d97108ac2c00 100644 --- a/nixos/tests/beszel.nix +++ b/nixos/tests/beszel.nix @@ -106,7 +106,7 @@ "pkey" = "{sshkey}"; "port" = "45876"; "tkn" = "{utoken}"; - "users" = ''{user['record']['id']}''; + "users" = "{user['record']['id']}"; } }}\' "${agentCfg.environment.HUB_URL}/api/collections/systems/records"') diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index 053b9d244a72..82580009faa9 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -47,7 +47,7 @@ in port = dependencyTrackPort; nginx.domain = "localhost"; - database.passwordFile = "${pkgs.writeText "dbPassword" ''hunter2'THE'''H''''E''}"; + database.passwordFile = "${pkgs.writeText "dbPassword" "hunter2'THE''H'''E"}"; }; }; }; diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index 8018419f8863..4b7975e26d56 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -167,5 +167,5 @@ machine.screenshot("lss_localised_page_${page.name}") '' ) settingsPages) - + ''''; + + ""; } diff --git a/nixos/tests/matrix/mautrix-meta-postgres.nix b/nixos/tests/matrix/mautrix-meta-postgres.nix index 72f12aa8db6a..b1ecf5da3cdd 100644 --- a/nixos/tests/matrix/mautrix-meta-postgres.nix +++ b/nixos/tests/matrix/mautrix-meta-postgres.nix @@ -73,7 +73,7 @@ in services.mautrix-meta.instances.instagram = { enable = true; - environmentFile = pkgs.writeText ''my-secrets'' '' + environmentFile = pkgs.writeText "my-secrets" '' AS_TOKEN=${asToken} HS_TOKEN=${hsToken} ''; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index c3405324a4a2..49feef8bd9e6 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1632,7 +1632,7 @@ let { exporterConfig = { enable = true; - metrics-file = "${pkgs.writeText "test.json" ''{}''}"; + metrics-file = "${pkgs.writeText "test.json" "{}"}"; }; exporterTest = '' wait_for_unit("prometheus-shelly-exporter.service") diff --git a/nixos/tests/restart-by-activation-script.nix b/nixos/tests/restart-by-activation-script.nix index 2fad1f21584e..b156aa21b8a5 100644 --- a/nixos/tests/restart-by-activation-script.nix +++ b/nixos/tests/restart-by-activation-script.nix @@ -51,7 +51,7 @@ specialisation.longscript.configuration = { system.activationScripts.long = { supportsDryActivation = true; - text = lib.concatStringsSep "\n" (lib.genList (i: ''# line number ${toString i}'') 1000000); + text = lib.concatStringsSep "\n" (lib.genList (i: "# line number ${toString i}") 1000000); }; }; }; diff --git a/nixos/tests/syncthing/guiPasswordFile.nix b/nixos/tests/syncthing/guiPasswordFile.nix index fa25fe946c6a..b275e2c70fea 100644 --- a/nixos/tests/syncthing/guiPasswordFile.nix +++ b/nixos/tests/syncthing/guiPasswordFile.nix @@ -26,7 +26,7 @@ insecureAdminAccess = false; user = "alice"; }; - guiPasswordFile = (pkgs.writeText "syncthing-password-file" ''alice_password'').outPath; + guiPasswordFile = (pkgs.writeText "syncthing-password-file" "alice_password").outPath; }; }; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 1a124b78075b..8e1b79cb3036 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -35,7 +35,7 @@ let packagesWithSingleLineConfigs = with vimPlugins; [ { plugin = vim-obsession; - config = ''map $ Obsession''; + config = "map $ Obsession"; } { plugin = trouble-nvim; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 12577a31a20b..556ae62513db 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -5,6 +5,8 @@ nix-update-script, vimUtils, vimPlugins, + autoPatchelfHook, + stdenv, }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; @@ -19,7 +21,8 @@ vimUtils.buildVimPlugin rec { dependencies = [ vimPlugins.nui-nvim ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; dontUseCmakeConfigure = true; buildPhase = '' runHook preBuild @@ -27,6 +30,12 @@ vimUtils.buildVimPlugin rec { runHook postBuild ''; + # The plugin detects Nix and tries to download libgomp at runtime. + # Symlinking it into the plugin directory fixes error message. + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + ln -s ${stdenv.cc.cc.lib}/lib/libgomp.so.1 $out/libgomp.so.1 + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3131b5e1f649..42db867495b2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -860,7 +860,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=carrie999.cyberpunk-2020"; homepage = "https://github.com/Carrie999/cyberpunk"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.d3vil0p3r ]; + maintainers = [ ]; }; }; @@ -1094,8 +1094,8 @@ let mktplcRef = { name = "csharpier-vscode"; publisher = "csharpier"; - version = "2.1.0"; - hash = "sha256-CEge0EZr9DTNBpPQ71tqsVsA8ljgamB1gMBh8CZTTZE="; + version = "10.0.0"; + hash = "sha256-2yL9G6A67KsBmWdG8AKIjcP2HUqUuoYRGb4vunh9AwU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog"; @@ -1320,7 +1320,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=dhedgecock.radical-vscode"; homepage = "https://github.com/dhedgecock/radical-vscode"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.d3vil0p3r ]; + maintainers = [ ]; }; }; @@ -1711,8 +1711,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.86"; - hash = "sha256-QLa8+WAghGJlToGCx7/R68D0GRgCbA0jkEtlA5EnEGA="; + version = "0.4.98"; + hash = "sha256-UhPkiUIIIf58D9hO4mFZba+IO4uJZkP18BH6PTVVfHk="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -3631,7 +3631,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=nur.just-black"; homepage = "https://github.com/nurmohammed840/extension.vsix/tree/Just-Black"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.d3vil0p3r ]; + maintainers = [ ]; }; }; @@ -4269,7 +4269,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=silofy.hackthebox"; homepage = "https://github.com/silofy/hackthebox"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.d3vil0p3r ]; + maintainers = [ ]; }; }; @@ -4700,7 +4700,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=thorerik.hacker-theme"; homepage = "https://github.com/thorerik/vscode-hacker-theme"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.d3vil0p3r ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix index cc9a49178047..6d1b49d91bf7 100644 --- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "11.0.2"; - hash = "sha256-PwP49p1gpxfx3AmGFhNvRBBc4SxWM2b9aaiUG/C+Uhg="; + version = "12.3.0"; + hash = "sha256-Zi5ihki/risHm75ERQxUgqhiTbpM6fknHLMCAkXrEVo="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix index de2b1ed5f41e..e49838ccbeba 100644 --- a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix +++ b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "google"; name = "colab"; - version = "0.1.6"; - hash = "sha256-2WJLXQfsdjor4YThjxvUZejBRjxEEe6fVCMba9grqIQ="; + version = "0.1.7"; + hash = "sha256-wAvmXccgIEfw9Q84F/ozJwvzo26OvehdrTy3DqKu5e8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix index bff445c31537..d88b60547f56 100644 --- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix +++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix @@ -28,7 +28,7 @@ let symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; in -writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" fileName}'' ( +writeShellScriptBin "vscodeNixUpdate-${lib.removeSuffix ".json" fileName}" ( lib.optionalString (settings != { }) ( if createIfDoesNotExists then '' diff --git a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix index 6e2fd767a792..8ed6f4c80fbc 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix @@ -20,11 +20,11 @@ let mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; mutableExtsPaths = lib.forEach mutExtsDrvs (e: { origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ + target = "${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ (lib.findSingle ( ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId ) "" "m" mutableExtensions).version - }''; + }"; }); #removed not defined extensions diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 59652d36bad0..013382e7f1f4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -357,13 +357,13 @@ let ] ++ lib.optionals (!hasMozSystemDirPatch && allNativeMessagingHosts != [ ]) [ "--run" - ''mkdir -p ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts'' + "mkdir -p \${MOZ_HOME:-~/.mozilla}/native-messaging-hosts" ] ++ lib.optionals (!hasMozSystemDirPatch) ( lib.concatMap (ext: [ "--run" - ''ln -sfLt ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*'' + "ln -sfLt \${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*" ]) allNativeMessagingHosts ); diff --git a/pkgs/applications/networking/cluster/rke2/README.md b/pkgs/applications/networking/cluster/rke2/README.md index e21a98b954b0..9990e04de310 100644 --- a/pkgs/applications/networking/cluster/rke2/README.md +++ b/pkgs/applications/networking/cluster/rke2/README.md @@ -33,7 +33,8 @@ release channel tied to each Kubernetes minor version, e.g. `v1.32`. Nixpkgs follows active minor version release channels (typically 4 at a time) and sets aliases for `rke2_stable` and `rke2_latest` accordingly. The [update-script](./update-script.sh) takes care of -updating the aliases automatically. +updating the aliases automatically, but these updates **should not be backported** to release +channels as they can cause breakage on multi-node clusters. For further information visit the [RKE2 release channels documentation](https://docs.rke2.io/upgrades/manual_upgrade?_highlight=manua#release-channels). @@ -64,7 +65,8 @@ by doing the following: 2. Add a new package block to [default.nix](./default.nix), you can copy an existing block from a previous release and update the version numbers - `rke2_1_35 = ...` -3. Run the update script for the new package +3. Add the package reference to [pkgs/top-level/all-packages.nix](/pkgs/top-level/all-packages.nix) +4. Run the update script for the new package - `./pkgs/applications/networking/cluster/rke2/update-script.sh 35` New minor versions are **not** backported to stable release channels. diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 98bc97f7c1c1..440b2d0c2453 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -45,7 +45,7 @@ rec { } ) extraArgs; - # Automatically set by update script + # Automatically set by update script, changes shouldn't be backported rke2_stable = rke2_1_34; rke2_latest = rke2_1_35; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 81c15a886861..4dd9f14b45eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -200,13 +200,13 @@ "vendorHash": "sha256-l30Jv7FYOLNrlC9f89pqziq29jkSjuWz/N26m98rMak=" }, "cloudflare_cloudflare": { - "hash": "sha256-QBGgXdwmF6S2hmFGHPCBA+v8VBiOxX1T199ws0AKVhk=", + "hash": "sha256-N594aLeErFeO7n6M+D1JcC8FlTmTrfaaMa71kFqv0vs=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.15.0", + "rev": "v5.16.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-qr0qKfOPiujY4QeD6yy3Rp1iIs8Ac72afRKaTZDGe3w=" + "vendorHash": "sha256-mM2Vlh3TZt2hq8XW7tTNTyK/nLAe3SLj8LQw52P4Ye8=" }, "cloudfoundry-community_cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index b120ed78b549..ef9c30c5a770 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation rec { ''; qtWrapperArgs = [ - ''--prefix PATH : ${ + "--prefix PATH : ${ lib.makeBinPath [ wirelesstools iw ] - }'' + }" ]; meta = { diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 39a7b666e042..e1e58f93e02f 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libGL ]; - qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; env.NIX_CFLAGS_COMPILE = # error: invalid conversion from 'unsigned char*' to 'char*' diff --git a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix index dc3de53c90c4..6ab37f4a3280 100644 --- a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix @@ -10,13 +10,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.sftp"; - version = "20.1.0"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "sha256-Dv/C8PHaSx13JoGp77rQPtp5G5EH5tqKqzjwZZA7+80="; + sha256 = "sha256-aD0AEr406urgnGVfB6C9JGaNmZAFL7WghnTZhbMfzA8="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 2eae324b17e3..480f2b942416 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -20,11 +20,11 @@ libXScrnSaver, libusb1, pkg-config, -# #FIXME: Could not get cmake to pick up on these dependencies -# Ommiting them prevents cmake from building the OCR video capabilities -# Everything else should work it's just missing this one plugin -# tesseract, -# leptonica, + # #FIXME: Could not get cmake to pick up on these dependencies + # Ommiting them prevents cmake from building the OCR video capabilities + # Everything else should work it's just missing this one plugin + # tesseract, + # leptonica, }: let httplib-src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 645491049862..b4dd4cf5d530 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -221,7 +221,7 @@ let --prefix PATH : "$out/libexec/docker:$extraPath" ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} + ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 2f32733c46d8..a4d4e5f2271d 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -199,7 +199,7 @@ in lib.concatStringsSep " " [ "--replace-fail" (addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath)) - (addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'') + (addShellDoubleQuotes "$systemDefaultPath\${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}\${inputsDefaultPath:+:}$inputsDefaultPath") ] ) originalDefaultPaths} '') sourceFilesWithDefaultPaths} diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index f204c654bf8f..a5388d141375 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -17,10 +17,10 @@ lib.makeOverridable ( state ? null, channel ? "main", name ? "fetchpijul", - # TODO: Changes in pijul are unordered so there's many ways to end up with the same repository state. - # This makes leaveDotPijul unfeasible to implement until pijul CLI implements - # a way of reordering changes to sort them in a consistent and deterministic manner. - # leaveDotPijul ? false + # TODO: Changes in pijul are unordered so there's many ways to end up with the same repository state. + # This makes leaveDotPijul unfeasible to implement until pijul CLI implements + # a way of reordering changes to sort them in a consistent and deterministic manner. + # leaveDotPijul ? false }: if change != null && state != null then throw "Only one of 'change' or 'state' can be set" diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix index d3828602594e..5eb6aa5f7241 100644 --- a/pkgs/build-support/fetchtorrent/default.nix +++ b/pkgs/build-support/fetchtorrent/default.nix @@ -9,7 +9,7 @@ rsync, }: let - urlRegexp = ''.*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*''; + urlRegexp = ".*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*"; in { url, diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 4b31bf225a48..6f300369aa50 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -81,12 +81,6 @@ in _compressorMeta.ubootName or (throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression"), }: -let - # !!! Move this into a public lib function, it is probably useful for others - toValidStoreName = - x: with builtins; lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); - -in stdenvNoCC.mkDerivation ( rec { inherit diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix index 3dd970833668..e9b89df87f07 100644 --- a/pkgs/build-support/setup-systemd-units.nix +++ b/pkgs/build-support/setup-systemd-units.nix @@ -22,10 +22,10 @@ # The names should include the unit suffix # (e.g. ".service") namespace, -# : String -# The namespace for the unit files, to allow for -# multiple independent unit sets managed by -# `setupSystemdUnits`. + # : String + # The namespace for the unit files, to allow for + # multiple independent unit sets managed by + # `setupSystemdUnits`. }: let static = runCommand "systemd-static" { } '' diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index f2957b7bfe7b..b350d51455cd 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -71,7 +71,7 @@ rec { derivationArgs ? { }, # name of the resulting derivation name, - # TODO(@Artturin): enable strictDeps always + # TODO(@Artturin): enable strictDeps always }: buildCommand: stdenv.mkDerivation ( @@ -170,9 +170,9 @@ rec { name: text: # TODO: To fully deprecate, replace the assertion with `lib.isString` and remove the warning assert lib.assertMsg (lib.strings.isConvertibleWithToString text) - ''pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.''; + "pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead."; lib.warnIf (!lib.isString text) - ''pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.'' + "pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first." writeTextFile { inherit name text; }; diff --git a/pkgs/build-support/trivial-builders/test/write-text-file.nix b/pkgs/build-support/trivial-builders/test/write-text-file.nix index f9d508de748b..ff57564e3aa9 100644 --- a/pkgs/build-support/trivial-builders/test/write-text-file.nix +++ b/pkgs/build-support/trivial-builders/test/write-text-file.nix @@ -45,7 +45,7 @@ lib.recurseIntoAttrs { weird-name = writeTextFile { name = "weird-names"; destination = "/etc/${veryWeirdName}"; - text = ''passed!''; + text = "passed!"; checkPhase = '' # intentionally hardcode everything here, to make sure # Nix does not mess with file paths diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d0359bbc38dc..971b38ff46b0 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -596,7 +596,7 @@ recurseIntoAttrs { no-empty-wrapper = let - bin = writeBashBin "bin" { makeWrapperArgs = [ ]; } ''true''; + bin = writeBashBin "bin" { makeWrapperArgs = [ ]; } "true"; in runCommand "run-test-writers-wrapping-no-empty-wrapper" { } '' ls -A ${bin}/bin diff --git a/pkgs/by-name/af/afterglow-cursors-recolored/package.nix b/pkgs/by-name/af/afterglow-cursors-recolored/package.nix index 733c3df8c963..386c6a527eeb 100644 --- a/pkgs/by-name/af/afterglow-cursors-recolored/package.nix +++ b/pkgs/by-name/af/afterglow-cursors-recolored/package.nix @@ -136,7 +136,7 @@ lib.checkListOfEnum "${pname}: theme variants" availableThemeVariants themeVaria meta = { description = "Recoloring of the Afterglow Cursors x-cursor theme"; homepage = "https://github.com/TeddyBearKilla/Afterglow-Cursors-Recolored"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix index cbfc5cc0851e..077100af5378 100644 --- a/pkgs/by-name/ai/aiac/package.nix +++ b/pkgs/by-name/ai/aiac/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; meta = { - description = ''Artificial Intelligence Infrastructure-as-Code Generator''; + description = "Artificial Intelligence Infrastructure-as-Code Generator"; mainProgram = "aiac"; homepage = "https://github.com/gofireflyio/aiac/"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index 4c378cbd5f45..2a20f5ee8c2d 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation { ln -s ${clapJuceExtensions} src-juce/clap-juce-extensions ''; - preConfigure = lib.optionalString enableVCVRack ''export RACK_DIR=${vcvRackSdk}''; + preConfigure = lib.optionalString enableVCVRack "export RACK_DIR=${vcvRackSdk}"; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 37f61ef13c60..084830f733f3 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-01-18"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "53a648baed26d12df3351b3301ea9cc741a35648"; - hash = "sha256-GN6AuqrHfFItFe8s1xU3LpltnTKEhasrvyI+3H9z7rU="; + rev = "fe67011732dada5da0cdba5550d4244c657d0aaa"; + hash = "sha256-/eAa8qLRoplQoEYocdrczEI5RSCTMTxSezw0WAtk47w="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix index 5020341ae860..0b456a677d6f 100644 --- a/pkgs/by-name/al/algolia-cli/package.nix +++ b/pkgs/by-name/al/algolia-cli/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: let - version = "1.7.2"; + version = "1.7.3"; in buildGoModule { pname = "algolia-cli"; @@ -16,10 +16,10 @@ buildGoModule { owner = "algolia"; repo = "cli"; tag = "v${version}"; - hash = "sha256-7g96LEtY6VCNwnJxKVQIOeqJSHrAdIIO3feUb+DmDJ0="; + hash = "sha256-m7PAD9EKrl7eBzRwCHDcH+eBcFnfXIDnIm6wvOtay5g="; }; - vendorHash = "sha256-zDhsJ9iUKm0RzALVlvZDIPYaTqfIDIuUWAU+h5gp4Es="; + vendorHash = "sha256-I6awzstThs0nC/Nyy00jCN3cpF1MXJcFTUM95E38HQI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index 8cffa71c0ef6..9274e10731ff 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "andcli"; - version = "2.4.2"; + version = "2.4.3"; subPackages = [ "cmd/andcli" ]; @@ -16,10 +16,10 @@ buildGoModule (finalAttrs: { owner = "tjblackheart"; repo = "andcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-gABpQFD0F08rSVf/6X2i15aulx9ABGPGtq5CaN5ovbw="; + hash = "sha256-OhMycd1L52hkrXbKwi21zh063FqPRQrBCcXcmy2ljdA="; }; - vendorHash = "sha256-FpXTKjTThrRejBiB4QKr7GfDsnWmDWDgxn5tHfgU+Dk="; + vendorHash = "sha256-XZcSD7/vIA5XibWCI7PorqB300r6/gWhItgUq7v92m4="; ldflags = [ "-s" diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index faf678b6df56..2c949ea1f4ae 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -90,7 +90,6 @@ buildGoModule (finalAttrs: { knightpp soopyc ryand56 - sigmasquadron defelo ]; mainProgram = "anubis"; diff --git a/pkgs/by-name/ap/apache-airflow/package.nix b/pkgs/by-name/ap/apache-airflow/package.nix index ba341a97bdf5..f8d5ee6ab778 100644 --- a/pkgs/by-name/ap/apache-airflow/package.nix +++ b/pkgs/by-name/ap/apache-airflow/package.nix @@ -3,276 +3,41 @@ fetchpatch, fetchPypi, python3, + + # Extra airflow providers to enable + enabledProviders ? [ ], }: let python = python3.override { self = python; packageOverrides = pySelf: pySuper: { - connexion = pySuper.connexion.overridePythonAttrs rec { - version = "2.14.2"; - src = fetchFromGitHub { - owner = "spec-first"; - repo = "connexion"; - tag = version; - hash = "sha256-1v1xCHY3ZnZG/Vu9wN/it7rLKC/StoDefoMNs+hMjIs="; - }; - nativeBuildInputs = with pySelf; [ - setuptools - ]; - pythonRelaxDeps = [ - "werkzeug" - ]; - propagatedBuildInputs = with pySelf; [ - aiohttp - aiohttp-jinja2 - aiohttp-swagger - clickclick - flask - inflection - jsonschema - openapi-spec-validator - packaging - pyyaml - requests - swagger-ui-bundle - ]; - nativeCheckInputs = with pySelf; [ - aiohttp-remotes - decorator - pytest-aiohttp - pytest-tornasync - pytestCheckHook - testfixtures - ]; - disabledTests = [ - "test_aiohttp_simple_api" - "test_app" - "test_invalid_type" # https://github.com/spec-first/connexion/issues/1969 - "test_openapi_yaml_behind_proxy" - "test_run_with_wsgi_containers" - "test_swagger_ui" - ]; - postPatch = '' - substituteInPlace connexion/__init__.py \ - --replace "2020.0.dev1" "${version}" - ''; - }; - werkzeug = pySuper.werkzeug.overridePythonAttrs rec { - version = "2.3.8"; - src = fetchPypi { - pname = "werkzeug"; - inherit version; - hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; - }; - nativeCheckInputs = with pySelf; [ - pytest-xprocess - ]; - }; - # flask's test-suite needs click 8.1.8 - # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' - click = pySuper.click.overridePythonAttrs rec { - version = "8.1.8"; - src = fetchPypi { - pname = "click"; - inherit version; - hash = "sha256-7VPJ2JkNg8Kifermjk7jN0c/YzDAQKMdQiXJV00WCWo="; - }; - }; - flask = pySuper.flask.overridePythonAttrs (o: rec { - version = "2.2.5"; - src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - nativeBuildInputs = (o.nativeBuildInputs or [ ]) ++ [ - pySelf.setuptools - ]; - pytestFlagsArray = [ - # tests that are marked with filterwarnings fail with - # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for - # removal in Python 3.14; use importlib.util.find_spec() instead - "-W ignore::DeprecationWarning" - ]; - }); - flask-login = pySuper.flask-login.overridePythonAttrs rec { - version = "0.6.3"; - src = fetchFromGitHub { - owner = "maxcountryman"; - repo = "flask-login"; - tag = version; - hash = "sha256-Sn7Ond67P/3+OmKKFE/KfA6FE4IajhiRXVVrXKJtY3I="; - }; - nativeBuildInputs = with pySelf; [ setuptools ]; - pytestFlagsArray = [ - # DeprecationWarning: datetime.datetime.utcnow() is deprecated - # and scheduled for removal in a future version. - # Use timezone-aware objects to represent datetimes in UTC: - # datetime.datetime.now(datetime.UTC). - "-W ignore::DeprecationWarning" - ]; - }; - flask-session = pySuper.flask-session.overridePythonAttrs rec { - version = "0.5.0"; - src = fetchFromGitHub { - owner = "palletc-eco"; - repo = "flask-session"; - tag = version; - hash = "sha256-t8w6ZS4gBDpnnKvL3DLtn+rRLQNJbrT2Hxm4f3+a3Xc="; - }; - nativeCheckInputs = with pySelf; [ pytestCheckHook ]; - pytestFlagsArray = [ - "-k" - "'null_session or filesystem_session'" - ]; - dependencies = with pySelf; [ - flask-sqlalchemy - cachelib - ]; - disabledTests = [ ]; - disabledTestPaths = [ ]; - preCheck = ""; - postCheck = ""; - }; - # flask-appbuilder doesn't work with sqlalchemy 2.x, flask-appbuilder 3.x - # https://github.com/dpgaspar/Flask-AppBuilder/issues/2038 - flask-appbuilder = pySuper.flask-appbuilder.overridePythonAttrs { - meta.broken = false; - }; - # a knock-on effect from overriding the sqlalchemy version - flask-sqlalchemy = pySuper.flask-sqlalchemy.overridePythonAttrs { - src = fetchPypi { - pname = "Flask-SQLAlchemy"; - version = "2.5.1"; - hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; - }; - format = "setuptools"; - }; - httpcore = pySuper.httpcore.overridePythonAttrs { - # nullify upstream's pytest flags which cause - # "TLS/SSL connection has been closed (EOF)" - # with pytest-httpbin 1.x - preCheck = '' - substituteInPlace pyproject.toml \ - --replace '[tool.pytest.ini_options]' '[tool.notpytest.ini_options]' - ''; - }; - pytest-httpbin = pySuper.pytest-httpbin.overridePythonAttrs rec { - version = "1.0.2"; - src = fetchFromGitHub { - owner = "kevin1024"; - repo = "pytest-httpbin"; - tag = "v${version}"; - hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI="; - }; - # Use unmerged PR #65 to fix older version: - # https://github.com/kevin1024/pytest-httpbin/pull/65/ - # It was closed in favour of another which isn't compatible with the overriden version. - patches = [ - (fetchpatch { - url = "https://github.com/kevin1024/pytest-httpbin/commit/4e325f877ff8f77dec9f380bd8e53bb42976775c.patch"; - hash = "sha256-a33XcdMupD+7ZzvUibePdldGImmPLDNU2sxRbwpveDA="; - }) - (fetchpatch { - url = "https://github.com/kevin1024/pytest-httpbin/commit/463afb9b200563ac6fe7ae535f7a7a3c818b0418.patch"; - hash = "sha256-HFmuLtAtEjnB6heSG1YNnqxtz2phXNkHbQaZyB5bLJs="; - }) - ]; - disabledTests = [ - "test_httpbin_secure_accepts_get_requests" - "test_httpbin_secure_accepts_lots_of_get_requests" - "test_httpbin_both[https]" - "test_chunked_encoding[https]" - "TestClassBassedTests::test_http_secure" - "test_dont_crash_on_certificate_problems" - "test_redirect_location_is_https_for_secure_server" - "test_httpbin_secure_accepts_get_requests" - "test_http_secure" - ]; - }; - # apache-airflow doesn't work with sqlalchemy 2.x - # https://github.com/apache/airflow/issues/28723 - sqlalchemy = pySuper.sqlalchemy_1_4; - gitpython = pySuper.gitpython.overridePythonAttrs rec { - version = "3.1.44"; - src = fetchFromGitHub { - owner = "gitpython-developers"; - repo = "gitpython"; - rev = version; - hash = "sha256-KnKaBv/tKk4wiGWUWCEgd1vgrTouwUhqxJ1/nMjRaWk="; - }; - }; - # ValueError: Unknown classifier in field `project.classifiers`: Programming Language :: Python :: Free Threading :: 2 - Beta - urllib3 = pySuper.urllib3.overridePythonAttrs rec { - version = "2.5.0"; - src = fetchPypi { - pname = "urllib3"; - inherit version; - hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A="; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "setuptools-scm>=8,<9"' "" - ''; - }; smmap = pySuper.smmap.overridePythonAttrs rec { version = "5.0.2"; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "smmap"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-0Y175kjv/8UJpSxtLpWH4/VT7JrcVPAq79Nf3rtHZZM="; }; }; - trove-classifiers = pySuper.trove-classifiers.overridePythonAttrs rec { - version = "2024.10.21.16"; - src = fetchPypi { - pname = "trove_classifiers"; - inherit version; - hash = "sha256-F8vQVdZ9Xp2d5jKTqHMpQ/q8IVdOTHt07fEStJKM9fM="; - }; - postPatch = ""; - }; - packaging = pySuper.packaging.overridePythonAttrs rec { - version = "24.2"; - src = fetchPypi { - pname = "packaging"; - inherit version; - hash = "sha256-wiim3F6TLTRrxXOTeRCdSeiFPdgiNXHHxbVSYO3AuX8="; - }; - }; - pluggy = pySuper.pluggy.overridePythonAttrs rec { - version = "1.5.0"; + structlog = pySuper.structlog.overridePythonAttrs (o: rec { + version = "25.4.0"; src = fetchFromGitHub { - owner = "pytest-dev"; - repo = "pluggy"; + owner = "hynek"; + repo = "structlog"; tag = version; - hash = "sha256-f0DxyZZk6RoYtOEXLACcsOn2B+Hot4U4g5Ogr/hKmOE="; + hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30="; }; - }; - pyproject-api = pySuper.pyproject-api.overridePythonAttrs rec { - version = "1.8.0"; - src = fetchPypi { - pname = "pyproject_api"; - inherit version; - hash = "sha256-d7gEny/rXTPu/MIbV/HieWNid6isita1hxA3skN3hJY="; - }; - disabledTests = [ - # AssertionError: assert ['magic>3', 'requests>2'] == ['magic >3', 'requests >2'] - "test_frontend_setuptools" - ]; - }; - tox = pySuper.tox.overridePythonAttrs rec { - version = "4.27.0"; - src = fetchFromGitHub { - owner = "tox-dev"; - repo = "tox"; - tag = version; - hash = "sha256-Z3qUK4w1ebPvdZD4ZuKgZXJPUu5lG0G41vn/pc9gC/0="; - }; - }; - apache-airflow = pySelf.callPackage ./python-package.nix { }; + nativeCheckInputs = + with pySelf; + o.nativeCheckInputs + ++ [ + freezegun + pretend + ]; + }); + apache-airflow = pySelf.callPackage ./python-package.nix { inherit enabledProviders; }; }; }; in diff --git a/pkgs/by-name/ap/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix index d2da8c6a4c65..d20c06f64e48 100644 --- a/pkgs/by-name/ap/apache-airflow/providers.nix +++ b/pkgs/by-name/ap/apache-airflow/providers.nix @@ -1,709 +1,340 @@ # Warning: generated by update-providers.py, do not update manually { airbyte = { - deps = [ - "aiohttp" - "asgiref" - "requests" - "requests-toolbelt" - ]; + deps = [ "requests" ]; imports = [ - "airflow.providers.airbyte.hooks.airbyte" - "airflow.providers.airbyte.operators.airbyte" + "airflow.providers.airbyte" + "airflow.providers.airbyte.get_provider_info" ]; + version = "5.2.3"; }; + alibaba = { deps = [ "oss2" ]; imports = [ - "airflow.providers.alibaba.cloud.hooks.analyticdb_spark" - "airflow.providers.alibaba.cloud.hooks.oss" - "airflow.providers.alibaba.cloud.operators.analyticdb_spark" - "airflow.providers.alibaba.cloud.operators.oss" + "airflow.providers.alibaba" + "airflow.providers.alibaba.get_provider_info" ]; + version = "3.2.2"; }; + amazon = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" + "aiobotocore" "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" "boto3" "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" "inflection" "jmespath" - "json-merge-patch" "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" + "lxml" + "marshmallow" "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" + "python3-saml" "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" + "s3fs" + "xmlsec" ]; imports = [ - "airflow.providers.amazon.aws.hooks.appflow" - "airflow.providers.amazon.aws.hooks.athena" - "airflow.providers.amazon.aws.hooks.athena_sql" - "airflow.providers.amazon.aws.hooks.base_aws" - "airflow.providers.amazon.aws.hooks.batch_client" - "airflow.providers.amazon.aws.hooks.batch_waiters" - "airflow.providers.amazon.aws.hooks.bedrock" - "airflow.providers.amazon.aws.hooks.chime" - "airflow.providers.amazon.aws.hooks.cloud_formation" - "airflow.providers.amazon.aws.hooks.comprehend" - "airflow.providers.amazon.aws.hooks.datasync" - "airflow.providers.amazon.aws.hooks.dms" - "airflow.providers.amazon.aws.hooks.dynamodb" - "airflow.providers.amazon.aws.hooks.ec2" - "airflow.providers.amazon.aws.hooks.ecr" - "airflow.providers.amazon.aws.hooks.ecs" - "airflow.providers.amazon.aws.hooks.eks" - "airflow.providers.amazon.aws.hooks.elasticache_replication_group" - "airflow.providers.amazon.aws.hooks.emr" - "airflow.providers.amazon.aws.hooks.emr" - "airflow.providers.amazon.aws.hooks.eventbridge" - "airflow.providers.amazon.aws.hooks.glacier" - "airflow.providers.amazon.aws.hooks.glue" - "airflow.providers.amazon.aws.hooks.glue_catalog" - "airflow.providers.amazon.aws.hooks.glue_crawler" - "airflow.providers.amazon.aws.hooks.glue_databrew" - "airflow.providers.amazon.aws.hooks.kinesis" - "airflow.providers.amazon.aws.hooks.kinesis_analytics" - "airflow.providers.amazon.aws.hooks.lambda_function" - "airflow.providers.amazon.aws.hooks.logs" - "airflow.providers.amazon.aws.hooks.neptune" - "airflow.providers.amazon.aws.hooks.opensearch_serverless" - "airflow.providers.amazon.aws.hooks.quicksight" - "airflow.providers.amazon.aws.hooks.rds" - "airflow.providers.amazon.aws.hooks.redshift_cluster" - "airflow.providers.amazon.aws.hooks.redshift_data" - "airflow.providers.amazon.aws.hooks.redshift_sql" - "airflow.providers.amazon.aws.hooks.s3" - "airflow.providers.amazon.aws.hooks.sagemaker" - "airflow.providers.amazon.aws.hooks.secrets_manager" - "airflow.providers.amazon.aws.hooks.ses" - "airflow.providers.amazon.aws.hooks.sns" - "airflow.providers.amazon.aws.hooks.sqs" - "airflow.providers.amazon.aws.hooks.ssm" - "airflow.providers.amazon.aws.hooks.step_function" - "airflow.providers.amazon.aws.hooks.sts" - "airflow.providers.amazon.aws.hooks.verified_permissions" - "airflow.providers.amazon.aws.operators.appflow" - "airflow.providers.amazon.aws.operators.athena" - "airflow.providers.amazon.aws.operators.base_aws" - "airflow.providers.amazon.aws.operators.batch" - "airflow.providers.amazon.aws.operators.bedrock" - "airflow.providers.amazon.aws.operators.cloud_formation" - "airflow.providers.amazon.aws.operators.comprehend" - "airflow.providers.amazon.aws.operators.datasync" - "airflow.providers.amazon.aws.operators.dms" - "airflow.providers.amazon.aws.operators.ec2" - "airflow.providers.amazon.aws.operators.ecs" - "airflow.providers.amazon.aws.operators.eks" - "airflow.providers.amazon.aws.operators.emr" - "airflow.providers.amazon.aws.operators.emr" - "airflow.providers.amazon.aws.operators.eventbridge" - "airflow.providers.amazon.aws.operators.glacier" - "airflow.providers.amazon.aws.operators.glue" - "airflow.providers.amazon.aws.operators.glue_crawler" - "airflow.providers.amazon.aws.operators.glue_databrew" - "airflow.providers.amazon.aws.operators.kinesis_analytics" - "airflow.providers.amazon.aws.operators.lambda_function" - "airflow.providers.amazon.aws.operators.neptune" - "airflow.providers.amazon.aws.operators.quicksight" - "airflow.providers.amazon.aws.operators.rds" - "airflow.providers.amazon.aws.operators.redshift_cluster" - "airflow.providers.amazon.aws.operators.redshift_data" - "airflow.providers.amazon.aws.operators.s3" - "airflow.providers.amazon.aws.operators.sagemaker" - "airflow.providers.amazon.aws.operators.sns" - "airflow.providers.amazon.aws.operators.sqs" - "airflow.providers.amazon.aws.operators.step_function" + "airflow.providers.amazon" + "airflow.providers.amazon.get_provider_info" ]; + version = "9.13.0"; }; + apache_beam = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" + "numpy" "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" ]; imports = [ - "airflow.providers.apache.beam.hooks.beam" - "airflow.providers.apache.beam.operators.beam" + "airflow.providers.apache.beam" + "airflow.providers.apache.beam.get_provider_info" ]; + version = "6.1.4"; }; + apache_cassandra = { deps = [ "cassandra-driver" ]; - imports = [ "airflow.providers.apache.cassandra.hooks.cassandra" ]; + imports = [ + "airflow.providers.apache.cassandra" + "airflow.providers.apache.cassandra.get_provider_info" + ]; + version = "3.8.2"; }; + apache_drill = { deps = [ ]; imports = [ - "airflow.providers.apache.drill.hooks.drill" - "airflow.providers.apache.drill.operators.drill" + "airflow.providers.apache.drill" + "airflow.providers.apache.drill.get_provider_info" ]; + version = "3.1.2"; }; + apache_druid = { + deps = [ "pydruid" ]; + imports = [ + "airflow.providers.apache.druid" + "airflow.providers.apache.druid.get_provider_info" + ]; + version = "4.3.0"; + }; + + apache_flink = { + deps = [ "cryptography" ]; + imports = [ + "airflow.providers.apache.flink" + "airflow.providers.apache.flink.get_provider_info" + ]; + version = "1.7.2"; + }; + + apache_hdfs = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" + "hdfs" "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pydruid" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" ]; imports = [ - "airflow.providers.apache.druid.hooks.druid" - "airflow.providers.apache.druid.operators.druid" - "airflow.providers.apache.druid.operators.druid_check" + "airflow.providers.apache.hdfs" + "airflow.providers.apache.hdfs.get_provider_info" ]; + version = "4.10.2"; }; - apache_flink = { - deps = [ - "aiofiles" - "asgiref" - "cryptography" - "google-re2" - "kubernetes" - "kubernetes-asyncio" - ]; - imports = [ "airflow.providers.apache.flink.operators.flink_kubernetes" ]; - }; - apache_hdfs = { - deps = [ "pandas" ]; - imports = [ "airflow.providers.apache.hdfs.hooks.webhdfs" ]; - }; + apache_hive = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" "thrift" - "vertica-python" ]; imports = [ - "airflow.providers.apache.hive.hooks.hive" - "airflow.providers.apache.hive.operators.hive" - "airflow.providers.apache.hive.operators.hive_stats" + "airflow.providers.apache.hive" + "airflow.providers.apache.hive.get_provider_info" ]; + version = "9.1.2"; }; + apache_iceberg = { deps = [ ]; - imports = [ "airflow.providers.apache.iceberg.hooks.iceberg" ]; + imports = [ + "airflow.providers.apache.iceberg" + "airflow.providers.apache.iceberg.get_provider_info" + ]; + version = "1.3.2"; }; + apache_impala = { - deps = [ ]; - imports = [ "airflow.providers.apache.impala.hooks.impala" ]; + deps = [ "kerberos" ]; + imports = [ + "airflow.providers.apache.impala" + "airflow.providers.apache.impala.get_provider_info" + ]; + version = "1.7.2"; }; + apache_kafka = { deps = [ "asgiref" "confluent-kafka" ]; imports = [ - "airflow.providers.apache.kafka.hooks.base" - "airflow.providers.apache.kafka.hooks.client" - "airflow.providers.apache.kafka.hooks.consume" - "airflow.providers.apache.kafka.hooks.produce" - "airflow.providers.apache.kafka.operators.consume" - "airflow.providers.apache.kafka.operators.produce" + "airflow.providers.apache.kafka" + "airflow.providers.apache.kafka.get_provider_info" ]; + version = "1.10.3"; }; + apache_kylin = { deps = [ ]; imports = [ - "airflow.providers.apache.kylin.hooks.kylin" - "airflow.providers.apache.kylin.operators.kylin_cube" + "airflow.providers.apache.kylin" + "airflow.providers.apache.kylin.get_provider_info" ]; + version = "3.9.2"; }; + apache_livy = { deps = [ "aiohttp" "asgiref" - "requests" - "requests-toolbelt" ]; imports = [ - "airflow.providers.apache.livy.hooks.livy" - "airflow.providers.apache.livy.operators.livy" + "airflow.providers.apache.livy" + "airflow.providers.apache.livy.get_provider_info" ]; + version = "4.4.2"; }; + apache_pig = { deps = [ ]; imports = [ - "airflow.providers.apache.pig.hooks.pig" - "airflow.providers.apache.pig.operators.pig" + "airflow.providers.apache.pig" + "airflow.providers.apache.pig.get_provider_info" ]; + version = "4.7.2"; }; + apache_pinot = { deps = [ ]; - imports = [ "airflow.providers.apache.pinot.hooks.pinot" ]; + imports = [ + "airflow.providers.apache.pinot" + "airflow.providers.apache.pinot.get_provider_info" + ]; + version = "4.8.2"; }; + apache_spark = { deps = [ - "aiofiles" - "asgiref" - "cryptography" - "google-re2" "grpcio-status" - "kubernetes" - "kubernetes-asyncio" "pyspark" ]; imports = [ - "airflow.providers.apache.spark.hooks.spark_connect" - "airflow.providers.apache.spark.hooks.spark_jdbc" - "airflow.providers.apache.spark.hooks.spark_jdbc_script" - "airflow.providers.apache.spark.hooks.spark_sql" - "airflow.providers.apache.spark.hooks.spark_submit" - "airflow.providers.apache.spark.operators.spark_jdbc" - "airflow.providers.apache.spark.operators.spark_sql" - "airflow.providers.apache.spark.operators.spark_submit" + "airflow.providers.apache.spark" + "airflow.providers.apache.spark.get_provider_info" ]; + version = "5.3.2"; }; + + apache_tinkerpop = { + deps = [ "gremlinpython" ]; + imports = [ + "airflow.providers.apache.tinkerpop" + "airflow.providers.apache.tinkerpop.get_provider_info" + ]; + version = "1.0.3"; + }; + apprise = { deps = [ "apprise" ]; - imports = [ "airflow.providers.apprise.hooks.apprise" ]; + imports = [ + "airflow.providers.apprise" + "airflow.providers.apprise.get_provider_info" + ]; + version = "2.1.2"; }; + arangodb = { deps = [ "python-arango" ]; imports = [ - "airflow.providers.arangodb.hooks.arangodb" - "airflow.providers.arangodb.operators.arangodb" + "airflow.providers.arangodb" + "airflow.providers.arangodb.get_provider_info" ]; + version = "2.8.2"; }; + asana = { deps = [ "asana" ]; imports = [ - "airflow.providers.asana.hooks.asana" - "airflow.providers.asana.operators.asana_tasks" + "airflow.providers.asana" + "airflow.providers.asana.get_provider_info" ]; + version = "2.10.2"; }; + atlassian_jira = { deps = [ "atlassian-python-api" ]; imports = [ - "airflow.providers.atlassian.jira.hooks.jira" - "airflow.providers.atlassian.jira.operators.jira" + "airflow.providers.atlassian.jira" + "airflow.providers.atlassian.jira.get_provider_info" ]; + version = "3.1.2"; }; + celery = { deps = [ - "aiofiles" - "asgiref" - "cryptography" + "celery" "flower" - "google-re2" - "kubernetes" - "kubernetes-asyncio" ]; - imports = [ ]; + imports = [ + "airflow.providers.celery" + "airflow.providers.celery.get_provider_info" + ]; + version = "3.12.3"; }; + cloudant = { deps = [ ]; - imports = [ "airflow.providers.cloudant.hooks.cloudant" ]; + imports = [ + "airflow.providers.cloudant" + "airflow.providers.cloudant.get_provider_info" + ]; + version = "4.2.2"; }; + cncf_kubernetes = { deps = [ "aiofiles" "asgiref" "cryptography" - "google-re2" "kubernetes" "kubernetes-asyncio" + "urllib3" ]; imports = [ - "airflow.providers.cncf.kubernetes.hooks.kubernetes" - "airflow.providers.cncf.kubernetes.operators.custom_object_launcher" - "airflow.providers.cncf.kubernetes.operators.job" - "airflow.providers.cncf.kubernetes.operators.pod" - "airflow.providers.cncf.kubernetes.operators.resource" - "airflow.providers.cncf.kubernetes.operators.spark_kubernetes" + "airflow.providers.cncf.kubernetes" + "airflow.providers.cncf.kubernetes.get_provider_info" ]; + version = "10.8.0"; }; + cohere = { deps = [ "cohere" ]; imports = [ - "airflow.providers.cohere.hooks.cohere" - "airflow.providers.cohere.operators.embedding" + "airflow.providers.cohere" + "airflow.providers.cohere.get_provider_info" ]; + version = "1.5.3"; }; + common_compat = { deps = [ ]; - imports = [ ]; + imports = [ + "airflow.providers.common.compat" + "airflow.providers.common.compat.get_provider_info" + ]; + version = "1.7.4"; }; + common_io = { - deps = [ "attrs" ]; - imports = [ "airflow.providers.common.io.operators.file_transfer" ]; + deps = [ ]; + imports = [ + "airflow.providers.common.io" + "airflow.providers.common.io.get_provider_info" + ]; + version = "1.6.3"; }; + + common_messaging = { + deps = [ ]; + imports = [ + "airflow.providers.common.messaging" + "airflow.providers.common.messaging.get_provider_info" + ]; + version = "2.0.0"; + }; + common_sql = { deps = [ - "attrs" + "methodtools" "more-itertools" + "pandas" + "polars" "sqlparse" ]; imports = [ - "airflow.providers.common.sql.hooks.sql" - "airflow.providers.common.sql.operators.sql" + "airflow.providers.common.sql" + "airflow.providers.common.sql.get_provider_info" ]; + version = "1.28.1"; }; + databricks = { deps = [ "aiohttp" + "azure-identity" + "databricks-sdk" "databricks-sql-connector" "mergedeep" "pandas" @@ -711,141 +342,156 @@ "requests" ]; imports = [ - "airflow.providers.databricks.hooks.databricks" - "airflow.providers.databricks.hooks.databricks_base" - "airflow.providers.databricks.hooks.databricks_sql" - "airflow.providers.databricks.operators.databricks" - "airflow.providers.databricks.operators.databricks_repos" - "airflow.providers.databricks.operators.databricks_sql" - "airflow.providers.databricks.operators.databricks_workflow" + "airflow.providers.databricks" + "airflow.providers.databricks.get_provider_info" ]; + version = "7.7.2"; }; + datadog = { deps = [ "datadog" ]; - imports = [ "airflow.providers.datadog.hooks.datadog" ]; + imports = [ + "airflow.providers.datadog" + "airflow.providers.datadog.get_provider_info" + ]; + version = "3.9.2"; }; + dbt_cloud = { deps = [ "aiohttp" "asgiref" - "attrs" - "requests" - "requests-toolbelt" ]; imports = [ - "airflow.providers.dbt.cloud.hooks.dbt" - "airflow.providers.dbt.cloud.operators.dbt" + "airflow.providers.dbt.cloud" + "airflow.providers.dbt.cloud.get_provider_info" ]; + version = "4.4.3"; }; + dingding = { - deps = [ - "aiohttp" - "asgiref" - "requests" - "requests-toolbelt" - ]; + deps = [ ]; imports = [ - "airflow.providers.dingding.hooks.dingding" - "airflow.providers.dingding.operators.dingding" + "airflow.providers.dingding" + "airflow.providers.dingding.get_provider_info" ]; + version = "3.8.2"; }; + discord = { - deps = [ - "aiohttp" - "asgiref" - "requests" - "requests-toolbelt" - ]; + deps = [ ]; imports = [ - "airflow.providers.discord.hooks.discord_webhook" - "airflow.providers.discord.operators.discord_webhook" + "airflow.providers.discord" + "airflow.providers.discord.get_provider_info" ]; + version = "3.10.2"; }; + docker = { deps = [ "docker" "python-dotenv" ]; imports = [ - "airflow.providers.docker.hooks.docker" - "airflow.providers.docker.operators.docker" - "airflow.providers.docker.operators.docker_swarm" + "airflow.providers.docker" + "airflow.providers.docker.get_provider_info" ]; + version = "4.4.2"; }; + + edge3 = { + deps = [ + "pydantic" + "retryhttp" + ]; + imports = [ + "airflow.providers.edge3" + "airflow.providers.edge3.get_provider_info" + ]; + version = "1.2.0"; + }; + elasticsearch = { deps = [ "elasticsearch" ]; - imports = [ "airflow.providers.elasticsearch.hooks.elasticsearch" ]; + imports = [ + "airflow.providers.elasticsearch" + "airflow.providers.elasticsearch.get_provider_info" + ]; + version = "6.3.2"; }; + exasol = { deps = [ "pandas" ]; imports = [ - "airflow.providers.exasol.hooks.exasol" - "airflow.providers.exasol.operators.exasol" + "airflow.providers.exasol" + "airflow.providers.exasol.get_provider_info" ]; + version = "4.8.2"; }; + fab = { deps = [ + "blinker" + "connexion" "flask" "flask-appbuilder" + "flask-limiter" "flask-login" - "google-re2" + "flask-session" + "flask-wtf" "jmespath" + "kerberos" + "werkzeug" + "wtforms" ]; - imports = [ ]; + imports = [ + "airflow.providers.fab" + "airflow.providers.fab.get_provider_info" + ]; + version = "2.4.2"; }; + facebook = { deps = [ ]; - imports = [ "airflow.providers.facebook.ads.hooks.ads" ]; - }; - ftp = { - deps = [ "attrs" ]; imports = [ - "airflow.providers.ftp.hooks.ftp" - "airflow.providers.ftp.operators.ftp" + "airflow.providers.facebook" + "airflow.providers.facebook.get_provider_info" ]; + version = "3.8.2"; }; + + ftp = { + deps = [ ]; + imports = [ + "airflow.providers.ftp" + "airflow.providers.ftp.get_provider_info" + ]; + version = "3.13.2"; + }; + + git = { + deps = [ "gitpython" ]; + imports = [ + "airflow.providers.git" + "airflow.providers.git.get_provider_info" + ]; + version = "0.0.7"; + }; + github = { deps = [ "pygithub" ]; imports = [ - "airflow.providers.github.hooks.github" - "airflow.providers.github.operators.github" + "airflow.providers.github" + "airflow.providers.github.get_provider_info" ]; + version = "2.9.2"; }; + google = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" "apache-beam" "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" "dill" - "dnspython" "gcsfs" "google-api-core" "google-api-python-client" @@ -854,6 +500,7 @@ "google-cloud-automl" "google-cloud-bigquery" "google-cloud-bigquery-datatransfer" + "google-cloud-bigquery-storage" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" @@ -866,6 +513,7 @@ "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" + "google-cloud-run" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" @@ -876,172 +524,26 @@ "google-cloud-videointelligence" "google-cloud-vision" "google-cloud-workflows" - "google-re2" "grpcio-gcp" "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" + "immutabledict" "pandas" - "paramiko" + "plyvel" "proto-plus" - "psycopg2" "pyarrow" - "pyathena" - "pymongo" - "pymssql" "pyopenssl" - "pysftp" "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" + "ray" "tenacity" - "thrift" - "vertica-python" + "types-protobuf" ]; imports = [ - "airflow.providers.google.ads.hooks.ads" - "airflow.providers.google.ads.operators.ads" - "airflow.providers.google.cloud.hooks.automl" - "airflow.providers.google.cloud.hooks.bigquery" - "airflow.providers.google.cloud.hooks.bigquery_dts" - "airflow.providers.google.cloud.hooks.bigtable" - "airflow.providers.google.cloud.hooks.cloud_batch" - "airflow.providers.google.cloud.hooks.cloud_build" - "airflow.providers.google.cloud.hooks.cloud_composer" - "airflow.providers.google.cloud.hooks.cloud_memorystore" - "airflow.providers.google.cloud.hooks.cloud_run" - "airflow.providers.google.cloud.hooks.cloud_sql" - "airflow.providers.google.cloud.hooks.cloud_storage_transfer_service" - "airflow.providers.google.cloud.hooks.compute" - "airflow.providers.google.cloud.hooks.compute_ssh" - "airflow.providers.google.cloud.hooks.datacatalog" - "airflow.providers.google.cloud.hooks.dataflow" - "airflow.providers.google.cloud.hooks.dataform" - "airflow.providers.google.cloud.hooks.datafusion" - "airflow.providers.google.cloud.hooks.datapipeline" - "airflow.providers.google.cloud.hooks.dataplex" - "airflow.providers.google.cloud.hooks.dataprep" - "airflow.providers.google.cloud.hooks.dataproc" - "airflow.providers.google.cloud.hooks.dataproc_metastore" - "airflow.providers.google.cloud.hooks.datastore" - "airflow.providers.google.cloud.hooks.dlp" - "airflow.providers.google.cloud.hooks.functions" - "airflow.providers.google.cloud.hooks.gcs" - "airflow.providers.google.cloud.hooks.gdm" - "airflow.providers.google.cloud.hooks.kms" - "airflow.providers.google.cloud.hooks.kubernetes_engine" - "airflow.providers.google.cloud.hooks.life_sciences" - "airflow.providers.google.cloud.hooks.looker" - "airflow.providers.google.cloud.hooks.mlengine" - "airflow.providers.google.cloud.hooks.natural_language" - "airflow.providers.google.cloud.hooks.os_login" - "airflow.providers.google.cloud.hooks.pubsub" - "airflow.providers.google.cloud.hooks.secret_manager" - "airflow.providers.google.cloud.hooks.spanner" - "airflow.providers.google.cloud.hooks.speech_to_text" - "airflow.providers.google.cloud.hooks.stackdriver" - "airflow.providers.google.cloud.hooks.tasks" - "airflow.providers.google.cloud.hooks.text_to_speech" - "airflow.providers.google.cloud.hooks.translate" - "airflow.providers.google.cloud.hooks.vertex_ai.auto_ml" - "airflow.providers.google.cloud.hooks.vertex_ai.batch_prediction_job" - "airflow.providers.google.cloud.hooks.vertex_ai.custom_job" - "airflow.providers.google.cloud.hooks.vertex_ai.dataset" - "airflow.providers.google.cloud.hooks.vertex_ai.endpoint_service" - "airflow.providers.google.cloud.hooks.vertex_ai.generative_model" - "airflow.providers.google.cloud.hooks.vertex_ai.hyperparameter_tuning_job" - "airflow.providers.google.cloud.hooks.vertex_ai.model_service" - "airflow.providers.google.cloud.hooks.vertex_ai.pipeline_job" - "airflow.providers.google.cloud.hooks.vertex_ai.prediction_service" - "airflow.providers.google.cloud.hooks.video_intelligence" - "airflow.providers.google.cloud.hooks.vision" - "airflow.providers.google.cloud.hooks.workflows" - "airflow.providers.google.cloud.operators.automl" - "airflow.providers.google.cloud.operators.bigquery" - "airflow.providers.google.cloud.operators.bigquery_dts" - "airflow.providers.google.cloud.operators.bigtable" - "airflow.providers.google.cloud.operators.cloud_base" - "airflow.providers.google.cloud.operators.cloud_batch" - "airflow.providers.google.cloud.operators.cloud_build" - "airflow.providers.google.cloud.operators.cloud_composer" - "airflow.providers.google.cloud.operators.cloud_memorystore" - "airflow.providers.google.cloud.operators.cloud_run" - "airflow.providers.google.cloud.operators.cloud_sql" - "airflow.providers.google.cloud.operators.cloud_storage_transfer_service" - "airflow.providers.google.cloud.operators.compute" - "airflow.providers.google.cloud.operators.datacatalog" - "airflow.providers.google.cloud.operators.dataflow" - "airflow.providers.google.cloud.operators.dataform" - "airflow.providers.google.cloud.operators.datafusion" - "airflow.providers.google.cloud.operators.datapipeline" - "airflow.providers.google.cloud.operators.dataplex" - "airflow.providers.google.cloud.operators.dataprep" - "airflow.providers.google.cloud.operators.dataproc" - "airflow.providers.google.cloud.operators.dataproc_metastore" - "airflow.providers.google.cloud.operators.datastore" - "airflow.providers.google.cloud.operators.dlp" - "airflow.providers.google.cloud.operators.functions" - "airflow.providers.google.cloud.operators.gcs" - "airflow.providers.google.cloud.operators.kubernetes_engine" - "airflow.providers.google.cloud.operators.life_sciences" - "airflow.providers.google.cloud.operators.looker" - "airflow.providers.google.cloud.operators.mlengine" - "airflow.providers.google.cloud.operators.natural_language" - "airflow.providers.google.cloud.operators.pubsub" - "airflow.providers.google.cloud.operators.spanner" - "airflow.providers.google.cloud.operators.speech_to_text" - "airflow.providers.google.cloud.operators.stackdriver" - "airflow.providers.google.cloud.operators.tasks" - "airflow.providers.google.cloud.operators.text_to_speech" - "airflow.providers.google.cloud.operators.translate" - "airflow.providers.google.cloud.operators.translate_speech" - "airflow.providers.google.cloud.operators.translate_speech" - "airflow.providers.google.cloud.operators.vertex_ai.auto_ml" - "airflow.providers.google.cloud.operators.vertex_ai.batch_prediction_job" - "airflow.providers.google.cloud.operators.vertex_ai.custom_job" - "airflow.providers.google.cloud.operators.vertex_ai.dataset" - "airflow.providers.google.cloud.operators.vertex_ai.endpoint_service" - "airflow.providers.google.cloud.operators.vertex_ai.generative_model" - "airflow.providers.google.cloud.operators.vertex_ai.hyperparameter_tuning_job" - "airflow.providers.google.cloud.operators.vertex_ai.model_service" - "airflow.providers.google.cloud.operators.vertex_ai.pipeline_job" - "airflow.providers.google.cloud.operators.video_intelligence" - "airflow.providers.google.cloud.operators.vision" - "airflow.providers.google.cloud.operators.workflows" - "airflow.providers.google.common.hooks.base_google" - "airflow.providers.google.common.hooks.discovery_api" - "airflow.providers.google.firebase.hooks.firestore" - "airflow.providers.google.firebase.operators.firestore" - "airflow.providers.google.leveldb.hooks.leveldb" - "airflow.providers.google.leveldb.operators.leveldb" - "airflow.providers.google.marketing_platform.hooks.analytics" - "airflow.providers.google.marketing_platform.hooks.analytics_admin" - "airflow.providers.google.marketing_platform.hooks.campaign_manager" - "airflow.providers.google.marketing_platform.hooks.display_video" - "airflow.providers.google.marketing_platform.hooks.search_ads" - "airflow.providers.google.marketing_platform.operators.analytics" - "airflow.providers.google.marketing_platform.operators.analytics_admin" - "airflow.providers.google.marketing_platform.operators.campaign_manager" - "airflow.providers.google.marketing_platform.operators.display_video" - "airflow.providers.google.marketing_platform.operators.search_ads" - "airflow.providers.google.suite.hooks.calendar" - "airflow.providers.google.suite.hooks.drive" - "airflow.providers.google.suite.hooks.sheets" - "airflow.providers.google.suite.operators.sheets" + "airflow.providers.google" + "airflow.providers.google.get_provider_info" ]; + version = "17.2.0"; }; + grpc = { deps = [ "google-auth" @@ -1049,112 +551,24 @@ "grpcio" ]; imports = [ - "airflow.providers.grpc.hooks.grpc" - "airflow.providers.grpc.operators.grpc" + "airflow.providers.grpc" + "airflow.providers.grpc.get_provider_info" ]; + version = "3.8.2"; }; + hashicorp = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" "hvac" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" ]; - imports = [ "airflow.providers.hashicorp.hooks.vault" ]; + imports = [ + "airflow.providers.hashicorp" + "airflow.providers.hashicorp.get_provider_info" + ]; + version = "4.3.2"; }; + http = { deps = [ "aiohttp" @@ -1163,48 +577,64 @@ "requests-toolbelt" ]; imports = [ - "airflow.providers.http.hooks.http" - "airflow.providers.http.operators.http" + "airflow.providers.http" + "airflow.providers.http.get_provider_info" ]; + version = "5.3.4"; }; + imap = { deps = [ ]; - imports = [ "airflow.providers.imap.hooks.imap" ]; + imports = [ + "airflow.providers.imap" + "airflow.providers.imap.get_provider_info" + ]; + version = "3.9.2"; }; + influxdb = { deps = [ "influxdb-client" "requests" ]; imports = [ - "airflow.providers.influxdb.hooks.influxdb" - "airflow.providers.influxdb.operators.influxdb" + "airflow.providers.influxdb" + "airflow.providers.influxdb.get_provider_info" ]; + version = "2.9.3"; }; + jdbc = { deps = [ "jaydebeapi" ]; imports = [ - "airflow.providers.jdbc.hooks.jdbc" - "airflow.providers.jdbc.operators.jdbc" + "airflow.providers.jdbc" + "airflow.providers.jdbc.get_provider_info" ]; + version = "5.2.3"; }; + jenkins = { deps = [ "python-jenkins" ]; imports = [ - "airflow.providers.jenkins.hooks.jenkins" - "airflow.providers.jenkins.operators.jenkins_job_trigger" + "airflow.providers.jenkins" + "airflow.providers.jenkins.get_provider_info" ]; + version = "4.1.2"; }; + + keycloak = { + deps = [ "python-keycloak" ]; + imports = [ + "airflow.providers.keycloak" + "airflow.providers.keycloak.get_provider_info" + ]; + version = "0.1.0"; + }; + microsoft_azure = { deps = [ "adal" "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" "azure-batch" "azure-cosmos" "azure-datalake-store" @@ -1224,1051 +654,407 @@ "azure-storage-file-share" "azure-synapse-artifacts" "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" "microsoft-kiota-abstractions" + "microsoft-kiota-authentication-azure" + "microsoft-kiota-http" + "microsoft-kiota-serialization-json" + "microsoft-kiota-serialization-text" + "msal-extensions" "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" ]; imports = [ - "airflow.providers.microsoft.azure.hooks.adx" - "airflow.providers.microsoft.azure.hooks.asb" - "airflow.providers.microsoft.azure.hooks.base_azure" - "airflow.providers.microsoft.azure.hooks.batch" - "airflow.providers.microsoft.azure.hooks.container_instance" - "airflow.providers.microsoft.azure.hooks.container_registry" - "airflow.providers.microsoft.azure.hooks.container_volume" - "airflow.providers.microsoft.azure.hooks.cosmos" - "airflow.providers.microsoft.azure.hooks.data_factory" - "airflow.providers.microsoft.azure.hooks.data_lake" - "airflow.providers.microsoft.azure.hooks.data_lake" - "airflow.providers.microsoft.azure.hooks.fileshare" - "airflow.providers.microsoft.azure.hooks.msgraph" - "airflow.providers.microsoft.azure.hooks.synapse" - "airflow.providers.microsoft.azure.hooks.wasb" - "airflow.providers.microsoft.azure.operators.adls" - "airflow.providers.microsoft.azure.operators.adx" - "airflow.providers.microsoft.azure.operators.asb" - "airflow.providers.microsoft.azure.operators.batch" - "airflow.providers.microsoft.azure.operators.container_instances" - "airflow.providers.microsoft.azure.operators.cosmos" - "airflow.providers.microsoft.azure.operators.data_factory" - "airflow.providers.microsoft.azure.operators.msgraph" - "airflow.providers.microsoft.azure.operators.synapse" - "airflow.providers.microsoft.azure.operators.wasb_delete_blob" + "airflow.providers.microsoft.azure" + "airflow.providers.microsoft.azure.get_provider_info" ]; + version = "12.7.0"; }; + microsoft_mssql = { - deps = [ "pymssql" ]; - imports = [ - "airflow.providers.microsoft.mssql.hooks.mssql" - "airflow.providers.microsoft.mssql.operators.mssql" + deps = [ + "methodtools" + "pymssql" ]; + imports = [ + "airflow.providers.microsoft.mssql" + "airflow.providers.microsoft.mssql.get_provider_info" + ]; + version = "4.3.2"; }; + microsoft_psrp = { deps = [ "pypsrp" ]; imports = [ - "airflow.providers.microsoft.psrp.hooks.psrp" - "airflow.providers.microsoft.psrp.operators.psrp" + "airflow.providers.microsoft.psrp" + "airflow.providers.microsoft.psrp.get_provider_info" ]; + version = "3.1.2"; }; + microsoft_winrm = { deps = [ "pywinrm" ]; imports = [ - "airflow.providers.microsoft.winrm.hooks.winrm" - "airflow.providers.microsoft.winrm.operators.winrm" + "airflow.providers.microsoft.winrm" + "airflow.providers.microsoft.winrm.get_provider_info" ]; + version = "3.11.0"; }; + mongo = { deps = [ "dnspython" "pymongo" ]; - imports = [ "airflow.providers.mongo.hooks.mongo" ]; + imports = [ + "airflow.providers.mongo" + "airflow.providers.mongo.get_provider_info" + ]; + version = "5.2.2"; }; + mysql = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" + "aiomysql" "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" ]; imports = [ - "airflow.providers.mysql.hooks.mysql" - "airflow.providers.mysql.operators.mysql" + "airflow.providers.mysql" + "airflow.providers.mysql.get_provider_info" ]; + version = "6.3.4"; }; + neo4j = { deps = [ "neo4j" ]; imports = [ - "airflow.providers.neo4j.hooks.neo4j" - "airflow.providers.neo4j.operators.neo4j" + "airflow.providers.neo4j" + "airflow.providers.neo4j.get_provider_info" ]; + version = "3.10.1"; }; + odbc = { deps = [ "pyodbc" ]; - imports = [ "airflow.providers.odbc.hooks.odbc" ]; - }; - openai = { - deps = [ ]; imports = [ - "airflow.providers.openai.hooks.openai" - "airflow.providers.openai.operators.openai" + "airflow.providers.odbc" + "airflow.providers.odbc.get_provider_info" ]; + version = "4.10.2"; }; + + openai = { + deps = [ "openai" ]; + imports = [ + "airflow.providers.openai" + "airflow.providers.openai.get_provider_info" + ]; + version = "1.6.2"; + }; + openfaas = { deps = [ ]; - imports = [ "airflow.providers.openfaas.hooks.openfaas" ]; + imports = [ + "airflow.providers.openfaas" + "airflow.providers.openfaas.get_provider_info" + ]; + version = "3.8.2"; }; + openlineage = { deps = [ "attrs" ]; - imports = [ ]; + imports = [ + "airflow.providers.openlineage" + "airflow.providers.openlineage.get_provider_info" + ]; + version = "2.7.0"; }; + opensearch = { deps = [ "opensearch-py" ]; imports = [ - "airflow.providers.opensearch.hooks.opensearch" - "airflow.providers.opensearch.operators.opensearch" + "airflow.providers.opensearch" + "airflow.providers.opensearch.get_provider_info" ]; + version = "1.7.2"; }; + opsgenie = { deps = [ ]; imports = [ - "airflow.providers.opsgenie.hooks.opsgenie" - "airflow.providers.opsgenie.operators.opsgenie" + "airflow.providers.opsgenie" + "airflow.providers.opsgenie.get_provider_info" ]; + version = "5.9.2"; }; + oracle = { - deps = [ "oracledb" ]; - imports = [ - "airflow.providers.oracle.hooks.oracle" - "airflow.providers.oracle.operators.oracle" + deps = [ + "numpy" + "oracledb" ]; + imports = [ + "airflow.providers.oracle" + "airflow.providers.oracle.get_provider_info" + ]; + version = "4.2.0"; }; + pagerduty = { deps = [ ]; imports = [ - "airflow.providers.pagerduty.hooks.pagerduty" - "airflow.providers.pagerduty.hooks.pagerduty_events" + "airflow.providers.pagerduty" + "airflow.providers.pagerduty.get_provider_info" ]; + version = "5.0.2"; }; + papermill = { deps = [ "ipykernel" + "nbconvert" "pandas" + "papermill" ]; imports = [ - "airflow.providers.papermill.hooks.kernel" - "airflow.providers.papermill.operators.papermill" + "airflow.providers.papermill" + "airflow.providers.papermill.get_provider_info" ]; + version = "3.11.2"; }; + pgvector = { - deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" - ]; + deps = [ "pgvector" ]; imports = [ - "airflow.providers.pgvector.hooks.pgvector" - "airflow.providers.pgvector.operators.pgvector" + "airflow.providers.pgvector" + "airflow.providers.pgvector.get_provider_info" ]; + version = "1.5.2"; }; + pinecone = { - deps = [ "pinecone-client" ]; + deps = [ ]; imports = [ - "airflow.providers.pinecone.hooks.pinecone" - "airflow.providers.pinecone.operators.pinecone" + "airflow.providers.pinecone" + "airflow.providers.pinecone.get_provider_info" ]; + version = "2.3.4"; }; + postgres = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" + "asyncpg" "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" + "polars" + "psycopg" + "psycopg2-binary" ]; imports = [ - "airflow.providers.postgres.hooks.postgres" - "airflow.providers.postgres.operators.postgres" + "airflow.providers.postgres" + "airflow.providers.postgres.get_provider_info" ]; + version = "6.3.0"; }; + presto = { deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" + "presto-python-client" ]; - imports = [ "airflow.providers.presto.hooks.presto" ]; + imports = [ + "airflow.providers.presto" + "airflow.providers.presto.get_provider_info" + ]; + version = "5.9.2"; }; + qdrant = { deps = [ "qdrant-client" ]; imports = [ - "airflow.providers.qdrant.hooks.qdrant" - "airflow.providers.qdrant.operators.qdrant" + "airflow.providers.qdrant" + "airflow.providers.qdrant.get_provider_info" ]; + version = "1.4.3"; }; + redis = { deps = [ "redis" ]; imports = [ - "airflow.providers.redis.hooks.redis" - "airflow.providers.redis.operators.redis_publish" + "airflow.providers.redis" + "airflow.providers.redis.get_provider_info" ]; + version = "4.3.0"; }; + salesforce = { deps = [ "pandas" "simple-salesforce" ]; imports = [ - "airflow.providers.salesforce.hooks.salesforce" - "airflow.providers.salesforce.operators.bulk" - "airflow.providers.salesforce.operators.salesforce_apex_rest" + "airflow.providers.salesforce" + "airflow.providers.salesforce.get_provider_info" ]; + version = "5.11.3"; }; + samba = { - deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" + deps = [ "smbprotocol" ]; + imports = [ + "airflow.providers.samba" + "airflow.providers.samba.get_provider_info" ]; - imports = [ "airflow.providers.samba.hooks.samba" ]; + version = "4.11.0"; }; + segment = { deps = [ ]; imports = [ - "airflow.providers.segment.hooks.segment" - "airflow.providers.segment.operators.segment_track_event" + "airflow.providers.segment" + "airflow.providers.segment.get_provider_info" ]; + version = "3.8.2"; }; + sendgrid = { - deps = [ "sendgrid" ]; - imports = [ ]; + deps = [ + "sendgrid" + "werkzeug" + ]; + imports = [ + "airflow.providers.sendgrid" + "airflow.providers.sendgrid.get_provider_info" + ]; + version = "4.1.3"; }; + sftp = { deps = [ "asyncssh" - "attrs" "paramiko" "pysftp" - "sshtunnel" ]; imports = [ - "airflow.providers.sftp.hooks.sftp" - "airflow.providers.sftp.operators.sftp" + "airflow.providers.sftp" + "airflow.providers.sftp.get_provider_info" ]; + version = "5.4.0"; }; + singularity = { deps = [ "spython" ]; - imports = [ "airflow.providers.singularity.operators.singularity" ]; + imports = [ + "airflow.providers.singularity" + "airflow.providers.singularity.get_provider_info" + ]; + version = "3.8.2"; }; + slack = { deps = [ "slack-sdk" ]; imports = [ - "airflow.providers.slack.hooks.slack" - "airflow.providers.slack.hooks.slack_webhook" - "airflow.providers.slack.operators.slack" - "airflow.providers.slack.operators.slack_webhook" + "airflow.providers.slack" + "airflow.providers.slack.get_provider_info" ]; + version = "9.2.0"; }; + smtp = { deps = [ ]; imports = [ - "airflow.providers.smtp.hooks.smtp" - "airflow.providers.smtp.operators.smtp" + "airflow.providers.smtp" + "airflow.providers.smtp.get_provider_info" ]; + version = "2.3.1"; }; + snowflake = { deps = [ - "attrs" "pandas" "pyarrow" "snowflake-connector-python" "snowflake-sqlalchemy" ]; imports = [ - "airflow.providers.snowflake.hooks.snowflake" - "airflow.providers.snowflake.hooks.snowflake_sql_api" - "airflow.providers.snowflake.operators.snowflake" + "airflow.providers.snowflake" + "airflow.providers.snowflake.get_provider_info" ]; + version = "6.5.3"; }; + sqlite = { deps = [ ]; imports = [ - "airflow.providers.sqlite.hooks.sqlite" - "airflow.providers.sqlite.operators.sqlite" + "airflow.providers.sqlite" + "airflow.providers.sqlite.get_provider_info" ]; + version = "4.1.2"; }; + ssh = { deps = [ "paramiko" "sshtunnel" ]; imports = [ - "airflow.providers.ssh.hooks.ssh" - "airflow.providers.ssh.operators.ssh" + "airflow.providers.ssh" + "airflow.providers.ssh.get_provider_info" ]; + version = "4.1.3"; }; + + standard = { + deps = [ ]; + imports = [ + "airflow.providers.standard" + "airflow.providers.standard.get_provider_info" + ]; + version = "1.9.0"; + }; + tableau = { deps = [ "tableauserverclient" ]; imports = [ - "airflow.providers.tableau.hooks.tableau" - "airflow.providers.tableau.operators.tableau" + "airflow.providers.tableau" + "airflow.providers.tableau.get_provider_info" ]; + version = "5.2.0"; }; - tabular = { - deps = [ ]; - imports = [ ]; - }; + telegram = { deps = [ "python-telegram-bot" ]; imports = [ - "airflow.providers.telegram.hooks.telegram" - "airflow.providers.telegram.operators.telegram" + "airflow.providers.telegram" + "airflow.providers.telegram.get_provider_info" ]; + version = "4.8.2"; }; + teradata = { - deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" - ]; + deps = [ ]; imports = [ - "airflow.providers.teradata.hooks.teradata" - "airflow.providers.teradata.operators.teradata" - "airflow.providers.teradata.operators.teradata_compute_cluster" + "airflow.providers.teradata" + "airflow.providers.teradata.get_provider_info" ]; + version = "3.2.1"; }; + trino = { - deps = [ - "adal" - "adlfs" - "aiofiles" - "aiohttp" - "apache-beam" - "asgiref" - "asyncssh" - "attrs" - "azure-batch" - "azure-cosmos" - "azure-datalake-store" - "azure-identity" - "azure-keyvault-secrets" - "azure-kusto-data" - "azure-mgmt-containerinstance" - "azure-mgmt-containerregistry" - "azure-mgmt-cosmosdb" - "azure-mgmt-datafactory" - "azure-mgmt-datalake-store" - "azure-mgmt-resource" - "azure-mgmt-storage" - "azure-servicebus" - "azure-storage-blob" - "azure-storage-file-datalake" - "azure-storage-file-share" - "azure-synapse-artifacts" - "azure-synapse-spark" - "boto3" - "botocore" - "cassandra-driver" - "cryptography" - "dill" - "dnspython" - "gcsfs" - "google-api-core" - "google-api-python-client" - "google-auth" - "google-auth-httplib2" - "google-cloud-automl" - "google-cloud-bigquery" - "google-cloud-bigquery-datatransfer" - "google-cloud-bigtable" - "google-cloud-compute" - "google-cloud-container" - "google-cloud-datacatalog" - "google-cloud-dataproc" - "google-cloud-dlp" - "google-cloud-kms" - "google-cloud-language" - "google-cloud-logging" - "google-cloud-monitoring" - "google-cloud-pubsub" - "google-cloud-redis" - "google-cloud-secret-manager" - "google-cloud-spanner" - "google-cloud-speech" - "google-cloud-storage" - "google-cloud-tasks" - "google-cloud-texttospeech" - "google-cloud-translate" - "google-cloud-videointelligence" - "google-cloud-vision" - "google-cloud-workflows" - "google-re2" - "grpcio-gcp" - "httpx" - "inflection" - "jmespath" - "json-merge-patch" - "jsonpath-ng" - "kubernetes" - "kubernetes-asyncio" - "microsoft-kiota-abstractions" - "msgraph-core" - "mysqlclient" - "oracledb" - "pandas" - "paramiko" - "proto-plus" - "psycopg2" - "pyarrow" - "pyathena" - "pymongo" - "pymssql" - "pyopenssl" - "pysftp" - "python-slugify" - "redshift-connector" - "requests" - "requests-toolbelt" - "simple-salesforce" - "smbprotocol" - "sshtunnel" - "tenacity" - "thrift" - "vertica-python" - ]; + deps = [ "pandas" ]; imports = [ - "airflow.providers.trino.hooks.trino" - "airflow.providers.trino.operators.trino" + "airflow.providers.trino" + "airflow.providers.trino.get_provider_info" ]; + version = "6.3.3"; }; + vertica = { deps = [ "vertica-python" ]; imports = [ - "airflow.providers.vertica.hooks.vertica" - "airflow.providers.vertica.operators.vertica" + "airflow.providers.vertica" + "airflow.providers.vertica.get_provider_info" ]; + version = "4.1.2"; }; + weaviate = { deps = [ "httpx" @@ -2276,33 +1062,37 @@ "weaviate-client" ]; imports = [ - "airflow.providers.weaviate.hooks.weaviate" - "airflow.providers.weaviate.operators.weaviate" + "airflow.providers.weaviate" + "airflow.providers.weaviate.get_provider_info" ]; + version = "3.2.3"; }; + yandex = { deps = [ ]; imports = [ - "airflow.providers.yandex.hooks.dataproc" - "airflow.providers.yandex.hooks.yandex" - "airflow.providers.yandex.hooks.yq" - "airflow.providers.yandex.operators.dataproc" - "airflow.providers.yandex.operators.yq" + "airflow.providers.yandex" + "airflow.providers.yandex.get_provider_info" ]; + version = "4.2.0"; }; + ydb = { deps = [ ]; imports = [ - "airflow.providers.ydb.hooks._vendor.dbapi.connection" - "airflow.providers.ydb.hooks._vendor.dbapi.constants" - "airflow.providers.ydb.hooks._vendor.dbapi.cursor" - "airflow.providers.ydb.hooks._vendor.dbapi.errors" - "airflow.providers.ydb.hooks.ydb" - "airflow.providers.ydb.operators.ydb" + "airflow.providers.ydb" + "airflow.providers.ydb.get_provider_info" ]; + version = "2.2.2"; }; + zendesk = { deps = [ ]; - imports = [ "airflow.providers.zendesk.hooks.zendesk" ]; + imports = [ + "airflow.providers.zendesk" + "airflow.providers.zendesk.get_provider_info" + ]; + version = "4.10.2"; }; + } diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index bce488ed44ec..d08ed53b8079 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -2,115 +2,156 @@ lib, stdenv, fetchFromGitHub, - writeScript, + writableTmpDirAsHomeHook, # javascript - fetchYarnDeps, + fetchPnpmDeps, nodejs, - webpack-cli, - yarnBuildHook, - yarnConfigHook, + pnpm, + pnpmConfigHook, # python + a2wsgi, + aiosqlite, alembic, argcomplete, + asgiref, + attrs, + babel, buildPythonPackage, + cadwyn, colorlog, - configupdater, - connexion, cron-descriptor, croniter, cryptography, + deprecated, dill, - flask-caching, - flask-login, - flask-session, + fastapi, + flit-core, fsspec, gitdb, gitpython, - gunicorn, + greenback, hatchling, + httpx, + importlib-metadata, + itsdangerous, + jinja2, + jsonschema, lazy-object-proxy, + libcst, linkify-it-py, lockfile, - marshmallow-oneofschema, - mdit-py-plugins, methodtools, + msgspec, + natsort, opentelemetry-api, opentelemetry-exporter-otlp, packaging, - pandas, pathspec, pendulum, pluggy, psutil, - pytest-asyncio, - pytestCheckHook, + pydantic, + pygments, + pygtrie, + pyjwt, python, python-daemon, - python-nvd3, + python-dateutil, python-slugify, + pyyaml, + requests, + retryhttp, + rich, rich-argparse, + rich-click, setproctitle, smmap, sqlalchemy, sqlalchemy-jsonfield, + sqlalchemy-utils, + starlette, + structlog, + svcs, tabulate, tenacity, termcolor, tomli, trove-classifiers, + types-requests, + typing-extensions, universal-pathlib, + uuid6, + uvicorn, - # Extra airflow providers to enable - enabledProviders ? [ ], + enabledProviders, }: let - version = "2.10.5"; + version = "3.1.6"; - airflow-src = fetchFromGitHub { + src = fetchFromGitHub { owner = "apache"; repo = "airflow"; tag = version; - # Download using the git protocol rather than using tarballs, because the - # GitHub archive tarballs don't appear to include tests - forceFetchGit = true; - hash = "sha256-q5/CM+puXE31+15F3yZmcrR74LrqHppdCDUqjLQXPfk="; + hash = "sha256-wC6C0jhCA76/+KhBQbe3WeSGqR6FwaudCT5xPV39Z6c="; }; - # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. - # This replicates this shell script, fixing bugs in yarn.lock and package.json - - airflow-frontend = stdenv.mkDerivation rec { - name = "airflow-frontend"; - - src = "${airflow-src}/airflow/www"; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-hKgtMH4c8sPRDLPLVn+H8rmwc2Q6ei6U4er6fGuFn4I="; - }; + airflowUi = stdenv.mkDerivation rec { + pname = "airflow-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook nodejs - webpack-cli + pnpm + pnpmConfigHook ]; - # The webpack license plugin tries to create /3rd-party-licenses when given the - # original relative path - postPatch = '' - sed -i 's!../../../../3rd-party-licenses/LICENSES-ui.txt!/3rd-party-licenses/LICENSES-ui.txt!' webpack.config.js - ''; + pnpmDeps = fetchPnpmDeps { + pname = "airflow-ui"; + inherit sourceRoot src version; + fetcherVersion = 1; + hash = "sha256-UcEFQkDZ9Ye+VfyJ9rdZKe0wilTgO4dMsULABWfL2Co="; + }; - postBuild = '' - find package.json yarn.lock static/css static/js -type f | sort | xargs md5sum > static/dist/sum.md5 + buildPhase = '' + pnpm install + pnpm build ''; installPhase = '' - mkdir -p $out/static/ - cp -r static/dist $out/static + mkdir -p $out/share/airflow/ui + cp -r dist $out/share/airflow/ui/ + ''; + }; + + airflowSimpleAuthUi = stdenv.mkDerivation rec { + pname = "airflow-simple-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + + nativeBuildInputs = [ + nodejs + pnpm + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + pname = "simple-auth-manager-ui"; + inherit sourceRoot src version; + fetcherVersion = 1; + hash = "sha256-8nZdWnhERUkiaY8USyy/a/j+dMksjmEzCabSkysndSE="; + }; + + buildPhase = '' + pnpm install + pnpm build + ''; + + installPhase = '' + mkdir -p $out/share/airflow/simple-ui + cp -r dist $out/share/airflow/simple-ui/ ''; }; @@ -118,216 +159,231 @@ let "common_compat" "common_io" "common_sql" - "fab" - "ftp" - "http" - "imap" "smtp" - "sqlite" + "standard" ]; - # Import generated file with metadata for provider dependencies and imports. - # Enable additional providers using enabledProviders above. providers = import ./providers.nix; - getProviderPath = provider: lib.replaceStrings [ "_" ] [ "/" ] provider; - getProviderDeps = provider: map (dep: python.pkgs.${dep}) providers.${provider}.deps; - getProviderImports = provider: providers.${provider}.imports; - providerImports = lib.concatMap getProviderImports enabledProviders; buildProvider = provider: - let - providerPath = getProviderPath provider; - in - python.pkgs.buildPythonPackage { + buildPythonPackage { pname = "apache-airflow-providers-${provider}"; - version = "unstable"; # will be extracted in the build phase - pyproject = false; # providers packages don't have pyproject.toml nor setup.py + version = providers.${provider}.version; + pyproject = true; - src = airflow-src; + inherit src; + sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}"; - propagatedBuildInputs = getProviderDeps provider; - dependencies = [ packaging ]; + buildInputs = [ flit-core ]; - buildPhase = '' - # extract version from the provider's __init__.py file - if [ -f "airflow/providers/${providerPath}/__init__.py" ]; then - version=$(grep -oP "(?<=__version__ = ')[^']+" "airflow/providers/${providerPath}/__init__.py" || echo "0.0.0") - echo "Provider ${provider} version: $version" - else - echo "Error: __init__.py not found for provider ${provider} at path airflow/providers/${providerPath}" - exit 1 - fi - ''; + dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps; - installPhase = '' - # create directory structure - mkdir -p $out/${python.sitePackages}/airflow/providers + pythonRemoveDeps = [ + "apache-airflow" + ]; - # copy the provider directory - if [ -d "airflow/providers/${providerPath}" ]; then - mkdir -p $out/${python.sitePackages}/airflow/providers/$(dirname "${providerPath}") - cp -r airflow/providers/${providerPath} $out/${python.sitePackages}/airflow/providers/$(dirname "${providerPath}") - - # create parent __init__.py files - touch $out/${python.sitePackages}/airflow/__init__.py - touch $out/${python.sitePackages}/airflow/providers/__init__.py - - # create any needed intermediate __init__.py files for nested providers - providerDir=$(dirname "${providerPath}") - while [ "$providerDir" != "." ] && [ -n "$providerDir" ]; do - mkdir -p $out/${python.sitePackages}/airflow/providers/$providerDir - touch $out/${python.sitePackages}/airflow/providers/$providerDir/__init__.py - providerDir=$(dirname "$providerDir") - done - - # create egg-info for package discovery - mkdir -p $out/${python.sitePackages}/apache_airflow_providers_${provider}.egg-info - cat > $out/${python.sitePackages}/apache_airflow_providers_${provider}.egg-info/PKG-INFO < yarn.nix - - # update provider dependencies - ./update-providers.py - ''; + passthru.updateScript = ./update.sh; + passthru.airflowUi = airflowUi; + passthru.airflowSimpleAuthUi = airflowSimpleAuthUi; # Note on testing the web UI: # You can (manually) test the web UI as follows: @@ -341,12 +397,13 @@ buildPythonPackage rec { # triggering the 'example_bash_operator' DAG and see if it reports success. meta = { - description = "Programmatically author, schedule and monitor data pipelines"; + description = "Platform to programmatically author, schedule and monitor workflows"; homepage = "https://airflow.apache.org/"; changelog = "https://airflow.apache.org/docs/apache-airflow/${version}/release_notes.html"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ taranarmo ]; + mainProgram = "airflow"; }; } diff --git a/pkgs/by-name/ap/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py index 32e24018d653..01ee2bd49fe0 100755 --- a/pkgs/by-name/ap/apache-airflow/update-providers.py +++ b/pkgs/by-name/ap/apache-airflow/update-providers.py @@ -1,4 +1,5 @@ -#! /usr/bin/env python3 +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ps.requests ps.tomli ps.packaging])" from itertools import chain import json @@ -11,7 +12,8 @@ import sys from typing import Dict, List, Optional, Set, TextIO from urllib.request import urlopen from urllib.error import HTTPError -import yaml +from packaging.requirements import Requirement +import tomli PKG_SET = "apache-airflow.pythonPackages" @@ -21,8 +23,9 @@ PKG_PREFERENCES = { "dnspython": "dnspython", "elasticsearch-dsl": "elasticsearch-dsl", "google-api-python-client": "google-api-python-client", + "numpy": "numpy", "protobuf": "protobuf", - "psycopg2-binary": "psycopg2", + "pydantic": "pydantic", "requests_toolbelt": "requests-toolbelt", } @@ -35,7 +38,7 @@ EXTRA_REQS = { def get_version(): with open(os.path.dirname(sys.argv[0]) + "/python-package.nix") as fh: # A version consists of digits, dots, and possibly a "b" (for beta) - m = re.search('version = "([\\d\\.b]+)";', fh.read()) + m = re.search(r'version = "([\d.b]+)";', fh.read()) return m.group(1) @@ -43,11 +46,11 @@ def get_file_from_github(version: str, path: str): with urlopen( f"https://raw.githubusercontent.com/apache/airflow/{version}/{path}" ) as response: - return yaml.safe_load(response) + return response.read() def repository_root() -> Path: - return Path(os.path.dirname(sys.argv[0])) / "../../../.." + return Path(os.path.dirname(sys.argv[0])) / "../../../../" def dump_packages() -> Dict[str, Dict[str, str]]: @@ -70,27 +73,33 @@ def dump_packages() -> Dict[str, Dict[str, str]]: def remove_version_constraint(req: str) -> str: - return re.sub(r"[=><~].*$", "", req) + parsed_req = Requirement(req) + name = parsed_req.name + extras = ",".join(sorted(parsed_req.extras)) + if extras: + return f"{name}[{extras}]" + return name def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - if req in PKG_PREFERENCES: - return f"{PKG_SET}.{PKG_PREFERENCES[req]}" + # Extract the base name, removing any extras (e.g., '[flask]') + base_req_name = req.split("[")[0] + logging.debug(f"Searching for base_req_name: {base_req_name}") + if base_req_name in PKG_PREFERENCES: + return f"{PKG_SET}.{PKG_PREFERENCES[base_req_name]}" attr_paths = [] - names = [req] + names = [base_req_name] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs - if req.startswith("python-") or req.startswith("python_"): - names.append(req[len("python-") :]) + if base_req_name.startswith("python-") or base_req_name.startswith("python_"): + names.append(base_req_name[len("python-") :]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) # python(minor).(major)-(pname)-(version or unstable-date) # we need the version qualifier, or we'll have multiple matches # (e.g. pyserial and pyserial-asyncio when looking for pyserial) - pattern = re.compile( - f"^python\\d+\\.\\d+-{name}-(?:\\d|unstable-.*)", re.I - ) + pattern = re.compile(rf"^python\d+\.\d+-{name}-(?:[\d\.]+|unstable-.*)", re.I) for attr_path, package in packages.items(): # logging.debug("Checking match for %s with %s", name, package["name"]) if pattern.match(package["name"]): @@ -130,30 +139,82 @@ def get_cross_provider_reqs( if len(cross_provider_deps[provider]) > 0: reqs.update( chain.from_iterable( - get_cross_provider_reqs( - d, provider_reqs, cross_provider_deps, seen + [provider] + ( + get_cross_provider_reqs( + d, provider_reqs, cross_provider_deps, seen + [provider] + ) + if d not in seen + else [] ) - if d not in seen - else [] for d in cross_provider_deps[provider] ) ) return reqs -def get_provider_reqs(version: str, packages: Dict) -> Dict: - provider_dependencies = get_file_from_github( - version, "generated/provider_dependencies.json" - ) +def parse_pyproject_toml(version: str, provider_name: str) -> Dict: + provider_dir = provider_name.replace(".", "/") + path = f"providers/{provider_dir}/pyproject.toml" + try: + content = get_file_from_github(version, path) + data = tomli.loads(content.decode("utf-8")) + + dependencies = data.get("project", {}).get("dependencies", []) + + # Extract optional dependencies + optional_dependencies = data.get("project", {}).get("optional-dependencies", {}) + for opt_deps_list in optional_dependencies.values(): + dependencies.extend(opt_deps_list) + + imports = [] + # Heuristic to generate imports based on provider name + # This might not be exhaustive but covers common cases + base_import_path = f"airflow.providers.{provider_name.replace('-', '.')}" + imports.append(base_import_path) + + # Try to get more specific imports from provider_info entry point if available + provider_info_entry_point = ( + data.get("project", {}) + .get("entry-points", {}) + .get("apache_airflow_provider", {}) + .get("provider_info") + ) + if provider_info_entry_point: + module_path = provider_info_entry_point.split(":")[0] + if module_path not in imports: + imports.append(module_path) + + return { + "deps": dependencies, + "imports": sorted(list(set(imports))), # Remove duplicates and sort + "cross-providers-deps": [], # pyproject.toml doesn't directly list cross-provider deps + "version": data.get("project", {}).get("version", "unknown"), + } + except HTTPError: + logging.warning("Couldn't get pyproject.toml for %s", provider_name) + return {"deps": [], "imports": [], "cross-providers-deps": []} + except Exception as e: + logging.error(f"Error parsing pyproject.toml for {provider_name}: {e}") + return {"deps": [], "imports": [], "cross-providers-deps": []} + + +def get_provider_reqs(version: str, packages: Dict, provider_names: List[str]) -> Dict: + provider_data = {} + for provider in provider_names: + data = parse_pyproject_toml(version, provider) + provider_data[provider] = { + "deps": data["deps"], + "cross-providers-deps": data["cross-providers-deps"], + } + provider_reqs = {} cross_provider_deps = {} - for provider, provider_data in provider_dependencies.items(): + for provider, data in provider_data.items(): provider_reqs[provider] = list( - provider_reqs_to_attr_paths(provider_data["deps"], packages) + provider_reqs_to_attr_paths(data["deps"], packages) ) + EXTRA_REQS.get(provider, []) - cross_provider_deps[provider] = [ - d for d in provider_data["cross-providers-deps"] if d != "common.sql" - ] + cross_provider_deps[provider] = data["cross-providers-deps"] + transitive_provider_reqs = {} # Add transitive cross-provider reqs for provider in provider_reqs: @@ -163,39 +224,25 @@ def get_provider_reqs(version: str, packages: Dict) -> Dict: return transitive_provider_reqs -def get_provider_yaml(version: str, provider: str) -> Dict: - provider_dir = provider.replace(".", "/") - path = f"airflow/providers/{provider_dir}/provider.yaml" - try: - return get_file_from_github(version, path) - except HTTPError: - logging.warning("Couldn't get provider yaml for %s", provider) - return {} - - -def get_provider_imports(version: str, providers) -> Dict: +def get_provider_imports(version: str, provider_names: List[str]) -> Dict: provider_imports = {} - for provider in providers: - provider_yaml = get_provider_yaml(version, provider) - imports: List[str] = [] - if "hooks" in provider_yaml: - imports.extend( - chain.from_iterable( - hook["python-modules"] for hook in provider_yaml["hooks"] - ) - ) - if "operators" in provider_yaml: - imports.extend( - chain.from_iterable( - operator["python-modules"] - for operator in provider_yaml["operators"] - ) - ) - provider_imports[provider] = imports + for provider in provider_names: + data = parse_pyproject_toml(version, provider) + provider_imports[provider] = data["imports"] return provider_imports -def to_nix_expr(provider_reqs: Dict, provider_imports: Dict, fh: TextIO) -> None: +def get_provider_versions(version: str, provider_names: List[str]) -> Dict: + provider_versions = {} + for provider in provider_names: + data = parse_pyproject_toml(version, provider) + provider_versions[provider] = data["version"] + return provider_versions + + +def to_nix_expr( + provider_reqs: Dict, provider_imports: Dict, provider_versions: Dict, fh: TextIO +) -> None: fh.write("# Warning: generated by update-providers.py, do not update manually\n") fh.write("{\n") for provider, reqs in provider_reqs.items(): @@ -209,19 +256,83 @@ def to_nix_expr(provider_reqs: Dict, provider_imports: Dict, fh: TextIO) -> None + " ".join(sorted(f'"{imp}"' for imp in provider_imports[provider])) + " ];\n" ) + fh.write(f' version = "{provider_versions[provider]}";\n') fh.write(" };\n") + fh.write("\n") fh.write("}\n") +def get_all_providers_from_github(version: str) -> List[str]: + """ + Fetches all provider paths that contain a pyproject.toml file from the airflow repository. + This is done by recursively fetching the git tree for the providers directory. + """ + providers = [] + try: + # Get the SHA of the 'providers' directory for the given version + with urlopen( + f"https://api.github.com/repos/apache/airflow/contents/?ref={version}" + ) as response: + root_contents = json.loads(response.read()) + + providers_dir_info = next( + ( + item + for item in root_contents + if item["name"] == "providers" and item["type"] == "dir" + ), + None, + ) + + if not providers_dir_info: + logging.error( + "Could not find 'providers' directory in the root of the repository." + ) + sys.exit(1) + + providers_dir_sha = providers_dir_info["sha"] + + # Now, get the tree for the 'providers' directory recursively + with urlopen( + f"https://api.github.com/repos/apache/airflow/git/trees/{providers_dir_sha}?recursive=1" + ) as response: + tree = json.loads(response.read()) + + pyproject_paths = [ + item["path"] + for item in tree["tree"] + if item["type"] == "blob" and item["path"].endswith("/pyproject.toml") + ] + + for path in pyproject_paths: + # remove /pyproject.toml suffix + provider_path = path[: -len("/pyproject.toml")] + # Exclude tests directory and empty paths (root pyproject.toml) + if provider_path and not provider_path.startswith("tests/"): + provider_name = provider_path.replace("/", ".") + providers.append(provider_name) + + except HTTPError as e: + logging.error(f"Error fetching provider list from GitHub: {e}") + sys.exit(1) + + return sorted(providers) + + def main() -> None: - logging.basicConfig(level=logging.INFO) + logging.basicConfig(level=logging.DEBUG) version = get_version() packages = dump_packages() logging.info("Generating providers.nix for version %s", version) - provider_reqs = get_provider_reqs(version, packages) - provider_imports = get_provider_imports(version, provider_reqs.keys()) - with open("providers.nix", "w") as fh: - to_nix_expr(provider_reqs, provider_imports, fh) + + # Fetch provider names from GitHub API + provider_names = get_all_providers_from_github(version) + + provider_reqs = get_provider_reqs(version, packages, provider_names) + provider_imports = get_provider_imports(version, provider_names) + provider_versions = get_provider_versions(version, provider_names) + with open(os.path.join(os.path.dirname(sys.argv[0]), "providers.nix"), "w") as fh: + to_nix_expr(provider_reqs, provider_imports, provider_versions, fh) if __name__ == "__main__": diff --git a/pkgs/by-name/ap/apache-airflow/update.sh b/pkgs/by-name/ap/apache-airflow/update.sh new file mode 100755 index 000000000000..943f73dcc6bf --- /dev/null +++ b/pkgs/by-name/ap/apache-airflow/update.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq nixfmt-tree + +set -euo pipefail + +# This script updates apache-airflow to the latest tag for a given major version. +# It defaults to major version 3. +# +# Usage: ./update.sh [MAJOR_VERSION] +# Example: ./update.sh 2 + +MAJOR_VERSION="${1:-3}" +PACKAGE_DIR=$(dirname "$0") +PACKAGE_NAME="apache-airflow" + +# Fetches the latest git tag for the given major version from the GitHub API. +# It filters for tags that look like version numbers and sorts them to find the latest. +get_latest_tag() { + TEMP_FILE=$(mktemp) + curl -s "https://api.github.com/repos/apache/airflow/releases" > "$TEMP_FILE" + LATEST_TAG=$(jq -r --arg major_version "$MAJOR_VERSION" ' + .[] + | select(.tag_name | test("^" + $major_version + "\\.\\d+\\.\\d+$")) + | .tag_name + ' "$TEMP_FILE" | sort -V | tail -n 1) + rm "$TEMP_FILE" + echo "$LATEST_TAG" +} + +echo "Looking for latest tag for major version $MAJOR_VERSION..." +LATEST_TAG=$(get_latest_tag) + +if [[ -z "$LATEST_TAG" ]]; then + echo "No new tag found for major version $MAJOR_VERSION." + exit 0 +fi + +echo "Latest tag found: $LATEST_TAG" + +# Update the version and hash in the package definition +# This uses the standard nixpkgs script `update-source-version`. +echo "Updating source version for $PACKAGE_NAME to $LATEST_TAG..." +update-source-version "$PACKAGE_NAME" "$LATEST_TAG" + +# After updating the main package, run the providers update script. +# It will automatically pick up the new version from the nix file. +echo "Updating provider dependencies..." +"$PACKAGE_DIR/update-providers.py" +echo "Formatting generated providers.nix" +treefmt "$PACKAGE_DIR" + +echo "Update complete. Please check the git diff for changes." + diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index fc9b1d53ef58..84092414015a 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; postInstall = '' - ARGC=${if canExecuteHost then ''''${!outputBin}/bin/argc'' else "argc"} + ARGC=${if canExecuteHost then "\${!outputBin}/bin/argc" else "argc"} installShellCompletion --cmd argc \ --bash <("$ARGC" --argc-completions bash) \ diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix index c567e342913b..40c6d1009dd7 100644 --- a/pkgs/by-name/as/asunder/package.nix +++ b/pkgs/by-name/as/asunder/package.nix @@ -21,7 +21,7 @@ #, musepackSupport ? false, TODO: mpcenc monkeysAudioSupport ? false, monkeysAudio, -#, aacSupport ? false, TODO: neroAacEnc + #, aacSupport ? false, TODO: neroAacEnc }: let diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index c8208b263d1c..75d441dcca0b 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "9.0.0"; + version = "9.0.1"; pyproject = true; disabled = python3.pythonOlder "3.11"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = "autosuspend"; tag = "v${version}"; - hash = "sha256-JOH4QzoiLR1Pp/RVz0nrLxjQw92pDxXTu414jbpCMqk="; + hash = "sha256-PVxsdCPGu+bhjfAF5Hu4Xa3lETARitbBUKuy7ursAUE="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index d65ce380545a..176e905ed688 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.8.7"; + version = "7.9.0"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${version}"; - hash = "sha256-q4I/sCFo8svf+XL+Eln5TWLvj1ggaRjUplSgV6M0f9s="; + hash = "sha256-G80hDf6rpWzgkS1VESBGUpTcShvnuCH1OAiMboOz37k="; }; proxyVendor = true; - vendorHash = "sha256-tsIyY+L3Bvv/3uvRVkCGK4cAZXQyZSa0mUPDg8Aqml8="; + vendorHash = "sha256-7ONAv0EooaseR5kpca8y2OX8yOKMID2xgkYC4rm4CcQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ba/bazel_8/build-support/patching.nix b/pkgs/by-name/ba/bazel_8/build-support/patching.nix index a2396f57e8ad..10542822230d 100644 --- a/pkgs/by-name/ba/bazel_8/build-support/patching.nix +++ b/pkgs/by-name/ba/bazel_8/build-support/patching.nix @@ -19,6 +19,6 @@ cp ${file} "${path}" diff -u /dev/null "${path}" >result.patch || true # diff exit code is non-zero if there's a diff ''; - installPhase = ''cp result.patch $out''; + installPhase = "cp result.patch $out"; }; } diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index 1d0832003936..8b2b9c5034e4 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazelisk"; rev = "v${version}"; - sha256 = "sha256-wpbJc4qF7UF8HG4tkk7jnsurO2snFIpcfKyRY1Ohby4="; + sha256 = "sha256-iKU8B8yOT8cPvZhuor8ZVRsHQDoXq1ja1mr60XqHoEs="; }; vendorHash = "sha256-PWqKq/2DFopeiecUL0iWnut8Kd/52U32sNSVGj3Ae5g="; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 9b5f1d48cb2d..e9ca8fc99436 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.482"; + version = "4.2.495"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-mxBE0U2ABiOdSNj8c3Lqgmy5iFtOulCCkQ+oC2xyENA="; + hash = "sha256-UZtJTKSFnKR192i2lRUYw/kjxGzq45VI4Rac6vzcQc0="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/bl/blast/package.nix b/pkgs/by-name/bl/blast/package.nix index 13073175d1ff..287b6a67637c 100644 --- a/pkgs/by-name/bl/blast/package.nix +++ b/pkgs/by-name/bl/blast/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; + description = "Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences"; homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = lib.licenses.publicDomain; diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index f5ed39a603b1..171fe2c8179c 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.26"; + version = "0.9.30"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-EZc+cageuhPSIwyHAW6JTbSGQwlHCl9YpUHzHZ0ygx0="; + hash = "sha256-wl1uE9pb5gZAdZ1sNp3wTG3yT0Yu3OrTHXNdNPHW5ew="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/bork/package.nix b/pkgs/by-name/bo/bork/package.nix index d3b22a18a342..c2de996fe2af 100644 --- a/pkgs/by-name/bo/bork/package.nix +++ b/pkgs/by-name/bo/bork/package.nix @@ -11,7 +11,7 @@ let zig = zig_0_14; in stdenvNoCC.mkDerivation { - name = "bork"; + pname = "bork"; version = "0.4.0-unstable-2025-04-18"; src = fetchFromGitHub { diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index e781eb4038e2..e4176c314d0e 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { khaneliman rmcgibbo ryan4yin + sigmasquadron ]; mainProgram = "btop"; }; diff --git a/pkgs/by-name/bu/bulk_extractor/package.nix b/pkgs/by-name/bu/bulk_extractor/package.nix index e03a6105b398..46f875dce6f4 100644 --- a/pkgs/by-name/bu/bulk_extractor/package.nix +++ b/pkgs/by-name/bu/bulk_extractor/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/simsong/bulk_extractor"; downloadPage = "http://downloads.digitalcorpora.org/downloads/bulk_extractor/"; changelog = "https://github.com/simsong/bulk_extractor/blob/${finalAttrs.src.rev}/ChangeLog"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = with lib.platforms; unix ++ windows; license = with lib.licenses; [ mit diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix index 7c553a22ef19..dfcbb86ecf0b 100644 --- a/pkgs/by-name/by/bytecode-viewer/package.nix +++ b/pkgs/by-name/by/bytecode-viewer/package.nix @@ -73,7 +73,6 @@ maven.buildMavenPackage rec { mainProgram = "bytecode-viewer"; maintainers = with lib.maintainers; [ shard7 - d3vil0p3r ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 1b99678389d2..fee8b0c6ade5 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -180,7 +180,6 @@ let license = lib.licenses.unfree; maintainers = with lib.maintainers; [ octodi - d3vil0p3r blackzeshi ]; platforms = [ diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 52bb3d857699..0309d5af5d95 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -594,7 +594,7 @@ stdenv.mkDerivation { # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now - ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' + "-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}" ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON"; diff --git a/pkgs/by-name/cm/cmus/package.nix b/pkgs/by-name/cm/cmus/package.nix index 7242a70f9c5c..7e73d01a2cd5 100644 --- a/pkgs/by-name/cm/cmus/package.nix +++ b/pkgs/by-name/cm/cmus/package.nix @@ -66,8 +66,8 @@ mp4Support ? false, mp4v2 ? null, # ffmpeg does support mp4 better -# not in nixpkgs -#, vtxSupport ? true, libayemu ? null + # not in nixpkgs + #, vtxSupport ? true, libayemu ? null }: assert samplerateSupport -> jackSupport; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 351399c2e889..763486bbbbe0 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.410.0"; + version = "1.412.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-pReUH/0PZ8q2z+rQScl/fcL1HIFnjH244hr6PjhX6JY="; + hash = "sha256-t1GDRnJq1O5T49/iKSMsRw467EujWmGsuShI8Q8bI8w="; stripRoot = false; }; diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index e2d55912388f..135069bc8124 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.42.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-IA13qA/b+owlrqbVAkhd4rS98/XB5RNONiJaPwjDm+A="; + hash = "sha256-IVlONpApZJOcm6ooC+mguBEgAevzqiynrabSYdq+SDA="; }; postPatch = '' diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix index 7638c2ac89e7..8be4afc7ff87 100644 --- a/pkgs/by-name/cr/crd2pulumi/package.nix +++ b/pkgs/by-name/cr/crd2pulumi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-f18E0mUE3bT5od0JBzyAEXOHymoPtpRHeZhZnQR4Ezw="; + sha256 = "sha256-0D5U3Ie9h5R0kTLb5YHshtYrwuoXxPX0fYAJGqUw35w="; }; - vendorHash = "sha256-cLp0EWF6h/xCWbqadpbgLRFmH8RKWoY6xPb/tzZoKzM="; + vendorHash = "sha256-mO1DgyasJFYpRxeTd8Dinn1mcddCjTiUqs54WD31V/w="; ldflags = [ "-s" diff --git a/pkgs/by-name/db/dbd/package.nix b/pkgs/by-name/db/dbd/package.nix index 2905318f17ac..9ee620fc5cc0 100644 --- a/pkgs/by-name/db/dbd/package.nix +++ b/pkgs/by-name/db/dbd/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "Netcat-clone, designed to be portable and offer strong encryption"; mainProgram = "dbd"; homepage = "https://github.com/gitdurandal/dbd"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/dc/dc3dd/package.nix b/pkgs/by-name/dc/dc3dd/package.nix index af4d3241a66c..d78c6a50c13f 100644 --- a/pkgs/by-name/dc/dc3dd/package.nix +++ b/pkgs/by-name/dc/dc3dd/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Patched version of dd that includes a number of features useful for computer forensics"; mainProgram = "dc3dd"; homepage = "https://sourceforge.net/projects/dc3dd/"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; # Refer to https://sourceforge.net/p/dc3dd/code/HEAD/tree/COPYING }; diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 6c5ad3882738..0b67ce5e17f7 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "2.2.4"; + version = "2.2.3"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-CK48ga6qozz068MqgElCjnbOVXh0VG44H9ZaglYN0ZU="; + hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index faec95dc4e5d..cd584368a7f8 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "19.6"; + version = "19.7"; src = fetchFromGitHub { owner = "ddnet"; repo = "ddnet"; tag = version; - hash = "sha256-U0Yd3Xus0hsBpbXUsEC7EyoMtmsOXZJT4c3cFai918g="; + hash = "sha256-HjTkl4KOvQpAlLcUpfn5Ujr4IDfosUY2ueh0ZxE8KAs="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index af6449f6f01e..971addbeaf51 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -32,9 +32,9 @@ let text = ( lib.generators.toINI { } { Environment = { - DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${ + DFLAGS = "-I@out@/include/dmd -L-L@out@/lib -fPIC ${ lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic" - }''; + }"; }; } ); diff --git a/pkgs/by-name/dm/dmitry/package.nix b/pkgs/by-name/dm/dmitry/package.nix index fcde9593ba4b..29c61a5d78a4 100644 --- a/pkgs/by-name/dm/dmitry/package.nix +++ b/pkgs/by-name/dm/dmitry/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "Deepmagic Information Gathering Tool"; mainProgram = "dmitry"; homepage = "https://github.com/jaygreig86/dmitry"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/dn/dns2tcp/package.nix b/pkgs/by-name/dn/dns2tcp/package.nix index 1a86af2cb016..c260a6bebe0b 100644 --- a/pkgs/by-name/dn/dns2tcp/package.nix +++ b/pkgs/by-name/dn/dns2tcp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/alex-sector/dns2tcp"; license = lib.licenses.gpl2Plus; mainProgram = "dns2tcpc"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/do/dockrtui/package.nix b/pkgs/by-name/do/dockrtui/package.nix new file mode 100644 index 000000000000..4e52993a906c --- /dev/null +++ b/pkgs/by-name/do/dockrtui/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "dockrtui"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "LuuNa-JD"; + repo = "dockrtui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-C0TS3jp3ONsgjXKZYeMM9AeIxT2Moy8gxhFxkguT1I8="; + }; + + cargoHash = "sha256-8DY4pRWCswsC+wkrAHFic7YTkAT2VMRk8++jpNoQkEs="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, modern and keyboard-driven terminal dashboard for Docker"; + homepage = "https://github.com/LuuNa-JD/dockrtui"; + changelog = "https://github.com/LuuNa-JD/dockrtui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chansuke ]; + mainProgram = "dockrtui"; + }; +}) diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index acaef387a326..3e0ee5b8debb 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.148.0"; + version = "1.149.0"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; tag = "v${version}"; - hash = "sha256-iQJ9P2hEDvL1VwUdwH4mbglJ9oO/4XyH7FX0F0J6+TI="; + hash = "sha256-Pqmm609fe1FNwlSxkjM9lFc5nQhzA+cCqwAxzkDl1pQ="; }; meta = { diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 1e1cf97a654a..c76e941dc1ae 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-OvbkIOAQBwpZnFU1nT72/ePC6IG9t4CNjQJOhCoGxYw="; + hash = "sha256-2K1sls8YYvDirk9knVDoL5KDfjlxD7UbeKLIe+Z+wrc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix index 540f183f444b..2ce8ba592931 100644 --- a/pkgs/by-name/el/elinks/package.nix +++ b/pkgs/by-name/el/elinks/package.nix @@ -25,7 +25,7 @@ python ? null, enablePerl ? (!stdenv.hostPlatform.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null, -# re-add javascript support when upstream supports modern spidermonkey + # re-add javascript support when upstream supports modern spidermonkey }: assert enableGuile -> guile != null; diff --git a/pkgs/by-name/ex/exe2hex/package.nix b/pkgs/by-name/ex/exe2hex/package.nix index ff0212156db7..753c4ccff5e8 100644 --- a/pkgs/by-name/ex/exe2hex/package.nix +++ b/pkgs/by-name/ex/exe2hex/package.nix @@ -35,6 +35,6 @@ python3Packages.buildPythonApplication { homepage = "https://github.com/g0tmi1k/exe2hex"; mainProgram = "exe2hex"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ex/ext3grep/package.nix b/pkgs/by-name/ex/ext3grep/package.nix index b7f3ad9f62dd..1cc8170abcf3 100644 --- a/pkgs/by-name/ex/ext3grep/package.nix +++ b/pkgs/by-name/ex/ext3grep/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool to investigate an ext3 file system for deleted content and possibly recover it"; mainProgram = "ext3grep"; homepage = "https://code.google.com/archive/p/ext3grep/"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix index 540f108bb24c..38470a693b1d 100644 --- a/pkgs/by-name/fa/fairywren/package.nix +++ b/pkgs/by-name/fa/fairywren/package.nix @@ -41,7 +41,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants meta = { description = "FairyWren Icon Set"; homepage = "https://gitlab.com/aiyahm/FairyWren-Icons"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; license = with lib.licenses; [ gpl3Plus ]; }; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 5e77bd64c0a6..05f1a6e615de 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.191"; + version = "2.15.194"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-jObw+/lHjk7pm/RNsgeXBfQkK2lBrjCc1LlpM3re82M="; + hash = "sha256-mbQ6weZBBt4wSutmpJ1I5HJgiEUOgVbPDIxTj5NCiOo="; }; - vendorHash = "sha256-BRiLBXHeSFvzCi7i9kmXfuHjtorG72IIcUz3z3thg+8="; + vendorHash = "sha256-CxE1nUhMa7WNWUwL4dOQADzU5x+2QIAfA/J9cqRPSE8="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/fosrl-gerbil/package.nix b/pkgs/by-name/fo/fosrl-gerbil/package.nix index b3f3ff83116a..62a712ff9297 100644 --- a/pkgs/by-name/fo/fosrl-gerbil/package.nix +++ b/pkgs/by-name/fo/fosrl-gerbil/package.nix @@ -32,7 +32,6 @@ buildGoModule rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ jackr - sigmasquadron water-sucks ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix index 2748f03d30dc..2204da49223e 100644 --- a/pkgs/by-name/fo/fosrl-newt/package.nix +++ b/pkgs/by-name/fo/fosrl-newt/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { maintainers = with lib.maintainers; [ fab jackr - sigmasquadron water-sucks ]; mainProgram = "newt"; diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 3a11a41dbeb0..ea0a438c2361 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ jackr - sigmasquadron water-sucks ]; mainProgram = "olm"; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 0d9a1aaad83a..391a61d1b62c 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -167,7 +167,6 @@ buildNpmPackage (finalAttrs: { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ jackr - sigmasquadron water-sucks ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix index ef9e3197e1ff..1d1c677c72b6 100644 --- a/pkgs/by-name/fo/foxglove-studio/package.nix +++ b/pkgs/by-name/fo/foxglove-studio/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - preFixup = ''patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio''; + preFixup = "patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix index fc433af8f0f1..304283285d92 100644 --- a/pkgs/by-name/fu/fuchsia-cursor/package.nix +++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix @@ -72,7 +72,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "Fuchsia" "Fuchsia-Pop" "Fuchsi meta = { description = "First OpenSource port of FuchsiaOS's cursors for Linux and Windows"; homepage = "https://github.com/ful1e5/fuchsia-cursor"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix index 77c8c1dc94e0..4ca1eb4cb191 100644 --- a/pkgs/by-name/fu/fuzzdb/package.nix +++ b/pkgs/by-name/fu/fuzzdb/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application"; homepage = "https://github.com/fuzzdb-project/fuzzdb"; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ga/galleta/package.nix b/pkgs/by-name/ga/galleta/package.nix index 08986fc1cec4..2256f27637bd 100644 --- a/pkgs/by-name/ga/galleta/package.nix +++ b/pkgs/by-name/ga/galleta/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Examine the contents of the IE's cookie files for forensic purposes"; mainProgram = "galleta"; homepage = "https://sourceforge.net/projects/odessa/files/Galleta"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix index 37e26d4f4ada..a2c1dc06280a 100644 --- a/pkgs/by-name/gd/gdmap/package.nix +++ b/pkgs/by-name/gd/gdmap/package.nix @@ -9,23 +9,25 @@ pkg-config, libxml2, gettext, + wrapGAppsHook3, }: stdenv.mkDerivation { pname = "gdmap"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sjohannes"; repo = "gdmap"; - tag = "v1.3.1"; - sha256 = "sha256-dgZ+EDk7O+nuqrBsTPVW7BHufvkqLnWbXrIOOn7YlW4="; + tag = "v1.4.0"; + sha256 = "sha256-yqrlxmMxtcJqUe9xgs01d1AAc2gkPBPsQbzQfffZET0="; }; nativeBuildInputs = [ meson ninja pkg-config + wrapGAppsHook3 ]; buildInputs = [ gtk3 diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix index 0b77dd2f1a20..de0cf7388772 100644 --- a/pkgs/by-name/ge/geteduroam/package.nix +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -17,16 +17,16 @@ buildGoModule (finalAttrs: { pname = "geteduroam"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; tag = finalAttrs.version; - hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8="; + hash = "sha256-fmkTenN5F2FEimYUQi6JVUGmHcnVJvE9Giur+xTl+1s="; }; - vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk="; + vendorHash = "sha256-kmBuyIs5S6h51+tF7vhY92o6VP+M7QI9AwuZSQUwjXg="; subPackages = [ "cmd/geteduroam-gui" diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix index 836e150aa256..8c9e47045484 100644 --- a/pkgs/by-name/gh/ghost-cli/package.nix +++ b/pkgs/by-name/gh/ghost-cli/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = ''${placeholder "out"}/bin/ghost''; + versionCheckProgram = "${placeholder "out"}/bin/ghost"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index c8d800125c50..5056b11f03f0 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.61.1"; + version = "0.61.2"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = version; - hash = "sha256-1gUhwZLZ+D1ML5yOifEGVWXpgcLgsligB1+yCkAvX5I="; + hash = "sha256-yxVovL4jjS+qMDH9ZrLVnFMLQeO+xwh49npv/ifgFEQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix index 4eb87a75a35a..599295fb4eea 100644 --- a/pkgs/by-name/go/go-jet/package.nix +++ b/pkgs/by-name/go/go-jet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "go-jet"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-6cFkLnZGSAlwvsewxXaKeNoeDaILqLo02vkzqjruhxU="; + sha256 = "sha256-BwhatFakmd2ksLQv7OLwvkuDHqnZI4HRnldfyJhR+i8="; }; vendorHash = "sha256-fgYZULAz3orhK637cJNYK7bw9hsQ9PuLH1nMDLVwoGM="; diff --git a/pkgs/by-name/go/gopsuinfo/package.nix b/pkgs/by-name/go/gopsuinfo/package.nix index 6e8ed38b8e00..665bedf8bd0a 100644 --- a/pkgs/by-name/go/gopsuinfo/package.nix +++ b/pkgs/by-name/go/gopsuinfo/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { ''; # Install icons - postInstall = ''make install DESTDIR=$out''; + postInstall = "make install DESTDIR=$out"; meta = { description = "Gopsutil-based command to display system usage info"; diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index ac4b748d7b49..38ee3cd4b975 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -38,7 +38,7 @@ backendStdenv.mkDerivation { '#define COMPARE_KERNEL "${placeholder "out"}/share/compare.ptx"' substituteInPlace Makefile \ --replace-fail \ - '${''''${CUDAPATH}/bin/nvcc''}' \ + '${"\${CUDAPATH}/bin/nvcc"}' \ '${lib.getExe cuda_nvcc}' ''; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 03e4930bb289..56cb557554af 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -115,7 +115,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ luftmensch-luftmensch - d3vil0p3r ]; }; } diff --git a/pkgs/by-name/gu/guymager/package.nix b/pkgs/by-name/gu/guymager/package.nix index 27700c07f486..60446ff51da7 100644 --- a/pkgs/by-name/gu/guymager/package.nix +++ b/pkgs/by-name/gu/guymager/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Forensic imager for media acquisition"; mainProgram = "guymager"; homepage = "https://guymager.sourceforge.io"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.linux; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/ha/hashid/package.nix b/pkgs/by-name/ha/hashid/package.nix index 122022a9fce6..a8c655016e5c 100644 --- a/pkgs/by-name/ha/hashid/package.nix +++ b/pkgs/by-name/ha/hashid/package.nix @@ -25,6 +25,6 @@ python3Packages.buildPythonApplication { homepage = "https://github.com/psypanda/hashID"; mainProgram = "hashid"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ha/hayabusa-sec/package.nix b/pkgs/by-name/ha/hayabusa-sec/package.nix index bc563871de4c..c349e425b990 100644 --- a/pkgs/by-name/ha/hayabusa-sec/package.nix +++ b/pkgs/by-name/ha/hayabusa-sec/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/Yamato-Security/hayabusa"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ - d3vil0p3r jk ]; mainProgram = "hayabusa"; diff --git a/pkgs/by-name/hb/hb-honeypot/package.nix b/pkgs/by-name/hb/hb-honeypot/package.nix index eedda1aa1baa..a1e5e0fadf17 100644 --- a/pkgs/by-name/hb/hb-honeypot/package.nix +++ b/pkgs/by-name/hb/hb-honeypot/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "Script that listens on TCP port 443 and responds with completely bogus SSL heartbeat responses"; mainProgram = "hb-honeypot"; homepage = "https://github.com/D3vil0p3r/hb-honeypot"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/hm/hm/package.nix b/pkgs/by-name/hm/hm/package.nix index fc3f01a56a66..600a07b375e5 100644 --- a/pkgs/by-name/hm/hm/package.nix +++ b/pkgs/by-name/hm/hm/package.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; passthru = { - updateScript = gitUpdater { rev-prefix = "HM-"; }; + updateScript = gitUpdater { + rev-prefix = "HM-"; + ignoredVersions = "rc"; + }; }; meta = { diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 3087e66da289..c01c7499060c 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage { description = "Play Hack The Box directly on your system"; mainProgram = "htb-toolkit"; homepage = "https://github.com/D3vil0p3r/htb-toolkit"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/hy/hylafaxplus/package.nix b/pkgs/by-name/hy/hylafaxplus/package.nix index 044198f267c9..c0fc6541bc83 100644 --- a/pkgs/by-name/hy/hylafaxplus/package.nix +++ b/pkgs/by-name/hy/hylafaxplus/package.nix @@ -33,7 +33,7 @@ let configSite = replaceVars ./config.site { - config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${toString maxgid}''; + config_maxgid = lib.optionalString (maxgid != null) "CONFIG_MAXGID=${toString maxgid}"; ghostscript_version = ghostscript.version; out = null; # "out" will be resolved in post-install.sh inherit coreutils ghostscript libtiff; diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 730cd4c4c459..9ff29a06b000 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck bin/unit-hyperscan - ${lib.optionalString withStatic ''bin/unit-chimera''} + ${lib.optionalString withStatic "bin/unit-chimera"} runHook postCheck ''; diff --git a/pkgs/by-name/ii/iio-oscilloscope/package.nix b/pkgs/by-name/ii/iio-oscilloscope/package.nix index f144b89da8e6..85ffb4703a76 100644 --- a/pkgs/by-name/ii/iio-oscilloscope/package.nix +++ b/pkgs/by-name/ii/iio-oscilloscope/package.nix @@ -17,8 +17,8 @@ jansson, enable9361 ? true, libad9361, -# enable9166 ? true, -# libad9166, + # enable9166 ? true, + # libad9166, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index e9467c3ddf59..4ceb76fe3b2c 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jql"; - version = "8.0.9"; + version = "8.0.10"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; tag = "jql-v${finalAttrs.version}"; - hash = "sha256-1gkKOOR2mIUKrbVb1BlFxVuskL6y7s6mrI99xTfjjTI="; + hash = "sha256-QKdLKib9cz5TjU3+tKaB+1jD9H7bYXidzruldTO6iuw="; }; - cargoHash = "sha256-7pSvHZqvPW9SXwU0AtQHIjgHQCSKPzrBhNxLY5ZAcMw="; + cargoHash = "sha256-krhy+CLoQyXeYyLHuNYVleSPtEAFKrdf24zDBCGID2Q="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix index fab5c48308d5..79268f40b27f 100644 --- a/pkgs/by-name/kc/kcc/package.nix +++ b/pkgs/by-name/kc/kcc/package.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ] ++ lib.optionals archiveSupport [ - ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' + "--prefix PATH : ${lib.makeBinPath [ p7zip ]}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/kr/krb5/package.nix b/pkgs/by-name/kr/krb5/package.nix index c4f6ac9b8ac9..62b21154e65d 100644 --- a/pkgs/by-name/kr/krb5/package.nix +++ b/pkgs/by-name/kr/krb5/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--enable-static" "--disable-shared" ] - ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS='' + ++ lib.optional stdenv.hostPlatform.isFreeBSD "WARN_CFLAGS=" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 323d8da5de8b..b49e25c681ea 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-al/byEO5wNhoVnfHHJFQMnx7EtoF3+P7MtS/x82Z8w0="; + hash = "sha256-/fOtepUysZvJQrpdNklgSeL946tSf3Icohi0bRSLieA="; }; vendorHash = "sha256-4thcMvdS2oxBai+3aOUPXd5T6f2DcW0Mm1d3y/DMGFc="; diff --git a/pkgs/by-name/la/laudanum/package.nix b/pkgs/by-name/la/laudanum/package.nix index 430d83a2f314..c11009ee9918 100644 --- a/pkgs/by-name/la/laudanum/package.nix +++ b/pkgs/by-name/la/laudanum/package.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Collection of injectable files, designed to be used in a pentest when SQL injection flaws are found and are in multiple languages for different environments"; homepage = "https://github.com/junk13/laudanum"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/lb/lbd/package.nix b/pkgs/by-name/lb/lbd/package.nix index d7d319364034..29efc4fbeb2c 100644 --- a/pkgs/by-name/lb/lbd/package.nix +++ b/pkgs/by-name/lb/lbd/package.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation { description = "Detect if a domain uses DNS and/or HTTP Load-Balancing"; mainProgram = "lbd"; homepage = "https://github.com/D3vil0p3r/lbd"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix index cffb6a89c86a..52a9c8220c84 100644 --- a/pkgs/by-name/le/lexy/package.nix +++ b/pkgs/by-name/le/lexy/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "lexy"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "antoniorodr"; repo = "lexy"; tag = "v${version}"; - hash = "sha256-r6Jy37Ici7l0jlQiGdF0YlbViW0Tl+0UwHMAe59YoKc="; + hash = "sha256-Ff+4QymAAxLK61Zdic26TcUzFEvH1A8X6puynMivKaY="; }; build-system = [ diff --git a/pkgs/by-name/li/libbfio/package.nix b/pkgs/by-name/li/libbfio/package.nix index a43baf04c5a2..9641dc5474f5 100644 --- a/pkgs/by-name/li/libbfio/package.nix +++ b/pkgs/by-name/li/libbfio/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { gpl3Plus lgpl3Plus ]; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = with lib.platforms; unix ++ windows; }; }) diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index b7f5900d30c3..b56fe54f295c 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGo [ "GOLANG=yes" - ''GOCACHE=''${TMPDIR}/go-cache'' + "GOCACHE=\${TMPDIR}/go-cache" "GOFLAGS=-trimpath" "GOARCH=${pkgsBuildHost.go.GOARCH}" "GOOS=${pkgsBuildHost.go.GOOS}" diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index 97063944a33e..386142d8c30a 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Legacy library for support of the Expert Witness Compression Format"; homepage = "https://sourceforge.net/projects/libewf/"; license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libguytools/package.nix b/pkgs/by-name/li/libguytools/package.nix index b882a1eb2ab0..5cb4f6b55a55 100644 --- a/pkgs/by-name/li/libguytools/package.nix +++ b/pkgs/by-name/li/libguytools/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Small programming toolbox"; mainProgram = "libguytools"; homepage = "https://libguytools.sourceforge.io"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/li/lightgbm/package.nix b/pkgs/by-name/li/lightgbm/package.nix index 37a6eb92ab6d..57c3522845da 100644 --- a/pkgs/by-name/li/lightgbm/package.nix +++ b/pkgs/by-name/li/lightgbm/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { # set the R package buildPhase to null because lightgbm has a # custom builder script that builds and installs in one step - buildPhase = lib.optionals rLibrary ''''; + buildPhase = lib.optionals rLibrary ""; inherit doCheck; @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r com $out cp -r lightgbmlib.jar $out '' - + '''' + + "" + lib.optionalString rLibrary '' mkdir $out mkdir $out/tmp diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 6e29b7ae09ed..e945598dbe7d 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.5.17"; + version = "3.5.18"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-B/0qzOf5xs4lEDludDhRQbBhEEs5r6WkmHkuY8pz3G4o4q6QcCPtm5I8ZcO0mpPcsoljrTonV4UGZplqTTNh6g=="; + hash = "sha512-TdxJM290M+3X8KJ+agly6umNoje8jYlUYz/pVmUAOBp1G8nTtekoYWi+2WZn8r2tJ94STZ3nkilLAA9CoLhqfw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mac-robber/package.nix b/pkgs/by-name/ma/mac-robber/package.nix index 22d9e3038151..f68420ab4d02 100644 --- a/pkgs/by-name/ma/mac-robber/package.nix +++ b/pkgs/by-name/ma/mac-robber/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Digital investigation tool that collects data from allocated files in a mounted file system"; mainProgram = "mac-robber"; homepage = "https://www.sleuthkit.org/mac-robber/"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; }; diff --git a/pkgs/by-name/ma/magicrescue/package.nix b/pkgs/by-name/ma/magicrescue/package.nix index 6f22b33233bf..a9e110e07b74 100644 --- a/pkgs/by-name/ma/magicrescue/package.nix +++ b/pkgs/by-name/ma/magicrescue/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "Find and recover deleted files on block devices"; mainProgram = "magicrescue"; homepage = "https://github.com/jbj/magicrescue"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index da6d9bf30637..cf349e7ef28a 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "maltego"; maintainers = with lib.maintainers; [ emilytrau - d3vil0p3r ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/by-name/ma/mariokart64recomp/package.nix b/pkgs/by-name/ma/mariokart64recomp/package.nix index cbfd0a7e7772..e5e1cb3704e1 100644 --- a/pkgs/by-name/ma/mariokart64recomp/package.nix +++ b/pkgs/by-name/ma/mariokart64recomp/package.nix @@ -145,7 +145,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { # application level if desired. postFixup = '' wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/" \ - ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''} + ${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"} ''; meta = { diff --git a/pkgs/by-name/ma/material-black-colors/package.nix b/pkgs/by-name/ma/material-black-colors/package.nix index 7d40703b3720..4412a4b73f01 100644 --- a/pkgs/by-name/ma/material-black-colors/package.nix +++ b/pkgs/by-name/ma/material-black-colors/package.nix @@ -63,7 +63,7 @@ lib.checkListOfEnum "${pname}: color variants" colorVariantList colorVariants meta = { description = "Material Black Colors icons"; homepage = "https://github.com/rtlewis88/rtl88-Themes/tree/material-black-COLORS"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; license = with lib.licenses; [ gpl3Plus diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 10667e95ac77..d41a5dc22ffa 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -117,7 +117,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib description = "GTK theme based on the Matrix colour palette"; homepage = "https://github.com/D3vil0p3r/Matrix-GTK-Theme"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix index f99b4d6a959c..a1da42ed3de9 100644 --- a/pkgs/by-name/md/mdbook-variables/package.nix +++ b/pkgs/by-name/md/mdbook-variables/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "mdbook-variables"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitLab { owner = "tglman"; repo = "mdbook-variables"; rev = version; - hash = "sha256-zverdL4Mrnn/8pxQk6qVyidPJNxnrmaETt+XTp64Rns="; + hash = "sha256-DMfVviMVizxtkunu3DygL1t0vTW6a+frfFfVl8h7Urw="; }; - cargoHash = "sha256-/zp5Qj2NUVpQqKAFgQP4QatYzg/hMJQE08ANacvNPko="; + cargoHash = "sha256-q8UbL1zBb1InYutgM3ZE7z9NdJKi68yjR2Za/o0jg9c="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 98ee0b167f6a..322bf863e0f9 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -121,26 +121,26 @@ python3.pkgs.buildPythonApplication rec { ++ (map (f: ''rm -vr "${f}";'') ( [ # requires git, creating cyclic dependency - ''test cases/common/66 vcstag'' + "test cases/common/66 vcstag" # requires glib, creating cyclic dependency - ''test cases/linuxlike/6 subdir include order'' - ''test cases/linuxlike/9 compiler checks with dependencies'' + "test cases/linuxlike/6 subdir include order" + "test cases/linuxlike/9 compiler checks with dependencies" # requires static zlib, see #66461 - ''test cases/linuxlike/14 static dynamic linkage'' + "test cases/linuxlike/14 static dynamic linkage" # Nixpkgs cctools does not have bitcode support. - ''test cases/osx/7 bitcode'' + "test cases/osx/7 bitcode" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires llvmPackages.openmp, creating cyclic dependency - ''test cases/common/184 openmp'' + "test cases/common/184 openmp" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # pch doesn't work quite right on FreeBSD, I think - ''test cases/common/13 pch'' + "test cases/common/13 pch" ] ++ lib.optionals python3.isPyPy [ # fails for unknown reason - ''test cases/python/4 custom target depends extmodule'' + "test cases/python/4 custom target depends extmodule" ] )) ++ [ diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix index 83dcbb552070..665ea7f82975 100644 --- a/pkgs/by-name/mi/mimikatz/package.nix +++ b/pkgs/by-name/mi/mimikatz/package.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/gentilkiwi/mimikatz"; description = "Little tool to play with Windows security"; license = with lib.licenses; [ cc-by-40 ]; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/mi/missidentify/package.nix b/pkgs/by-name/mi/missidentify/package.nix index 1349d36d3ff6..713514955fec 100644 --- a/pkgs/by-name/mi/missidentify/package.nix +++ b/pkgs/by-name/mi/missidentify/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; mainProgram = "missidentify"; homepage = "https://missidentify.sourceforge.net"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; }; diff --git a/pkgs/by-name/my/myrescue/package.nix b/pkgs/by-name/my/myrescue/package.nix index 754e7e706aef..078e5f75134d 100644 --- a/pkgs/by-name/my/myrescue/package.nix +++ b/pkgs/by-name/my/myrescue/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hard disk recovery tool that reads undamaged regions first"; mainProgram = "myrescue"; homepage = "https://myrescue.sourceforge.net"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix index c39f3a88da23..3ddce615c014 100644 --- a/pkgs/by-name/n6/n64recomp/package.nix +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "n64recomp"; - version = "0-unstable-2025-12-31"; + version = "0-unstable-2026-01-17"; src = fetchFromGitHub { owner = "N64Recomp"; repo = "N64Recomp"; - rev = "2b6f05688de2abc7d86da5b4a89b84c2c6acbabe"; - hash = "sha256-nf1O4Q6ewNbXG4EuFlY+ckP8335ZAUgpH/ckaB9aEZg="; + rev = "81213c1831fab2521a6a5459c67b63437d67e253"; + hash = "sha256-BfZTmKAXn+9b0lHg0SbTP4/ZTjk7IqvPc78ab8XNFoM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/na/national-park-typeface/package.nix b/pkgs/by-name/na/national-park-typeface/package.nix index 5b1f86bbed1d..a742f3fb5b18 100644 --- a/pkgs/by-name/na/national-park-typeface/package.nix +++ b/pkgs/by-name/na/national-park-typeface/package.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; + description = "Typeface designed to mimic the national park service signs that are carved using a router bit"; homepage = "https://nationalparktypeface.com/"; license = lib.licenses.ofl; maintainers = [ ]; diff --git a/pkgs/by-name/nb/nbtscan/package.nix b/pkgs/by-name/nb/nbtscan/package.nix index a0a8cc57d1ee..9306ca3825b9 100644 --- a/pkgs/by-name/nb/nbtscan/package.nix +++ b/pkgs/by-name/nb/nbtscan/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Scan networks searching for NetBIOS information"; mainProgram = "nbtscan"; homepage = "https://github.com/resurrecting-open-source-projects/nbtscan"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 930b58804aff..66719dbb2fa5 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -120,6 +120,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ni/nix-required-mounts/closure.nix b/pkgs/by-name/ni/nix-required-mounts/closure.nix index 3e361114bc4c..777db01599a9 100644 --- a/pkgs/by-name/ni/nix-required-mounts/closure.nix +++ b/pkgs/by-name/ni/nix-required-mounts/closure.nix @@ -19,7 +19,7 @@ runCommand "allowed-patterns.json" let prefix = "${builtins.storeDir}/"; # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 - exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; + exportName = "references-${lib.strings.removePrefix prefix "${path}"}"; isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); in lib.optionals isStorePath [ diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index c6d0758fcfe2..b419cf461a42 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - ''--libexecdir=$(out)/bin'' + "--libexecdir=$(out)/bin" ]; preFixup = '' diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 407bff8b1a94..19a0c847eaa7 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -114,8 +114,8 @@ symlinkJoin { ''--prefix PATH : "$out/bin"'' ''--prefix PATH : "$out"/lib/nrfutil-npm'' ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools'' - ''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libusb1 ]}'' - ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so'' + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libusb1 ]}" + "--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so" ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim'' ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim'' ] diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 0a8682d7a4e2..a207dc662086 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2026-01-14"; + version = "2026-01-20"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "ec14da72fbf8b5016bb1533d4af3ff3bb2ac7a19"; - sha256 = "sha256-ML9s5t26DTbrSxQLP1CEC7GWUdRYAy8IhMraMHqOc50="; + rev = "e0766905519fbc7982a590a195ee7c3e8bb594e8"; + sha256 = "sha256-6sTLyZ4UztU2PDpyiAZx1Q5smY+vrZdGbgVRNmek7nM="; }; strictDeps = true; diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index f2ce7d4eb7dc..0b6cde0ea30a 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -8,7 +8,7 @@ }: let # Requires an /etc/os-release file, so we override it with this. - osRelease = writeText "os-release" ''ID=NixOS''; + osRelease = writeText "os-release" "ID=NixOS"; in stdenv.mkDerivation (finalAttrs: { pname = "openapv"; diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix index db9d8a2bb113..9820cb3f6770 100644 --- a/pkgs/by-name/op/opencommit/package.nix +++ b/pkgs/by-name/op/opencommit/package.nix @@ -8,13 +8,13 @@ buildNpmPackage rec { pname = "opencommit"; - version = "3.2.10"; + version = "3.2.12"; src = fetchFromGitHub { owner = "di-sukharev"; repo = "opencommit"; rev = "v${version}"; - hash = "sha256-FsPtTuvBvbDIldwxLbuXOxNfOIQ8THboRB6ghTSzTbI="; + hash = "sha256-jtumHDDsoc/jJZf+V0bzTTS6dmgwKcIDNkDidXa8eYY="; postFetch = '' cd $out # Fix lockfile issues with bundled dependencies @@ -22,7 +22,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-Ilf9lfFegraQRkYU5v7Zv6MubpN5m6bck3j5UkTXk+4="; + npmDepsHash = "sha256-oqmRUzAptEurwEFux6kvxUC2TexWaXftSILjWDwakYU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index a2571d2788a6..c18ef8908d1d 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2026-01-12"; + version = "0.2-unstable-2026-01-21"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "fcfafe953edbf73a1be00e029564c65193f2ad4b"; + rev = "66e4d2ddaa03ee441dc6156b681ad832522ff2cf"; fetchSubmodules = true; - hash = "sha256-Vnty6fZNSmgFTNjWPiqLu5jdtomPuirBz8i9tWBSBR8="; + hash = "sha256-KTeCDI67BGkoDBBeBG96BJrvO9kPX+Vztgk1S1PoyIM="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix index 75790ab39f23..5b6fbd09840b 100644 --- a/pkgs/by-name/pa/pasco/package.nix +++ b/pkgs/by-name/pa/pasco/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Examine the contents of Internet Explorer's cache files for forensic purposes"; mainProgram = "pasco"; homepage = "https://sourceforge.net/projects/fast/files/Pasco/"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = with lib.licenses; [ bsd3 ]; }; diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix index 1cbeee66f3d3..4f28bf6c673e 100644 --- a/pkgs/by-name/pd/pdfid/package.nix +++ b/pkgs/by-name/pd/pdfid/package.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; license = with lib.licenses; [ free ]; mainProgram = "pdfid"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/pf/pff-tool/package.nix b/pkgs/by-name/pf/pff-tool/package.nix index 9b394c198bf3..c4b5345cecac 100644 --- a/pkgs/by-name/pf/pff-tool/package.nix +++ b/pkgs/by-name/pf/pff-tool/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line tools to process PFF files"; homepage = "https://github.com/avranju/pff-tools"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; mainProgram = "pff-cli"; }; }) diff --git a/pkgs/by-name/ph/phantom/package.nix b/pkgs/by-name/ph/phantom/package.nix new file mode 100644 index 000000000000..48c1909604c0 --- /dev/null +++ b/pkgs/by-name/ph/phantom/package.nix @@ -0,0 +1,53 @@ +{ + stdenv, + fetchFromGitea, + qt6, + cmark-gfm, + cmake, + pkg-config, + lib, +}: + +stdenv.mkDerivation { + pname = "phantom"; + version = "0.0.0-unstable-2025-12-22"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "ItsZariep"; + repo = "Phantom"; + rev = "7bba1e0a2d9b33d881fb999bb543324d14355505"; + hash = "sha256-KjQX6Hxp4hcRJWRF/CDxZGQtzQqozGWxxHn0VpOzR0U="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + cmake + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtwebengine + cmark-gfm + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp phantom-qt $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Markdown editor with support for multi-tab"; + homepage = "https://codeberg.org/ItsZariep/Phantom"; + license = licenses.gpl3Only; + mainProgram = "phantom"; + platforms = platforms.all; + maintainers = with maintainers; [ reylak ]; + }; +} diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index bc46cd4eccce..6db51f2666ea 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.53.1"; + version = "2.54.3"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-5Iral/ju6tJGRS8JUIXBVEQeme34F+v1i8F7pXprZas="; + sha256 = "sha256-t/DWbfxQkIlLJ5Scej2dlEp6+Tk7+SGPt7R1DkM+MEo="; }; - vendorHash = "sha256-LyPS2E5v3n7RVV3YEsEUZJZWB5x32TTfeOHAZProuCs="; + vendorHash = "sha256-eg/m6PgeVHsF0gTXdP5B5IZFMd68IVPSFs1e8nCps8U="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pi/picolisp/package.nix b/pkgs/by-name/pi/picolisp/package.nix index 0b9977d24f21..188dfeea5eb7 100644 --- a/pkgs/by-name/pi/picolisp/package.nix +++ b/pkgs/by-name/pi/picolisp/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { openssl readline ]; - sourceRoot = ''pil21''; + sourceRoot = "pil21"; preBuild = '' cd src '' diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index 193071f18f3b..deb57e13697c 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -119,29 +119,29 @@ stdenv.mkDerivation (finalAttrs: { installPhase = lib.concatStringsSep "\n" ( [ - ''runHook preInstall'' + "runHook preInstall" ] ++ [ - ''mkdir -p $out/share/{applications,ppsspp/bin,icons}'' + "mkdir -p $out/share/{applications,ppsspp/bin,icons}" ] ++ ( if enableQt then [ - ''install -Dm555 PPSSPPQt $out/share/ppsspp/bin/'' + "install -Dm555 PPSSPPQt $out/share/ppsspp/bin/" ] else [ - ''install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/'' - ''makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless'' - ''install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/'' + "install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/" + "makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless" + "install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/" ] ) ++ [ - ''mv assets $out/share/ppsspp'' - ''mv ../icons/hicolor $out/share/icons'' + "mv assets $out/share/ppsspp" + "mv ../icons/hicolor $out/share/icons" ] ++ [ - ''runHook postInstall'' + "runHook postInstall" ] ); @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ); binToBeWrapped = if enableQt then "PPSSPPQt" else "PPSSPPSDL"; in - ''makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}''; + "makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}"; meta = { homepage = "https://www.ppsspp.org/"; diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index 056693f89115..7ea647aeec8a 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -39,8 +39,8 @@ withXfce4ui ? false, totem-pl-parser, withTotemPlParser ? false, -# , grilo, withGrilo ? false -# , rygel, withRygel ? true + # , grilo, withGrilo ? false + # , rygel, withRygel ? true }: assert withGlyr -> withLastfm; diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 71f43ec18168..0a6cd4404971 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -121,7 +121,7 @@ let ${plugin.pname}: error context, tried finding entry point under; pathAbsoluteNaive -> ${pathAbsoluteNaive} pathAbsoluteFallback -> ${pathAbsoluteFallback} - '' throw ''${plugin.pname}: does not provide parse-able entry point''; + '' throw "${plugin.pname}: does not provide parse-able entry point"; in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; diff --git a/pkgs/by-name/pt/ptunnel/package.nix b/pkgs/by-name/pt/ptunnel/package.nix index e0202288717d..1b57eeedee1d 100644 --- a/pkgs/by-name/pt/ptunnel/package.nix +++ b/pkgs/by-name/pt/ptunnel/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cs.uit.no/~daniels/PingTunnel"; license = lib.licenses.bsd3; mainProgram = "ptunnel"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pu/puredata/package.nix b/pkgs/by-name/pu/puredata/package.nix index 54e04bba7ebb..2aca99971134 100644 --- a/pkgs/by-name/pu/puredata/package.nix +++ b/pkgs/by-name/pu/puredata/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Real-time graphical programming environment for audio, video, and graphical processing''; + description = "Real-time graphical programming environment for audio, video, and graphical processing"; homepage = "http://puredata.info"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/qi/qimgv/package.nix b/pkgs/by-name/qi/qimgv/package.nix index bd763d3c4f20..aa1fcb7963fb 100644 --- a/pkgs/by-name/qi/qimgv/package.nix +++ b/pkgs/by-name/qi/qimgv/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - libsForQt5, + kdePackages, exiv2, mpv, opencv4, @@ -24,21 +24,23 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - libsForQt5.wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; cmakeFlags = [ "-DVIDEO_SUPPORT=ON" + "-DUSE_QT5=OFF" ]; buildInputs = [ exiv2 mpv opencv4.cxxdev - libsForQt5.qtbase - libsForQt5.qtimageformats - libsForQt5.qtsvg - libsForQt5.qttools + kdePackages.qtbase + kdePackages.qtimageformats + kdePackages.qtsvg + kdePackages.qttools + kdePackages.kimageformats ]; postPatch = '' @@ -53,7 +55,7 @@ stdenv.mkDerivation { ]; meta = { - description = "Qt5 image viewer with optional video support"; + description = "Qt6 image viewer with optional video support"; mainProgram = "qimgv"; homepage = "https://github.com/easymodo/qimgv"; license = lib.licenses.gpl3; diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index e3fb61f4a77a..bfa0fbb44de5 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -150,7 +150,7 @@ python3.pkgs.buildPythonApplication { "''${qtWrapperArgs[@]}" # avoid persistant warning on starup --set QT_STYLE_OVERRIDE Fusion - ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString pipewireSupport "--prefix LD_LIBRARY_PATH : ${libPath}"} ${lib.optionalString enableVulkan '' --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} --set-default QSG_RHI_BACKEND vulkan diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index e5cb7e1d13b3..bebbcfa61ec6 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -43,12 +43,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "rabbitmq-server"; - version = "4.2.2"; + version = "4.2.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-jLsBn3TxlFZYNYLkOtCdWvzf/SY1RqYwfJObbhXeyVI="; + hash = "sha256-R1PtbkZs0aaJYUN8vZnJHG9Z+2SPOIRiaFOTz703LcA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/razergenie/package.nix b/pkgs/by-name/ra/razergenie/package.nix index 9e72a1dde834..0e5f5ad38ca8 100644 --- a/pkgs/by-name/ra/razergenie/package.nix +++ b/pkgs/by-name/ra/razergenie/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TxW6IUHmEaNdJPeEGwo57a3EGH6MMyitVTmzStVmZjc="; }; - postUnpack = ''ln -s ${libopenrazer} libopenrazer''; + postUnpack = "ln -s ${libopenrazer} libopenrazer"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix index d0f483cce617..dfd3c5b055a9 100644 --- a/pkgs/by-name/re/recoverdm/package.nix +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "recoverdm"; homepage = "https://salsa.debian.org/pkg-security-team/recoverdm"; changelog = "https://salsa.debian.org/pkg-security-team/recoverdm/-/blob/debian/master/debian/changelog"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl1Only; }; diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix index dee3efcc219b..97d4eb9c8ad9 100644 --- a/pkgs/by-name/re/regripper/package.nix +++ b/pkgs/by-name/re/regripper/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { description = "Open source forensic software used as a Windows Registry data extraction command line"; mainProgram = "regripper"; homepage = "https://github.com/keydet89/RegRipper3.0"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/ri/rifiuti/package.nix b/pkgs/by-name/ri/rifiuti/package.nix index 806015e793ed..10074e82ace6 100644 --- a/pkgs/by-name/ri/rifiuti/package.nix +++ b/pkgs/by-name/ri/rifiuti/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Analyze Windows Recycle Bin INFO2 file"; mainProgram = "rifiuti"; homepage = "https://sourceforge.net/projects/odessa/files/Rifiuti"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 7d29ef06801a..af85461b0745 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rke"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "rancher"; repo = "rke"; rev = "v${version}"; - hash = "sha256-oKdq0QZRlIs1yts8zasbDGcQGvYPzeeVI95DIqeXPuM="; + hash = "sha256-FSkEsoo0k8G/tv1EkSXVBn8p16n7M88WtFvD4WgqDl4="; }; vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4="; diff --git a/pkgs/by-name/ro/rofi/package.nix b/pkgs/by-name/ro/rofi/package.nix index 472886bb7912..d0653ce6eaf7 100644 --- a/pkgs/by-name/ro/rofi/package.nix +++ b/pkgs/by-name/ro/rofi/package.nix @@ -43,7 +43,7 @@ symlinkJoin { --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ ${ lib.optionalString (plugins != [ ]) - ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}'' + "--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}" } \ ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ ${lib.optionalString (plugins != [ ]) ''--add-flags "-plugin-path $out/lib/rofi"''} diff --git a/pkgs/by-name/rs/rsmangler/package.nix b/pkgs/by-name/rs/rsmangler/package.nix index 31aa87e7c445..cae8e39f77d2 100644 --- a/pkgs/by-name/rs/rsmangler/package.nix +++ b/pkgs/by-name/rs/rsmangler/package.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/digininja/RSMangler"; license = lib.licenses.cc-by-sa-20; mainProgram = "rsmangler"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = ruby.meta.platforms; }; }) diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index ec4c165b3e32..2303b4838817 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2026-01-12"; + version = "2026-01-19"; - cargoHash = "sha256-2lutUe9+VZqMXPfFP6zjg2wQR7Amdc0U6Ih3OXvwCEk="; + cargoHash = "sha256-0eVrWPe/S4lwwmgk8T76tAenEfFri9Y8PtRpGJ6b7BQ="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-xSOqy4OwQtkuPtptNQDkKs36K4xdrebEHnchoMhIpug="; + hash = "sha256-sJMJ64vN2LaeMJ8C8daD/rmOzqsrTpwVAaykL/J+BG0="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sa/samdump2/package.nix b/pkgs/by-name/sa/samdump2/package.nix index c232c1fe3fdb..ab7c6fc2bf97 100644 --- a/pkgs/by-name/sa/samdump2/package.nix +++ b/pkgs/by-name/sa/samdump2/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "samdump2"; homepage = "https://sourceforge.net/projects/ophcrack/files/samdump2"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sc/scrounge-ntfs/package.nix b/pkgs/by-name/sc/scrounge-ntfs/package.nix index 25baefbd1fc3..c9f6d5083672 100644 --- a/pkgs/by-name/sc/scrounge-ntfs/package.nix +++ b/pkgs/by-name/sc/scrounge-ntfs/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Data recovery program for NTFS file systems"; mainProgram = "scrounge-ntfs"; homepage = "http://thewalter.net/stef/software/scrounge/"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index 6d5ca4b14aa2..c6ea00e34271 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-01-19"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "65490d3c39825a84f9c2cb4fa9bc359284f37ca2"; - hash = "sha256-v6V5TTmI7PKHU5F82yhyyPdofPegvbbGeqqque+C1hU="; + rev = "07a5c6b80262a208200573186eb5d5ac2518e89d"; + hash = "sha256-Lz55pKQ5vT3kAAziOKzT5q8GCVHO/GOZ8fOC8BHoMJA="; }; dontBuild = true; diff --git a/pkgs/by-name/si/sigtop/package.nix b/pkgs/by-name/si/sigtop/package.nix index 8bfb19c9507d..8a4be7818da2 100644 --- a/pkgs/by-name/si/sigtop/package.nix +++ b/pkgs/by-name/si/sigtop/package.nix @@ -7,7 +7,7 @@ }: buildGoModule rec { - name = "sigtop"; + pname = "sigtop"; version = "0.22.0"; src = fetchFromGitHub { diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 4e082f346d9d..c2ee2e8cb11c 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ - ''--prefix PATH : ${ + "--prefix PATH : ${ lib.makeBinPath [ cryfs encfs @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { securefs sshfs ] - }'' + }" ]; doCheck = true; diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index c8f05d8db137..8c0ad97f5052 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.10-unstable-2026-01-13"; + version = "3.2.11-unstable-2026-01-17"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "da2bf4fd868062ea69111077c6631b26860ad5e3"; - hash = "sha256-PmTRseccN9ZyyFKWAJyDitDhWIKyTEJi77H5/CdNzbY="; + rev = "97e9f38a1b348705e68a9a6d66bbe6156e923770"; + hash = "sha256-kZ6KyhI2oZH0SeymcHge9+rbq/ZGfhKXGdfOlje2zqM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 334adb2dca00..ab13b3b9a014 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.14.7"; + version = "9.15.0"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-kKULORORg187jwEp5rjtWBVYdS0IA+aYCnPhJj7mVNE="; + hash = "sha256-wkx19shtDWs/9E3Dg22YG1G3RCzMx4STLQm1gYUK1wk="; }; postPatch = '' diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index 672ab0487b7c..dc793d78db38 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.11.2"; + version = "0.11.3"; in buildGoModule { pname = "soft-serve"; @@ -19,10 +19,10 @@ buildGoModule { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-FItQus4dAf1/wG+7B3oC5Z/7rv3HG/b7lcbrsW4IUyM="; + hash = "sha256-WugaUfu4X3eEMNKEjIo/um91iI5WeaZmkG/eJ1TPogA="; }; - vendorHash = "sha256-bGtIqdbjkQZD0lOfAOS022gPBGWWzXsjfLbbLwup1/Q="; + vendorHash = "sha256-qyOBwDSP+roKqi5Khn0ApmtVIgRc/0wB6FVmjzqaZOY="; doCheck = false; diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 85bfbbaa2afa..d2b30d91ea90 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -107,7 +107,7 @@ buildDotnetModule rec { # ${soundfont-path} is escaped here: # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45 # via https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html under ${parameter@operator} - makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}'' ]; + makeWrapperArgs = [ "--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}" ]; executables = [ "SS14.Launcher" ]; diff --git a/pkgs/by-name/sp/spooftooph/package.nix b/pkgs/by-name/sp/spooftooph/package.nix index 34f2341b7138..dc045344aec9 100644 --- a/pkgs/by-name/sp/spooftooph/package.nix +++ b/pkgs/by-name/sp/spooftooph/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "spooftooph"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/st/starsector/package.nix b/pkgs/by-name/st/starsector/package.nix index 9a48fdd40c80..9c4cec38b960 100644 --- a/pkgs/by-name/st/starsector/package.nix +++ b/pkgs/by-name/st/starsector/package.nix @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bbigras rafaelrc + sigmasquadron ]; }; } diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index ba70b3e3b905..56c03f2882e0 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gitUpdater { - ignoredVersions = ''master.*''; + ignoredVersions = "master.*"; }; }; diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix index e9faff43c7a8..69b8f90c8761 100644 --- a/pkgs/by-name/st/strawberry/package.nix +++ b/pkgs/by-name/st/strawberry/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "strawberry"; - version = "1.2.16"; + version = "1.2.17"; src = fetchFromGitHub { owner = "jonaski"; repo = "strawberry"; rev = finalAttrs.finalPackage.version; - hash = "sha256-4V/geww/M0FD3McBuz8MgkwdXA7j+d71SJn5Q4AZrvU="; + hash = "sha256-ZyWVOpa1laBUNW5lwbNeAmVBXEOLlXy+Xz8vbtuLi/8="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/by-name/sw/sweet-folders/package.nix b/pkgs/by-name/sw/sweet-folders/package.nix index bf36f3f1f789..e14084cf1f98 100644 --- a/pkgs/by-name/sw/sweet-folders/package.nix +++ b/pkgs/by-name/sw/sweet-folders/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Folders icons for Sweet GTK theme"; homepage = "https://github.com/EliverLara/Sweet-folders"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/sw/sweet/package.nix b/pkgs/by-name/sw/sweet/package.nix index 807c2e473525..02e53789142b 100644 --- a/pkgs/by-name/sw/sweet/package.nix +++ b/pkgs/by-name/sw/sweet/package.nix @@ -104,7 +104,6 @@ lib.checkListOfEnum "${pname}: color variants" colorVariantList colorVariants license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fuzen - d3vil0p3r ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix index 5699d00bd206..8fcad3d6b7e2 100644 --- a/pkgs/by-name/sy/syncterm/package.nix +++ b/pkgs/by-name/sy/syncterm/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # We can't use sourceRoot, as the cherry-picked patches apply to files outside of it. - postPatch = ''cd src/syncterm''; + postPatch = "cd src/syncterm"; CFLAGS = [ "-DHAS_INTTYPES_H" diff --git a/pkgs/by-name/sy/system-manager/package.nix b/pkgs/by-name/sy/system-manager/package.nix new file mode 100644 index 000000000000..c8570f7b6f13 --- /dev/null +++ b/pkgs/by-name/sy/system-manager/package.nix @@ -0,0 +1,56 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + dbus, + pkg-config, + clippy, + nix, + cargo, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "system-manager"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "system-manager"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Jjvn9gPmL6otZcaYjzE4cXLQFyzAEEsnpgwP3OoN8Gk="; + }; + + cargoHash = "sha256-A3A1RRx9U43u6wmzPE+yZwi08m7vcD5ccLC89TgDvOg="; + + buildInputs = [ dbus ]; + nativeBuildInputs = [ + pkg-config + ]; + + nativeCheckInputs = [ + clippy + nix + cargo + ]; + + preCheck = '' + cargo clippy + + # Stop the Nix command from trying to create /nix/var/nix/profiles. + # + # https://nix.dev/manual/nix/2.24/command-ref/new-cli/nix3-profile#profiles + export NIX_STATE_DIR=$TMPDIR + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage system config using nix on any distro"; + homepage = "http://system-manager.net"; + license = lib.licenses.mit; + mainProgram = "system-manager"; + maintainers = with lib.maintainers; [ jfroche ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 81b296c62786..e1de49bc5b8f 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { postFixup = if stdenv.hostPlatform.isDarwin then - ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + "install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib" else null; diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 08031e8f6c9a..9fba06147400 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -120,7 +120,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ garaiza-93 - d3vil0p3r ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/to/toml2nix/package.nix b/pkgs/by-name/to/toml2nix/package.nix index 796bee262e08..441d7f45a4a7 100644 --- a/pkgs/by-name/to/toml2nix/package.nix +++ b/pkgs/by-name/to/toml2nix/package.nix @@ -2,14 +2,15 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "toml2nix"; version = "0.1.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; }; @@ -19,6 +20,7 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Tool to convert TOML files to Nix expressions"; mainProgram = "toml2nix"; @@ -27,6 +29,6 @@ rustPlatform.buildRustPackage rec { mit # or asl20 ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/tt/ttfautohint/package.nix b/pkgs/by-name/tt/ttfautohint/package.nix index 4b9c579ba8fc..ec996dbbab78 100644 --- a/pkgs/by-name/tt/ttfautohint/package.nix +++ b/pkgs/by-name/tt/ttfautohint/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableGUI [ libsForQt5.qt5.qtbase ]; configureFlags = [ - ''--with-qt=${if enableGUI then "${libsForQt5.qt5.qtbase}/lib" else "no"}'' + "--with-qt=${if enableGUI then "${libsForQt5.qt5.qtbase}/lib" else "no"}" ] ++ lib.optionals (!enableGUI) [ "--without-doc" ]; diff --git a/pkgs/by-name/ua/uavs3d/package.nix b/pkgs/by-name/ua/uavs3d/package.nix index 085eed38d3ed..47898d8d5ce4 100644 --- a/pkgs/by-name/ua/uavs3d/package.nix +++ b/pkgs/by-name/ua/uavs3d/package.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix index 82541764edb8..0639bbee8847 100644 --- a/pkgs/by-name/un/undbx/package.nix +++ b/pkgs/by-name/un/undbx/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Extract e-mail messages from Outlook Express DBX files"; homepage = "https://github.com/ZungBang/undbx"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; mainProgram = "undbx"; diff --git a/pkgs/by-name/un/unix-privesc-check/package.nix b/pkgs/by-name/un/unix-privesc-check/package.nix index e13ddd931252..11270f3465e5 100644 --- a/pkgs/by-name/un/unix-privesc-check/package.nix +++ b/pkgs/by-name/un/unix-privesc-check/package.nix @@ -81,7 +81,7 @@ resholve.mkDerivation rec { description = "Find misconfigurations that could allow local unprivilged users to escalate privileges to other users or to access local apps"; mainProgram = "unix-privesc-check"; homepage = "https://pentestmonkey.net/tools/audit/unix-privesc-check"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index e5142e2ce05d..a47b6d3e966c 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; env = lib.optionalAttrs selinuxSupport { - SELINUX_INCLUDE_DIR = ''${libselinux.dev}/include''; + SELINUX_INCLUDE_DIR = "${libselinux.dev}/include"; SELINUX_LIB_DIR = lib.makeLibraryPath [ libselinux ]; diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index 18527522dbe8..c78a575e97ce 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2026-01-08"; + version = "0.0.1-unstable-2026-01-19"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "d0dd746491844b5de4724bcb7d0a28674a8b33f9"; - hash = "sha256-gRkXVc3+0dqlvt/hAsAXnDFsOeN83ozPjieU4yLlOms="; + rev = "0dcfb73afa946d585a1056d3ae117c8ec3407a31"; + hash = "sha256-oq2tPaguyptMtYdnsM9nUXzSbKXdozl+xY0+qk/zZW8="; }; - cargoHash = "sha256-wh9GHj/F/v1kTyZim7nGuuuFm92OsX8Mxj01GL0H/CE="; + cargoHash = "sha256-MYIlzLP6DMBgLfNQSE3TxfMAMRdIHLlAwd6hmdHa8OU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix index 126281d616d3..7b07c13ad246 100644 --- a/pkgs/by-name/uu/uutils-util-linux/package.nix +++ b/pkgs/by-name/uu/uutils-util-linux/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-util-linux"; - version = "0.0.1-unstable-2026-01-15"; + version = "0.0.1-unstable-2026-01-19"; src = fetchFromGitHub { owner = "uutils"; repo = "util-linux"; - rev = "60c8f8b572109d8bef0210b17486de2a2d565a19"; - hash = "sha256-hebVBj/u8UQcOXFniY+FKVbT8kZgbmLWGClAX858GzI="; + rev = "6fa694801a4c51f82787d0613f49338e67a284ab"; + hash = "sha256-DMjKMzXbDaWA7BPIBj9tKo6VXyS9WcF5iree3oqIViI="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"' ''; - cargoHash = "sha256-bgOnkNfVZuPB9Ku12wwjhryR/fjRkWK2cMhoRZMBMZ0="; + cargoHash = "sha256-+oKsHCAWiMH/oV7AL5+Nq5PgfS9SQvs5MLqCW8yG3vw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index bca2dde18605..526331e167b5 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20260115051358"; + version = "20260122141558"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-KtYU16cpYkZ739+Y9ZqZkNa4Uv8WGvoY2flbf/cCZyA="; + hash = "sha256-MmtAA+SR8a6glzAuKaqH3z/cqKlYUQNRzymtPlOrbcg="; }; vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk="; meta = { diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index 13490914bf66..3c1a26e03076 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "vfox"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "version-fox"; repo = "vfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-iCHvrq1GoW1J6BnslhhFb7M9IE4DGtoXLRrZe2PzlAU="; + hash = "sha256-42uaGW+qo9YC7FIpucWna+RwKhIsObFGYQja1fcArQo="; }; vendorHash = "sha256-+swC2G8g0rrANsUM8jXad+38QX0yWIf+2boyAv7+hG8="; diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix index 6bf8494bdc2f..ff57393545ff 100644 --- a/pkgs/by-name/vi/villain/package.nix +++ b/pkgs/by-name/vi/villain/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/t3l3machus/Villain"; license = lib.licenses.cc-by-nc-nd-40; mainProgram = "villain"; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 17ad2046d65a..c6fe08a53e84 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -25,7 +25,7 @@ buildGoLatestModule { excludedPackages = [ "scripts" ]; # Fix up reported version - postPatch = ''echo ${version} > version.txt''; + postPatch = "echo ${version} > version.txt"; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 93ea549ba19f..d765581fd205 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - preBuild = ''export OUT_PATH=$out''; + preBuild = "export OUT_PATH=$out"; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index e44878f3465b..4c24e97cc2e3 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.24.29"; + version = "1.24.35"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-LBMPx/IRxqkdD3dwLwoFHqjnuMUApffaq3ccu4WA2v4="; + hash = "sha256-qf8RU7cNHzXSjyzlRtHxuoxGlkSWNYTmYu/Z0hiqQpc="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-oLeVLNJ69tX8cuUVbe6WfAnR2In08iSJLqIhz4/fG20="; + cargoHash = "sha256-A9Cg9zZ4FNTTdA+oIvxVH2D2627t+mhNLnRKDsVeKb8="; postPatch = '' substituteInPlace src/handler.rs \ diff --git a/pkgs/by-name/we/weevely/package.nix b/pkgs/by-name/we/weevely/package.nix index d81b3dcc74ba..3e78a04c4901 100644 --- a/pkgs/by-name/we/weevely/package.nix +++ b/pkgs/by-name/we/weevely/package.nix @@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "weevely"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix index 51ad6dc062af..41426beb1c9a 100644 --- a/pkgs/by-name/wi/wifite2/package.nix +++ b/pkgs/by-name/wi/wifite2/package.nix @@ -82,7 +82,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ lassulus danielfullmer - d3vil0p3r ]; }; } diff --git a/pkgs/by-name/wi/wild-unwrapped/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix index 453d810cd079..acd36edcea45 100644 --- a/pkgs/by-name/wi/wild-unwrapped/package.nix +++ b/pkgs/by-name/wi/wild-unwrapped/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wild-unwrapped"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "davidlattimore"; repo = "wild"; tag = finalAttrs.version; - hash = "sha256-x0IZuWjj0LRMj4pu2FVaD8SENm/UVtE1e4rl0EOZZZM="; + hash = "sha256-E5cmZuOtF+MNTPyalKjnguhin70zqtDDB0D71ZpeE48="; }; - cargoHash = "sha256-5s0qS8y0+EH+R1tgN2W5/+t+GdjbQdRVLlcA2KjpHsE="; + cargoHash = "sha256-r0r7sN1SW5TIybHORfzJkN51Y0REEC2/h7q71GxUgAM="; cargoBuildFlags = [ "-p wild-linker" ]; diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 577b8c22bb3a..7271e7da5e37 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -7,10 +7,10 @@ let pname = "wootility"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage"; - sha256 = "sha256-0ROk+Qv874zxoHFznWbdVYSwdui5XNqHGu5hcWzo4Wg="; + sha256 = "sha256-AoToN2oQ0kUnXRYPDEFUk4jS/CXGOn4adD2gyaB/wGo="; }; in diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix index 6d42b94f8589..4cd4e3edbed1 100644 --- a/pkgs/by-name/xe/xeus/package.nix +++ b/pkgs/by-name/xe/xeus/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - preCheck = ''export LD_LIBRARY_PATH=$PWD''; + preCheck = "export LD_LIBRARY_PATH=$PWD"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 26ff26d21da5..47b5fb2e12c4 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.219.4"; + version = "0.220.3"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-x0N+xGoWNQOXI/b6hityYy6ZbcAPTrzGKMbgCxDcHhM="; + hash = "sha256-BxGNgJxwX7qY4chi5xaJ8RZnmo80v+9QeZOPTUpsHBc="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-adHfP57EpqCOo8HSpuG1JTV6qNljz282PYgR32cCuxE="; + cargoHash = "sha256-pjHJkvdZn5JoL9LSdnmpov8/mGZQKzM5lC4u7MZEsQ4="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ze/zelda64recomp/package.nix b/pkgs/by-name/ze/zelda64recomp/package.nix index f04215319157..53000e040a01 100644 --- a/pkgs/by-name/ze/zelda64recomp/package.nix +++ b/pkgs/by-name/ze/zelda64recomp/package.nix @@ -142,7 +142,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { # application level if desired. postFixup = '' wrapProgram $out/bin/Zelda64Recompiled --chdir "$out/bin/" \ - ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''} + ${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"} ''; meta = { diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 4b1f2b59a4af..90e53739af5d 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - hash = "sha256-ahinXciTzG4fBtWKLSWP9uFG3Z3M7NHg60mcziMV1qM="; + hash = "sha256-mynoXNJE7IcP/0bMLUr/pJQbaEVEj2q/488Z4c9Tr5A="; }; - cargoHash = "sha256-37AoQOfntpdLb0EPRmlgqrElLts7IGW0fr8g2TeTTRc="; + cargoHash = "sha256-AEgyaKenTMKAoJjzcklFFWjy5H5hkNZvVnlMZmqQxlM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index 0054a1e57286..8a6d5714c248 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -91,10 +91,10 @@ stdenv.mkDerivation rec { let setOptionalSupport = name: var: "support_${name}=" + (if var then "1" else ""); makeOptsCommon = [ - ''-j$NIX_BUILD_CORES'' - ''root.version=${src.rev}'' - ''system.zlib=1'' - ''platform=${platformName}'' + "-j$NIX_BUILD_CORES" + "root.version=${src.rev}" + "system.zlib=1" + "platform=${platformName}" ''includes.dirs.${platformName}="${lib.makeSearchPathOutput "dev" "include" buildInputs}"'' ''libraries.dirs.${platformName}="${lib.makeLibraryPath staticBuildInputs}"'' ''ld_flags="-Wl,-rpath=\"${lib.makeLibraryPath dlopenBuildInputs}\""'' @@ -108,9 +108,9 @@ stdenv.mkDerivation rec { (setOptionalSupport "pulseaudio" withPulse) ]; makeOptsQt = [ - ''tools.uic=${qt5.qtbase.dev}/bin/uic'' - ''tools.moc=${qt5.qtbase.dev}/bin/moc'' - ''tools.rcc=${qt5.qtbase.dev}/bin/rcc'' + "tools.uic=${qt5.qtbase.dev}/bin/uic" + "tools.moc=${qt5.qtbase.dev}/bin/moc" + "tools.rcc=${qt5.qtbase.dev}/bin/rcc" ]; in '' diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index ddb5b5dbb85d..c7c336305e3d 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -44,7 +44,7 @@ mkCoqDerivation { metacoq ]; - postPatch = ''patchShebangs ./tests/process-extraction-examples.sh''; + postPatch = "patchShebangs ./tests/process-extraction-examples.sh"; meta = { description = "Framework for extracting Coq programs to Elm"; diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix index 75c81476d109..dd2b85934b29 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix +++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix @@ -87,7 +87,7 @@ buildRedist (finalAttrs: { ++ lib.optionals (cudaOlder "12.5") [ "$(_NVVM_BRANCH_)" ] ++ lib.optionals (cudaAtLeast "12.5") [ "nvvm" ] ); - newNvvmDir = ''''${!outputBin:?}/nvvm''; + newNvvmDir = "\${!outputBin:?}/nvvm"; in lib.optionalString finalAttrs.finalPackage.meta.available ( # From CUDA 13.0, NVVM is available as a separate library and not bundled in the NVCC redist. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1e2df1082117..9fb971bfd2ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -259523,7 +259523,7 @@ self: { sed -i "s|\"-s\"|\"\"|" ./Setup.hs sed -i "s|numJobs (bf bi)++||" ./Setup.hs ''; - preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; + preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; description = "Grammatical Framework"; license = "unknown"; hydraPlatforms = lib.platforms.none; diff --git a/pkgs/development/interpreters/php/service.nix b/pkgs/development/interpreters/php/service.nix index 06b1247c5e20..e41aa6ae3f30 100644 --- a/pkgs/development/interpreters/php/service.nix +++ b/pkgs/development/interpreters/php/service.nix @@ -84,7 +84,7 @@ in package = lib.mkOption { type = lib.types.package; description = "PHP package to use for php-fpm"; - defaultText = lib.literalMD ''The PHP package that provided this module.''; + defaultText = lib.literalMD "The PHP package that provided this module."; example = lib.literalExpression '' php.buildEnv { extensions = diff --git a/pkgs/development/julia-modules/util.nix b/pkgs/development/julia-modules/util.nix index c9e3fb54e092..a10d3f5d35cd 100644 --- a/pkgs/development/julia-modules/util.nix +++ b/pkgs/development/julia-modules/util.nix @@ -24,7 +24,7 @@ # Convert an ordinary source checkout into a repo with a single commit repoifySimple = name: path: - runCommand ''${name}-repoified'' { buildInputs = [ gitMinimal ]; } '' + runCommand "${name}-repoified" { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${path}/. $out cd $out @@ -40,7 +40,7 @@ # Convert an dependency source info into a repo with a single commit repoifyInfo = uuid: info: - runCommand ''julia-${info.name}-${info.version}'' { buildInputs = [ gitMinimal ]; } '' + runCommand "julia-${info.name}-${info.version}" { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${info.src}/. $out cd $out diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 020e9e9580e5..0720a23b8936 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -435,14 +435,14 @@ stdenv.mkDerivation ( "-I" "${openssl.dev}/include" "-system-sqlite" - ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' - ''-${if libpq != null then "plugin" else "no"}-sql-psql'' + "-${if mysqlSupport then "plugin" else "no"}-sql-mysql" + "-${if libpq != null then "plugin" else "no"}-sql-psql" "-system-libpng" "-make libs" "-make tools" - ''-${lib.optionalString (!buildExamples) "no"}make examples'' - ''-${lib.optionalString (!buildTests) "no"}make tests'' + "-${lib.optionalString (!buildExamples) "no"}make examples" + "-${lib.optionalString (!buildTests) "no"}make tests" ] ++ ( if stdenv.hostPlatform.isDarwin then @@ -471,7 +471,7 @@ stdenv.mkDerivation ( "-I" "${libXrender.out}/include" - ''-${lib.optionalString (cups == null) "no-"}cups'' + "-${lib.optionalString (cups == null) "no-"}cups" "-dbus-linked" "-glib" ] diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index da8366b840d6..d5b7b6560858 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -58,11 +58,11 @@ typer, uvicorn, wrapt, -# , flair -# , setfit -# , spacy-huggingface-hub -# , span_marker -# , trl + # , flair + # , setfit + # , spacy-huggingface-hub + # , span_marker + # , trl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 29efa818ec59..50bdeb18a84a 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -64,7 +64,7 @@ buildPythonPackage (finalAttrs: { pname = "atopile"; - version = "0.12.4"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.13"; @@ -73,17 +73,9 @@ buildPythonPackage (finalAttrs: { owner = "atopile"; repo = "atopile"; tag = "v${finalAttrs.version}"; - hash = "sha256-SB6D1738t3kQJI+V9ClVsByHm6BsLl078N/wDAHJE6E="; + hash = "sha256-/1vkYGG3OHyeFpzbvRoAxUtLQLePKE2jwQx8o/CTErQ="; }; - patches = [ - (fetchpatch { - name = "migrate-to-pygls-v2.patch"; - url = "https://github.com/atopile/atopile/pull/1533.patch"; - hash = "sha256-yyRtYFwwcwliz38l7WkzT+zvi+uxWzHdZ06cl8q09Ec="; - }) - ]; - build-system = [ hatchling scikit-build-core @@ -140,7 +132,6 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "posthog" "prompt-toolkit" - "zstd" ]; pythonImportsCheck = [ "atopile" ]; diff --git a/pkgs/development/python-modules/cadwyn/default.nix b/pkgs/development/python-modules/cadwyn/default.nix new file mode 100644 index 000000000000..34fc2f74030e --- /dev/null +++ b/pkgs/development/python-modules/cadwyn/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytestCheckHook, + # runtime dependencies + fastapi, + issubclass, + jinja2, + pydantic, + starlette, + typing-extensions, + typing-inspection, + # test dependencies + dirty-equals, + httpx, + inline-snapshot, + pydantic-settings, + pytest-fixture-classes, + python-multipart, + svcs, + typer, + uvicorn, + pythonAtLeast, +}: + +buildPythonPackage rec { + pname = "cadwyn"; + version = "5.6.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zmievsa"; + repo = "cadwyn"; + tag = version; + hash = "sha256-VVi79c/Y1mu520H/7gy9lGdBIVuKsYedU49P501NQao="; + }; + + disabled = pythonAtLeast "3.14"; + + build-system = [ hatchling ]; + + dependencies = [ + fastapi + issubclass + jinja2 + pydantic + starlette + typing-extensions + typing-inspection + ]; + + pythonImportsCheck = [ "cadwyn" ]; + + nativeCheckInputs = [ + dirty-equals + httpx + inline-snapshot + pydantic-settings + pytest-fixture-classes + pytestCheckHook + python-multipart + svcs + typer + uvicorn + ]; + + meta = { + description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"; + homepage = "https://github.com/zmievsa/cadwyn"; + changelog = "https://github.com/zmievsa/cadwyn/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index e1100871b2b6..cf868a493a4e 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-debug-toolbar"; tag = version; - hash = "sha256-gDBir6xf4BBo3KwfVGEUo+Ve5vsmuB12cQqy9sdXSUg="; + hash = "sha256-0NF71cuA55puEjJxd6I0xoeDQPWW+oxfWseDBmhis5k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 04067083b56a..5cc46af5fd31 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -13,7 +13,7 @@ dbus, xvfb-run, wrapGAppsHook3, -# , fetchPypi + # , fetchPypi }: buildPythonPackage { diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 4982bdb60836..c5c975c7716e 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.56.0"; + version = "1.60.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-gtI2t4vgd9i7SPbSro/eC2/mwGudTY6YfekcmbaaPeY="; + hash = "sha256-Ucpf3Lyozg/LSHzgA5UE+ntTcN6Ese+/YEA0osWjwmI="; }; build-system = [ diff --git a/pkgs/development/python-modules/greenback/default.nix b/pkgs/development/python-modules/greenback/default.nix new file mode 100644 index 000000000000..fcf90d4ce115 --- /dev/null +++ b/pkgs/development/python-modules/greenback/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + asgiref, + greenlet, + importlib-metadata, + outcome, + setuptools, + sniffio, +}: + +buildPythonPackage rec { + pname = "greenback"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oremanj"; + repo = "greenback"; + tag = "v${version}"; + hash = "sha256-u7kihdE5EH3Xbq4dQGY4ojiootjw3muYnoI7d2MrMkE="; + }; + + build-system = [ + importlib-metadata + setuptools + ]; + + dependencies = [ + asgiref + greenlet + outcome + sniffio + ]; + + pythonImportsCheck = [ "greenback" ]; + + meta = { + description = "Use anyio and asyncio from synchronous code"; + homepage = "https://github.com/oremanj/greenback"; + changelog = "https://github.com/oremanj/greenback/blob/${src.rev}/CHANGES.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index bb1b2331e6c0..d40e7f97ebc8 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -258,9 +258,9 @@ stdenv.mkDerivation rec { gnFlags = [ ''chip_project_config_include_dirs=["//.."]'' ''chip_crypto="openssl"'' - ''enable_rtti=true'' - ''chip_config_memory_debug_checks=false'' - ''chip_config_memory_debug_dmalloc=false'' + "enable_rtti=true" + "chip_config_memory_debug_checks=false" + "chip_config_memory_debug_dmalloc=false" ''chip_mdns="minimal"'' ''chip_minmdns_default_policy="libnl"'' ''chip_python_version="${lib.versions.majorMinor python.version}"'' diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 1750ab27d75d..53405cb97fb8 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,14 +16,14 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.14"; + version = "1.15"; pyproject = true; src = fetchFromGitHub { owner = "dahlia"; repo = "iso4217"; tag = version; - hash = "sha256-lGXNSUBv/So3UgqXQ5AksqrCJVoyU8icDCfOda7Y5BE="; + hash = "sha256-YhYCCGMj5q+QeXWElysONbFkCVkcQeOPy/Tk4+fyNLk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/issubclass/default.nix b/pkgs/development/python-modules/issubclass/default.nix new file mode 100644 index 000000000000..041ec408e62e --- /dev/null +++ b/pkgs/development/python-modules/issubclass/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, +}: + +buildPythonPackage rec { + pname = "issubclass"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zmievsa"; + repo = "issubclass"; + tag = version; + hash = "sha256-a4EUbQY5duicnxuwtpBQ/7UBmtmeU+ZaySEnT4lmgLs="; + }; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ "issubclass" ]; + + meta = { + description = "issubclass() builtin that doesn't raise TypeError when arguments are not classes"; + homepage = "https://pypi.org/project/issubclass"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index 6089a2ae5c9d..4550da40c92a 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -8,15 +8,15 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-workflows"; - version = "2.11.7"; + version = "2.12.2"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; - inherit version; - hash = "sha256-+4dSoLNp7jGBFkOKvx6T8KVNdO487H5Dz0Un/ROQZPU="; + inherit (finalAttrs) version; + hash = "sha256-N+Bc00g8ZPQQF2/mFNuMhLb0L8Ms2ts8yKyN4Y8BqXs="; }; postPatch = '' @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 9209960190c3..00cca426e33f 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "python-llfuse"; repo = "python-llfuse"; tag = "release-${version}"; - hash = "sha256-wni/b1hEn6/G0RszCJi+wmBHx6F0Ov1cZ/sRf8PLmps="; + hash = "sha256-PFnY+gmm1tjZhptc27XTE9yxF0IaJ+U4Ng/OGhNDDPI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/miniflux/default.nix b/pkgs/development/python-modules/miniflux/default.nix index 1a847608f7ac..b04c503ecf50 100644 --- a/pkgs/development/python-modules/miniflux/default.nix +++ b/pkgs/development/python-modules/miniflux/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "miniflux"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "miniflux"; repo = "python-client"; tag = version; - hash = "sha256-SCam8WiQH0cOUcqMMvhNDaNPGs7hi1RP4x4eoa5WIa4="; + hash = "sha256-RnND/NBTpmqT1UubGQLM7NVpIYKvue7CnRXWG0scqPo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix index 1cce35847bd2..663c1d30df26 100644 --- a/pkgs/development/python-modules/openslide/default.nix +++ b/pkgs/development/python-modules/openslide/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = ''rm -rf openslide/''; + preCheck = "rm -rf openslide/"; meta = { description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images"; diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index 01a973784202..a4275b3450b3 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # Prevent importing from build during test collection: - preCheck = ''rm -rf pillow_jpls''; + preCheck = "rm -rf pillow_jpls"; pythonImportsCheck = [ "pillow_jpls" ]; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 99a4a9521a61..42b741fa7d56 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.7"; + version = "1.7.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-8/d0SM/iTCuNIpa22HMigLJQQaPz4fVRhWxkUdPgG5Y="; + hash = "sha256-X2ltTzl66bCvObH6/7MZV8Ud+8WjgVhWRy1PTocpN+4="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix index e204161f1647..9a29d904841e 100644 --- a/pkgs/development/python-modules/prodict/default.nix +++ b/pkgs/development/python-modules/prodict/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; # make setuptools happy on case-sensitive filesystems - postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi''; + postPatch = "if [[ ! -f README.md ]]; then mv README.MD README.md; fi"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 87c7972f15d7..7c88c7dd6b65 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pydash"; - version = "8.0.5"; + version = "8.0.6"; pyproject = true; src = fetchFromGitHub { owner = "dgilland"; repo = "pydash"; tag = "v${version}"; - hash = "sha256-u8vLE0kjsnV2HNt3N3kmnaabgQzW3FcH4qxycNdv1Ls="; + hash = "sha256-8DPeM9Q9NrlVF9a6vIfJLGyyB2SrWpZZRHZKqU/DT2w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index b37d5cd7e8b8..a084c467818e 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "pylance"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${finalAttrs.version}"; - hash = "sha256-yhEM+1Rr0nEVj5XGQOjaZXlRQKnvPagvlNBhDfNUItw="; + hash = "sha256-k6dwZAKhziTDoOGsIj1tasF2QUn4EG1+ogeirCt3Kwc="; }; sourceRoot = "${finalAttrs.src.name}/python"; @@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-aMgy20urjm5gRX2fOh/vAoGUpXvnG3oY8u/D8rfSbHw="; + hash = "sha256-8Ja6GrqZqq/zJCh/QiUrHaukHFMvGEcXKZmo1gZjGq8="; }; nativeBuildInputs = [ @@ -107,6 +107,13 @@ buildPythonPackage (finalAttrs: { "-Wignore::DeprecationWarning" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + # RuntimeError: torch.compile is not supported on Python 3.14+ + "torch_tests/test_bench_utils.py" + "torch_tests/test_distance.py" + "torch_tests/test_torch_kmeans.py" + ]; + disabledTests = [ # Hangs indefinitely "test_all_permutations" @@ -148,6 +155,26 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Build hangs after all the tests are run due to a torch subprocess not exiting "test_multiprocess_loading" + + # torch._inductor.exc.InductorError: CppCompileError: C++ compile error + # OpenMP support not found + # TODO: figure out why this only happens on python 3.13 and not 3.14 + "test_cosine_distance" + "test_ground_truth" + "test_index_cast_centroids" + "test_index_with_no_centroid_movement" + "test_l2_distance" + "test_l2_distance_f16_bf16_cpu" + "test_pairwise_cosine" + "test_torch_index_with_nans" + "test_torch_kmeans_nans" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # RuntimeError: torch.compile is not supported on Python 3.14+ + "test_create_index_unsupported_accelerator" + "test_index_cast_centroids" + "test_index_with_no_centroid_movement" + "test_torch_index_with_nans" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index c5e6e3196104..b9a2164f1deb 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -10,14 +10,14 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytapo"; - version = "3.3.54"; + version = "3.3.56"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-B31PTYqXFzLkn/YuFbq0G7SDA1wMqAcwGOaj3xfmxYA="; + inherit (finalAttrs) pname version; + hash = "sha256-Cx3X0C8CiTixEdepj0bQViSMQJ65bVTRrZuMnPO/ys8="; }; build-system = [ setuptools ]; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Python library for communication with Tapo Cameras"; homepage = "https://github.com/JurajNyiri/pytapo"; - changelog = "https://github.com/JurajNyiri/pytapo/releases/tag/${version}"; + changelog = "https://github.com/JurajNyiri/pytapo/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fleaz ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-fixture-classes/default.nix b/pkgs/development/python-modules/pytest-fixture-classes/default.nix new file mode 100644 index 000000000000..6765247d940f --- /dev/null +++ b/pkgs/development/python-modules/pytest-fixture-classes/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + pytest, + pytestCheckHook, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "pytest-fixture-classes"; + version = "1.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zmievsa"; + repo = "pytest-fixture-classes"; + tag = version; + hash = "sha256-A3HsDhCGxoJnkl841tZ/7lIn8UyGy5NRjVWODZV7aOQ="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + typing-extensions + ]; + + pythonImportsCheck = [ "pytest_fixture_classes" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Fixtures as classes that work well with dependency injection, autocompletetion, type checkers, and language servers"; + homepage = "https://github.com/zmievsa/pytest-fixture-classes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix index 028a78177ea9..de5fbdcd88e3 100644 --- a/pkgs/development/python-modules/pywebcopy/default.nix +++ b/pkgs/development/python-modules/pywebcopy/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Python package for cloning complete webpages and websites to local storage"; homepage = "https://github.com/rajatomar788/pywebcopy/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ d3vil0p3r ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 9b2eb27f6093..353e3c0972f0 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.16.2"; + version = "0.16.4"; pyproject = true; src = fetchFromGitHub { owner = "python-quantities"; repo = "python-quantities"; tag = "v${version}"; - hash = "sha256-6Kl7TiSCSDtMjRKMNVweoGJ1y8kmo1j4SY0tikyAozs="; + hash = "sha256-a+UtNvcnQr4z87tpidx99u46M2H+EKtQ1EzIG5zQnmI="; }; build-system = [ diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 30478f3d2082..5df10c44be29 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; src = fetchFromGitHub { owner = "randy3k"; repo = "rchitect"; tag = "v${version}"; - hash = "sha256-R1Zr0M6NQw+8MYHSm8ll5oe/P1Q/apO4xnWdWVFTgWQ="; + hash = "sha256-xIBDPYuEdYrwpHQBSXfZcEkLra+b0bKy5ILNDCS2Vz0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/retryhttp/default.nix b/pkgs/development/python-modules/retryhttp/default.nix new file mode 100644 index 000000000000..8cc37882c709 --- /dev/null +++ b/pkgs/development/python-modules/retryhttp/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build system + setuptools, + setuptools-scm, + # runtime + httpx, + pydantic, + requests, + tenacity, + types-requests, +}: + +buildPythonPackage rec { + pname = "retryhttp"; + version = "1.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "austind"; + repo = "retryhttp"; + tag = "release/v${version}"; + hash = "sha256-Jz073CTeIfPjcOQUGdb6/Q5OfEXZW5hTiEPKrfAK0Gg="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + httpx + pydantic + requests + tenacity + types-requests + ]; + + pythonImportsCheck = [ "retryhttp" ]; + + meta = { + description = "Retry potentially transient HTTP errors in Python"; + homepage = "https://github.com/austind/retryhttp"; + changelog = "https://github.com/austind/retryhttp/releases/tag/release%2Fv${version}"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 29b2c3b940a5..18bcd842b60e 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -16,8 +16,8 @@ withManufDb ? false, wireshark, libpcap, -# 2D/3D graphics and graphs TODO: VPython -# TODO: nmap, numpy + # 2D/3D graphics and graphs TODO: VPython + # TODO: nmap, numpy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix index 0eed5cf1a62d..2b5e11cfdce8 100644 --- a/pkgs/development/python-modules/securityreporter/default.nix +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -9,21 +9,21 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "securityreporter"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "dongit-org"; repo = "python-reporter"; - tag = "v${version}"; - hash = "sha256-YvUDgsKM0JUajp8JAR2vj30QsNtcGvADGCZ791ZZD/8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bM11ztDd7Zg0O2+yGn9ZxKSo3B8nvhqUHSmdea/6sTg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ poetry-core ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper for the Reporter API"; homepage = "https://github.com/dongit-org/python-reporter"; - changelog = "https://github.com/dongit-org/python-reporter/releases/tag/v${version}"; + changelog = "https://github.com/dongit-org/python-reporter/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/svcs/default.nix b/pkgs/development/python-modules/svcs/default.nix new file mode 100644 index 000000000000..08a1452b9bfb --- /dev/null +++ b/pkgs/development/python-modules/svcs/default.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + attrs, + hatch-fancy-pypi-readme, + hatch-vcs, + hatchling, + # test dependencies + aiohttp, + fastapi, + flask, + httpx, + pyramid, + pytest-asyncio, + pytestCheckHook, + starlette, + sybil, +}: + +buildPythonPackage rec { + pname = "svcs"; + version = "25.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hynek"; + repo = "svcs"; + tag = version; + hash = "sha256-dDPmOKGifAGmAH3TD0NzJvR8lUB5qDWbxIwzHtNeF+4="; + }; + + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + dependencies = [ + attrs + ]; + + nativeCheckInputs = [ + aiohttp + fastapi + flask + httpx + pyramid + pytest-asyncio + pytestCheckHook + starlette + sybil + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_aclose_registry_ok" + "test_registrations" + "test_get_pings" + "test_client_pool_register_value" + ]; + + pythonImportsCheck = [ "svcs" ]; + + meta = { + description = "Flexible Service Locator for Python"; + homepage = "https://github.com/hynek/svcs"; + changelog = "https://github.com/hynek/svcs/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 25d3858801a9..c31ddac56df3 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.8.10"; + version = "0.8.11"; pyproject = true; src = fetchFromGitHub { owner = "EbbLabs"; repo = "python-tidal"; tag = "v${version}"; - hash = "sha256-hqtTe/KIGds01udMKoH5xXnoEe17FuOXLvWtp1yvJ2c="; + hash = "sha256-5IGMSiDwEGCnMtTARmx8Z9nfc3BaCe6z32m5j2FFBAI="; }; build-system = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 1f044cb1476b..b017c92c8877 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "twilio"; - version = "9.9.1"; + version = "9.10.0"; pyproject = true; src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; tag = finalAttrs.version; - hash = "sha256-ewG2VgxK8F2G/wogkGnhqZT9M9vrJu9Rdx4uXYNRhrI="; + hash = "sha256-DJxyDnAv3wKcujBFCE808PJ9NZe/PN8+Z9J2o49n0HU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uuid-utils/default.nix b/pkgs/development/python-modules/uuid-utils/default.nix index b1f0a3d9d202..fff22d62d308 100644 --- a/pkgs/development/python-modules/uuid-utils/default.nix +++ b/pkgs/development/python-modules/uuid-utils/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "uuid-utils"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "aminalaee"; repo = "uuid-utils"; tag = version; - hash = "sha256-wq68t8j+q57WLLOex0HxPU3H6mb+YRn8X53wSpUxPxE="; + hash = "sha256-zjf9+vqrDaI8PbOj+xNgMUIj6SvcJAHhCQAYbtkYpuQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-20O0l7/UCjF2mtKOzfZ9Pm0/hhiGZdHLMZhohJGaup0="; + hash = "sha256-JiAuJvlacQt9acOyGHxR2lV7IQPBpX/lLd/UhKGhdrI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index e003d73a97e4..0ae2c7deb581 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -71,7 +71,7 @@ mkDerivation { NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl -L${libmysqlclient}/lib/mariadb"; qtWrapperArgs = [ - ''--prefix PATH : ${lib.getBin graphviz}/bin'' + "--prefix PATH : ${lib.getBin graphviz}/bin" ]; postPatch = '' diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 8c941c8879bd..eb3970b35867 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -33,7 +33,7 @@ # An attribute set of settings to override in data/init/*.txt. # For example, `init.FOO = true;` is translated to `[FOO:YES]` in init.txt settings ? { }, -# TODO world-gen.txt, interface.txt require special logic + # TODO world-gen.txt, interface.txt require special logic }: let diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index ccbda6b7086e..a32db61709b5 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -854,7 +854,7 @@ runBuildTests { format = formats.nixConf { package = pkgs.nix; version = pkgs.nix.version; - extraOptions = ''ignore-try = false''; + extraOptions = "ignore-try = false"; }; input = { auto-optimise-store = true; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 660d04cfff4f..b2975c35018e 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -14,13 +14,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; tag = version; - hash = "sha256-EkdkP3NLcw0Zv5qdVrScu8ks3QRoDeVYCCMT6XP2j2I="; + hash = "sha256-3GY0aPCWjrnObaHVQmVjZUsQE4ZB+LtnUxO96IZxZAk="; }; dependencies = [ diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0c1225237ba7..803389ee8f15 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -219,7 +219,7 @@ xwd, xwininfo, xwud, -# keep-sorted end + # keep-sorted end }: _: { diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix index dbbe364f802c..28b21a7d7b8f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -12,6 +12,6 @@ callPackage ./generic.nix ( extraPatches = [ ]; - extraPostInstall = ''''; + extraPostInstall = ""; } ) diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index 6ce4cc29c8f6..6cddbaf022fd 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -55,7 +55,7 @@ withSuggested ? false, # Install (most) suggested tools hplip, sane-backends, -# , pnputils # pnputils (lspnp) isn't currently in nixpkgs and appears to be poorly maintained + # , pnputils # pnputils (lspnp) isn't currently in nixpkgs and appears to be poorly maintained }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index aafe1e3af0b1..c54b878ecb5d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -154,7 +154,7 @@ rec { cp *.rng $out/share cp README.md $doc/share/${pname} ''; - checkPhase = ''''; + checkPhase = ""; }; zlib = diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e64a6ef38fc4..c0f172b404a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2383,6 +2383,8 @@ self: super: with self; { cachy = callPackage ../development/python-modules/cachy { }; + cadwyn = callPackage ../development/python-modules/cadwyn { }; + caffe = toPythonModule ( pkgs.caffe.override { pythonSupport = true; @@ -6576,6 +6578,8 @@ self: super: with self; { green = callPackage ../development/python-modules/green { }; + greenback = callPackage ../development/python-modules/greenback { }; + greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { }; # built-in for pypi @@ -7578,6 +7582,8 @@ self: super: with self; { israel-rail-api = callPackage ../development/python-modules/israel-rail-api { }; + issubclass = callPackage ../development/python-modules/issubclass { }; + itables = callPackage ../development/python-modules/itables { }; itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; @@ -14963,6 +14969,8 @@ self: super: with self; { pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + pytest-fixture-classes = callPackage ../development/python-modules/pytest-fixture-classes { }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; @@ -16478,6 +16486,8 @@ self: super: with self; { retry2 = callPackage ../development/python-modules/retry2 { }; + retryhttp = callPackage ../development/python-modules/retryhttp { }; + retrying = callPackage ../development/python-modules/retrying { }; returns = callPackage ../development/python-modules/returns { }; @@ -18408,6 +18418,8 @@ self: super: with self; { sv-ttk = callPackage ../development/python-modules/sv-ttk { }; + svcs = callPackage ../development/python-modules/svcs { }; + svg-path = callPackage ../development/python-modules/svg-path { }; svg-py = callPackage ../development/python-modules/svg-py { };