diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 63ff34aa286a..879b802a5db6 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -249,8 +249,8 @@ in setopt ${builtins.concatStringsSep " " cfg.setOptions} ''} - # Alternative method of determining short and full hostname. - HOST=${config.networking.fqdnOrHostName} + # Determine current fqdn hostname + HOST=$(hostname --fqdn) # Setup command line history. # Don't export these, otherwise other shells (bash) will try to use same HISTFILE. diff --git a/nixos/tests/pam/zfs-key.nix b/nixos/tests/pam/zfs-key.nix index 9251a3a9173c..b7ef454b67e6 100644 --- a/nixos/tests/pam/zfs-key.nix +++ b/nixos/tests/pam/zfs-key.nix @@ -11,6 +11,7 @@ in { ... }: { boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.forceImportRoot = false; networking.hostId = "12345678"; @@ -42,10 +43,10 @@ in machine.succeed("truncate -s 64M /testpool.img") machine.succeed("zpool create -O canmount=off '${pool}' /testpool.img") machine.succeed("zfs create -o canmount=off -p '${homes}'") - machine.succeed("echo ${userPassword} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/alice'") - machine.succeed("zfs unload-key '${homes}/alice'") - machine.succeed("echo ${mismatchPass} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/bob'") - machine.succeed("zfs unload-key '${homes}/bob'") + machine.succeed("echo ${userPassword} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/alice'") + machine.succeed("zfs unmount '${homes}/alice' && zfs unload-key '${homes}/alice'") + machine.succeed("echo ${mismatchPass} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/bob'") + machine.succeed("zfs unmount '${homes}/bob' && zfs unload-key '${homes}/bob'") with subtest("Switch to tty2"): machine.fail("pgrep -f 'agetty.*tty2'") diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index ae3ff9dc1800..f95494812bd5 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -288,6 +288,7 @@ let toNvimTreesitterGrammar = makeSetupHook { name = "to-nvim-treesitter-grammar"; + meta.license = lib.licenses.mit; } ./to-nvim-treesitter-grammar.sh; in diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8a3ccf19a81a..18a1c9a7f702 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8348,12 +8348,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - tag = "v6.1.0"; - hash = "sha256-0wr4MdsKnS6qcmmhhRgPlSEhlyY64zQ+fArbjvdusOE="; + tag = "v6.2.0"; + hash = "sha256-Uh2Lt6VZv5X9eqlbaquL40wNfJX8kON8vU9h+cHhlHg="; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix index 5f0290699007..d297ffab0114 100644 --- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix @@ -446,6 +446,7 @@ rec { vimBinary = "${vim}/bin/vim"; inherit rtpPath; }; + meta.license = lib.licenses.mit; } ../hooks/vim-gen-doc-hook.sh ) { }; @@ -458,6 +459,7 @@ rec { vimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; + meta.license = lib.licenses.mit; } ../hooks/vim-command-check-hook.sh ) { }; @@ -470,6 +472,7 @@ rec { nvimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; + meta.license = lib.licenses.mit; } ../hooks/neovim-require-check-hook.sh ) { }; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index b95723b7e49d..6bfcf8380051 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -18,6 +18,7 @@ let substitutions = { unzip = "${buildPackages.unzip}/bin/unzip"; }; + meta.license = lib.licenses.mit; } ./unpack-vsix-setup-hook.sh; buildVscodeExtension = lib.extendMkDerivation { constructDrv = stdenv.mkDerivation; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index d25f943a1363..bee9d7c4af85 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -78,6 +78,7 @@ let darwinSuffixSalt = stdenv.cc.suffixSalt; mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs; }; + meta.license = lib.licenses.mit; } ./setup-hook-darwin.sh; # Building Wine with these flags isn't supported on Darwin. Using any of them will result in an evaluation failures diff --git a/pkgs/applications/office/activitywatch/aw-notify-desktop-notifier-6.patch b/pkgs/applications/office/activitywatch/aw-notify-desktop-notifier-6.patch new file mode 100644 index 000000000000..3d1f7d8a7ac4 --- /dev/null +++ b/pkgs/applications/office/activitywatch/aw-notify-desktop-notifier-6.patch @@ -0,0 +1,72 @@ +diff --git a/aw_notify/main.py b/aw_notify/main.py +index c749725..44dce5a 100644 +--- a/aw_notify/main.py ++++ b/aw_notify/main.py +@@ -3,6 +3,7 @@ + and send notifications to the user on predefined conditions. + """ + ++import asyncio + import logging + import sys + import threading +@@ -23,7 +24,7 @@ + import aw_client.queries + import click + from aw_core.log import setup_logging +-from desktop_notifier import DesktopNotifier ++from desktop_notifier import DesktopNotifier, Icon + from typing_extensions import TypeAlias + + logger = logging.getLogger(__name__) +@@ -149,11 +150,20 @@ def notify(title: str, msg: str): + if notifier is None: + notifier = DesktopNotifier( + app_name="AW", +- app_icon=f"file://{icon_path}", ++ app_icon=Icon(uri=f"file://{icon_path}"), + notification_limit=10, + ) + + logger.info(f'Showing: "{title} - {msg}"') +- notifier.send_sync(title=title, message=msg) ++ ++ # Get or create event loop ++ try: ++ loop = asyncio.get_running_loop() ++ except RuntimeError: ++ loop = asyncio.new_event_loop() ++ asyncio.set_event_loop(loop) ++ ++ # Send notification ++ loop.run_until_complete(notifier.send(title=title, message=msg)) + + + class CategoryAlert: +diff --git a/pyproject.toml b/pyproject.toml +index 314fe2f..0d6d5a9 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -13,15 +13,15 @@ packages = [{include = "aw_notify"}] + aw-notify = "aw_notify.main:main" + + [tool.poetry.dependencies] +-python = "^3.9,<3.12" +-aw-client = "^0.5.13" +-desktop-notifier = "^3.4.2" +-rubicon-objc = { version = "^0.4.0", platform = "darwin" } ++python = ">=3.9,<3.14" ++aw-client = "^0.5.15" ++desktop-notifier = "^6.0.0" ++rubicon-objc = { version = "^0.5.0", platform = "darwin" } + + [tool.poetry.group.dev.dependencies] + black = "*" + mypy = "*" +-pyinstaller = "^6.6" +-pytest = "^7.4" ++pyinstaller = "^6.12.0" ++pytest = "*" + + [build-system] + requires = ["poetry-core"] diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index fbd26fb5d8b7..a1d2ec066635 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -159,6 +159,12 @@ rec { pyproject = true; build-system = [ python3Packages.poetry-core ]; + patches = [ + # Backport desktop-notifier 6 / rubicon-objc 0.5 support. + # https://github.com/ActivityWatch/aw-notify/pull/10 + ./aw-notify-desktop-notifier-6.patch + ]; + dependencies = with python3Packages; [ aw-client desktop-notifier diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5eef5d7a9286..07cb616ba1c9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -400,7 +400,7 @@ in # https://github.com/moby/moby/tree/${mobyRev}/Dockerfile docker_25 = let - version = "25.0.13"; + version = "25.0.16"; in callPackage dockerGen { inherit version; @@ -409,7 +409,7 @@ in cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f"; cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40="; mobyRev = "v${version}"; - mobyHash = "sha256-X+1QG/toJt+VNLktR5vun8sG3PRoTVBAcekFXxocJdU="; + mobyHash = "sha256-St5yLoxo8QUTu7PjNcblS/EzZm98T189RPl1y+pAyHA="; runcRev = "v1.2.5"; runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4="; containerdRev = "v1.7.27"; diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix index a22db27f4d97..e14dcccfef3a 100644 --- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix +++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix @@ -15,16 +15,20 @@ substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ])); substitutions.packageGraphScript = ../../pub2nix/package-graph.py; substitutions.workspacePackageConfigScript = ../workspace-package-config.py; + meta.license = lib.licenses.mit; } ./dart-config-hook.sh; dartBuildHook = makeSetupHook { name = "dart-build-hook"; substitutions.yq = "${yq}/bin/yq"; substitutions.jq = "${jq}/bin/jq"; + meta.license = lib.licenses.mit; } ./dart-build-hook.sh; dartInstallHook = makeSetupHook { name = "dart-install-hook"; + meta.license = lib.licenses.mit; } ./dart-install-hook.sh; dartFixupHook = makeSetupHook { name = "dart-fixup-hook"; + meta.license = lib.licenses.mit; } ./dart-fixup-hook.sh; } diff --git a/pkgs/build-support/dlang/builddubpackage/hooks/default.nix b/pkgs/build-support/dlang/builddubpackage/hooks/default.nix index b407d24fae4e..3243fdf7ec57 100644 --- a/pkgs/build-support/dlang/builddubpackage/hooks/default.nix +++ b/pkgs/build-support/dlang/builddubpackage/hooks/default.nix @@ -1,10 +1,11 @@ -{ callPackage }: +{ lib, callPackage }: { dubSetupHook = callPackage ( { makeSetupHook }: makeSetupHook { name = "dub-setup-hook"; + meta.license = lib.licenses.mit; } ./dub-setup-hook.sh ) { }; @@ -13,6 +14,7 @@ makeSetupHook { name = "dub-build-hook"; propagatedBuildInputs = [ dub ]; + meta.license = lib.licenses.mit; } ./dub-build-hook.sh ) { }; @@ -21,6 +23,7 @@ makeSetupHook { name = "dub-check-hook"; propagatedBuildInputs = [ dub ]; + meta.license = lib.licenses.mit; } ./dub-check-hook.sh ) { }; } diff --git a/pkgs/build-support/dlang/dub-support.nix b/pkgs/build-support/dlang/dub-support.nix index 083b318ecd88..8b4642d49cac 100644 --- a/pkgs/build-support/dlang/dub-support.nix +++ b/pkgs/build-support/dlang/dub-support.nix @@ -1,8 +1,8 @@ -{ callPackage }: +{ lib, callPackage }: { dub-to-nix = callPackage ./dub-to-nix { }; importDubLock = callPackage ./builddubpackage/import-dub-lock.nix { }; buildDubPackage = callPackage ./builddubpackage { }; } -// import ./builddubpackage/hooks { inherit callPackage; } +// import ./builddubpackage/hooks { inherit lib callPackage; } diff --git a/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix index cbe9105e6115..0e4860c6e875 100644 --- a/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix +++ b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix @@ -11,4 +11,5 @@ makeSetupHook { shell = lib.getExe bash; patchcil = lib.getExe patchcil; }; + meta.license = lib.licenses.mit; } ./auto-patchcil.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix index 54b802b6a1a0..e1f7cd816719 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix @@ -15,4 +15,5 @@ makeSetupHook { coreutils ]; }; + meta.license = lib.licenses.mit; } ./dotnet-hook.sh diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index a28b0fbaa379..db5a13cad19b 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -31,10 +31,12 @@ nodeVersion = nodejs.version; nodeVersionMajor = lib.versions.major nodejs.version; }; + meta.license = lib.licenses.mit; } ./npm-config-hook.sh; npmBuildHook = makeSetupHook { name = "npm-build-hook"; + meta.license = lib.licenses.mit; } ./npm-build-hook.sh; npmInstallHook = makeSetupHook { @@ -50,5 +52,6 @@ substitutions = { jq = "${jq}/bin/jq"; }; + meta.license = lib.licenses.mit; } ./npm-install-hook.sh; } diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index c16a8fb1f89e..20df85467c16 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -249,5 +249,6 @@ in npmArch = stdenvNoCC.targetPlatform.node.arch; npmPlatform = stdenvNoCC.targetPlatform.node.platform; }; + meta.license = lib.licenses.mit; } ./pnpm-config-hook.sh; } diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 9bce7d2f628d..fefb40db0176 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -180,6 +180,7 @@ in }; meta = { description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps"; + license = lib.licenses.mit; }; } ./yarn-config-hook.sh; @@ -187,6 +188,7 @@ in name = "yarn-build-hook"; meta = { description = "Run yarn build in buildPhase"; + license = lib.licenses.mit; }; } ./yarn-build-hook.sh; @@ -202,6 +204,7 @@ in }; meta = { description = "Prune yarn dependencies and install files for packages using Yarn 1"; + license = lib.licenses.mit; }; } ./yarn-install-hook.sh; } diff --git a/pkgs/build-support/node/import-npm-lock/hooks/default.nix b/pkgs/build-support/node/import-npm-lock/hooks/default.nix index 4a54628e1d64..342eef115f99 100644 --- a/pkgs/build-support/node/import-npm-lock/hooks/default.nix +++ b/pkgs/build-support/node/import-npm-lock/hooks/default.nix @@ -14,6 +14,7 @@ canonicalizeSymlinksScript = ./canonicalize-symlinks.js; storePrefix = builtins.storeDir; }; + meta.license = lib.licenses.mit; } ./npm-config-hook.sh; linkNodeModulesHook = makeSetupHook { @@ -23,5 +24,6 @@ script = ./link-node-modules.js; storePrefix = builtins.storeDir; }; + meta.license = lib.licenses.mit; } ./link-node-modules-hook.sh; } diff --git a/pkgs/build-support/php/builders/v1/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix index bfc0511ce569..8091e7a1ed7d 100644 --- a/pkgs/build-support/php/builders/v1/hooks/default.nix +++ b/pkgs/build-support/php/builders/v1/hooks/default.nix @@ -26,6 +26,7 @@ in substitutions = { phpScriptUtils = lib.getExe php-script-utils; }; + meta.license = lib.licenses.mit; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook { @@ -42,6 +43,7 @@ in cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; phpScriptUtils = lib.getExe php-script-utils; }; + meta.license = lib.licenses.mit; } ./composer-install-hook.sh; composerWithPluginVendorHook = makeSetupHook { @@ -58,5 +60,6 @@ in cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; phpScriptUtils = lib.getExe php-script-utils; }; + meta.license = lib.licenses.mit; } ./composer-with-plugin-vendor-hook.sh; } diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix index b361b8060830..57d46c17e3f6 100644 --- a/pkgs/build-support/php/builders/v2/hooks/default.nix +++ b/pkgs/build-support/php/builders/v2/hooks/default.nix @@ -26,6 +26,7 @@ in substitutions = { phpScriptUtils = lib.getExe php-script-utils; }; + meta.license = lib.licenses.mit; } ./composer-vendor-hook.sh; composerInstallHook = makeSetupHook { @@ -42,5 +43,6 @@ in cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; phpScriptUtils = lib.getExe php-script-utils; }; + meta.license = lib.licenses.mit; } ./composer-install-hook.sh; } diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 2d0b29bf76d6..c18100df2acc 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation { wrapperName ; }; + meta.license = lib.licenses.mit; } ../setup-hooks/role.bash; setupHook = makeSetupHook { name = "pkgs-config-setup-hook"; @@ -116,6 +117,7 @@ stdenv.mkDerivation { baseBinName ; }; + meta.license = lib.licenses.mit; } ./setup-hook.sh; in [ diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 0814f78edfef..282fa6bc1611 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -30,6 +30,7 @@ // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; }; + meta.license = lib.licenses.mit; } ./cargo-build-hook.sh; cargoCheckHook = makeSetupHook { @@ -44,6 +45,7 @@ // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; }; + meta.license = lib.licenses.mit; } ./cargo-check-hook.sh; cargoInstallHook = makeSetupHook { @@ -57,6 +59,7 @@ // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; }; + meta.license = lib.licenses.mit; } ./cargo-install-hook.sh; cargoNextestHook = makeSetupHook { @@ -71,6 +74,7 @@ // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; }; + meta.license = lib.licenses.mit; } ./cargo-nextest-hook.sh; cargoSetupHook = makeSetupHook { @@ -110,6 +114,7 @@ // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; }; + meta.license = lib.licenses.mit; } ./cargo-setup-hook.sh; maturinBuildHook = makeSetupHook { @@ -124,6 +129,7 @@ inherit (rust.envVars) setEnv; }; + meta.license = lib.licenses.mit; } ./maturin-build-hook.sh; bindgenHook = makeSetupHook { @@ -132,5 +138,6 @@ libclang = (lib.getLib clang.cc); inherit clang; }; + meta.license = lib.licenses.mit; } ./rust-bindgen-hook.sh; } diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix index 8214a85052f2..001a003df326 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix @@ -1,4 +1,5 @@ { + lib, callPackages, isDeclaredArray, makeSetupHook, @@ -11,5 +12,8 @@ makeSetupHook { patchelf ]; passthru.tests = callPackages ./tests.nix { }; - meta.description = "Appends runpath entries of a file to an array"; + meta = { + description = "Appends runpath entries of a file to an array"; + license = lib.licenses.mit; + }; } ./getRunpathEntries.bash diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix index 0a610db6eeed..79b3a31d5ad1 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix @@ -1,4 +1,5 @@ { + lib, callPackages, isDeclaredArray, isDeclaredMap, @@ -13,5 +14,8 @@ makeSetupHook { sortArray ]; passthru.tests = callPackages ./tests.nix { }; - meta.description = "Gets the sorted indices of an associative array"; + meta = { + description = "Gets the sorted indices of an associative array"; + license = lib.licenses.mit; + }; } ./getSortedMapKeys.bash diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix index 2b8ba3942c98..53aaad3508e8 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix @@ -1,9 +1,13 @@ { + lib, callPackages, makeSetupHook, }: makeSetupHook { name = "isDeclaredArray"; passthru.tests = callPackages ./tests.nix { }; - meta.description = "Tests if an array is declared"; + meta = { + description = "Tests if an array is declared"; + license = lib.licenses.mit; + }; } ./isDeclaredArray.bash diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix index 99d969312dab..484b5a3bc5bd 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix @@ -1,9 +1,13 @@ { + lib, callPackages, makeSetupHook, }: makeSetupHook { name = "isDeclaredMap"; passthru.tests = callPackages ./tests.nix { }; - meta.description = "Tests if an associative array is declared"; + meta = { + description = "Tests if an associative array is declared"; + license = lib.licenses.mit; + }; } ./isDeclaredMap.bash diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix index 5e5c2ced69b0..94ff78bc991a 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix @@ -1,4 +1,5 @@ { + lib, callPackages, isDeclaredArray, makeSetupHook, @@ -7,5 +8,8 @@ makeSetupHook { name = "sortArray"; propagatedBuildInputs = [ isDeclaredArray ]; passthru.tests = callPackages ./tests.nix { }; - meta.description = "Sorts an array"; + meta = { + description = "Sorts an array"; + license = lib.licenses.mit; + }; } ./sortArray.bash diff --git a/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix b/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix index 74bbf5673292..12be2f0f4517 100644 --- a/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix +++ b/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix @@ -1,2 +1,8 @@ -{ makeSetupHook }: -makeSetupHook { name = "flatten-include-hack-hook"; } ./flatten-include-hack-hook.sh +{ + lib, + makeSetupHook, +}: +makeSetupHook { + name = "flatten-include-hack-hook"; + meta.license = lib.licenses.mit; +} ./flatten-include-hack-hook.sh diff --git a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix index 298101976ee2..774b7c2f3be1 100644 --- a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix +++ b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix @@ -12,6 +12,7 @@ in name = "patch-rc-path-bash"; meta = { description = "Setup-hook to inject source-time PATH prefix to a Bash/Ksh/Zsh script"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ShamrockLee ]; }; passthru.tests = { @@ -25,6 +26,7 @@ in }; meta = { description = "Setup-hook to inject source-time PATH prefix to a Csh script"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ShamrockLee ]; }; passthru.tests = { @@ -35,6 +37,7 @@ in name = "patch-rc-path-fish"; meta = { description = "Setup-hook to inject source-time PATH prefix to a Fish script"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ShamrockLee ]; }; passthru.tests = { @@ -48,6 +51,7 @@ in }; meta = { description = "Setup-hook to inject source-time PATH prefix to a POSIX shell script"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ShamrockLee ]; }; passthru.tests = { diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index c5df25d4066d..3f29c77e0575 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -51,6 +51,7 @@ makeSetupHook { # D-Bus service enabled globally (e.g. through a NixOS module). dconf.lib ]; + meta.license = lib.licenses.mit; passthru = { tests = let diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 29832b303ad6..670bc075db62 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -11,4 +11,6 @@ makeSetupHook { # hardware drivers installed by NixOS driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; }; + + meta.license = lib.licenses.mit; } ./setup-hook.sh diff --git a/pkgs/by-name/ad/adguardhome/package.nix b/pkgs/by-name/ad/adguardhome/package.nix index dd3a819e9880..8380edda58cf 100644 --- a/pkgs/by-name/ad/adguardhome/package.nix +++ b/pkgs/by-name/ad/adguardhome/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "adguardhome"; - version = "0.107.74"; + version = "0.107.76"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "AdGuardHome"; tag = "v${finalAttrs.version}"; - hash = "sha256-cAuthACY/rBVRTSv/UIarhScm+EoTUhnkQ0RUtvhAFg="; + hash = "sha256-CF1Ieu7oCnzvXwoHzX5126gQGcgXL+giMtUciKBZ2ZU="; }; - vendorHash = "sha256-o4hpiqQEt8gkYFeAkxPDisvLWbi7WOBZ7xMXrPt6Cdo="; + vendorHash = "sha256-tHabP5I7PZtDkVucF95StRyXGEsfbuc6Z3AhQZ/g2f8="; dashboard = buildNpmPackage { inherit (finalAttrs) src version; @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { postPatch = '' cd client ''; - npmDepsHash = "sha256-SOHmXvGLpjs8h0X+AJ6/jAYpxzoizhwRjIzx4SqJOCo="; + npmDepsHash = "sha256-Yyv8dTKhZ9IlIW/x/57cl/+cpvjjycaFLSyOR0IiIPk="; npmBuildScript = "build-prod"; postBuild = '' mkdir -p $out/build/ diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index de1bd19ddd11..55bf2c5957d5 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 antigravity $out/bin/antigravity-cli + install -Dm755 antigravity $out/bin/agy runHook postInstall ''; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ u3kkasha ]; platforms = lib.attrNames sources; - mainProgram = "antigravity-cli"; + mainProgram = "agy"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix b/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix index 7d3897dc1dcc..49da85c775fe 100644 --- a/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix +++ b/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix @@ -1,9 +1,14 @@ -{ makeSetupHook, sdkVersion }: +{ + lib, + makeSetupHook, + sdkVersion, +}: self: super: { passthru = super.passthru or { } // { privateFrameworksHook = makeSetupHook { name = "apple-sdk-private-frameworks-hook"; + meta.license = lib.licenses.mit; } ../setup-hooks/add-private-frameworks.sh; }; } diff --git a/pkgs/by-name/as/asyncapi/package.nix b/pkgs/by-name/as/asyncapi/package.nix new file mode 100644 index 000000000000..17ccdbac817e --- /dev/null +++ b/pkgs/by-name/as/asyncapi/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, +}: + +buildNpmPackage (finalAttrs: { + pname = "asyncapi"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "asyncapi"; + repo = "cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AvEzwUMXZZRexlcYbD4iW2GYmndN0usFxYJclXst57g="; + }; + + npmDepsHash = "sha256-f+1KRqPIufMoSv6pa7CAd8fvG8uigNjr6QE6leVCtUI="; + + env.PUPPETEER_SKIP_DOWNLOAD = "true"; + + postPatch = '' + # The build script fetches AsyncAPI examples from the internet. + # Replace with a no-op since the CLI works without bundled examples. + mkdir -p assets/examples + echo '[]' > assets/examples/examples.json + substituteInPlace package.json \ + --replace-fail "node scripts/fetch-asyncapi-example.js && " "" + + # The logger tries to create a logs directory relative to __dirname, + # which ends up inside the read-only Nix store. Use a writable path instead. + substituteInPlace src/utils/logger.ts \ + --replace-fail "path.join(__dirname, config.has('log.dir') ? config.get('log.dir') : 'logs')" \ + "path.join(process.env.XDG_STATE_HOME || path.join(require('os').homedir(), '.local', 'state'), 'asyncapi', 'logs')" \ + --replace-fail "fs.mkdirSync(logDir)" \ + "fs.mkdirSync(logDir, { recursive: true })" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "CLI to work with your AsyncAPI files. You can validate them and in the future use a generator and even bootstrap a new file"; + homepage = "https://www.asyncapi.com/tools/cli"; + changelog = "https://github.com/asyncapi/cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pmyjavec ]; + mainProgram = "asyncapi"; + }; +}) diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix index 9c631d791f17..7f290279de0d 100644 --- a/pkgs/by-name/at/attyx/package.nix +++ b/pkgs/by-name/at/attyx/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "attyx"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "semos-labs"; repo = "attyx"; tag = "v${finalAttrs.version}"; - hash = "sha256-9OTvpkkIo6pb9G2mvlNeZrwyOwIhAM7f9zy1LJzxJG0="; + hash = "sha256-b8a/fLW4jeek5KckBWmd+fIhN6S2JoNvxAW2zBCokiY="; }; deps = callPackage ./build.zig.zon.nix { }; diff --git a/pkgs/by-name/au/autoAddDriverRunpath/package.nix b/pkgs/by-name/au/autoAddDriverRunpath/package.nix index 1dd962cdeee6..a793aa41f12a 100644 --- a/pkgs/by-name/au/autoAddDriverRunpath/package.nix +++ b/pkgs/by-name/au/autoAddDriverRunpath/package.nix @@ -1,4 +1,5 @@ { + lib, addDriverRunpath, autoFixElfFiles, makeSetupHook, @@ -10,4 +11,5 @@ makeSetupHook { addDriverRunpath autoFixElfFiles ]; + meta.license = lib.licenses.mit; } ./auto-add-driver-runpath-hook.sh diff --git a/pkgs/by-name/au/autoFixElfFiles/package.nix b/pkgs/by-name/au/autoFixElfFiles/package.nix index db8258e9b43b..d750a3819b9e 100644 --- a/pkgs/by-name/au/autoFixElfFiles/package.nix +++ b/pkgs/by-name/au/autoFixElfFiles/package.nix @@ -1,5 +1,9 @@ -{ makeSetupHook }: +{ + lib, + makeSetupHook, +}: makeSetupHook { name = "auto-fix-elf-files"; + meta.license = lib.licenses.mit; } ./auto-fix-elf-files.sh diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index 902e93137152..d553183cd34d 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -10,15 +10,15 @@ }: buildGoModule (finalAttrs: { pname = "aws-sso-cli"; - version = "2.1.0"; + version = "2.2.4"; src = fetchFromGitHub { owner = "synfinatic"; repo = "aws-sso-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-MomH4Zcc6iyVmLfA0PPsWgEqMBAAaPd+21NX4GdnFk0="; + hash = "sha256-JkCHzIbIeFvmXrIkQaybjUtPDzmZ2XPv6tz3fA6ni44="; }; - vendorHash = "sha256-Le5BOD/iBIMQwTNmb7JcW8xJS7WG5isf4HXpJxyvez0="; + vendorHash = "sha256-euqhgbyz8H/fQ1RAP0k4GMOjOu7gVeYzQv75tjCh5z0="; nativeBuildInputs = [ makeWrapper @@ -46,14 +46,18 @@ buildGoModule (finalAttrs: { checkFlags = let skippedTests = [ - "TestAWSConsoleUrl" "TestAWSFederatedUrl" - "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x + "TestAWSConsoleUrlChina" + "TestAWSConsoleUrlEU" + "TestAWSConsoleUrlUSEast" + "TestAWSConsoleUrlUSGov" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + __darwinAllowLocalNetworking = true; + meta = { homepage = "https://github.com/synfinatic/aws-sso-cli"; description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard"; diff --git a/pkgs/by-name/br/breakpointHook/package.nix b/pkgs/by-name/br/breakpointHook/package.nix index bbdcf9e05651..c2a30b5c27f5 100644 --- a/pkgs/by-name/br/breakpointHook/package.nix +++ b/pkgs/by-name/br/breakpointHook/package.nix @@ -22,7 +22,10 @@ in makeSetupHook { name = "breakpoint-hook"; - meta.broken = !stdenv.buildPlatform.isLinux; + meta = { + broken = !stdenv.buildPlatform.isLinux; + license = lib.licenses.mit; + }; substitutions = { attach = "${attach}/bin/attach"; # The default interactive shell in case $debugShell is not set in the derivation. diff --git a/pkgs/by-name/br/breakpointHookCntr/package.nix b/pkgs/by-name/br/breakpointHookCntr/package.nix index c6c705788914..9d300a8263c7 100644 --- a/pkgs/by-name/br/breakpointHookCntr/package.nix +++ b/pkgs/by-name/br/breakpointHookCntr/package.nix @@ -1,6 +1,13 @@ -{ stdenv, makeSetupHook }: +{ + lib, + stdenv, + makeSetupHook, +}: makeSetupHook { name = "breakpoint-hook"; - meta.broken = !stdenv.buildPlatform.isLinux; + meta = { + broken = !stdenv.buildPlatform.isLinux; + license = lib.licenses.mit; + }; } ./breakpoint-hook.sh diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index 9104f34136e7..0a319fca91e7 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-zNZMk9C/KsiqqGZOzc6B1WjL4wemWmdrr0a+CMA2BlQ="; + hash = "sha256-+OK9rmAGGLq/rJIHs++dbdyvh6WFu+Xhcp48TpnYV0w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 6b642ce2b281..a07985e07f1a 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -23,7 +23,7 @@ optipng, piper-tts, pkg-config, - podofo_0_10, + podofo0, poppler-utils, python314Packages, qt6, @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { libuchardet libusb1 onnxruntime - podofo_0_10 + podofo0 poppler-utils qt6.qtbase qt6.qtwayland @@ -170,8 +170,8 @@ stdenv.mkDerivation (finalAttrs: { MAGICK_LIB = "${lib.getLib imagemagick}/lib"; FC_INC_DIR = "${lib.getDev fontconfig}/include/fontconfig"; FC_LIB_DIR = "${lib.getLib fontconfig}/lib"; - PODOFO_INC_DIR = "${lib.getDev podofo_0_10}/include/podofo"; - PODOFO_LIB_DIR = "${lib.getLib podofo_0_10}/lib"; + PODOFO_INC_DIR = "${lib.getDev podofo0}/include/podofo"; + PODOFO_LIB_DIR = "${lib.getLib podofo0}/lib"; XDG_DATA_HOME = "${placeholder "out"}/share"; XDG_UTILS_INSTALL_MODE = "user"; } diff --git a/pkgs/by-name/ca/cargo-tauri/hook.nix b/pkgs/by-name/ca/cargo-tauri/hook.nix index d432d79c67d9..ecc9c9b024a1 100644 --- a/pkgs/by-name/ca/cargo-tauri/hook.nix +++ b/pkgs/by-name/ca/cargo-tauri/hook.nix @@ -77,5 +77,6 @@ makeSetupHook { inherit (cargo-tauri.meta) maintainers broken; # Platforms that Tauri supports bundles for platforms = lib.platforms.darwin ++ lib.platforms.linux; + license = lib.licenses.mit; }; } ./hook.sh diff --git a/pkgs/by-name/cc/cccc/cccc.patch b/pkgs/by-name/cc/cccc/cccc.patch deleted file mode 100644 index 9454e3b18ad1..000000000000 --- a/pkgs/by-name/cc/cccc/cccc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc -index df98e2b..59f2572 100644 ---- a/cccc/cccc_tbl.cc -+++ b/cccc/cccc_tbl.cc -@@ -96,7 +96,7 @@ bool CCCC_Table::remove(T* old_item_ptr) - typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key()); - if(value_iterator!=map_t::end()) - { -- erase(value_iterator); -+ map_t::erase(value_iterator); - retval=true; - } - return retval; -diff --git a/makefile b/makefile -index 23ad004..2cca469 100644 ---- a/makefile -+++ b/makefile -@@ -20,5 +20,5 @@ test : - cd test ; make -f posix.mak - - install : -- cd install ; su root -c "make -f install.mak" -+ cd install ; make -f install.mak - diff --git a/pkgs/by-name/cc/cccc/package.nix b/pkgs/by-name/cc/cccc/package.nix index e33094ab57d1..445982d35363 100644 --- a/pkgs/by-name/cc/cccc/package.nix +++ b/pkgs/by-name/cc/cccc/package.nix @@ -1,31 +1,38 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cccc"; - version = "3.1.4"; + version = "3.2.0"; - src = fetchurl { - url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; - sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; + src = fetchFromGitHub { + owner = "sarnold"; + repo = "cccc"; + tag = finalAttrs.version; + sha256 = "sha256-5UgCz9zURD+LsMB3kLSdkS1zFOTCuU16hK253GFu9HU"; }; hardeningDisable = [ "format" ]; - patches = [ ./cccc.patch ]; - - preConfigure = '' - substituteInPlace install/install.mak --replace /usr/local/bin $out/bin - substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p" - ''; buildFlags = [ "CCC=c++" "LD=c++" ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp cccc/cccc $out/bin/ + + runHook postInstall + ''; + + env.NIX_CFLAGS_COMPILE = "-Wno-register " + lib.optionalString stdenv.cc.isGNU "-std=gnu17"; + meta = { description = "C and C++ Code Counter"; mainProgram = "cccc"; @@ -34,13 +41,9 @@ stdenv.mkDerivation rec { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = "https://cccc.sourceforge.net/"; + homepage = "https://github.com/sarnold/cccc"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - maintainers = [ ]; - # The last successful Darwin Hydra build was in 2023 - # On linux fails to build on gcc-15, needs porting to c23, but - # the upstream code did not update since 2006. - broken = true; + maintainers = with lib.maintainers; [ tbutter ]; }; -} +}) diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix index 517cda05f5b7..c6ca421d5c5d 100644 --- a/pkgs/by-name/ci/cie-middleware-linux/package.nix +++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix @@ -15,7 +15,7 @@ libxml2, openssl, pcsclite, - podofo_0_10, + podofo0, ghostscript, }: @@ -54,7 +54,7 @@ stdenv.mkDerivation { buildInputs = [ cryptopp fontconfig - podofo_0_10 + podofo0 openssl pcsclite curl diff --git a/pkgs/by-name/ct/ctestCheckHook/package.nix b/pkgs/by-name/ct/ctestCheckHook/package.nix index 631b2ba8b86a..cf3da33493b3 100644 --- a/pkgs/by-name/ct/ctestCheckHook/package.nix +++ b/pkgs/by-name/ct/ctestCheckHook/package.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, cmake, }: @@ -6,4 +7,5 @@ makeSetupHook { name = "ctestCheckHook"; propagatedBuildInputs = [ cmake ]; + meta.license = lib.licenses.mit; } ./ctest-check-hook.sh diff --git a/pkgs/by-name/de/devede/package.nix b/pkgs/by-name/de/devede/package.nix index e70579c59119..ffe4a94a5254 100644 --- a/pkgs/by-name/de/devede/package.nix +++ b/pkgs/by-name/de/devede/package.nix @@ -11,6 +11,13 @@ wrapGAppsHook3, gdk-pixbuf, gobject-introspection, + # The subtitle encoder and mixer 'spumux' looks for the font 'arial' by default (hardcoded in devede) + # and it should be made available to that program in the user environment or it throws an error. + # If overrideFont is true we instead use a particular font file in the nix store, + # which is always available by design. + overrideFont ? true, + liberation_ttf, + fontPath ? "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf", }: let @@ -33,7 +40,7 @@ buildPythonApplication (finalAttrs: { src = fetchFromGitLab { owner = "rastersoft"; repo = "devedeng"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg="; }; @@ -63,16 +70,27 @@ buildPythonApplication (finalAttrs: { ]; postPatch = '' - substituteInPlace setup.py --replace "'/usr'," "" substituteInPlace src/devedeng/configuration_data.py \ - --replace "/usr/share" "$out/share" \ - --replace "/usr/local/share" "$out/share" + --replace-fail "/usr/share" "$out/share" \ + --replace-fail "/usr/local/share" "$out/share" + '' + + lib.optionalString overrideFont '' + substituteInPlace src/devedeng/subtitles_mux.py \ + --replace-fail arial ${fontPath} + ''; + + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru.updateScript = ./update.sh; meta = { description = "DVD Creator for Linux"; + mainProgram = "devede_ng"; homepage = "https://www.rastersoft.com/programas/devede.html"; license = lib.licenses.gpl3; maintainers = [ diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index dc10fe8e2d91..570e940467e6 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -61,13 +61,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; - version = "8.2.2"; + version = "8.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${finalAttrs.version}"; - hash = "sha256-rdg7XvrJU7HH9aGd/TwMqqexmFeLOMBldh1XQakQSeM="; + hash = "sha256-hhQVfUXjobQmrSYFquxbkIuCdBYaExAtjtwbyVqyVUg="; }; nativeBuildInputs = [ @@ -114,8 +114,10 @@ stdenv.mkDerivation (finalAttrs: { speexdsp' onetbb webrtc-audio-processing - x42-plugins zita-convolver + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ + x42-plugins ]; preFixup = @@ -124,8 +126,10 @@ stdenv.mkDerivation (finalAttrs: { calf # compressor exciter, bass enhancer and others lsp-plugins # delay, limiter, multiband compressor mda_lv2 # loudness - x42-plugins # autotune zam-plugins # maximizer + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ + x42-plugins # autotune ]; ladspaPlugins = [ diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 4fc9a3ab7853..4f0fb2d03d03 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.307.0"; + version = "0.307.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-G6+8cJF+So9kePDpNlFGuvsTU5+KXg9dlgaMnElWwL8="; + hash = "sha256-ED+mRcnkerdPFjEhxH3fBr8GcH0geLVnjnejpNqNBdI="; }; - vendorHash = "sha256-ie5wCRgGj8DeotYD/GrDP9qTnonTJsMqj1fBqHNR84M="; + vendorHash = "sha256-sOyx1Ev0UfoI6mOQAWide19Sg/MWJ8VUVftN9psNq5U="; commonMeta = { license = lib.licenses.mit; @@ -40,7 +40,7 @@ buildGo126Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-CtZoPtpENUfaVvs2zozBWsMYD8ZJFAXig7sYcNNLwzY="; + hash = "sha256-U7gcAkfw7a0skM91mSAZJIPUPBRfSkyJYVjjVyEyZ4E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 419dfc6b038e..929b162916d6 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.297"; + version = "2.15.305"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-oXgAQikdzzcp0SxYSerqXvjZ4/hI8Wt9ZJio7tHlt38="; + hash = "sha256-LnwcDzJLqxqYtjqi9XWOpa80DHKUDaL5eu6Yv/ZKiNs="; }; - vendorHash = "sha256-SYi7Pq+vIMp0SH434cp0zJLV7ZkzODW3+FIarnX4ezs="; + vendorHash = "sha256-vGhH3CTEQ5YIFZo/HYN6iMBTnH2O5mO1XbDCbWZDvYE="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index e56f7b898ece..7ef314704e29 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -5,17 +5,18 @@ pkg-config, rustPlatform, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; - version = "0.7.2"; + version = "0.9.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-B1BZuR+ieW4/ykYl0kltM7hou7oBT9qky9MY5V43r9g="; + hash = "sha256-cto3Fu2UW8+Pq6OK5miw+cAwzqiotTGWPD0Yyckh1/M="; }; - cargoHash = "sha256-Re+vX59uJQyQsPBJTWjj8QphxqyN/KpbcS+jzRBlyEw="; + cargoHash = "sha256-uOa/qWBtTQf7jJWJhFJBmYWQ5mU/3P/YuACbnVbHdJc="; nativeBuildInputs = [ pkg-config ]; @@ -25,6 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; versionCheckProgramArg = "version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "K9s-inspired terminal UI for monitoring Flux GitOps resources in real-time"; mainProgram = "flux9s"; diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix index b683352b3664..bdf8cdc327f3 100644 --- a/pkgs/by-name/gc/gclient2nix/package.nix +++ b/pkgs/by-name/gc/gclient2nix/package.nix @@ -46,6 +46,7 @@ let substitutions = { jq = lib.getExe buildPackages.jq; }; + meta.license = lib.licenses.mit; } ./gclient-unpack-hook.sh ) { }; diff --git a/pkgs/by-name/gi/gimagereader/package.nix b/pkgs/by-name/gi/gimagereader/package.nix index e93e55f97806..b6c8f4741587 100644 --- a/pkgs/by-name/gi/gimagereader/package.nix +++ b/pkgs/by-name/gi/gimagereader/package.nix @@ -6,7 +6,7 @@ pkg-config, libuuid, sane-backends, - podofo_0_10, + podofo0, libjpeg, djvulibre, libxmlxx3, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libzip libuuid sane-backends - podofo_0_10 + podofo0 libjpeg djvulibre tesseract diff --git a/pkgs/by-name/gi/gitSetupHook/package.nix b/pkgs/by-name/gi/gitSetupHook/package.nix index b03b6490366d..5527afb8bae2 100644 --- a/pkgs/by-name/gi/gitSetupHook/package.nix +++ b/pkgs/by-name/gi/gitSetupHook/package.nix @@ -11,4 +11,5 @@ makeSetupHook { gitMinimal = lib.getExe gitMinimal; }; + meta.license = lib.licenses.mit; } ./gitSetupHook.sh diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index d520eaedfb4e..b14df90b4bdc 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo126Module (finalAttrs: { pname = "goreleaser"; - version = "2.15.4"; + version = "2.16.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${finalAttrs.version}"; - hash = "sha256-KpOttfnlVB+4YHg/SHqJHjQtK7DDO2yh6WH1kQFe/tE="; + hash = "sha256-TV03T9OZXiEa4+v1teI9YA2ilDEU4RoDY9kGdENfZqU="; }; - vendorHash = "sha256-I4y+0yT6/SFvJbJTByHn/EPQ3rNzpUEb4/7gtF+i80o="; + vendorHash = "sha256-9an5C6xLxyiC4pejOZlz40ZNdc6c0A1mvekXefrCTeQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ha/hare/hook.nix b/pkgs/by-name/ha/hare/hook.nix index ef8fc0219e9e..0dc9ef954d61 100644 --- a/pkgs/by-name/ha/hare/hook.nix +++ b/pkgs/by-name/ha/hare/hook.nix @@ -52,5 +52,6 @@ makeSetupHook { meta = { description = "Setup hook for the Hare compiler"; inherit (hare.meta) badPlatforms platforms; + license = lib.licenses.mit; }; } ./setup-hook.sh diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix index a29b038884a0..45d1122adaca 100644 --- a/pkgs/by-name/ho/horizon-eda/base.nix +++ b/pkgs/by-name/ho/horizon-eda/base.nix @@ -15,7 +15,7 @@ ninja, opencascade-occt_7_6, pkg-config, - podofo_0_10, + podofo0, sqlite, }: let @@ -51,7 +51,7 @@ rec { librsvg libuuid opencascade-occt - podofo_0_10 + podofo0 sqlite ]; diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 5be928e2a333..025ae112855f 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.9.5"; + version = "3.9.8"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-FFF5k+eGKg066zYYc9GvRMCsXdu092h9SQGvO6S8rBA="; + hash = "sha256-jKhmcHfi3QuihTxIX73QRLfs8K7iH+lKxhCNpKJsumk="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyprmon/package.nix b/pkgs/by-name/hy/hyprmon/package.nix index 2c327def665d..a4afcc0f8cf5 100644 --- a/pkgs/by-name/hy/hyprmon/package.nix +++ b/pkgs/by-name/hy/hyprmon/package.nix @@ -1,27 +1,28 @@ { - lib, buildGo126Module, fetchFromGitHub, + lib, }: buildGo126Module (finalAttrs: { pname = "hyprmon"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "erans"; repo = "hyprmon"; rev = "v${finalAttrs.version}"; - hash = "sha256-dcjEnxSQwXUPJ44gj7pVPQtZUkBXbqLvQgmhYvANz8o="; + hash = "sha256-1rtmToVveAkNRqPR1gDCYIOS+nM9Ag+3T5QYJmdtbEg="; }; - vendorHash = "sha256-n4RZxpsrlSUD3B/GLVoM2CPckvDkbyaMyg6h4QNbuH0="; + vendorHash = "sha256-U2fw/1tnRwmd9qzEcrMduZbbNU67NbDhG2Id5IHj5js="; meta = { description = "TUI monitor configuration tool for Hyprland with visual layout, drag-and-drop, and profile management"; - homepage = "https://github.com/erans/hyprmon"; + inherit (finalAttrs.src.meta) homepage; + changelog = "${finalAttrs.src.meta.homepage}/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.asl20; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ onatustun ]; mainProgram = "hyprmon"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/in/installShellFiles/package.nix b/pkgs/by-name/in/installShellFiles/package.nix index f1cf436a9b79..133e9b5395e9 100644 --- a/pkgs/by-name/in/installShellFiles/package.nix +++ b/pkgs/by-name/in/installShellFiles/package.nix @@ -13,4 +13,5 @@ makeSetupHook { directory = ./tests; }; }; + meta.license = lib.licenses.mit; } ./setup-hook.sh diff --git a/pkgs/by-name/ju/juce/projucerHook.nix b/pkgs/by-name/ju/juce/projucerHook.nix index 9830453db14a..380c2be39d05 100644 --- a/pkgs/by-name/ju/juce/projucerHook.nix +++ b/pkgs/by-name/ju/juce/projucerHook.nix @@ -6,5 +6,8 @@ makeSetupHook { name = "projucer-hook"; propagatedBuildInputs = [ (callPackage ./package.nix { }) ]; - meta.platforms = lib.platforms.linux; + meta = { + platforms = lib.platforms.linux; + license = lib.licenses.mit; + }; } ./projucer-hook.sh diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix index 427812bfb87f..f1504853ea03 100644 --- a/pkgs/by-name/ju/julec/hook.nix +++ b/pkgs/by-name/ju/julec/hook.nix @@ -1,4 +1,5 @@ { + lib, julec, makeSetupHook, }: @@ -10,5 +11,6 @@ makeSetupHook { meta = { inherit (julec.meta) maintainers; + license = lib.licenses.mit; }; } ./hook.sh diff --git a/pkgs/by-name/kr/krename/package.nix b/pkgs/by-name/kr/krename/package.nix index 92cc85ddf0f1..7201878a8af8 100644 --- a/pkgs/by-name/kr/krename/package.nix +++ b/pkgs/by-name/kr/krename/package.nix @@ -6,7 +6,7 @@ kdePackages, taglib, exiv2, - podofo_0_10, + podofo0, }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = with kdePackages; [ exiv2 - podofo_0_10 + podofo0 kio kxmlgui qtbase diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix index 4493dbfa4072..37a81c43b0fa 100644 --- a/pkgs/by-name/ku/kubectl-cnpg/package.nix +++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-cnpg"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${finalAttrs.version}"; - hash = "sha256-D4Z2v0bBctQPVm7lblyQP3qD16GXGLF+5gQ6tCsuu8M="; + hash = "sha256-SlisY7v/CFVXH85IAvlBH1RjyrTS+e8hFHJIwh0FgCc="; }; - vendorHash = "sha256-WDVipOz2yx9kvSQnc0Fnn+es0OhLgXye4e6jro0xDZ8="; + vendorHash = "sha256-He5L4HBTMOlzLgB+tAxNbjvDdvGyz5UolC8mMFibwZ4="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix index 87c47608983c..438c922eba3f 100644 --- a/pkgs/by-name/ku/kulala-core/package.nix +++ b/pkgs/by-name/ku/kulala-core/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "kulala-core"; - version = "0.6.0"; + version = "0.7.0"; strictDeps = true; __structuredAttrs = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "mistweaverco"; repo = "kulala-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-qEPJFd1/C9F8oyUTx3PMmRS9B8kdjQT9O0bfoalAJ/k="; + hash = "sha256-zY/Yg/1s/pyyuKxtUa2cIzLCraSNSzpPMBx9EbGIIGI="; }; node_modules = stdenv.mkDerivation { diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix index 55fa9762f086..a211bfc15ed4 100644 --- a/pkgs/by-name/le/lensfun/package.nix +++ b/pkgs/by-name/le/lensfun/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + stdenvNoCC, fetchFromGitHub, pkg-config, glib, @@ -9,20 +10,54 @@ cmake, python3, python3Packages, + + # optionally specify a derivation containing the lens data as generated from the `generate_db.py` script + lensfunDatabases ? null, }: let version = "0.3.4"; pname = "lensfun"; - # Fetch a more recent version of the repo containing a more recent lens - # database - lensfunDatabase = fetchFromGitHub { - owner = "lensfun"; - repo = "lensfun"; - rev = "a1510e6f33ce9bc8b5056a823c6d5bc6b8cba033"; - sha256 = "sha256-qdONyKk873Tq11M33JmznhJMAGd4dqp5KdXdVhfy/Ak="; - }; + lensData = + if lensfunDatabases != null then + lensfunDatabases + else + # fetch a more recent version of the lens database + stdenvNoCC.mkDerivation { + name = "lensfun-databases"; + + src = fetchFromGitHub { + owner = "lensfun"; + repo = "lensfun"; + rev = "201da1a7433626a2a1ecd67e1f21a42fb17aa4a5"; + sha256 = "sha256-64ZcupHA4oClPRCnG8KofGC46M/mZFermugzQ15B6k4="; + + leaveDotGit = true; + # generate timestamp based on the most recent commit + postFetch = '' + cd $out + git log -1 --format=%at > $out/timestamp.txt + rm -R .git + ''; + }; + + nativeBuildInputs = [ + python3 + python3Packages.setuptools + python3Packages.lxml + ]; + + # generates versioned tarballs of lens data + # patch applied so that we read the previously generated `timestamp.txt` instead + # of trying to read from `.git` (which is deleted during `postFetch`) + buildPhase = '' + substituteInPlace tools/update_database/generate_db.py \ + --replace-fail '"git", "log", "-1", "--format=%ad", "--date=raw", "--", "*.xml"' '"cat", "timestamp.txt"' + python3 tools/update_database/generate_db.py --input data/db --output $out + cp timestamp.txt $out/timestamp.txt + ''; + }; in stdenv.mkDerivation { @@ -36,15 +71,13 @@ stdenv.mkDerivation { }; # replace database with a more recent snapshot - # the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, - # so we run the conversion tool the project provides, - # then untar the version 1 profiles into the source dir before we build + # the master branch uses version 2 profiles, while this version requires version 1 profiles + # also copies in the required `timestamp.txt` file prePatch = '' rm -R data/db - python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db mkdir -p data/db - tar xvf $TMPDIR/db/version_1.tar -C data/db - date +%s > data/db/timestamp.txt + tar xvfj ${lensData}/version_1.tar.bz2 -C data/db + cp ${lensData}/timestamp.txt data/db/timestamp.txt '' # Backport CMake 4 support # This is already on master, but not yet in a stable release: @@ -60,9 +93,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - python3 - python3Packages.setuptools - python3Packages.lxml # For the db converison ]; buildInputs = [ diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 7ea4f42df493..4358b387e73f 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -91,5 +91,6 @@ makeSetupHook { meta = { description = "Setup hook for configuring and wrapping applications based on libcosmic"; teams = [ lib.teams.cosmic ]; + license = lib.licenses.mit; }; } ./libcosmic-app-hook.sh diff --git a/pkgs/by-name/li/libudev-zero/package.nix b/pkgs/by-name/li/libudev-zero/package.nix index b2a599de97e1..bbaab9072059 100644 --- a/pkgs/by-name/li/libudev-zero/package.nix +++ b/pkgs/by-name/li/libudev-zero/package.nix @@ -2,23 +2,25 @@ lib, stdenv, fetchFromGitHub, + hwdata, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "libudev-zero"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "illiliti"; repo = "libudev-zero"; rev = finalAttrs.version; - sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI="; + sha256 = "sha256-uKOfN9oJBFkR5n92bQ8RxVxfNaE2EKajrQseDkH5q+k="; }; makeFlags = [ "PREFIX=$(out)" "AR=${stdenv.cc.targetPrefix}ar" + "USB_IDS_PATH=${hwdata}/share/hwdata/usb.ids" ]; # Just let the installPhase build stuff, because there's no diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index 749851d547e2..a844a586d800 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -30,4 +30,6 @@ makeSetupHook { tests = tests.makeBinaryWrapper; }; + + meta.license = lib.licenses.mit; } ./make-binary-wrapper.sh diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix index 88e8fe8701c2..44cb06c81bae 100644 --- a/pkgs/by-name/mc/mcat-unwrapped/package.nix +++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix @@ -9,21 +9,26 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mcat-unwrapped"; - version = "0.4.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Skardyy"; repo = "mcat"; tag = "v${finalAttrs.version}"; - hash = "sha256-8NWWEV/1Kk3s/Ip6Mtt2uSX8lhsaVFmkldBG1qyCTrM="; + hash = "sha256-zedVMX3JV0jHSUzSY3x9Olimy4Y6GrNVGRSc6Eev9ow="; }; - cargoHash = "sha256-VrJMM++giBJQt+8YBPu370AScLTOgaLZNiRP3wk9nt8="; + cargoHash = "sha256-szqXS2CRfHoCtt6Lq1DuVb199mIuf7HUPiN7fj5BGtc="; nativeBuildInputs = [ installShellFiles ]; + checkFlags = [ + # Requires network access: the test embeds a remote URL in the SVG. + "--skip=stdin_svg_output_is_image" + ]; + postInstall = let mcat = diff --git a/pkgs/by-name/me/memcachedTestHook/package.nix b/pkgs/by-name/me/memcachedTestHook/package.nix index 6635b36a35e6..42569e370b75 100644 --- a/pkgs/by-name/me/memcachedTestHook/package.nix +++ b/pkgs/by-name/me/memcachedTestHook/package.nix @@ -15,4 +15,6 @@ makeSetupHook { passthru.tests = { simple = callPackage ./test.nix { }; }; + + meta.license = lib.licenses.mit; } ./memcached-test-hook.sh diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 95c026562553..53a4a945e085 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -74,7 +74,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.bsd0; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - quadradical aleksana ]; mainProgram = "monophony"; diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index c771e87376fa..e5bdc817379d 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,4 +1,5 @@ { + lib, callPackage, makeSetupHook, stdenv, @@ -11,4 +12,6 @@ makeSetupHook { iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo"; topology = ./topology.xml; }; + + meta.license = lib.licenses.mit; } ./mpi-check-hook.sh diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix new file mode 100644 index 000000000000..0fd9b85b4d18 --- /dev/null +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + python, +}: + +buildPythonPackage rec { + pname = "netbox-data-flows"; + version = "1.5.2"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Alef-Burzmali"; + repo = "netbox-data-flows"; + tag = "v${version}"; + hash = "sha256-fry8AK0qgPs+QC5L2oilGSY68m1Y9KHWQ/QOzQ7B2+k="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_data_flows" ]; + + meta = { + description = "NetBox plugin to document data flows between systems and applications"; + homepage = "https://github.com/Alef-Burzmali/netbox-data-flows"; + changelog = "https://github.com/Alef-Burzmali/netbox-data-flows/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix new file mode 100644 index 000000000000..d0aa49dbaf1e --- /dev/null +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + python, +}: + +buildPythonPackage rec { + pname = "netbox-inventory"; + version = "2.5.1"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "ArnesSI"; + repo = "netbox-inventory"; + tag = "v${version}"; + hash = "sha256-6MIYwz11YZhu3ksM7iAfKACKIKpuq283DTzaRR3lcXA="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_inventory" ]; + + meta = { + description = "NetBox plugin to manage hardware inventory"; + homepage = "https://github.com/ArnesSI/netbox-inventory"; + changelog = "https://github.com/ArnesSI/netbox-inventory/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix new file mode 100644 index 000000000000..c4f510c786ec --- /dev/null +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + python, + pycryptodome, +}: + +buildPythonPackage rec { + pname = "netbox-secrets"; + version = "3.0.2"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Onemind-Services-LLC"; + repo = "netbox-secrets"; + tag = "v${version}"; + hash = "sha256-4qUbzQTfSCXT7b8DfrsP9y3tatJZa5F40kl9tuMKed4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pycryptodome ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_secrets" ]; + + meta = { + description = "NetBox plugin to enhance secret management with encrypted storage and flexible, user-friendly features"; + homepage = "https://github.com/Onemind-Services-LLC/netbox-secrets"; + changelog = "https://github.com/Onemind-Services-LLC/netbox-secrets/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index c8b3f3552b3d..eaab9ed0c8ea 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -16,16 +16,16 @@ let in buildNpmPackage (finalAttrs: { pname = "netron"; - version = "9.0.8"; + version = "9.0.9"; src = fetchFromGitHub { owner = "lutzroeder"; repo = "netron"; tag = "v${finalAttrs.version}"; - hash = "sha256-vWzifB8A0VzzSkPVrcFtrR/tLBeFh1n+xwefhNo4PDQ="; + hash = "sha256-SNBNjMmOVkOpLGnzrXotUecQuEKii8bg22GPA1wiF3s="; }; - npmDepsHash = "sha256-3Vaoym7o3sTmEHTNTG90i/NgdJ2x+skJ1slpp0dmv64="; + npmDepsHash = "sha256-KgMf4qWM8HeaZ6UQNVqLjbFZvlFZ/Y2YydI/dtGaeEw="; nativeBuildInputs = [ jq ]; diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index fc69ae546621..783c07bb247c 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -4,20 +4,20 @@ rustPlatform, makeWrapper, nix, - unstableGitUpdater, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nixpkgs-hammering"; - version = "0-unstable-2025-09-10"; + version = "0-unstable-2026-04-21"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "8cb86601cfa5521b454974d7219924f2d1c304c9"; - hash = "sha256-9rSdimO591tpfe3MpcHkqsc0lPk6roNwgj6ajVSOG7E="; + rev = "0ca8e718c6809e0c2b640b954bfe000b915634dc"; + hash = "sha256-j/jqwdM466jE2Rf6aW3DfI6wQa44eN8W8/ii1aX8HDs="; }; - cargoHash = "sha256-MRwmeR5rj0PWUF5VMW5+9BbcX7Pq82YhufUv2Gt107U="; + cargoHash = "sha256-Lmj9XWUUavlmZn/IK+CcXQhKUYfz3dKF6S2U3BMhoIc="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # running checks requires to run nix inside of the builder which fails due to permission errors doCheck = false; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests"; diff --git a/pkgs/by-name/no/nodejsInstallExecutables/package.nix b/pkgs/by-name/no/nodejsInstallExecutables/package.nix index 8403cf8881d6..fe5ae5ca9825 100644 --- a/pkgs/by-name/no/nodejsInstallExecutables/package.nix +++ b/pkgs/by-name/no/nodejsInstallExecutables/package.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, installShellFiles, makeWrapper, @@ -16,4 +17,5 @@ makeSetupHook { hostNode = "${nodejs}/bin/node"; jq = "${jq}/bin/jq"; }; + meta.license = lib.licenses.mit; } ./hook.sh diff --git a/pkgs/by-name/no/nodejsInstallManuals/package.nix b/pkgs/by-name/no/nodejsInstallManuals/package.nix index 9f74cf8538da..7b9bb4c4fdb1 100644 --- a/pkgs/by-name/no/nodejsInstallManuals/package.nix +++ b/pkgs/by-name/no/nodejsInstallManuals/package.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, installShellFiles, jq, @@ -10,4 +11,5 @@ makeSetupHook { substitutions = { jq = "${jq}/bin/jq"; }; + meta.license = lib.licenses.mit; } ./hook.sh diff --git a/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix b/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix index 37983b5164b3..3d0ac47cc7ac 100644 --- a/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix +++ b/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix @@ -26,6 +26,7 @@ let pythonIncludeDir = "${python}/include/python${python.pythonVersion}"; pythonSitePackages = "${python}/${python.sitePackages}"; }; + meta.license = lib.licenses.mit; } ./pybind11-setup-hook.sh; in buildPythonPackage (finalAttrs: { diff --git a/pkgs/by-name/pa/patchPpdFilesHook/package.nix b/pkgs/by-name/pa/patchPpdFilesHook/package.nix index 1c29360e2714..80250d637561 100644 --- a/pkgs/by-name/pa/patchPpdFilesHook/package.nix +++ b/pkgs/by-name/pa/patchPpdFilesHook/package.nix @@ -14,6 +14,7 @@ makeSetupHook { passthru.tests.test = callPackage ./test.nix { }; meta = { description = "Setup hook to patch executable paths in ppd files"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.yarny ]; }; } ./patch-ppd-hook.sh diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index 241f3da8007c..1193090e415d 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/pkgs/by-name/pi/pihole/package.nix @@ -32,13 +32,13 @@ (resholve.mkDerivation (finalAttrs: { pname = "pihole"; - version = "6.4"; + version = "6.4.2"; src = fetchFromGitHub { owner = "pi-hole"; repo = "pi-hole"; tag = "v${finalAttrs.version}"; - hash = "sha256-aBQO+wAqeuXc9ekByVFlOZQ9SBCGsozGdoS8r1qhGuk="; + hash = "sha256-A34LLXI+hmDNXN4MoLLlC9tW3xx+v/1La/qzFSDW0xQ="; }; patches = [ @@ -231,6 +231,11 @@ ]; }; + passthru = { + inherit stateDir; + tests = nixosTests.pihole-ftl; + }; + meta = { description = "Black hole for Internet advertisements"; homepage = "https://pi-hole.net"; @@ -240,12 +245,11 @@ platforms = lib.platforms.linux; mainProgram = "pihole"; }; - - passthru.tests = nixosTests.pihole-ftl; - - passthru = { inherit stateDir; }; })).overrideAttrs (old: { + # fixes nix-update trying to update resholve instead of this package + inherit (old) version src; + # Resholve can't fix the hardcoded absolute paths, so substitute them before resholving preFixup = '' scriptsDir=$out/share/pihole diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo/package.nix similarity index 77% rename from pkgs/by-name/po/podofo_1_0/package.nix rename to pkgs/by-name/po/podofo/package.nix index 1576ce6bc232..bf635ab9b383 100644 --- a/pkgs/by-name/po/podofo_1_0/package.nix +++ b/pkgs/by-name/po/podofo/package.nix @@ -47,13 +47,17 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + (lib.cmakeBool "PODOFO_BUILD_STATIC" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "CMAKE_BUILD_WITH_INSTALL_NAME_DIR" true) ]; + strictDeps = true; + __structuredAttrs = true; + meta = { homepage = "https://github.com/podofo/podofo"; description = "Library to work with the PDF file format"; + changelog = "https://github.com/podofo/podofo/blob/${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.all; license = with lib.licenses; [ gpl2Plus diff --git a/pkgs/by-name/po/podofo0/package.nix b/pkgs/by-name/po/podofo0/package.nix new file mode 100644 index 000000000000..31fd73e8d69d --- /dev/null +++ b/pkgs/by-name/po/podofo0/package.nix @@ -0,0 +1,11 @@ +{ + podofo, + libidn, +}: +podofo.overrideAttrs (prevAttrs: { + version = "0.10.6"; + src = prevAttrs.src.override { + hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI="; + }; + buildInputs = prevAttrs.buildInputs ++ [ libidn ]; +}) diff --git a/pkgs/by-name/po/podofo_0_10/package.nix b/pkgs/by-name/po/podofo_0_10/package.nix deleted file mode 100644 index 0470a0ad3825..000000000000 --- a/pkgs/by-name/po/podofo_0_10/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - fontconfig, - freetype, - libidn, - libjpeg, - libpng, - libtiff, - libxml2, - openssl, - pkg-config, - zlib, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "podofo"; - version = "0.10.6"; - - src = fetchFromGitHub { - owner = "podofo"; - repo = "podofo"; - rev = finalAttrs.version; - hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI="; - }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - fontconfig - freetype - libidn - libjpeg - libpng - libtiff - libxml2 - openssl - zlib - ]; - - cmakeFlags = [ - "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ]; - - meta = { - homepage = "https://github.com/podofo/podofo"; - description = "Library to work with the PDF file format"; - platforms = lib.platforms.all; - license = with lib.licenses; [ - gpl2Plus - lgpl2Plus - ]; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; -}) diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix deleted file mode 100644 index 5131b6138d74..000000000000 --- a/pkgs/by-name/po/podofo_0_9/package.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - zlib, - freetype, - libjpeg, - libtiff, - fontconfig, - openssl, - libpng, - lua5, - pkg-config, - libidn, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "0.9.8"; - pname = "podofo"; - - src = fetchFromGitHub { - owner = "podofo"; - repo = "podofo"; - rev = finalAttrs.version; - hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s="; - }; - - outputs = [ - "out" - "dev" - "lib" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - zlib - freetype - libjpeg - libtiff - fontconfig - openssl - libpng - libidn - lua5 - ]; - - cmakeFlags = [ - "-DPODOFO_BUILD_SHARED=ON" - "-DPODOFO_BUILD_STATIC=OFF" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ]; - - postPatch = '' - # Use GNU directories to fix multiple outputs - failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}' - sed -ni src/podofo/CMakeLists.txt \ - -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches" - sed -ni src/podofo/libpodofo.pc.in \ - -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches" - - substituteInPlace {src/podofo/,./}CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - homepage = "https://podofo.sourceforge.net"; - description = "Library to work with the PDF file format"; - platforms = lib.platforms.all; - license = with lib.licenses; [ - gpl2Plus - lgpl2Plus - ]; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; -}) diff --git a/pkgs/by-name/po/postgresqlTestHook/package.nix b/pkgs/by-name/po/postgresqlTestHook/package.nix index 4b67c7716e07..625418356336 100644 --- a/pkgs/by-name/po/postgresqlTestHook/package.nix +++ b/pkgs/by-name/po/postgresqlTestHook/package.nix @@ -9,6 +9,9 @@ makeSetupHook { passthru.tests = { simple = callPackage ./test.nix { }; }; - # See comment in postgresql's generic.nix doInstallCheck section. - meta.badPlatforms = lib.platforms.darwin; + meta = { + # See comment in postgresql's generic.nix doInstallCheck section. + badPlatforms = lib.platforms.darwin; + license = lib.licenses.mit; + }; } ./postgresql-test-hook.sh diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json index 5e1988a9e2e0..8405c08770c1 100644 --- a/pkgs/by-name/py/pyright/package-lock.json +++ b/pkgs/by-name/py/pyright/package-lock.json @@ -6,74 +6,123 @@ "": { "name": "pyright-root", "devDependencies": { - "glob": "^8.1.0", - "jsonc-parser": "^3.2.0" + "glob": "^11.1.0", + "jsonc-parser": "^3.3.1" + } + }, + "node_modules/@isaacs/cliui": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-9.0.0.tgz", + "integrity": "sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, - "license": "ISC" + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } }, - "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "dev": true, "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" }, "engines": { - "node": ">=12" + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "node_modules/glob": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz", + "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "once": "^1.3.0", - "wrappy": "1" + "foreground-child": "^3.3.1", + "jackspeak": "^4.1.1", + "minimatch": "^10.1.1", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true, "license": "ISC" }, + "node_modules/jackspeak": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.2.3.tgz", + "integrity": "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^9.0.0" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/jsonc-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", @@ -81,35 +130,127 @@ "dev": true, "license": "MIT" }, - "node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "node_modules/lru-cache": { + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz", + "integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.5" }, "engines": { - "node": ">=10" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "node_modules/minipass": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "license": "ISC", "dependencies": { - "wrappy": "1" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" } } } diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 0d4ccccbedb9..0becc68d6524 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.409"; + version = "1.1.410"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-h0sXYwRCIQlrnNIp/a7ow55McA9fdHP2FcvrRCqWROg="; + hash = "sha256-ouG+Lz08eljOU6ved1IoeeW/3GJWbFT7WzdhTilWqBs="; }; patchedPackageJSON = @@ -32,7 +32,7 @@ let pname = "pyright-root"; inherit version src; sourceRoot = "${src.name}"; # required for update.sh script - npmDepsHash = "sha256-OpXxcALwMyBJEcZz5WTnjAysufbgWkW/VKAg1zIJgDE="; + npmDepsHash = "sha256-Q7niMODoPmtn4zbou3OeJFAGEjRtt8j40qiw2NJvo8k="; dontNpmBuild = true; postPatch = '' cp ${patchedPackageJSON} ./package.json @@ -49,7 +49,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-HG2714eCHWD6aQAKGpGClMg+XDPQ08Q0ofXf3wMafg0="; + npmDepsHash = "sha256-lzwDayoN2qmF33Slv7r+rv1bl81utjRGGeeXI6jCd0U="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -63,7 +63,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-wyswu6pTtZmksj1hZUhaZLWuJnf8WKofo1htLtgKm9w="; + npmDepsHash = "sha256-nCfoa+c6I8khFqXBRI5AAdFzn1tO3G03KT+LPqHY82U="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/qi/qidi-studio/package.nix b/pkgs/by-name/qi/qidi-studio/package.nix index 876a62adc3af..b316f1eaa172 100644 --- a/pkgs/by-name/qi/qidi-studio/package.nix +++ b/pkgs/by-name/qi/qidi-studio/package.nix @@ -7,11 +7,11 @@ }: let pname = "qidi-studio"; - version = "2.05.02.50"; + version = "2.06.00.51"; src = fetchurl { url = "https://github.com/QIDITECH/QIDIStudio/releases/download/v${version}/QIDIStudio_v0${version}_Ubuntu24.AppImage"; - hash = "sha256-dHefxOelz8B40HFxqDdG0+whPMYLlbLDbx3AM7+R/TA="; + hash = "sha256-Qb/NbyjOCtIg74O5yPxX9Jq0Hf92hJXo9RqQTQh/ESM="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 99c4d389cf3d..5d96d1256067 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-Cs2SYz6+3ziAbnoXiWdpwBg3lmIJWq06wuYy/TKoVSU="; + hash = "sha256-GNojgZ416OheIL/b4hV4TBr7PKnEGxPSom3F1mo52hg="; }; vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA="; diff --git a/pkgs/by-name/re/redisTestHook/package.nix b/pkgs/by-name/re/redisTestHook/package.nix index c3ff3c842b4c..f9209bf9d080 100644 --- a/pkgs/by-name/re/redisTestHook/package.nix +++ b/pkgs/by-name/re/redisTestHook/package.nix @@ -16,4 +16,5 @@ makeSetupHook { simple = callPackage ./test.nix { }; python3-valkey = python3Packages.valkey; }; + meta.license = lib.licenses.mit; } ./redis-test-hook.sh diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 289b440cd865..68167e401eb8 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; - version = "2.70.0"; + version = "3.4.2"; src = fetchFromGitHub { - owner = "RedisInsight"; + owner = "redis"; repo = "RedisInsight"; rev = finalAttrs.version; - hash = "sha256-b97/hBhXqSFDzcyrQKu5Ebu1Ud3wpWEjyzUehj0PP9w="; + hash = "sha256-QV1xxpr8aMgkxWitJPVjXB/G2UaAYrV2wMM1FbltZpE="; }; patches = [ @@ -42,21 +42,21 @@ stdenv.mkDerivation (finalAttrs: { baseOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-base-offline-cache"; inherit (finalAttrs) src patches; - hash = "sha256-m3relh3DZGReEi4dVOJcIXU9QVClisXw+f7K5i25x24="; + hash = "sha256-hU8/ycljmRxqQEx0neezQmJPaianJhL0IyVOJEfLy5o="; }; innerOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-inner-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight"; - hash = "sha256-rqmrETlc2XoZDM4GP1+qI4eK4oGmtpmc6TVvAam2+W8="; + hash = "sha256-s4JTgqXT+5P/C5e3/c30/VZHt8MRct3KViZOD1Fekqc="; }; apiOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-api-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight/api"; - hash = "sha256-KFtmq3iYAnsAi5ysvGCzBk9RHV7EE7SIPbzPza7vBdA="; + hash = "sha256-GsdKJjQltpHKDZmGRF60M1TLTbnwyHt9e5ayrXgbFOU="; }; nativeBuildInputs = [ @@ -120,9 +120,13 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Generate defaults. Currently broken because it requires network access. # yarn --offline --cwd=redisinsight/api build:defaults + # Electron dist needs to be writable during the build. + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + yarn --offline electron-builder \ --dir \ - -c.electronDist=${electron.dist} \ + -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} \ -c.npmRebuild=false # we've already rebuilt the native libs using the electron headers @@ -167,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Developer GUI for Redis"; - homepage = "https://github.com/RedisInsight/RedisInsight"; + homepage = "https://github.com/redis/RedisInsight"; license = lib.licenses.sspl; maintainers = with lib.maintainers; [ tomasajt diff --git a/pkgs/by-name/re/redisinsight/remove-cpu-features.patch b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch index a24964a6e322..59fddffd099e 100644 --- a/pkgs/by-name/re/redisinsight/remove-cpu-features.patch +++ b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch @@ -1,20 +1,20 @@ diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json -index 4a24ac8..fab339c 100644 +index 825b18a59..034bb9491 100644 --- a/redisinsight/api/package.json +++ b/redisinsight/api/package.json -@@ -49,7 +49,6 @@ - "@nestjs/platform-socket.io/socket.io": "^4.8.0", - "@nestjs/cli/**/braces": "^3.0.3", +@@ -44,7 +44,6 @@ + "jest/**/micromatch": "^4.0.8", + "mocha/minimatch": "^3.0.5", "**/semver": "^7.5.2", - "**/cpu-features": "file:./stubs/cpu-features", "**/cross-spawn": "^7.0.5", "**/redis-parser": "3.0.0", - "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0" + "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0", diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock -index e0e8495..dfed1ae 100644 +index dfdb57365..7aef4106b 100644 --- a/redisinsight/api/yarn.lock +++ b/redisinsight/api/yarn.lock -@@ -3223,9 +3223,6 @@ cosmiconfig@^8.2.0: +@@ -3080,9 +3080,6 @@ cosmiconfig@^8.2.0: parse-json "^5.2.0" path-type "^4.0.0" @@ -24,47 +24,47 @@ index e0e8495..dfed1ae 100644 create-jest@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320" -@@ -7969,7 +7966,6 @@ ssh2@^1.15.0: +@@ -6945,7 +6942,6 @@ ssh2@^1.15.0: asn1 "^0.2.6" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "~0.0.9" nan "^2.18.0" - ssri@^8.0.0, ssri@^8.0.1: + stack-trace@0.0.x: diff --git a/redisinsight/package.json b/redisinsight/package.json -index 8649be7..354ed42 100644 +index c7d8a7f89..d0c06916c 100644 --- a/redisinsight/package.json +++ b/redisinsight/package.json -@@ -16,8 +16,7 @@ +@@ -15,8 +15,7 @@ + "postinstall": "npx patch-package" }, "resolutions": { - "**/semver": "^7.5.2", -- "sqlite3/**/tar": "^6.2.1", +- "**/semver": "^7.5.2", - "**/cpu-features": "file:./api/stubs/cpu-features" -+ "sqlite3/**/tar": "^6.2.1" ++ "**/semver": "^7.5.2" }, "dependencies": { - "keytar": "^7.9.0", + "better-sqlite3": "^12.8.0", diff --git a/redisinsight/yarn.lock b/redisinsight/yarn.lock -index 7a063ce..22f37a7 100644 +index 1d164a2e6..b239a21eb 100644 --- a/redisinsight/yarn.lock +++ b/redisinsight/yarn.lock -@@ -183,9 +183,6 @@ console-control-strings@^1.1.0: - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== +@@ -58,9 +58,6 @@ chownr@^1.1.1: + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -"cpu-features@file:./api/stubs/cpu-features", cpu-features@~0.0.10: - version "1.0.0" - - debug@4, debug@^4.3.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" -@@ -807,7 +804,6 @@ ssh2@^1.15.0: + decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" +@@ -281,7 +278,6 @@ ssh2@^1.15.0: asn1 "^0.2.6" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "~0.0.10" nan "^2.20.0" - ssri@^8.0.0, ssri@^8.0.1: + string_decoder@^1.1.1: diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 27e7dbd86679..5ba9af393c59 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rune"; - version = "0.14.1"; + version = "0.14.2"; src = fetchCrate { pname = "rune-cli"; inherit (finalAttrs) version; - hash = "sha256-Y/iCH6hwYRhDnu+lPVcJd2YaK3c4YJbfp9VEP1/c1ic="; + hash = "sha256-f/kpdDrLQLuKrOTV+AkxzbzBBLIW6j+RAERn5YIUSL4="; }; - cargoHash = "sha256-Xp87BvDh3uPtvUMmG1R8g6lEZcf/frEHVXdQ/+kV5OI="; + cargoHash = "sha256-l/RlOi7DVLNlqAb5M0pvU7Eks3xmhmOgmkLFvoGyMLs="; env = { RUNE_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 8a109186c7b8..d9bca070a823 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -73,14 +73,14 @@ let ]; in stdenv.mkDerivation rec { - version = "5.0.1"; + version = "5.0.3"; pname = "sabnzbd"; src = fetchFromGitHub { owner = "sabnzbd"; repo = "sabnzbd"; rev = version; - hash = "sha256-wx3lNGeHsNvd+nLiI9jfIKHcsVstfjEpZry6o3xbWd4="; + hash = "sha256-UTzdBM64fCbyY8+h94G8XbTIdoXk0mDZjlnGPywRB4Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix index ea6dbf56309e..faba5541389b 100644 --- a/pkgs/by-name/sc/scribus/package.nix +++ b/pkgs/by-name/sc/scribus/package.nix @@ -29,7 +29,7 @@ libzmf, pixman, pkg-config, - podofo_0_10, + podofo, poppler, poppler_data, python3, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libzmf pixman - podofo_0_10 + podofo poppler poppler_data (python3.withPackages ( diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/package.nix b/pkgs/by-name/sh/shadps4-qtlauncher/package.nix new file mode 100644 index 000000000000..8b0a0888bef2 --- /dev/null +++ b/pkgs/by-name/sh/shadps4-qtlauncher/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + qt6, + + fmt, + sdl3, + toml11, + + shadps4, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "shadps4-qtlauncher"; + version = "224"; + + src = fetchFromGitHub { + owner = "shadps4-emu"; + repo = "shadps4-qtlauncher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lRZH9fokUKN/n3m/ZkTsRHwkwZZ04buvqBMXYLrqqLE="; + + postCheckout = '' + cd "$out" + + git rev-parse --short=8 HEAD > $out/COMMIT + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + + git -C externals submodule update --init --recursive \ + volk \ + json + ''; + }; + + strictDeps = true; + __structuredAttrs = true; + + patches = [ + ./qt-paths.patch + # https://github.com/shadps4-emu/shadps4-qtlauncher/pull/335 + ./version-directory.patch + ]; + + postPatch = '' + substituteInPlace src/common/scm_rev.cpp.in \ + --replace-fail @APP_VERSION@ ${finalAttrs.version} \ + --replace-fail @GIT_REV@ $(cat COMMIT) \ + --replace-fail @GIT_BRANCH@ ${finalAttrs.version} \ + --replace-fail @GIT_DESC@ nixpkgs \ + --replace-fail @BUILD_DATE@ $(cat SOURCE_DATE_EPOCH) + + substituteInPlace src/common/versions.cpp \ + --replace-fail "@shadps4-qt@" "$out" + + substituteInPlace src/qt_gui/gui_settings.cpp \ + --replace-fail "@shadps4-qt@" "$out" + + substituteInPlace src/qt_gui/version_dialog.cpp \ + --replace-fail "@shadps4-qt@" "$out" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + fmt + sdl3 + toml11 + qt6.qtbase + qt6.qttools + qt6.qtmultimedia + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_UPDATER" false) + (lib.cmakeBool "HIDE_VERSION_MANAGER" true) + ]; + + postInstall = '' + substitute ${./versions.json} $out/share/versions.json \ + --replace-fail @shadps4@ ${lib.getExe shadps4} + + substitute ${./qt_ui.ini} $out/share/qt_ui.ini \ + --replace-fail @shadps4@ ${lib.getExe shadps4} + ''; + + meta = { + inherit (shadps4.meta) + platforms + license + maintainers + ; + + description = shadps4.meta.description + " (Qt UI)"; + homepage = "https://github.com/shadps4-emu/shadps4-qtlauncher"; + mainProgram = "shadPS4QtLauncher"; + }; +}) diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/qt-paths.patch b/pkgs/by-name/sh/shadps4-qtlauncher/qt-paths.patch new file mode 100644 index 000000000000..45d41ddbf425 --- /dev/null +++ b/pkgs/by-name/sh/shadps4-qtlauncher/qt-paths.patch @@ -0,0 +1,50 @@ +diff --git a/src/common/versions.cpp b/src/common/versions.cpp +index b935bb6..8625989 100644 +--- a/src/common/versions.cpp ++++ b/src/common/versions.cpp +@@ -18,7 +18,7 @@ namespace VersionManager { + + std::vector GetVersionList(std::filesystem::path const& path) { + std::filesystem::path cfg_path = +- path.empty() ? Common::FS::GetUserPath(Common::FS::PathType::LauncherDir) / "versions.json" ++ path.empty() ? "@shadps4-qt@/share/versions.json" + : path; + + std::ifstream ifs{cfg_path}; +@@ -76,7 +76,7 @@ std::vector GetVersionList(std::filesystem::path const& path) { + + void SaveVersionList(std::vector const& versions, std::filesystem::path const& path) { + std::filesystem::path out_path = +- path.empty() ? Common::FS::GetUserPath(Common::FS::PathType::LauncherDir) / "versions.json" ++ path.empty() ? "@shadps4-qt@/share/versions.json" + : path; + + json root = json::array(); +diff --git a/src/qt_gui/gui_settings.cpp b/src/qt_gui/gui_settings.cpp +index 707131c..40e3f14 100644 +--- a/src/qt_gui/gui_settings.cpp ++++ b/src/qt_gui/gui_settings.cpp +@@ -5,7 +5,9 @@ + #include "gui_settings.h" + + gui_settings::gui_settings(QObject* parent) : settings(parent) { +- m_settings = std::make_unique(ComputeSettingsDir() + "qt_ui.ini", ++ QString currentPath; ++ Common::FS::PathToQString(currentPath, "@shadps4-qt@/share/qt_ui.ini"); ++ m_settings = std::make_unique(currentPath, + QSettings::Format::IniFormat, parent); + } + +diff --git a/src/qt_gui/version_dialog.cpp b/src/qt_gui/version_dialog.cpp +index 2ed0418..13c6788 100644 +--- a/src/qt_gui/version_dialog.cpp ++++ b/src/qt_gui/version_dialog.cpp +@@ -638,7 +638,7 @@ tr("First you need to choose a location to save the versions in\n'Path to save v + } + + void VersionDialog::LoadInstalledList() { +- const auto path = Common::FS::GetUserPath(Common::FS::PathType::LauncherDir) / "versions.json"; ++ const auto path = "@shadps4-qt@/share/versions.json"; + auto versions = VersionManager::GetVersionList(path); + const auto& selected_version = + m_gui_settings->GetValue(gui::vm_versionSelected).toString().toStdString(); diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/qt_ui.ini b/pkgs/by-name/sh/shadps4-qtlauncher/qt_ui.ini new file mode 100644 index 000000000000..dd5bc8fef4d1 --- /dev/null +++ b/pkgs/by-name/sh/shadps4-qtlauncher/qt_ui.ini @@ -0,0 +1,2 @@ +[version_manager] +versionSelected=@shadps4@ diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/version-directory.patch b/pkgs/by-name/sh/shadps4-qtlauncher/version-directory.patch new file mode 100644 index 000000000000..77b80208c18e --- /dev/null +++ b/pkgs/by-name/sh/shadps4-qtlauncher/version-directory.patch @@ -0,0 +1,37 @@ +diff --git a/src/qt_gui/game_install_dialog.cpp b/src/qt_gui/game_install_dialog.cpp +index 8a9b94d..919d4a5 100644 +--- a/src/qt_gui/game_install_dialog.cpp ++++ b/src/qt_gui/game_install_dialog.cpp +@@ -144,7 +144,9 @@ void GameInstallDialog::Save() { + // Check games directory. + auto gamesDirectory = m_gamesDirectory->text(); + auto addonsDirectory = m_addonsDirectory->text(); ++#ifndef HIDE_VERSION_MANAGER + auto versionDirectory = m_versionDirectory->text(); ++#endif + + if (gamesDirectory.isEmpty() || !QDir(gamesDirectory).exists() || + !QDir::isAbsolutePath(gamesDirectory)) { +@@ -167,6 +169,7 @@ void GameInstallDialog::Save() { + } + } + ++#ifndef HIDE_VERSION_MANAGER + if (versionDirectory.isEmpty() || !QDir::isAbsolutePath(versionDirectory)) { + QMessageBox::critical(this, tr("Error"), + "The value for location to install emulator versions is not valid."); +@@ -181,11 +184,14 @@ void GameInstallDialog::Save() { + return; + } + } ++#endif + + // Save the directories + Config::addGameInstallDir(Common::FS::PathFromQString(gamesDirectory)); + Config::setAddonInstallDir(Common::FS::PathFromQString(addonsDirectory)); ++#ifndef HIDE_VERSION_MANAGER + m_gui_settings->SetValue(gui::vm_versionPath, versionDirectory); ++#endif + + const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir); + Config::save(config_dir / "config.toml"); diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/versions.json b/pkgs/by-name/sh/shadps4-qtlauncher/versions.json new file mode 100644 index 000000000000..abe7564b8e74 --- /dev/null +++ b/pkgs/by-name/sh/shadps4-qtlauncher/versions.json @@ -0,0 +1,8 @@ +[ + { + "codename": "built-in", + "name": "built-in", + "path": "@shadps4@", + "type": 0 + } +] diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 3ff4dd9e4d3e..a5820c0f0314 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -1,28 +1,27 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, + makeWrapper, nixosTests, alsa-lib, boost, + cli11, cmake, cryptopp, - game-music-emu, - glslang, ffmpeg, - flac, - fluidsynth, fmt, half, jack2, libdecor, - libGL, + libpng, libpulseaudio, libunwind, libusb1, - libvorbis, - libxmp, + magic-enum, + miniz, + nlohmann_json, libgbm, libx11, libxcb, @@ -32,14 +31,14 @@ libxrandr, libxscrnsaver, libxtst, - magic-enum, - mpg123, pipewire, pkg-config, pugixml, rapidjson, renderdoc, robin-map, + sdl3, + sdl3-mixer, sndio, stb, toml11, @@ -49,29 +48,38 @@ vulkan-memory-allocator, xbyak, xxhash, - zlib-ng, - zydis, + zlib, nix-update-script, }: -# relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700 -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; tag = "v.${finalAttrs.version}"; - hash = "sha256-zc3zhFTphty/vwioFEOfhgXttpD9MG2F7+YJYcW0H2w="; - fetchSubmodules = true; + hash = "sha256-76rbxOf4grDWPVILy8nF35wQ6/NcxHQkmiQOB0u4oJo="; - leaveDotGit = true; - postFetch = '' + postCheckout = '' cd "$out" + git rev-parse --short=8 HEAD > $out/COMMIT date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH - find "$out" -name .git -print0 | xargs -0 rm -rf + + git -C externals submodule update --init --recursive \ + glslang \ + zydis \ + sirit \ + tracy \ + ext-libusb \ + discord-rpc \ + hwinfo \ + openal-soft \ + dear_imgui \ + LibAtrac9 \ + aacdec/fdk-aac ''; }; @@ -82,27 +90,26 @@ gcc14Stdenv.mkDerivation (finalAttrs: { --replace-fail @GIT_BRANCH@ ${finalAttrs.version} \ --replace-fail @GIT_DESC@ nixpkgs \ --replace-fail @BUILD_DATE@ $(cat SOURCE_DATE_EPOCH) + + substituteInPlace src/core/libraries/np/trophy_ui.cpp \ + --replace-fail "MIX_SetMasterGain" "MIX_SetMixerGain" \ + --replace-fail "MIX_GetMasterGain" "MIX_GetMixerGain" ''; buildInputs = [ alsa-lib boost + cli11 cryptopp - game-music-emu - glslang ffmpeg - flac - fluidsynth fmt half jack2 libdecor - libGL + libpng libpulseaudio libunwind libusb1 - libvorbis - libxmp libx11 libxcb libxcursor @@ -111,14 +118,17 @@ gcc14Stdenv.mkDerivation (finalAttrs: { libxrandr libxscrnsaver libxtst - libgbm magic-enum - mpg123 + miniz + libgbm + nlohmann_json pipewire pugixml rapidjson renderdoc robin-map + sdl3 + sdl3-mixer sndio stb toml11 @@ -128,13 +138,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { vulkan-memory-allocator xbyak xxhash - zlib-ng - zydis + zlib ]; nativeBuildInputs = [ cmake pkg-config + makeWrapper ]; cmakeFlags = [ @@ -145,15 +155,14 @@ gcc14Stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebugInfo"; dontStrip = true; - installPhase = '' - runHook preInstall - - install -D -t $out/bin shadps4 - install -Dm644 $src/.github/shadps4.png $out/share/icons/hicolor/512x512/apps/net.shadps4.shadPS4.png - install -Dm644 -t $out/share/applications $src/dist/net.shadps4.shadPS4.desktop - install -Dm644 -t $out/share/metainfo $src/dist/net.shadps4.shadPS4.metainfo.xml - - runHook postInstall + postInstall = '' + wrapProgram $out/bin/shadps4 \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libpulseaudio + pipewire + ] + } ''; runtimeDependencies = [ diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 9a0d4bd53935..535836777b65 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { version = "0.14.8"; src = fetchFromGitHub { repo = "shopware-cli"; - owner = "FriendsOfShopware"; + owner = "shopware"; tag = finalAttrs.version; hash = "sha256-yN6yuGnZv6BsXoERUdA3aBGEmri1hqmPsbIYsX7HE5Q="; }; @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X 'github.com/FriendsOfShopware/shopware-cli/cmd.version=${finalAttrs.version}'" + "-X 'github.com/shopware/shopware-cli/cmd.version=${finalAttrs.version}'" ]; __darwinAllowLocalNetworking = true; @@ -53,8 +53,8 @@ buildGoModule (finalAttrs: { meta = { description = "Command line tool for Shopware 6"; mainProgram = "shopware-cli"; - homepage = "https://github.com/FriendsOfShopware/shopware-cli"; - changelog = "https://github.com/FriendsOfShopware/shopware-cli/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/shopware/shopware-cli"; + changelog = "https://github.com/shopware/shopware-cli/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shyim ]; }; diff --git a/pkgs/by-name/so/sonar/package.nix b/pkgs/by-name/so/sonar/package.nix new file mode 100644 index 000000000000..1b61013c2f1a --- /dev/null +++ b/pkgs/by-name/so/sonar/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + pname = "sonar"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "raskrebs"; + repo = "sonar"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ucOIFws3fo94o5ziJDn8ldgWkpAuiUqW8A+MQdPNy3c="; + }; + + vendorHash = "sha256-komX1AmHt2NoF1x6xsNa2RFkfVzOXfYEMPhT0zwMxjw="; + + ldflags = [ + "-s -w -X github.com/raskrebs/sonar/internal/selfupdate.Version=v${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + meta = { + description = "CLI tool for inspecting and managing services listening on localhost ports"; + homepage = "https://github.com/raskrebs/sonar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paepcke ]; + mainProgram = "sonar"; + }; +}) diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix index df108e82e57f..b79a89097843 100644 --- a/pkgs/by-name/tc/tcping-rs/package.nix +++ b/pkgs/by-name/tc/tcping-rs/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tcping-rs"; - version = "1.2.26"; + version = "1.2.27"; src = fetchFromGitHub { owner = "lvillis"; repo = "tcping-rs"; tag = finalAttrs.version; - hash = "sha256-qcvoV57t36c230p7KRec9CBIb+F+dVeGU4EVs0DrREM="; + hash = "sha256-7VbuSGT1EGHvKoccLfd8Y5TBaPIMKzZ9eaCVrZPNz34="; }; - cargoHash = "sha256-Y+Hv4oWHTzC/8DQ6/wQ3QLtDy/rqQs+89x312cYOpKY="; + cargoHash = "sha256-O94qItpOhLyWxdj7TXljacMbufbYGZw4F5FRS/o7qME="; checkFlags = [ # This test requires external network access diff --git a/pkgs/by-name/te/teensy-cmake-macros/hook.nix b/pkgs/by-name/te/teensy-cmake-macros/hook.nix index ab35445bcad8..efa64eaf4e86 100644 --- a/pkgs/by-name/te/teensy-cmake-macros/hook.nix +++ b/pkgs/by-name/te/teensy-cmake-macros/hook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, teensy-cmake-macros, }: @@ -13,5 +14,6 @@ makeSetupHook { meta = { description = "Setup hook for teensy-cmake-macros"; inherit (teensy-cmake-macros.meta) maintainers platforms broken; + license = lib.licenses.mit; }; } ./setup-hook.sh diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index a5b1107e143c..d67d83daafe7 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { tee = lib.getExe' coreutils "tee"; tor = lib.getExe finalAttrs.finalPackage; }; + meta.license = lib.licenses.mit; } ./proxy-hook.sh; }; diff --git a/pkgs/by-name/ud/udevCheckHook/package.nix b/pkgs/by-name/ud/udevCheckHook/package.nix index 5d52b72edad5..b93b447a999b 100644 --- a/pkgs/by-name/ud/udevCheckHook/package.nix +++ b/pkgs/by-name/ud/udevCheckHook/package.nix @@ -21,5 +21,6 @@ makeSetupHook { meta = { description = "Check validity of udev rules in outputs"; maintainers = with lib.maintainers; [ grimmauld ]; + license = lib.licenses.mit; }; } ./hook.sh diff --git a/pkgs/by-name/ve/versionCheckHook/package.nix b/pkgs/by-name/ve/versionCheckHook/package.nix index 0cf103133e04..6e5f3301f774 100644 --- a/pkgs/by-name/ve/versionCheckHook/package.nix +++ b/pkgs/by-name/ve/versionCheckHook/package.nix @@ -13,5 +13,6 @@ makeSetupHook { meta = { description = "Lookup for $version in the output of --help and --version"; maintainers = with lib.maintainers; [ doronbehar ]; + license = lib.licenses.mit; }; } ./hook.sh diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index 0855f0ce0a31..9195c21fcdb8 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, waf, }: @@ -16,5 +17,6 @@ makeSetupHook { meta = { description = "Setup hook for using Waf in Nixpkgs"; inherit (waf.meta) maintainers platforms broken; + license = lib.licenses.mit; }; } ./setup-hook.sh diff --git a/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix index 1485f8a8ae1b..71e24faaa7fc 100644 --- a/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix +++ b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix @@ -1,4 +1,5 @@ { + lib, makeBinaryWrapper, makeSetupHook, }: @@ -6,4 +7,5 @@ makeSetupHook { name = "wrapGNUstepAppsHook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + meta.license = lib.licenses.mit; } ./wrapGNUstepAppsHook.sh diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index e42dc4896f3c..c4071d9c6fd6 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wstunnel"; - version = "10.5.4"; + version = "10.5.5"; src = fetchFromGitHub { owner = "erebe"; repo = "wstunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-4nNJgunyc4mqUlLTB1e91x636Z4z/h2PU/so5jdhR50="; + hash = "sha256-iPCyS+VkFfOBHiZfUtgseSDSoHL/aK1LoFk4mdZNjqo="; }; - cargoHash = "sha256-mbMcNqzLi1XJp6bWUHgmDZWKBGMwuZven/wykKA1vqw="; + cargoHash = "sha256-KhuLV89LTiyofx57Vc5fub3vipRB7jqt28lgQnMwq7M="; cargoBuildFlags = [ "--package wstunnel-cli" ]; diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix index f7999975258c..4761c5d7bcae 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, yarn-berry-offline, srcOnly, @@ -20,5 +21,6 @@ makeSetupHook { }; meta = { description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps"; + license = lib.licenses.mit; }; } ./yarn-berry-config-hook.sh diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py index 7370a02ceaa9..c7d7b8ca57cf 100755 --- a/pkgs/by-name/ya/yazi/plugins/update.py +++ b/pkgs/by-name/ya/yazi/plugins/update.py @@ -567,7 +567,7 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) } -def update_all_plugins(nixpkgs_dir: str) -> list[dict[str, str]]: +def update_all_plugins(nixpkgs_dir: str, commit: bool = False) -> list[dict[str, str]]: """Update all available Yazi plugins Returns: @@ -602,6 +602,8 @@ def update_all_plugins(nixpkgs_dir: str) -> list[dict[str, str]]: if update_info: updated_count += 1 updated_plugins.append(update_info) + if commit: + commit_plugin_change(nixpkgs_dir, update_info) except KeyboardInterrupt: print("\nUpdate process interrupted by user") sys.exit(1) @@ -630,47 +632,58 @@ def update_all_plugins(nixpkgs_dir: str) -> list[dict[str, str]]: return updated_plugins -def commit_changes(updated_plugins: list[dict[str, str]]) -> None: - """Commit all changes after updating plugins""" +def get_compare_url(plugin: dict[str, str]) -> str | None: + if plugin["old_commit"] == "unknown" or plugin["new_commit"] is None: + return None + + owner = plugin["owner"].strip() + repo = plugin["repo"].strip() + return f"https://github.com/{owner}/{repo}/compare/{plugin['old_commit']}...{plugin['new_commit']}" + + +def commit_plugin_change(nixpkgs_dir: str, plugin: dict[str, str]) -> None: + """Commit the updated file for one plugin.""" + plugin_path = f"pkgs/by-name/ya/yazi/plugins/{plugin['name']}/default.nix" + + try: + subprocess.run(["git", "add", "--", plugin_path], cwd=nixpkgs_dir, check=True) + diff_result = subprocess.run( + ["git", "diff", "--cached", "--quiet", "--", plugin_path], + cwd=nixpkgs_dir, + check=False, + ) + if diff_result.returncode == 0: + print(f"No changes to commit for {plugin['name']}") + return + if diff_result.returncode != 1: + raise RuntimeError(f"Could not inspect staged changes for {plugin['name']}") + + subject = f"yaziPlugins.{plugin['name']}: {plugin['old_version']} → {plugin['new_version']}" + commit_args = ["git", "commit", "--no-verify", "-m", subject] + + compare_url = get_compare_url(plugin) + if compare_url: + commit_args.extend(["-m", f"Compare: {compare_url}"]) + + commit_args.extend(["--", plugin_path]) + + subprocess.run(commit_args, cwd=nixpkgs_dir, check=True) + print(f"\nCommitted {plugin['name']} with message:\n{subject}") + if compare_url: + print(f"\nCompare: {compare_url}") + except Exception as e: + print(f"Error committing changes for {plugin['name']}: {e}") + raise + + +def commit_changes(nixpkgs_dir: str, updated_plugins: list[dict[str, str]]) -> None: + """Commit one change per updated plugin.""" if not updated_plugins: print("No plugins were updated, skipping commit") return - try: - status_output = run_command("git status --porcelain", capture_output=True) - if not status_output: - print("No changes to commit") - return - - current_date = run_command("date +%Y-%m-%d", capture_output=True) - - def get_compare_url(plugin: dict[str, str]) -> str | None: - if plugin["old_commit"] != "unknown": - owner = plugin['owner'].strip() - repo = plugin['repo'].strip() - return f"https://github.com/{owner}/{repo}/compare/{plugin['old_commit']}...{plugin['new_commit']}" - return None - - if len(updated_plugins) == 1: - plugin = updated_plugins[0] - commit_message = f"yaziPlugins.{plugin['name']}: {plugin['old_version']} -> {plugin['new_version']}" - compare_url = get_compare_url(plugin) - if compare_url: - commit_message += f"\n\nCompare: {compare_url}" - else: - commit_message = f"yaziPlugins: update on {current_date}\n\n" - for plugin in sorted(updated_plugins, key=lambda x: x['name']): - commit_message += f"- {plugin['name']}: {plugin['old_version']} → {plugin['new_version']}\n" - compare_url = get_compare_url(plugin) - if compare_url: - commit_message += f" Compare: {compare_url}\n" - - run_command("git add pkgs/by-name/ya/yazi/plugins/", capture_output=False) - - subprocess.run(["git", "commit", "--no-verify", "-m", commit_message], check=True) - print(f"\nCommitted changes with message:\n{commit_message}") - except Exception as e: - print(f"Error committing changes: {e}") + for plugin in updated_plugins: + commit_plugin_change(nixpkgs_dir, plugin) def main(): @@ -688,7 +701,7 @@ def main(): if args.all: print("Updating all Yazi plugins...") - updated_plugins = update_all_plugins(nixpkgs_dir) + updated_plugins = update_all_plugins(nixpkgs_dir, args.commit) elif args.plugin: plugin_name = args.plugin @@ -713,8 +726,8 @@ def main(): parser.print_help() sys.exit(0) - if args.commit and updated_plugins: - commit_changes(updated_plugins) + if args.commit and updated_plugins and not args.all: + commit_changes(nixpkgs_dir, updated_plugins) if __name__ == "__main__": diff --git a/pkgs/by-name/zs/zsh-completions/package.nix b/pkgs/by-name/zs/zsh-completions/package.nix index 6be2806c2c5a..dc3623af96ce 100644 --- a/pkgs/by-name/zs/zsh-completions/package.nix +++ b/pkgs/by-name/zs/zsh-completions/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zsh-completions"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = finalAttrs.version; - sha256 = "sha256-GFHlZjIHUWwyeVoCpszgn4AmLPSSE8UVNfRmisnhkpg="; + sha256 = "sha256-XCSC7DyhfnxzKjtbdsu7/pyw8eoVLPdthEoFZ8rBAyo="; }; strictDeps = true; diff --git a/pkgs/development/beam-modules/hooks/default.nix b/pkgs/development/beam-modules/hooks/default.nix index 1be544b2f2c7..cb567537f628 100644 --- a/pkgs/development/beam-modules/hooks/default.nix +++ b/pkgs/development/beam-modules/hooks/default.nix @@ -1,30 +1,40 @@ -{ makeSetupHook }: +{ + lib, + makeSetupHook, +}: { beamCopySourceHook = makeSetupHook { name = "beam-copy-source-hook.sh"; + meta.license = lib.licenses.mit; } ./beam-copy-source-hook.sh; beamModuleInstallHook = makeSetupHook { name = "beam-module-install-hook.sh"; + meta.license = lib.licenses.mit; } ./beam-module-install-hook.sh; mixBuildDirHook = makeSetupHook { name = "mix-configure-hook.sh"; + meta.license = lib.licenses.mit; } ./mix-build-dir-hook.sh; mixCompileHook = makeSetupHook { name = "mix-compile-hook.sh"; + meta.license = lib.licenses.mit; } ./mix-compile-hook.sh; mixAppConfigPatchHook = makeSetupHook { name = "mix-config-patch-hook.sh"; + meta.license = lib.licenses.mit; } ./mix-app-config-patch-hook.sh; rebar3CompileHook = makeSetupHook { name = "rebar3-compile-hook.sh"; + meta.license = lib.licenses.mit; } ./rebar3-compile-hook.sh; rebarDevendorPatchHook = makeSetupHook { name = "rebar-devendor-patch-hook.sh"; + meta.license = lib.licenses.mit; } ./rebar-devendor-patch-hook.sh; } diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.nix b/pkgs/development/compilers/dotnet/nuget-package-hook.nix index 1d00e1d781a1..1f7b4580dc48 100644 --- a/pkgs/development/compilers/dotnet/nuget-package-hook.nix +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, unzip, zip, @@ -11,4 +12,5 @@ makeSetupHook { inherit unzip zip xmlstarlet; stripNondeterminism = strip-nondeterminism; }; + meta.license = lib.licenses.mit; } ./nuget-package-hook.sh diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 24277a2ec882..55f6d30b05dc 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -26,11 +26,11 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; - "22.1.5".officialRelease.sha256 = "sha256-eunfMOH+HVpefZJ+CG7hXDoM+pi6iYvHpD3DoSAsjoE="; + "22.1.6".officialRelease.sha256 = "sha256-0on6nTlwzVTT0y3tjZ4ijt5qPQfY/o9Uwe2VYq2NZx8="; "23.0.0-git".gitRelease = { - rev = "e9122d11ff92f2f343668cc759081496a130a943"; - rev-version = "23.0.0-unstable-2026-05-17"; - sha256 = "sha256-dnfnxQJ6Ye3wW3FOqZbaY0t/vuSapqc8c85oItGD4D8="; + rev = "25294a2fffcf40cbd8b6743d78524badeded7446"; + rev-version = "23.0.0-unstable-2026-05-24"; + sha256 = "sha256-TEb4GetdllWC67ulgi7L8CB55YzR1xCWZOMQ+nENdTw="; }; } // llvmVersions; diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix index 75a279addf78..af6e43657eb7 100644 --- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix +++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix @@ -26,4 +26,6 @@ makeSetupHook { passthru = { inherit enableHook; }; + + meta.license = lib.licenses.mit; } ./auto-add-cuda-compat-runpath.sh diff --git a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix index 86ff28d6c41a..1f95c6276635 100644 --- a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix +++ b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix @@ -1,4 +1,10 @@ # Internal hook, used by cudatoolkit and cuda redist packages # to accommodate automatic CUDAToolkit_ROOT construction -{ makeSetupHook }: -makeSetupHook { name = "mark-for-cudatoolkit-root-hook"; } ./mark-for-cudatoolkit-root-hook.sh +{ + lib, + makeSetupHook, +}: +makeSetupHook { + name = "mark-for-cudatoolkit-root-hook"; + meta.license = lib.licenses.mit; +} ./mark-for-cudatoolkit-root-hook.sh diff --git a/pkgs/development/cuda-modules/packages/removeStubsFromRunpathHook/package.nix b/pkgs/development/cuda-modules/packages/removeStubsFromRunpathHook/package.nix index f864f288280a..d5867687d9c2 100644 --- a/pkgs/development/cuda-modules/packages/removeStubsFromRunpathHook/package.nix +++ b/pkgs/development/cuda-modules/packages/removeStubsFromRunpathHook/package.nix @@ -1,4 +1,5 @@ { + lib, addDriverRunpath, arrayUtilities, autoFixElfFiles, @@ -14,4 +15,6 @@ makeSetupHook { substitutions = { driverLinkLib = addDriverRunpath.driverLink + "/lib"; }; + + meta.license = lib.licenses.mit; } ./removeStubsFromRunpathHook.bash diff --git a/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix b/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix index c15f9a6015aa..0609e06f9e29 100644 --- a/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix +++ b/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix @@ -1,5 +1,9 @@ # Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly -{ makeSetupHook, backendStdenv }: +{ + lib, + makeSetupHook, + backendStdenv, +}: makeSetupHook { name = "setup-cuda-hook"; @@ -8,4 +12,6 @@ makeSetupHook { # Required in addition to ccRoot as otherwise bin/gcc is looked up # when building CMakeCUDACompilerId.cu substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; + + meta.license = lib.licenses.mit; } ./setup-cuda-hook.sh diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 384467091804..41cd2468b159 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -27,6 +27,8 @@ let # STACK_IN_NIX_EXTRA_ARGS. stackHook = makeSetupHook { name = "stack-hook"; + + meta.license = lib.licenses.mit; } ./stack-hook.sh; in diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index b92db70413fa..0e68761ee1b9 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -1,5 +1,6 @@ # Hooks for building lua packages. { + lib, lua, makeSetupHook, }: @@ -19,6 +20,7 @@ in propagatedBuildInputs = [ busted ]; + meta.license = lib.licenses.mit; } ./busted-check-hook.sh ) { }; @@ -27,6 +29,7 @@ in makeSetupHook { name = "luarocks-check-hook"; propagatedBuildInputs = [ luarocks ]; + meta.license = lib.licenses.mit; } ./luarocks-check-hook.sh ) { }; @@ -34,5 +37,6 @@ in # we move the files around ourselves luarocksMoveDataFolder = makeSetupHook { name = "luarocks-move-rock"; + meta.license = lib.licenses.mit; } ./luarocks-move-data.sh; } diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index 94e546bf3125..373cf3444526 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -1,4 +1,5 @@ { + lib, lua, makeSetupHook, makeWrapper, @@ -13,4 +14,5 @@ makeSetupHook { substitutions.luaHost = lua.luaOnHostForHost; substitutions.luarocksBuild = lua.luaOnBuildForHost.pkgs.luarocks_bootstrap; substitutions.luarocksHost = lua.luaOnHostForHost.pkgs.luarocks_bootstrap; + meta.license = lib.licenses.mit; } ./wrap.sh diff --git a/pkgs/development/interpreters/octave/hooks/default.nix b/pkgs/development/interpreters/octave/hooks/default.nix index 633187654b6f..c347c24da8b4 100644 --- a/pkgs/development/interpreters/octave/hooks/default.nix +++ b/pkgs/development/interpreters/octave/hooks/default.nix @@ -1,10 +1,12 @@ # Hooks for building Octave packages. { + lib, makeSetupHook, }: { writeRequiredOctavePackagesHook = makeSetupHook { name = "write-required-octave-packages-hook"; + meta.license = lib.licenses.mit; } ./write-required-octave-packages-hook.sh; } diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 905ba06a5044..ce5831f8cbc2 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -1,4 +1,5 @@ { + lib, octave, makeSetupHook, makeWrapper, @@ -13,4 +14,5 @@ makeSetupHook { propagatedBuildInputs = [ makeWrapper ]; substitutions.executable = octave.interpreter; substitutions.octave = octave; + meta.license = lib.licenses.mit; } ./wrap.sh diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 21702a4c74c6..83116044fae9 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -140,6 +140,7 @@ let propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; meta = { inherit (meta) maintainers platforms; + license = lib.licenses.mit; }; } ./tcl-package-hook.sh ) { }; @@ -150,6 +151,7 @@ let propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; meta = { inherit (meta) maintainers platforms; + license = lib.licenses.mit; }; } ./tcl-requires-check-hook.sh ) { }; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0557a3dabbf1..14c690a882c5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -408,6 +408,7 @@ stdenv.mkDerivation { llvmpipeHook = makeSetupHook { name = "llvmpipe-hook"; substitutions.mesa = mesa; + meta.license = lib.licenses.mit; } ./llvmpipe-hook.sh; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index e9856f26c034..6302d6ab5b31 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -291,6 +291,7 @@ let inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; + meta.license = lib.licenses.mit; } ../hooks/qmake-hook.sh ) { }; @@ -307,6 +308,7 @@ let makeBinaryWrapper ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev; + meta.license = lib.licenses.mit; } ../hooks/wrap-qt-apps-hook.sh ) { }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index cf2b8fdf7e27..1be9cf974bbe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -576,6 +576,7 @@ stdenv.mkDerivation ( ; debug = debugSymbols; }; + meta.license = lib.licenses.mit; } ../hooks/qtbase-setup-hook.sh; in "${hook}/nix-support/setup-hook"; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 69381ff13e23..dc7233f11a8c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -134,6 +134,7 @@ let depsTargetTargetPropagated = [ (onlyPluginsAndQml qtbase) ]; + meta.license = lib.licenses.mit; } ./hooks/wrap-qt-apps-hook.sh ) { }; @@ -145,6 +146,7 @@ let substitutions = { fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; + meta.license = lib.licenses.mit; } ./hooks/qmake-hook.sh ) { }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 425a17b56234..df428b92f64e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -356,6 +356,7 @@ stdenv.mkDerivation { qtQmlPrefix ; }; + meta.license = lib.licenses.mit; } ../../hooks/qtbase-setup-hook.sh; in "${hook}/nix-support/setup-hook"; diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix index f5395bbefd6c..8b542ff2ff2a 100644 --- a/pkgs/development/php-packages/amqp/default.nix +++ b/pkgs/development/php-packages/amqp/default.nix @@ -21,7 +21,7 @@ buildPecl { buildInputs = [ rabbitmq-c ]; - AMQP_DIR = rabbitmq-c; + env.AMQP_DIR = rabbitmq-c; meta = { changelog = "https://github.com/php-amqp/php-amqp/releases/tag/v${version}"; diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 689cc94b61c8..7b24722ec623 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -10,7 +10,7 @@ buildPecl { sha256 = "sha256-Hmp0RWOqxwCBXlca2YsRNahOhA1E5qxnmXSUx4Cpzec="; # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 - LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; + env.LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ samba ]; diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 0b35804525ad..d222735ca5cc 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "aiodiscover"; - version = "3.0.0"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiodiscover"; tag = "v${finalAttrs.version}"; - hash = "sha256-O5aQ2yCcy6ZtDviH8Jie3BrgS4kPhSDHBVhbXco5oqM="; + hash = "sha256-GivEYa0/i/ufudYSHWQwYRhTEpzmwhlOyPHWH/JpdfU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bezier/default.nix b/pkgs/development/python-modules/bezier/default.nix index e7c3990db4cb..9fa66ee44f4f 100644 --- a/pkgs/development/python-modules/bezier/default.nix +++ b/pkgs/development/python-modules/bezier/default.nix @@ -50,7 +50,12 @@ buildPythonPackage rec { gfortran ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-z,noexecstack"; + env = { + # -fmacro-prefix-map is not a valid option for Fortran. + # This is true on all platforms, but the flag only seems to be a problem on Darwin. + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-complain-wrong-lang"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-z,noexecstack"; + }; }; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=incompatible-pointer-types" diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 25e27be14f48..259933372b8c 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.43.13"; + version = "1.43.14"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-bjAYJbQILdjRIc8qpKx9nGVOm7MzOz/B0QAPTsSnClE="; + hash = "sha256-GPPUAs+BHWOMj8s82TXQ5Fl1PbXL+j03t9Jdff3iyyA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 023c21b611d8..ae626cc6b894 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "botocore-stubs"; - version = "1.42.41"; + version = "1.43.14"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit (finalAttrs) version; - hash = "sha256-2+rC90Tfa4FM6D7D83d7KZoBXL6lei78QcM7jDgmWCU="; + hash = "sha256-njvB/dUdp0c/DfcmyCdHobCukTRJ1illl2XCR/7MIDk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix index e5cfee6b0d76..6a6f57d5c596 100644 --- a/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/pkgs/development/python-modules/docstr-coverage/default.nix @@ -37,6 +37,9 @@ buildPythonPackage { disabledTests = [ # AssertionError: assert 'docstr_coverage' in '/build/source/tests' "test_set_config_defaults_with_ignore_patterns" + # click 8.3 no longer overwrites ctx.params entries set by callbacks, so config-file + # paths silently win over CLI paths in these parametrize cases + "config_specifier_w_ignore" ]; meta = { diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index c516379c834b..c87dca558444 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202605231"; + version = "0.1.202605251"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-j2JUMNy2rPKcVnOeoCy1zr0k976QC+Ajs1hYJhQMsg8="; + hash = "sha256-EO2FwOx7b5m8ChAkyHfYRwSbWf+h3unG8TfApa50+ME="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix index 2f75cad47f18..355b777eb5f7 100644 --- a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix +++ b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix @@ -21,6 +21,9 @@ buildPythonPackage rec { hash = "sha256-axWG5cJtNaoZl7cG+Zyo1k+eA8pXHDWFgHqpTmQNHlo="; }; + # pyo3 0.23 has no python 3.14 support yet. + env.PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook diff --git a/pkgs/development/python-modules/mediawiki-langcodes/default.nix b/pkgs/development/python-modules/mediawiki-langcodes/default.nix index 3fd2a9c32630..742204e26c0a 100644 --- a/pkgs/development/python-modules/mediawiki-langcodes/default.nix +++ b/pkgs/development/python-modules/mediawiki-langcodes/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "mediawiki-langcodes"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; # Using fetchPypi instead of fetching from source for technical reason. @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "mediawiki_langcodes"; inherit (finalAttrs) version; - hash = "sha256-8CGCPHT7I7FYlwTpt3hSONq6XToTowEZ0lkd7sN6+ao="; + hash = "sha256-X4yWykEIBrdPnYQlzJ999lYI0v3PKUOjTH7aGyNx1n8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b4bb09840da7..c94d4fa9c803 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -443,8 +443,8 @@ in "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.43.10" - "sha256-fuLTYcz1oNGgN8zoTNJ8QPkdv0Jl5fjmputRuY9svo8="; + buildMypyBoto3Package "ec2" "1.43.14" + "sha256-4FPmtV6paCZOQ3rJW29d55RnB5TokCOzNhCgH03cIvo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.43.0" @@ -1022,8 +1022,8 @@ in "sha256-jA+JYi8QNlcBHN594d4Iur14ytDdg7/G3pXIWdvY2Yo="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.43.0" - "sha256-V61eo3XMqDqvZzPltRq2JMjKhJUnv1AhOn2/xHPWCEo="; + buildMypyBoto3Package "pi" "1.43.14" + "sha256-9mNS3NKDG6eBciLbBd+mweeP7FULFjl9SNLW1vrC0go="; mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.43.0" @@ -1158,8 +1158,8 @@ in "sha256-8or7NMBfeq9jZRzAu0Q1ShoTXTm8GCXR4kov0kaJCcE="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.43.5" - "sha256-umfbw9qCW2gYg52zgjci87EjBN0RbpTtOY63rehrD2I="; + buildMypyBoto3Package "s3" "1.43.14" + "sha256-c9VMHQmZxzxAPcmpo9pKlyJxWroRZZWvCMDUZ1+LxnA="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.43.0" diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 5e16e90cc7dc..948ee9f4895d 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "3.12.2"; + version = "3.12.3"; pyproject = true; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; tag = "v${version}"; - hash = "sha256-iXMN/wFe0IWr9kwGmuU+j/n2DHvxP37VqY/NVn8F690="; + hash = "sha256-X1NPqbugBdxD5Nt9wIwQADV4CuydGLpgKhlNazVdrIY="; }; meta = { diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index 8f361c109dee..5f538647776e 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -7,6 +7,7 @@ postgresql, postgresqlTestHook, pytestCheckHook, + pythonAtLeast, setuptools, six, stdenv, @@ -56,6 +57,11 @@ buildPythonPackage rec { "testEmptyArray" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [ + # testutils.script_to_py3 imports lib2to3, removed in 3.13 + "psycopg2cffi/tests/psycopg2_tests/test_notify.py" + ]; + env = { PGDATABASE = "psycopg2_test"; }; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 1d2d35271418..866dc6991c50 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -26,6 +26,7 @@ let pythonIncludeDir = "${python}/include/${python.libPrefix}"; pythonSitePackages = "${python}/${python.sitePackages}"; }; + meta.license = lib.licenses.mit; } ./setup-hook.sh; in buildPythonPackage (finalAttrs: { diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index a4b5f93bf0cb..6d79266a8daf 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -41,9 +41,9 @@ checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "cfg-if" @@ -68,9 +68,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -144,9 +144,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.97" +version = "0.3.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" +checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" dependencies = [ "cfg-if", "once_cell", @@ -222,7 +222,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.13.0" +version = "0.13.1" dependencies = [ "pyo3", "serde_json", @@ -355,9 +355,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -435,9 +435,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.120" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" +checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" dependencies = [ "cfg-if", "once_cell", @@ -448,9 +448,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.120" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" +checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -458,9 +458,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.120" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" +checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" dependencies = [ "bumpalo", "proc-macro2", @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.120" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" +checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" dependencies = [ "unicode-ident", ] diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 05733b1f133a..31fc478a50af 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; __structuredAttrs = true; @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { owner = "y-crdt"; repo = "pycrdt"; tag = finalAttrs.version; - hash = "sha256-gfXdH/V2ZwxfxMFoA20cMv0ilgxuCULl4EFl2vqStqI="; + hash = "sha256-B4Ez0aYQihLnQOhk4bPBrNeo/u9Qrvv0thvy+esEP/Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/symfc/default.nix b/pkgs/development/python-modules/symfc/default.nix index e0fab3f934bf..0c9c5c873810 100644 --- a/pkgs/development/python-modules/symfc/default.nix +++ b/pkgs/development/python-modules/symfc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "symfc"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; __structuredAttrs = true; @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { owner = "symfc"; repo = "symfc"; tag = "v${finalAttrs.version}"; - hash = "sha256-UTiVJQQxMmjZjgqfeDJn6g0XQ6i1JVktwgEt2StSsGE="; + hash = "sha256-bMG22yQszrAAh7qbQjIuaY3KjDXB95Y2OgkwKU+FW0E="; }; build-system = [ diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 935aa1915007..5a9906b6cb12 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -28,17 +28,23 @@ let inherit (gradle) version; paths = [ - (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { - name = "setup-hook.sh"; - files = [ - (mitm-cache.setupHook) - (replaceVars ./setup-hook.sh { - # jdk used for keytool - inherit (gradle) jdk; - init_script = "${./init-build.gradle}"; - }) - ]; - })) + (makeSetupHook + { + name = "gradle-setup-hook"; + meta.license = lib.licenses.mit; + } + (concatTextFile { + name = "setup-hook.sh"; + files = [ + (mitm-cache.setupHook) + (replaceVars ./setup-hook.sh { + # jdk used for keytool + inherit (gradle) jdk; + init_script = "${./init-build.gradle}"; + }) + ]; + }) + ) gradle mitm-cache ]; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index e3b1e037e0e6..2fff1584528f 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -20,6 +20,7 @@ let darwinSuffixSalt = stdenv.cc.suffixSalt; avrSuffixSalt = avrgcc.suffixSalt; }; + meta.license = lib.licenses.mit; } ./setup-hook-darwin.sh; in diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index a32f57d69e12..2dccec5f772b 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -47,6 +47,7 @@ let ]; mkdirp = makeSetupHook { name = "openra-mkdirp-hook"; + meta.license = lib.licenses.mit; } ./mkdirp.sh; in diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index e013644e6908..8408a31f2633 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -77,7 +77,10 @@ let None = null; }; - moveOutputsHook = makeSetupHook { name = "kf6-move-outputs-hook"; } ./move-outputs-hook.sh; + moveOutputsHook = makeSetupHook { + name = "kf6-move-outputs-hook"; + meta.license = lib.licenses.mit; + } ./move-outputs-hook.sh; qmllintHook = makeSetupHook { name = "qmllint-validate-hook"; @@ -85,6 +88,7 @@ let qmllint = "${qt6.qtdeclarative}/bin/qmllint"; jq = lib.getExe jq; }; + meta.license = lib.licenses.mit; } ./qmllint-hook.sh; in { diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix index ef4a14ccf4aa..66ab603fec74 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix @@ -1,3 +1,9 @@ -{ makeSetupHook }: +{ + lib, + makeSetupHook, +}: -makeSetupHook { name = "freebsd-setup-hook"; } ./setup-hook.sh +makeSetupHook { + name = "freebsd-setup-hook"; + meta.license = lib.licenses.mit; +} ./setup-hook.sh diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix b/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix index 4609c004e6f5..6df6edf6970c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, writeText, stat, @@ -9,8 +10,13 @@ # breaks stdenv. Work around that with a hook that will point # NetBSD's build system and NetBSD stat without including it in # PATH. -makeSetupHook { name = "netbsd-stat-hook"; } ( - writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) - '' -) +makeSetupHook + { + name = "netbsd-stat-hook"; + meta.license = lib.licenses.mit; + } + ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' + ) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix index 31368523ee6f..3963545f7238 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix @@ -1,3 +1,9 @@ -{ makeSetupHook }: +{ + lib, + makeSetupHook, +}: -makeSetupHook { name = "netbsd-setup-hook"; } ./setup-hook.sh +makeSetupHook { + name = "netbsd-setup-hook"; + meta.license = lib.licenses.mit; +} ./setup-hook.sh diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix index e38c53a3aac5..b6f60d139f32 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix @@ -1,4 +1,5 @@ { + lib, makeSetupHook, writeText, stat, @@ -10,8 +11,13 @@ # NetBSD's build system and NetBSD stat without including it in # PATH. -makeSetupHook { name = "netbsd-stat-hook"; } ( - writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) - '' -) +makeSetupHook + { + name = "netbsd-stat-hook"; + meta.license = lib.licenses.mit; + } + ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' + ) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/compatHook/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/compatHook/package.nix index 3678b60f658b..3b6237a0e2e2 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/compatHook/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/compatHook/package.nix @@ -1,4 +1,5 @@ { + lib, stdenv, makeSetupHook, compat, @@ -10,4 +11,5 @@ makeSetupHook { inherit compat; inherit (stdenv.cc) suffixSalt; }; + meta.license = lib.licenses.mit; } ./setup-hook.sh diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/package.nix index 61147954812f..92d02b3a4468 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/package.nix @@ -1,3 +1,9 @@ -{ makeSetupHook }: +{ + lib, + makeSetupHook, +}: -makeSetupHook { name = "openbsd-setup-hook"; } ./setup-hook.sh +makeSetupHook { + name = "openbsd-setup-hook"; + meta.license = lib.licenses.mit; +} ./setup-hook.sh diff --git a/pkgs/os-specific/cygwin/cygwin-dll-link-hook/default.nix b/pkgs/os-specific/cygwin/cygwin-dll-link-hook/default.nix index ff9eed6bdeef..0eef68e97dfd 100644 --- a/pkgs/os-specific/cygwin/cygwin-dll-link-hook/default.nix +++ b/pkgs/os-specific/cygwin/cygwin-dll-link-hook/default.nix @@ -11,5 +11,6 @@ makeSetupHook { objdump = "${lib.getBin binutils-unwrapped}/${stdenv.targetPlatform.config}/bin/objdump"; }; + meta.license = lib.licenses.mit; passthru.tests = callPackage ./tests { }; } ./cygwin-dll-link.sh diff --git a/pkgs/os-specific/darwin/by-name/au/autoSignDarwinBinariesHook/package.nix b/pkgs/os-specific/darwin/by-name/au/autoSignDarwinBinariesHook/package.nix index b4d9eda8aba8..0a65b0786906 100644 --- a/pkgs/os-specific/darwin/by-name/au/autoSignDarwinBinariesHook/package.nix +++ b/pkgs/os-specific/darwin/by-name/au/autoSignDarwinBinariesHook/package.nix @@ -1,6 +1,11 @@ -{ signingUtils, makeSetupHook }: +{ + lib, + signingUtils, + makeSetupHook, +}: makeSetupHook { name = "auto-sign-darwin-binaries-hook"; propagatedBuildInputs = [ signingUtils ]; + meta.license = lib.licenses.mit; } ./auto-sign-hook.sh diff --git a/pkgs/os-specific/darwin/by-name/xc/xcodeProjectCheckHook/package.nix b/pkgs/os-specific/darwin/by-name/xc/xcodeProjectCheckHook/package.nix index bf975876a07d..1e6f7197b433 100644 --- a/pkgs/os-specific/darwin/by-name/xc/xcodeProjectCheckHook/package.nix +++ b/pkgs/os-specific/darwin/by-name/xc/xcodeProjectCheckHook/package.nix @@ -1,6 +1,11 @@ -{ makeSetupHook, pkgsBuildHost }: +{ + lib, + makeSetupHook, + pkgsBuildHost, +}: makeSetupHook { name = "xcode-project-check-hook"; propagatedBuildInputs = [ pkgsBuildHost.openssl ]; + meta.license = lib.licenses.mit; } ./setup-hook.sh diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 92b5c2e7d75b..34fb0b24addb 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -7,7 +7,7 @@ let manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix { - inherit makeSetupHook; + inherit lib makeSetupHook; inherit (home-assistant) python; }; in diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix index 757fcf33a633..91cf7fb53f4b 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -1,4 +1,5 @@ { + lib, python, makeSetupHook, }: @@ -9,4 +10,5 @@ makeSetupHook { pythonCheckInterpreter = python.interpreter; checkManifest = ./check_manifest.py; }; + meta.license = lib.licenses.mit; } ./manifest-requirements-check-hook.sh diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index d8b3dc1100e9..2516d6be2f48 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.144.0"; + version = "0.151.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-u7OVkRmSn0DomwkFByOHSNCmpPaLwQnMumJYKHbqdl0="; + hash = "sha256-X7Ke4X6t0HXKlf0hJb1CXE18T8Ov2GZwjX4HSGJ1gtw="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-W+Ap4JMQTI7g9s668VL1rMj4CErbyczW+nKh5ZW94/Y="; + vendorHash = "sha256-rRrLHqwLQQAB5u2vbtAjInUjvj6sGMyKPjOKVnwvQSM="; env.CGO_ENABLED = 0; ldflags = [ @@ -28,7 +28,7 @@ buildGoModule rec { # Some tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping. checkFlags = [ - "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning" + "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning|TestRunInit" ]; # Rename to ocb (it's generated as "builder") diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix index 656ee5fc0aa2..db447e24cddd 100644 --- a/pkgs/tools/misc/opentelemetry-collector/releases.nix +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -26,7 +26,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-collector-releases"; rev = "v${version}"; - hash = "sha256-/I6kYm/j2hO2OAZaWVIRYI1ejBTGMI3PzTjRLcmwziQ="; + hash = "sha256-5AoUgGZEvxbvlksD1P84lxMrHPAP05cN21fABK4UXRg="; }; # Then from this src, we use the tool to generate some go code, including @@ -148,26 +148,26 @@ in lib.recurseIntoAttrs { otelcol = mkDistribution { name = "otelcol"; - sourceHash = "sha256-XGQIHkRfCSdEnZlhodN38BKZGkgOPuUnxveG4yX0rMw="; - vendorHash = "sha256-0i+eHVBwYvEKf4kXfyOuN/gEkDk2/5s7+3HQjYCtI94="; + sourceHash = "sha256-4PpZ6anKPkFyVcARJJSEpyy3duTCyrMnnAnh6CWwjUc="; + vendorHash = "sha256-OoXz9rFIipM0tc6kvkkPdUtYXVIfo0L40V4SUfwSF6M="; }; otelcol-contrib = mkDistribution { name = "otelcol-contrib"; - sourceHash = "sha256-87VmiafluGem4p5hRP+UmPuSJeXdXjZkubWzqhXtyJg="; - vendorHash = "sha256-/qSXvt8oQ0C3V49an7TNUw0bcNVnXd5Qmz5oCRp+KTE="; + sourceHash = "sha256-wUmpivqLSnRYGTJn3IIlpwFXORmK4FJrc8U472YPV2o="; + vendorHash = "sha256-7Rb3Ku0q+5cBvgtd/oZaLaFa4chv0b/MzaHEpJvJ6rE="; proxyVendor = true; # hash mismatch between linux and darwin }; otelcol-k8s = mkDistribution { name = "otelcol-k8s"; - sourceHash = "sha256-B5NbbQBIz3RZ/+jSxNhuY+zpfhHlg26cvUlMqlYXtq0="; - vendorHash = "sha256-2dGNrsskrCh76bTMuPYcRH+bMl/sE+KVn2mOqcF2PeI="; + sourceHash = "sha256-yNhE0CwMNus12QDSbP/x9irrIcOdez0e/RpXFFRQ2LE="; + vendorHash = "sha256-2ZzLCMTafbpmSpkpwvYgkP/Myg/QD1LHgiMigbj3x9I="; }; otelcol-otlp = mkDistribution { name = "otelcol-otlp"; - sourceHash = "sha256-c83fzhC4XbvRHZ3XwXQgwsyW1TDiDs0T/bX3h53n2RE="; - vendorHash = "sha256-QVNQFsaACvlByQWwpl2emSIrL+how78WtU51YJ2AvAU="; + sourceHash = "sha256-+cffC4sOlyPWtydkPZz7M0NF2Q3heQ04/pEB8d+942c="; + vendorHash = "sha256-WiP+TYj7VZBt3tP4C/ZvQwkDP8/b4F+Bc7Z95p0tBTI="; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index ce4ede6cd78f..2e27056f68b3 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { multitrandata ]; - NIX_LDFLAGS = "-lbtree"; + env.NIX_LDFLAGS = "-lbtree"; patchPhase = '' sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e707d6d9a618..c498269dad82 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1733,7 +1733,10 @@ mapAliases { pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17 poac = throw "'poac' has been renamed to/replaced by 'cabinpkg'"; # Converted to throw 2025-10-27 pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27 - podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27 + podofo010 = throw "'podofo010' has been renamed to 'podofo0'"; # Converted to throw 2025-10-27 + podofo_0_9 = throw "'podofo_0_9' has been deprecated, it may be replaced by 'podofo0'"; # Added 2026-05-08 + podofo_0_10 = warnAlias "'podofo_0_10' has been renamed to 'podofo0'" podofo0; # Added 2026-05-08 + podofo_1_0 = throw "'podofo_1_0' has been deprecated in favour of 'podofo'"; # Added 2026-05-08 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 polonium = throw "'polonium' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1ab8b2a9b91..ece4f96a5030 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -247,6 +247,7 @@ with pkgs; { makeSetupHook }: makeSetupHook { name = "add-bin-to-path-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/add-bin-to-path.sh ) { }; @@ -276,6 +277,7 @@ with pkgs; gettext libtool ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/autoreconf.sh ) { }; @@ -301,6 +303,7 @@ with pkgs; stripJavaArchivesHook = makeSetupHook { name = "strip-java-archives-hook"; propagatedBuildInputs = [ strip-nondeterminism ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/strip-java-archives.sh; ensureNewerSourcesHook = @@ -308,6 +311,7 @@ with pkgs; makeSetupHook { name = "ensure-newer-sources-hook"; + meta.license = lib.licenses.mit; } ( writeScript "ensure-newer-sources-hook.sh" '' @@ -345,6 +349,7 @@ with pkgs; runtimeShell = if stdenv.buildPlatform == stdenv.hostPlatform then stdenv.shell else runtimeShell; }; }; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; gogUnpackHook = makeSetupHook { @@ -353,6 +358,7 @@ with pkgs; innoextract file-rename ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/gog-unpack.sh; buildEnv = callPackage ../build-support/buildenv { }; # not actually a package @@ -432,6 +438,7 @@ with pkgs; dieHook = makeSetupHook { name = "die-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/die.sh; devShellTools = callPackage ../build-support/dev-shell-tools { }; @@ -738,10 +745,12 @@ with pkgs; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/ld-is-cc-hook.sh; copyDesktopItems = makeSetupHook { name = "copy-desktop-items-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; @@ -761,6 +770,7 @@ with pkgs; copyPkgconfigItems = makeSetupHook { name = "copy-pkg-config-items-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/copy-pkgconfig-items.sh; makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; @@ -792,6 +802,7 @@ with pkgs; passthru = { tests = tests.makeWrapper; }; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/make-wrapper.sh; compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; }; @@ -839,6 +850,7 @@ with pkgs; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/prune-libtool-files.sh; closureInfo = callPackage ../build-support/closure-info.nix { }; @@ -848,6 +860,7 @@ with pkgs; shortenPerlShebang = makeSetupHook { name = "shorten-perl-shebang-hook"; propagatedBuildInputs = [ dieHook ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/shorten-perl-shebang.sh; singularity-tools = callPackage ../build-support/singularity-tools { }; @@ -906,6 +919,7 @@ with pkgs; setJavaClassPath = makeSetupHook { name = "set-java-classpath-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/set-java-classpath.sh; fixDarwinDylibNames = callPackage ( @@ -917,7 +931,10 @@ with pkgs; makeSetupHook { name = "fix-darwin-dylib-names-hook"; substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; }; - meta.platforms = lib.platforms.darwin; + meta = { + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + }; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh ) { }; @@ -931,18 +948,22 @@ with pkgs; imagemagick (onlyBin python3Packages.icnsutil) ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; keepBuildTree = makeSetupHook { name = "keep-build-tree-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/keep-build-tree.sh; moveBuildTree = makeSetupHook { name = "move-build-tree-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/move-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { name = "enable-gcov-instrumentation-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; makeGCOVReport = makeSetupHook { @@ -951,6 +972,7 @@ with pkgs; lcov enableGCOVInstrumentation ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; @@ -960,6 +982,7 @@ with pkgs; findXMLCatalogs = makeSetupHook { name = "find-xml-catalogs-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook3 = wrapGAppsNoGuiHook.override { @@ -977,21 +1000,25 @@ with pkgs; separateDebugInfo = makeSetupHook { name = "separate-debug-info-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/separate-debug-info.sh; setupDebugInfoDirs = makeSetupHook { name = "setup-debug-info-dirs-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/setup-debug-info-dirs.sh; writableTmpDirAsHomeHook = callPackage ( { makeSetupHook }: makeSetupHook { name = "writable-tmpdir-as-home-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/writable-tmpdir-as-home.sh ) { }; useOldCXXAbi = makeSetupHook { name = "use-old-cxx-abi-hook"; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/use-old-cxx-abi.sh; validatePkgConfig = makeSetupHook { @@ -1000,6 +1027,7 @@ with pkgs; findutils pkg-config ]; + meta.license = lib.licenses.mit; } ../build-support/setup-hooks/validate-pkg-config.sh; #package writers @@ -1819,6 +1847,7 @@ with pkgs; exe_wrapper = '${lib.escape [ "'" "\\" ] (stdenv.targetPlatform.emulator pkgs)}' ''; }; + meta.license = lib.licenses.mit; } # The throw is moved into the `makeSetupHook` derivation, so that its # outer level, but not its outPath can still be evaluated if the condition @@ -2146,7 +2175,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; - inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; }) + inherit (import ../build-support/dlang/dub-support.nix { inherit lib callPackage; }) dub-to-nix importDubLock buildDubPackage @@ -5903,6 +5932,7 @@ with pkgs; xcbuildHook = makeSetupHook { name = "xcbuild-hook"; propagatedBuildInputs = [ xcbuild ]; + meta.license = lib.licenses.mit; } ../by-name/xc/xcbuild/setup-hook.sh; xcodebuild = xcbuild; @@ -6982,8 +7012,6 @@ with pkgs; place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; - podofo = podofo_1_0; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_gi = lowPrio ( @@ -7429,6 +7457,7 @@ with pkgs; darwinMinVersionVariable = lib.escapeShellArg stdenv.hostPlatform.darwinMinVersionVariable; deploymentTarget = lib.escapeShellArg deploymentTarget; }; + meta.license = lib.licenses.mit; } ../os-specific/darwin/darwin-min-version-hook/setup-hook.sh; ### DEVELOPMENT / TESTING TOOLS @@ -11904,6 +11933,7 @@ with pkgs; bsdSetupHook = makeSetupHook { name = "bsd-setup-hook"; + meta.license = lib.licenses.mit; } ../os-specific/bsd/setup-hook.sh; freebsd = callPackage ../os-specific/bsd/freebsd { };