diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 10470fc6f202c..c92c0311c992d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13364,6 +13364,12 @@ githubId = 37505890; name = "Luis Wirth"; }; + lu1a = { + email = "lu5a@proton.me"; + github = "lu1a"; + githubId = 83420438; + name = "Lewis"; + }; LucaGuerra = { email = "luca@guerra.sh"; github = "LucaGuerra"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6766371ffa7f6..97e0ca92469f1 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -143,6 +143,8 @@ +services.asusd.asusdConfig.text = '''file contents''' ``` +- `linuxPackages.nvidiaPackages.stable` now defaults to the `production` variant instead of `latest`. + - `timescaledb` requires manual upgrade steps. After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797). PostgreSQL 13 is no longer supported in TimescaleDB v2.16. diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 74fc216569e56..6f2bb5c2fba02 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -113,6 +113,19 @@ in } ]; + warnings = + lib.mkIf + ( + (lib.elem "nvidia" config.services.xserver.videoDrivers) + && !config.hardware.nvidia.open + && (lib.versionOlder "551" ( + lib.versions.major (lib.getVersion config.hardware.nvidia.package) + )) + ) + [ + "Using Sway with Nvidia driver version <= 550 may result in a broken system. Configure hardware.nvidia.package to use a newer version." + ]; + environment = { systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 18fd4e2126deb..51991069e0c4f 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -1,13 +1,14 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, wrapQtAppsHook, - borgbackup, - qtbase, qtwayland, - stdenv, + borgbackup, + versionCheckHook, makeFontsConf, + qtbase, }: python3Packages.buildPythonApplication rec { @@ -23,7 +24,6 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - python3Packages.setuptools wrapQtAppsHook ]; @@ -31,18 +31,22 @@ python3Packages.buildPythonApplication rec { qtwayland ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + packaging peewee - pyqt6 + platformdirs psutil + pyqt6 secretstorage - setuptools - platformdirs ]; postPatch = '' substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \ - --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic" + --replace-fail com.borgbase.Vorta "com.borgbase.Vorta-symbolic" ''; postInstall = '' @@ -61,7 +65,9 @@ python3Packages.buildPythonApplication rec { pytest-qt pytest-mock pytestCheckHook + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; preCheck = let @@ -89,13 +95,13 @@ python3Packages.buildPythonApplication rec { "tests/network_manager/test_darwin.py" ]; - meta = with lib; { + meta = { changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}"; description = "Desktop Backup Client for Borg"; homepage = "https://vorta.borgbase.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ma27 ]; + platforms = lib.platforms.linux; mainProgram = "vorta"; }; } diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 8f14fd8556ffe..431e4fbb0762b 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -13,6 +13,7 @@ Here are some common neovim flags used in the tests: , neovim-unwrapped , fetchFromGitLab , runCommandLocal +, testers , pkgs }: let @@ -107,8 +108,7 @@ in inherit nmt; - # Disabled because of https://github.com/NixOS/nixpkgs/pull/352727 - # failed_check = pkgs.testers.testBuildFailure nvim-run-failing-check; + failed_check = testers.testBuildFailure nvim-run-failing-check; vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 979441ed87b3f..5b0d9679bb2af 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1290,6 +1290,18 @@ final: prev: meta.homepage = "https://github.com/Saghen/blink.compat/"; }; + blink-emoji-nvim = buildVimPlugin { + pname = "blink-emoji.nvim"; + version = "2025-01-04"; + src = fetchFromGitHub { + owner = "moyiz"; + repo = "blink-emoji.nvim"; + rev = "81e6c080d1e64c9ef548534c51147fd8063481c8"; + sha256 = "1kh5sblmnkspdjhcski2dghmkv2asw35k1cib1227h21rlalqc67"; + }; + meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/"; + }; + blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; version = "2025-01-04"; @@ -4918,6 +4930,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; + gx-nvim = buildVimPlugin { + pname = "gx.nvim"; + version = "2025-01-07"; + src = fetchFromGitHub { + owner = "chrishrb"; + repo = "gx.nvim"; + rev = "c7e6a0ace694a098a5248d92a866c290bd2da1cc"; + sha256 = "14cjwnsrjdfhqx0hbd6j1b9lm668a6c3f72wklx66vp18qy0pafb"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/chrishrb/gx.nvim/"; + }; + hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; version = "2024-09-22"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e0d1a265207b2..c4e3678ada56a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -59,6 +59,7 @@ typescript, vim, which, + xdg-utils, xdotool, xkb-switch, xorg, @@ -265,6 +266,10 @@ in dependencies = [ self.copilot-lua ]; }; + blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; }; @@ -1183,6 +1188,17 @@ in dependencies = [ self.guard-nvim ]; }; + gx-nvim = super.gx-nvim.overrideAttrs { + patches = lib.optionals stdenv.hostPlatform.isLinux [ + (substituteAll { + src = ./patches/gx-nvim/fix-paths.patch; + inherit xdg-utils; + }) + ]; + + nvimRequireCheck = "gx"; + }; + hardhat-nvim = super.hardhat-nvim.overrideAttrs { dependencies = with self; [ overseer-nvim diff --git a/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch new file mode 100644 index 0000000000000..380a32b4d54ca --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/lua/gx/init.lua b/lua/gx/init.lua +index 12272d4..c51771a 100644 +--- a/lua/gx/init.lua ++++ b/lua/gx/init.lua +@@ -73,7 +73,7 @@ local function get_open_browser_app() + if sysname == "Darwin" then + app = "open" + elseif sysname == "Linux" then +- app = "xdg-open" ++ app = "@xdg-utils@/bin/xdg-open" + elseif sysname == "Windows_NT" then + app = "powershell.exe" + end diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 428704ad1d504..b8971349d6a32 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -104,6 +104,7 @@ https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, +https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, @@ -407,6 +408,7 @@ https://github.com/nvimdev/guard.nvim/,HEAD, https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, +https://github.com/chrishrb/gx.nvim/,HEAD, https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, https://github.com/m4xshen/hardtime.nvim/,HEAD, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index a37e7d54c7d23..a2761b16a7b6d 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.3"; - sha256 = "sha256-bVddcoj0zO+pWySg7JOGXqLJeJnoet3Lo/I1ctd0znk="; + version = "0.37.4"; + sha256 = "sha256-+DFoHjb5sl9s5Vqw7onsv+MKjS4+loGVnZsF9/e+7dQ="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 19e16d2d854ba..47c566f6b4b7d 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4922"; + version = "4923"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw="; + sha256 = "sha256-tB/0VFLn/ch7XWPz1sJ3kqy/1U5Hk1yV9+wq7ohTRWw="; }; patches = [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 2bdd10248afd5..7d06c2a6f6d67 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ma/UcG+DkUR2FqRKFGMjPxMXDrbcbytZVi59zaK1W0k="; + hash = "sha256-TZ2qY0aJHIJq9gd522NJyNkUDYQuICyTsUnQBf34Pq0="; }; - vendorHash = "sha256-7LI08qFcNRyZEZXVWpu2PR2PwpRlcTLIcE05Y5YgABg="; + vendorHash = "sha256-kMQIXN7Qu39MUFUHtLl1vnNv2qOUUcDhGes1MJ2Nh64="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d3ad8efd000d9..d35131241f559 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -858,13 +858,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-xHBr+6rI0G6Fv7HXTrdvtDc+Ij53IfPAb7bvXgyTaH0=", + "hash": "sha256-kyfNlLVzrNMLKGCahpbzeyqvFYPug6RyPPxCnxwP/W4=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.53.0", + "rev": "v3.54.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UsekZjrioy2F/OvfrvXMVYlZO3I2NU4B+BOZHwP5YSk=" + "vendorHash": "sha256-hxDLJrv7a8JZ6etYS7u+kiIcudJJeB47PKQTE3NzCvI=" }, "nomad": { "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=", diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 3c112daea5a10..ae477caec042b 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.16"; + version = "0.6.17"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; tag = version; - hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss="; + hash = "sha256-wtXqJfI/I0prPip3AbfFk0OvPja6oytPsl6hFtZ6b50="; }; nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w="; + cargoHash = "sha256-R9hh696KLoYUfJIe3X4X1VHOpPmv1fhZ55y8muVAdRI="; postInstall = '' diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 92b248882e6f6..fbe37c3b86788 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -24,7 +24,12 @@ testBuildFailure = drv: drv.overrideAttrs (orig: { builder = buildPackages.bash; args = [ - (replaceVars ./expect-failure.sh { coreutils = buildPackages.coreutils; }) + (replaceVars ./expect-failure.sh { + coreutils = buildPackages.coreutils; + vars = lib.toShellVars { + outputNames = (orig.outputs or [ "out" ]); + }; + }) orig.realBuilder or stdenv.shell ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)]; }); diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh index 9c725d48bf342..e8eb612b0d8b2 100644 --- a/pkgs/build-support/testers/expect-failure.sh +++ b/pkgs/build-support/testers/expect-failure.sh @@ -34,19 +34,28 @@ echo "testBuildFailure: Original builder produced exit code: $r" # ----------------------------------------- # Write the build log to the default output + +# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/default-builder.sh +# +# We need this so that we can read $outputs when `__structuredAttrs` is enabled # -# # from stdenv setup.sh -getAllOutputNames() { - if [ -n "$__structuredAttrs" ]; then - echo "${!outputs[*]}" - else - echo "$outputs" - fi -} +# NOTE: This MUST be done after the original builder has finished! +# Otherwise we could pollute its environment. +if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -outs=( $(getAllOutputNames) ) -defOut=${outs[0]} -defOutPath=${!defOut} +# Variables injected by replaceVars +# +# `$outputs` is unordered when `__structuredAttrs` is enabled, +# so we use `replaceVars` to pass in an ordered `$outputNames` array +@vars@ + +declare -a outputPaths +for name in "${outputNames[@]}"; do + # Either dereference $name, or access $outputs[] associative array + outputPath=${!name:-${outputs[$name]}} + outputPaths+=( "$outputPath" ) +done +defOutPath=${outputPaths[0]} if [[ ! -d $defOutPath ]]; then if [[ -e $defOutPath ]]; then @@ -63,8 +72,7 @@ echo $r >$defOutPath/testBuildFailure.exit # ------------------------------------------------------ # Put empty directories in place for any missing outputs -for outputName in ${outputs:-out}; do - outputPath="${!outputName}" +for outputPath in "${outputPaths[@]}"; do if [[ ! -e "${outputPath}" ]]; then @coreutils@/bin/mkdir "${outputPath}"; fi diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index a198cc6774ec6..b0f2b4c1d391a 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -6,6 +6,7 @@ runCommand, emptyFile, emptyDirectory, + stdenvNoCC, ... }: let @@ -21,6 +22,15 @@ let label = "test"; }; + overrideStructuredAttrs = + enable: drv: + drv.overrideAttrs (old: { + failed = old.failed.overrideAttrs (oldFailed: { + name = oldFailed.name + "${lib.optionalString (!enable) "-no"}-structuredAttrs"; + __structuredAttrs = enable; + }); + }); + in lib.recurseIntoAttrs { lycheeLinkCheck = lib.recurseIntoAttrs pkgs.lychee.tests; @@ -92,7 +102,7 @@ lib.recurseIntoAttrs { } ); - testBuildFailure = lib.recurseIntoAttrs { + testBuildFailure = lib.recurseIntoAttrs rec { happy = runCommand "testBuildFailure-happy" { @@ -122,6 +132,8 @@ lib.recurseIntoAttrs { touch $out ''; + happyStructuredAttrs = overrideStructuredAttrs true happy; + helloDoesNotFail = runCommand "testBuildFailure-helloDoesNotFail" { @@ -167,6 +179,45 @@ lib.recurseIntoAttrs { echo 'All good.' touch $out ''; + + multiOutputStructuredAttrs = overrideStructuredAttrs true multiOutput; + + sideEffects = + runCommand "testBuildFailure-sideEffects" + { + failed = testers.testBuildFailure ( + stdenvNoCC.mkDerivation { + name = "fail-with-side-effects"; + src = emptyDirectory; + + postHook = '' + echo touching side-effect... + # Assert that the side-effect doesn't exist yet... + # We're checking that this hook isn't run by expect-failure.sh + if [[ -e side-effect ]]; then + echo "side-effect already exists" + exit 1 + fi + touch side-effect + ''; + + buildPhase = '' + echo i am failing + exit 1 + ''; + } + ); + } + '' + grep -F 'touching side-effect...' $failed/testBuildFailure.log >/dev/null + grep -F 'i am failing' $failed/testBuildFailure.log >/dev/null + [[ 1 = $(cat $failed/testBuildFailure.exit) ]] + [[ ! -e side-effect ]] + + touch $out + ''; + + sideEffectStructuredAttrs = overrideStructuredAttrs true sideEffects; }; testEqualContents = lib.recurseIntoAttrs { diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix index f796eb03bf98a..6ab45612b442c 100644 --- a/pkgs/by-name/ba/bash_unit/package.nix +++ b/pkgs/by-name/ba/bash_unit/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kd5h12yjzvR/RBE/IjVXNSyjcf+rz6B2eoO8w2jiaps="; + sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0="; }; patchPhase = '' diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 2579e8e9137c7..ac353879f7ec2 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.18"; + version = "1.10.19"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-EFDaKxAUDgMwkURKcupL2s9TS/oSYviqA38qa8Jo1Ek="; + hash = "sha256-dKQRXEZfvONaWocvoaEQtENAyNvIUaqomckaSj7bUtM="; }; - cargoHash = "sha256-td47+/LYCJy9ED/2VJDE9P9bXcr+SEgRY1N4LAi2C7s="; + cargoHash = "sha256-gN6aNPV6K8BUTUvTTKtTu54JFLwL1XSA0rA4EyKdovc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index ba5c2e999776b..34a6763e2d4b8 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -2,20 +2,22 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.33"; + version = "0.9.35"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "cargo-hakari-${version}"; - sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo="; + tag = "cargo-hakari-${version}"; + hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc="; }; - cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew="; + cargoHash = "sha256-xMgNk82U32AtMeZJ8v2M0faHLAPkXrdIJHwOJcqE9m8="; cargoBuildFlags = [ "-p" @@ -26,6 +28,14 @@ rustPlatform.buildRustPackage rec { "cargo-hakari" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = [ "--version" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Manage workspace-hack packages to speed up builds in large workspaces"; mainProgram = "cargo-hakari"; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index d8efe2547c433..da227d0b48cd1 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.4"; + version = "1.1.8"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-40LBTB/lDY1UxK2dCqZJu1CUIqJxMbDxpSTlSLClpVY="; + hash = "sha256-T05BSeVF67T7F6GMwsGDOYyiuz//0aTstTlGoOZndRM="; }; - cargoHash = "sha256-GmNKUv0jfQ59pG8AspZT1NTX0AJQ9xl93LbCgUzPllo="; + cargoHash = "sha256-iV2hV57zuqnsDX0krtAADGvFo3YSCkiEm6+dNAz3W08="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ch/cht-sh/package.nix b/pkgs/by-name/ch/cht-sh/package.nix index 0cba6cd2e58c2..7c7828976d452 100644 --- a/pkgs/by-name/ch/cht-sh/package.nix +++ b/pkgs/by-name/ch/cht-sh/package.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "0-unstable-2024-11-13"; + version = "0-unstable-2024-12-31"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "4cebb8c066cab49375694a7b30bc39185472ca1c"; - sha256 = "xmFjypxnSZ3LYZbwIegFd1Rc0Vbdf9U6b/LGHN39FUg="; + rev = "045d15f074310028c0760b9ae61b96245c835325"; + sha256 = "5Vsyd8z5qkPyDJVX41EFlMimRkRtjGFL+n+jnmONaVI="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix index 0d5e8ff1a47b7..f212569df456e 100644 --- a/pkgs/by-name/ci/circup/package.nix +++ b/pkgs/by-name/ci/circup/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "circup"; tag = version; - hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw="; + hash = "sha256-4jmqS/XMB8t7aMfHriipi+VnCbZqrqjt21K5ktes2ec="; }; pythonRelaxDeps = [ "semver" ]; diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index 022e17029826d..7b8948a6bdc89 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "clapboard"; - version = "0.1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "clapboard"; rev = "v${version}"; - hash = "sha256-/4HBhsW2C3xYzKVw9TuSj8b7LdirWbNg4OxLm/ebf40="; + hash = "sha256-dXlUOIYgptYqUIIC7batc0TVQeP89i8vizwYSIUlzGA="; }; - cargoHash = "sha256-bq+r2J2lhhZKTEV69OnsXiAGKspOZ0kF0q2hDnbIXn8="; + cargoHash = "sha256-Ll2fpH0v3ZWizrl6Mip0gaPCHlQAdddh9F9bNXveb/0="; meta = with lib; { description = "Wayland clipboard manager that will make you clap"; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index fd2b3631417a4..d82ef369389c1 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.1"; + version = "1.23.3"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-kisYm0bM+IZJ9qRx1lDlcFtZIdjsNfu6Ao75q84ruDM="; + hash = "sha256-YRIlmOwCE1Q4h9Jeow4X6fYI8GFyfuqppW1XFJHVvQM="; }; - vendorHash = "sha256-EXI4xpo4j/EzugW8zyu0Dvk2i6bYFBIF+SsL6GZ+J2Q="; + vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix new file mode 100644 index 0000000000000..c9a8354d70c5b --- /dev/null +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -0,0 +1,32 @@ +{ + stdenv, + fetchurl, + lib, + perl, +}: + +stdenv.mkDerivation rec { + pname = "courier-unicode"; + version = "2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2"; + sha256 = "sha256-uD7mRqR8Kp1pL7bvuThWRmjDLsF51PrAwH6s6KG4/JE="; + }; + + nativeBuildInputs = [ + perl + ]; + + outputs = [ + "out" + "dev" + ]; + + meta = { + homepage = "http://www.courier-mta.org/unicode/"; + description = "The Courier Unicode Library is used by most other Courier packages"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix index 722bc175d3df2..11a171c2bb08b 100644 --- a/pkgs/by-name/da/dayon/package.nix +++ b/pkgs/by-name/da/dayon/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "15.0.0"; + version = "15.0.1"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-Tnw1Tr+iRxvHFzSICwOcf4mErNx+imD7/WxVspiR7yo="; + hash = "sha256-3/A8aAWnaPg0sgzWJKU4Ys/R3nXYQj8aFuEVMgzauqQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix index 453b18d4d9398..8ceaeecd14def 100644 --- a/pkgs/by-name/dd/ddns-updater/package.nix +++ b/pkgs/by-name/dd/ddns-updater/package.nix @@ -29,9 +29,6 @@ buildGoModule rec { tests = { inherit (nixosTests) ddns-updater; }; - # nixpkgs-update: no auto update - # Necessary only as rryantm keeps getting confused and thinks 2.6.1 is newer than 2.7.0 - # TODO remove once version newer than 2.7.0 is released updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 050330f49fac4..c0142b6ba85d4 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.16"; + version = "7.0.0"; - nugetHash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs="; + nugetHash = "sha256-v4bXmvjZOYxl5RSIHuqVfDzBQdRz5SrmzZtD6SeEYTY="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix index 6bc8b9fdc23f1..b8e5b2e4cf78b 100644 --- a/pkgs/by-name/ga/galene/package.nix +++ b/pkgs/by-name/ga/galene/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.9.1"; + version = "0.96"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-Ky38PM9HX1jV1LTMUeqaY8fUjZAxe4uK52YKQF8WOMA="; + hash = "sha256-E/xFh60Fzy/bRX414N1Juc7j4D8fN8CEDYPOUrNp5/4="; }; - vendorHash = "sha256-U8DH3b2KbFQbEV+7suVsBiTA42FEl6DebH+GJDaH6aE="; + vendorHash = "sha256-LDLKjD4qYn/Aae6GUX6gZ57+MUfKc058H+YHM0bNZV0="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index ac029bee4a84f..02e14e963a178 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "gallery-dl"; - version = "1.28.2"; + version = "1.28.3"; pyproject = true; src = fetchFromGitHub { owner = "mikf"; repo = "gallery-dl"; rev = "v${version}"; - hash = "sha256-AVycp24wGhit9JVE0b+didc2GRnB+EQNnJ3y9a5dMQw="; + hash = "sha256-OV+4BJmJNvkNmDsogI9V7SLmnc5HJkZd5xqsFoZCHEk="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix index a6089418a9425..15988ea3b421b 100644 --- a/pkgs/by-name/ga/gatekeeper/package.nix +++ b/pkgs/by-name/ga/gatekeeper/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.18.1"; + version = "3.18.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; - rev = "v${version}"; - hash = "sha256-u/XOJjXk6gq+A6VFh/97VgI7eu33/lA91YqL9efUjTU="; + tag = "v${version}"; + hash = "sha256-lO+z/6JRn0iKNoCMiMgYKZ8Jo53udoylleHFRyTF+4w="; }; vendorHash = null; diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 3ca92cd8be1f6..71d303d947196 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.42.3"; + version = "0.42.4"; in buildGoModule { pname = "geesefs"; @@ -15,7 +15,7 @@ buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-keF6KrkHI5sIm5XCIpWAvKD1qu5XvWx3uR70eKhOZk8="; + hash = "sha256-INCsDMFhVRkNSPkhVPJkLP+8zBinYcj8S6C0rYO1h6M="; }; # hashes differ per architecture otherwise. diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 4df061439ad3e..6b9bf2a6d8a88 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-d6wAyn6Vj4pWnPUmYodSm+SQtBf3EU1vVSCUnfiXRas="; + hash = "sha256-25Ik5VsTYLssI9u235pBWD1XNABvWCzbXma04pJX2nQ="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 5e52145944e59..0bbd3e73d186a 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -57,24 +57,24 @@ let pname = "gitkraken"; - version = "10.5.0"; + version = "10.6.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-zgzKwQCt1FoBgzVn1WrllANuBvYxKjPJNhVq0JqiXCM="; + hash = "sha256-I4Pxz4pH5V4X1vguH1/TwoVDhZseKzkXZobqH/WVxTE="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-H1rxvCGo0m8g5XSUcuREMfe+Im/QsL6nsDbPQDo09j4="; + hash = "sha256-k/ilZie8PVo8jjrR/7c0Yw6GpudzgZrc3uMwXeWd76M="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-OsCbTtGNo+heQQL6OEeUq64Dlbs86FUpfqEJ80PnV2o="; + hash = "sha256-d+CsEPoznjsyhFQHjMxFffT60ak8j9BtTSvDVmvXWDA="; }; }; diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index eec5e5bbeda70..97a310c1d912e 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "gmetronome"; - version = "0.3.4"; + version = "0.4.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "dqpb"; repo = "gmetronome"; rev = version; - hash = "sha256-fjtdM2/LMZx0dFt78Ih4BG5+NZoocPknh5INA+2e5qk="; + hash = "sha256-w7ziWfpaFU8KTJcCTJUsLghy4Q3cCL1Bi0TxrReiP7s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index 83f4aaa0ae7ca..de811d147b9c2 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -3,17 +3,18 @@ buildGoModule, fetchFromGitHub, versionCheckHook, + nix-update-script, }: buildGoModule rec { pname = "golds"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-ExvCVGWYAngasnDHVzBLeLmms4cFNcQ/KzuE4t3r36A="; + hash = "sha256-kVXr/5qJCTjpfRpz2mDIsMRirp5dT5aGo/BlLR9Qp0M="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source @@ -21,7 +22,7 @@ buildGoModule rec { # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027 patches = [ ./info_module-gover.patch ]; - vendorHash = "sha256-omjHRZB/4VzPhc6RrFY11s6BRD69+Y4RRZ2XdeKbZf0="; + vendorHash = "sha256-Sy9O23iCW8voImPFQkqczPxqGyD5rf0/tKxaRDFgbSs="; ldflags = [ "-s" ]; @@ -29,6 +30,8 @@ buildGoModule rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Experimental Go local docs server/generator and code reader implemented with some fresh ideas"; homepage = "https://github.com/go101/golds"; diff --git a/pkgs/by-name/ho/host-spawn/package.nix b/pkgs/by-name/ho/host-spawn/package.nix index 6fd12d0968e6f..95b06655d7d8a 100644 --- a/pkgs/by-name/ho/host-spawn/package.nix +++ b/pkgs/by-name/ho/host-spawn/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "host-spawn"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "1player"; repo = "host-spawn"; rev = "v${version}"; - hash = "sha256-017o50MSSkehn4zMEdCTPW2o2IQaXbI21z8Z+jfRuDs="; + hash = "sha256-V8WI0TyJw+dkCyG8huIrg6VDFI2Kmak7bI/GXU8RI/w="; }; vendorHash = "sha256-Agc3hl+VDTNW7cnh/0g4G8BgzNAX11hKASYQKieBN4M="; diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix index 0eb5e39b43b12..f5fee0f211896 100644 --- a/pkgs/by-name/in/inferno/package.nix +++ b/pkgs/by-name/in/inferno/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-KB9E4kqi85reDJnjb2PKgOsBo9opTuPVUW4nDrJIMmU="; + hash = "sha256-lnNS3+2VZ+DgbmaM8/9X79vhqoxw3G8M9macLILX//w="; fetchSubmodules = true; }; - cargoHash = "sha256-AA1Bm70W2gAL2IohQwY0wcLNq6AOzQ3oqVRzzyeRyxA="; + cargoHash = "sha256-L2Mq8y5v0n4OP8nZLeB0A8+UBr0snEDjTDZAGZQTxuo="; # skip flaky tests checkFlags = [ diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index e7c8416b9924a..a29891f11a107 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.12"; + version = "0.5.13"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-tIylP5VOt53wK/KfgsK6HiMX0YhuiJMDLn0L9XY6aJQ="; + hash = "sha256-QetnD+0SCzn5Zx5v1EJNjhx8U9ueHdp+zZu/Yf77AdY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index c465e2a48ea4f..36a92c0527b74 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.058"; + version = "0.059"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-QKMTU6ISP983Kg4ZxyPV4IgiuO0ZXMiOtvZPwP7dF7k="; + hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE="; }; installPhase = '' diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix index 05c32829ec4d8..fa9e163e5a733 100644 --- a/pkgs/by-name/ku/kubectl-cnpg/package.nix +++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.24.2"; + version = "1.25.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-XXlqtqn2PiBo2YHaBnwt1BpTnON+ActIuLO0EFDAxMw="; + hash = "sha256-pU8OgGmRzZEfcMOhMHXhwK+oA/6zyj7F7QZ0ZNJIjsQ="; }; - vendorHash = "sha256-FpCM2R/bQ1BScYHEK5xaO0kZ/hCUZaUDhu6XoTNPn2o="; + vendorHash = "sha256-sKYREfo107RYGACXn37X9ENz/rwkdiBswRlFN4Z20yY="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 9c740ff6cd298..529e012275743 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.152.2"; + version = "1.153.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-NPdUHBge6k2BqWf6SxA35Tqo0xGjFIIU2t5dbdnbMGg="; + hash = "sha256-kRyDmbz17zHCDfIvxejEvNZTRRF0bHApa3jT5hs4htM="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-AbFtGL63wl2fo4rbxq8Hx8VvEw64sawtLHS8jQ496Vw="; + hash = "sha256-hPfWyJbBFFlh+Cy1ZrzJ9mq1nhEVr+GGTneMkqYfAtk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index e30193d7d17c6..085798010bd89 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY="; + hash = "sha256-7Oy7qEXIAJ50NXL4+Mm67WrivpubDz7uLWZ3YVzTFxA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index 7f8e75e6ac9a1..bdebfa16221e1 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -84,12 +84,19 @@ stdenv.mkDerivation rec { # libtirpc (for now) # 4. prevent installation of static libraries because of step 3 # 5. prevent installation of libnvidia-container-go.so twice + # 6. Replace pkg-config and objcopy with target platform's one + # 7. Stub ldconfig + # sed -i Makefile \ -e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \ -e 's#\$(DEPS_DIR)\$#\$#g' \ -e 's#all: shared static tools#all: shared tools#g' \ -e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \ - -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d' + -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d' \ + -e "s,pkg-config,$PKG_CONFIG,g" + substituteInPlace mk/common.mk \ + --replace-fail objcopy '$(OBJCOPY)' \ + --replace-fail ldconfig true ''; enableParallelBuilding = true; @@ -98,7 +105,12 @@ stdenv.mkDerivation rec { HOME="$(mktemp -d)" ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ]; + env = { + NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ]; + CGO_ENABLED = "1"; # Needed for cross-compilation + GOFLAGS = "-trimpath"; # Don't include paths to Go stdlib to resulting binary + inherit (go) GOARCH GOOS; + }; NIX_LDFLAGS = [ "-L${lib.getLib libtirpc}/lib" "-ltirpc" diff --git a/pkgs/by-name/li/libsixel/package.nix b/pkgs/by-name/li/libsixel/package.nix index 186920ccf282a..76d028ced1e5a 100644 --- a/pkgs/by-name/li/libsixel/package.nix +++ b/pkgs/by-name/li/libsixel/package.nix @@ -7,19 +7,33 @@ gdk-pixbuf, gd, pkg-config, + + # Enable linking against image loading libraries as part of the + # implementation of the sixel_helper_{load,write}_image_file() functions. + # These helper functions are not needed for the main functionality of the + # library to encode image buffers to sixels. + # + # libsixel already uses vendored stb image loading to provide basic + # implementations, but also allows for the "gd" library to be linked for + # a wider set of image formats. + # This pulls in a large amount of deps bloating the resulting library. + # + # Default off, but configurable in case you really need it. + withGd ? false, }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "libsixel"; version = "1.10.5"; src = fetchFromGitHub { owner = "libsixel"; repo = "libsixel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck="; }; - buildInputs = [ + buildInputs = lib.optionals withGd [ gdk-pixbuf gd ]; @@ -34,8 +48,14 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtests=enabled" - # build system seems to be broken here, it still seems to handle jpeg - # through some other ways. + "-Dimg2sixel=enabled" + "-Dsixel2png=enabled" + + (lib.mesonEnable "gd" withGd) + + # build system seems to be broken here; error message indicates pkconfig + # issue. + # Not to worry: jpeg and png are handled by the built-in stb and/or gd lib. "-Djpeg=disabled" "-Dpng=disabled" ]; @@ -47,4 +67,4 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 3d7bea50a1aff..798a330dda693 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.76"; + version = "1.4.77"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-jL9CluNzz9DO3+nZeHYLWwXFj9xASLTivK8KYayPUBE="; + sha256 = "sha256-rK+r2/oiZ9i2RS0D2F/dKmZSXz8Fo2p5tmRcAX8VYs4="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix index faf8d004e70a6..430373fe90c58 100644 --- a/pkgs/by-name/ma/mactracker/package.nix +++ b/pkgs/by-name/ma/mactracker/package.nix @@ -3,15 +3,24 @@ stdenvNoCC, fetchurl, unzip, + writeShellApplication, + curl, + cacert, + libxml2, + xmlstarlet, + common-updater-scripts, + versionCheckHook, + writeShellScript, + xcbuild, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mactracker"; - version = "7.13"; + version = "7.13.2"; src = fetchurl { url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip"; - hash = "sha256-GbaGhYF9Pf3EpzoLQd9fkWYxHFwCkYdlRyy33lieUxM="; + hash = "sha256-Ns2es6uMqfHKmeVV6ehGXV0pNtv2T3eNYLnRvsjOhpE="; }; dontPatch = true; @@ -31,6 +40,29 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = lib.getExe (writeShellApplication { + name = "mactracker-update-script"; + runtimeInputs = [ + curl + cacert + libxml2 + xmlstarlet + common-updater-scripts + ]; + text = '' + url="https://mactracker.ca/releasenotes-mac.html" + version=$(curl -s "$url" | xmllint -html -xmlout - | xmlstarlet sel -t -v "//faq/h5[1]") + update-source-version mactracker "$version" + ''; + }); + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = writeShellScript "version-check" '' + ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1" + ''; + versionCheckProgramArg = [ "${placeholder "out"}/Applications/Mactracker.app/Contents/Info.plist" ]; + doInstallCheck = true; + meta = { description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made"; homepage = "https://mactracker.ca"; diff --git a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch index 08988f6cde507..69874b17bc3e9 100644 --- a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch +++ b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch @@ -1,6 +1,6 @@ ---- a/maildrop/configure 2012-09-06 01:52:13.000000000 +0100 -+++ b/maildrop/configure 2013-01-04 03:00:57.095628327 +0000 -@@ -17562,8 +17562,8 @@ +--- a/libs/maildrop/configure 2012-09-06 01:52:13.000000000 +0100 ++++ b/libs/maildrop/configure 2013-01-04 03:00:57.095628327 +0000 +@@ -19857,8 +19862,8 @@ check_spooldir() { if test "$CHECKED_SPOOLDIR" != 1 then diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix index 6e891e434513a..3f222a427293b 100644 --- a/pkgs/by-name/ma/maildrop/package.nix +++ b/pkgs/by-name/ma/maildrop/package.nix @@ -3,22 +3,26 @@ lib, stdenv, pkg-config, - pcre, + courier-unicode, + pcre2, + libidn2, perl, }: stdenv.mkDerivation rec { pname = "maildrop"; - version = "2.6.0"; + version = "3.1.8"; src = fetchurl { url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2"; - sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; + sha256 = "sha256-foJsAxkXRE8berccH82QODWVZEhG4rOyYONSsc4D6VA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - pcre + courier-unicode + libidn2 + pcre2 perl ]; diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix index 08210d806f133..5d71ec9da6f50 100644 --- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix +++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-Avp5hWRdkM/vCz6B/b7uOrnYjFrN5UkE7siK0+ANO1Q="; + sha256 = "sha256-VIqk5GxI5qFnsjeq6FL1UUd7lX3VLLhTcPlo4j8oL/c="; }; - vendorHash = "sha256-cyZ/LzKB3UlyqzID9f6I4niwJ/sPIm2htVOn3Ik2HAY="; + vendorHash = "sha256-PXJkjRg699tu/WPrFkekmAbGwPPHoUXaiYfxuju9Dwk="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index f753f0ead366d..2a67ab55c137b 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.44.1"; + version = "0.44.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-TVyKnxS7XDDXxZNuw6Gp9iEsyJmQCn8tAcnkc8kbCJg="; + hash = "sha256-K/mpwSzZuaNx3vbEJD0mYzFUylB6bUhYRhW81BcXin4="; }; - cargoHash = "sha256-zYM4hEjcKo/ThbPcLjhmIBAPws8UKfEDnexycf5ke9o="; + cargoHash = "sha256-Zq8PTXc9mEFbswTUUiBmguuzIZVRN41aBiW37Jr7WWM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pr/proxysql/dont-phone-home.patch b/pkgs/by-name/pr/proxysql/dont-phone-home.patch index 5701d86b4b405..7c4244fd22f79 100644 --- a/pkgs/by-name/pr/proxysql/dont-phone-home.patch +++ b/pkgs/by-name/pr/proxysql/dont-phone-home.patch @@ -1,12 +1,12 @@ diff --git a/src/main.cpp b/src/main.cpp -index 39dfaa24..634b004b 100644 +index 382b4236..4e1ecc62 100644 --- a/src/main.cpp +++ b/src/main.cpp -@@ -237,6 +237,7 @@ static char * main_check_latest_version() { - - +@@ -201,6 +201,7 @@ static char * main_check_latest_version() { + * @return NULL. + */ void * main_check_latest_version_thread(void *arg) { + return NULL; + set_thread_name("CheckLatestVers"); + // Fetch the latest version information char * latest_version = main_check_latest_version(); - if (latest_version) { - if ( diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch index 6a6d003a60883..61cb744101ffe 100644 --- a/pkgs/by-name/pr/proxysql/makefiles.patch +++ b/pkgs/by-name/pr/proxysql/makefiles.patch @@ -1,21 +1,29 @@ diff --git a/Makefile b/Makefile -index f8902b4f..57844bd7 100644 +index dd6b8c44..7a703858 100644 --- a/Makefile +++ b/Makefile -@@ -59,11 +59,7 @@ endif - - export MAKEOPT=-j ${NPROCS} +@@ -73,10 +73,7 @@ endif + export MAKEOPT := -j${NPROCS} + ### systemd +-SYSTEMD := 0 -ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system) -- SYSTEMD=1 --else -- SYSTEMD=0 +- SYSTEMD := 1 -endif -+SYSTEMD=1 ++SYSTEMD := 1 + + ### check user/group USERCHECK := $(shell getent passwd proxysql) - GROUPCHECK := $(shell getent group proxysql) +@@ -238,7 +235,7 @@ build_tap_test_debug: build_tap_tests_debug + build_tap_tests_debug: build_src_debug + cd test/tap && OPTZ="${O0} -ggdb -DDEBUG" CC=${CC} CXX=${CXX} ${MAKE} debug -@@ -303,16 +299,10 @@ cleanbuild: +-# ClickHouse build targets are now default build targets. ++# ClickHouse build targets are now default build targets. + # To maintain backward compatibility, ClickHouse targets are still available. + .PHONY: build_deps_clickhouse + build_deps_clickhouse: build_deps_default +@@ -382,16 +379,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,11 +44,11 @@ index f8902b4f..57844bd7 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 710e070b..fd1352f6 100644 +index 25bcc603..8fafc224 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -69,10 +69,7 @@ default: $(tmpdefault) - +@@ -54,10 +54,7 @@ default: $(targets) + ### deps targets libinjection/libinjection/src/libinjection.a: - cd libinjection && rm -rf libinjection-*/ || true @@ -49,8 +57,8 @@ index 710e070b..fd1352f6 100644 - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch endif - ifeq ($(UNAME_S),Darwin) -@@ -86,11 +83,7 @@ libinjection: libinjection/libinjection/src/libinjection.a + ifeq ($(SYS_KERN),Darwin) +@@ -71,11 +68,7 @@ libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: @@ -61,17 +69,17 @@ index 710e070b..fd1352f6 100644 -# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} - cd libssl/openssl && ln -s . lib # curl wants this path -@@ -108,8 +101,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) - endif + cd libssl/openssl && ln -fs ./ lib # curl wants this path +@@ -84,8 +77,6 @@ libssl: libssl/openssl/libssl.a + libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a - cd libhttpserver && rm -rf libhttpserver-*/ || true - cd libhttpserver && tar -zxf libhttpserver-*.tar.gz - #ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch -@@ -127,8 +118,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a + cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch +@@ -103,8 +94,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -80,7 +88,7 @@ index 710e070b..fd1352f6 100644 cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch cd libev/libev && ./configure cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} -@@ -144,8 +133,6 @@ coredumper/coredumper/src/libcoredumper.a: +@@ -121,8 +110,6 @@ coredumper/coredumper/src/libcoredumper.a: coredumper: coredumper/coredumper/src/libcoredumper.a curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a @@ -88,25 +96,18 @@ index 710e070b..fd1352f6 100644 - cd curl && tar -zxf curl-*.tar.gz # cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} cd curl/curl && autoreconf -fi - ifeq ($(UNAME_S),Darwin) -@@ -157,16 +144,6 @@ curl: curl/curl/lib/.libs/libcurl.a + ifeq ($(SYS_KERN),Darwin) +@@ -134,9 +121,6 @@ curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: - cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true -- cd libmicrohttpd && rm -f libmicrohttpd || true --ifeq ($(CENTOSVER),6) -- cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd -- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.55.tar.gz --else -- cd libmicrohttpd && ln -s libmicrohttpd-0.9.75 libmicrohttpd -- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.75.tar.gz +- cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz -# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch --endif cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -182,8 +159,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a +@@ -152,8 +136,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/lib/liblz4.a: @@ -115,7 +116,7 @@ index 710e070b..fd1352f6 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/lib/liblz4.a -@@ -209,8 +184,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -171,8 +153,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -124,7 +125,7 @@ index 710e070b..fd1352f6 100644 cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -299,8 +272,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o +@@ -256,8 +236,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -133,7 +134,7 @@ index 710e070b..fd1352f6 100644 cd libconfig/libconfig && ./configure --disable-examples cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} -@@ -308,9 +279,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a +@@ -265,9 +243,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: @@ -143,7 +144,7 @@ index 710e070b..fd1352f6 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a +@@ -296,8 +271,6 @@ re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: @@ -152,3 +153,8 @@ index 710e070b..fd1352f6 100644 cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch cd pcre/pcre && ./configure cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} +@@ -334,4 +307,3 @@ cleanall: + cd cityhash && rm -rf cityhash-*/ || true + cd coredumper && rm -rf coredumper-*/ || true + .PHONY: cleanall +- diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index edf8d11267dd4..ca7ce16a8adce 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; rev = finalAttrs.version; - hash = "sha256-vFPTBSp5DPNRuhtSD34ah2074almS+jiYxBE1L9Pz6g="; + hash = "sha256-Ouz1SSc35gQaJcVQO95azkxNgLxuY712ELAwM5buEtY="; }; patches = [ @@ -154,7 +154,18 @@ stdenv.mkDerivation (finalAttrs: { } { f = "prometheus-cpp"; - p = prometheus-cpp; + p = prometheus-cpp.overrideAttrs ( + finalAttrs: _: { + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jupp0r"; + repo = "prometheus-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; + }; + } + ); } ] ) diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index cf20b5ddb9ed6..1d40233a15d95 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.2.11"; + version = "2.3.0"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-wFdRMWnOZ3gVp9RwTwD1bJEKVJ9khPRSQoCi75/YiPM="; + hash = "sha256-xDiGVPXi12P2YzSESO4I4WGeQgWU9UPhJbenoN8sADc="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index efe93beb7713a..b40e45af22a78 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "realm"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "zhboner"; repo = "realm"; rev = "v${version}"; - hash = "sha256-G3scFSOxbmR3Q2fkRdg115WN/GCYpys/8Y4JC4YMGdY="; + hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno="; }; - cargoHash = "sha256-EvXafTujqTdQwfK4NXgT7lGKGnrpyP9ouplD6DmJUKU="; + cargoHash = "sha256-SrTymeGERDO42/S3m5ErwtB15KslPzdmcn3KlrVNVIc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index e6bf1c5b9d887..b115c57a6a756 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.12.30.00"; + version = "2025.01.06.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-o8PHtGG3Ndz6Ei9ZBoAdeNmBb70m4c+jCvHCGOjaA+w="; + hash = "sha256-3Wa10eLlvOXw8DZAwQiCTGFOcUEsHvYhl6OTEYsCdZ8="; }; - cargoHash = "sha256-guRi+kYLjPHFLm4eN3kJ2kHYIBZ5JXMb3ii8416e+IA="; + cargoHash = "sha256-UI70YLTR/+fKh+4wD2hZJyuzN4ZNUCkrhyf9CRepetA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix index 9a92d5f769ec5..bdc2a459b3c2a 100644 --- a/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix +++ b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "rose-pine-gtk-theme"; - version = "unstable-2022-09-01"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rose-pine"; repo = "gtk"; - rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; - sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + tag = "v${version}"; + hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE="; }; buildInputs = [ diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index f533522983716..1af1969bb0129 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; tag = "v${version}"; - hash = "sha256-d+k7EbGrFWOztr/e+ugnXVP/hUZAIEgmLDvQDf18K48="; + hash = "sha256-D8eh0Wun3bm5k2kuCgaEAR33O6i4aowifd1b0tSWV64="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 59c4ba6466e7b..79e7dde76c623 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "slackdump"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; tag = "v${version}"; - hash = "sha256-gnZbBY1XMYSGgsVG5MqR2y3o574hOwapcLZf5F21AJg="; + hash = "sha256-XkNxkLKm22an8Ts1kLdOyqNyV7mG5ZQJXOsAoFh3CjY="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -32,7 +32,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-GUPBrSgwxVXA3vEVbY36IZQfd2jEhvgk0OlFdP/2DU0="; + vendorHash = "sha256-4fgII2IJ0UCbUtqutMak9T2qhpZg1hu9Y+bxSaxcgqc="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 66db433fcfd89..79f2acbc612e1 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h7oIL9MWah5kEBj0N6Ro53P0T9fF0B8qdfv1031vLN8="; + sha256 = "sha256-q/tIG+RS/guRcKLo1iXmXi8IcgXS2pfJNFEvn/jxFks="; }; vendorHash = "sha256-/8tPq/piCrguFoRigzGoAUSBJ2C1AY0ghyHosPE5n68="; diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index d4ae19720cdb3..d23c403e49774 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.83"; + version = "2.1.84"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-JC31BsCqctpl2hx0RYkrUY5nrQdN22V6OzAfGK45SDc="; + hash = "sha256-1w+n/CXFWVLROSlI/bo5g9MMb1UNsqFDz8mL+5Xxg/s="; }; vendorHash = "sha256-GCXbp8cJUji7vAEVpTP9T/mRIwfu5+TqEKtoOQWlxrY="; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index 06f30390937eb..36814b7d6a45d 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.18.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-ZvyMGtsmXnJUGUoC9UciqCpQJsbxykzeRDo+i4ni82o="; + sha256 = "sha256-3sYi2/c5twM10Q70/73Pd58qkAl5m8KqghG7oV+p2t8="; }; - vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; + vendorHash = "sha256-vPeqStOjoJPYKpdkHQNTBJFKc8NBjTH4A/W9B+HAy1I="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix index 2266c626c6df5..0f65953ea0e02 100644 --- a/pkgs/by-name/tr/trillian/package.nix +++ b/pkgs/by-name/tr/trillian/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.7.0"; - vendorHash = "sha256-5zUCDKOeINVN/4PWDzqWMRhELc2wRvgJNdOJSAsFwUA="; + version = "1.7.1"; + vendorHash = "sha256-muPKjhUbpBJBMq8abcgTzq8/bjGXVPLoYHqQJKv8a1k="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E4A53Jru69sPIcB6Ydv8KauzjS9jvfhm5VbH69bfrt4="; + sha256 = "sha256-TOJqBfYVubwgDF/9i6lwmCLj6x0utzz0O7QJ5SqshCA="; }; subPackages = [ diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 5934eb4d7b620..a11e25d0544fa 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -15,18 +15,18 @@ }: rustPlatform.buildRustPackage rec { pname = "tsukimi"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-S4+mhFgBNSl2h8dk0izNyCw9//u3CaLGd/shCSWmN3M="; + hash = "sha256-5c/Rfiz9CkBasfWTCviC3HnWKkMVOEWoaMvsZyQN/iw="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-zVzDpZRni/0AyGE5ahBH7hm8Ovyt+Fn6x1NOHkyI0v8="; + cargoHash = "sha256-KvyF10kP/zRpgNdy+lLkgUgqiu075QvezYklMbkVvxQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index 64b5f40d2fcd0..4af5c7ef5ca14 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.7"; + version = "5.22.8"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-JHI5WZbInlZgRPZwh+XO39T7p05oSS+PkcHJ6QdUtOk="; + hash = "sha256-1vDSFi6VL7s7IAMlTMj+7GrvY8evrnFPXaznSM27c6E="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix new file mode 100644 index 0000000000000..05f2c95084f8f --- /dev/null +++ b/pkgs/by-name/up/upcloud-cli/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "upcloud-cli"; + version = "3.14.0"; + + src = fetchFromGitHub { + owner = "UpCloudLtd"; + repo = "upcloud-cli"; + tag = "v${version}"; + hash = "sha256-zKPoJFfgqi6ZIeZKJy7YeYuqHWVPH0LXvWpOYCEM7dE="; + }; + + vendorHash = "sha256-76bLk4zten9SGXbt/M8VKPSylCwQqclyscSVQQaAtbA="; + + ldflags = [ + "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${version}" + ]; + + subPackages = [ + "cmd/upctl" + "internal/*" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/upctl"; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = true; + + passthru = { + updateScript = lib.nix-update-script { }; + }; + + meta = { + changelog = "https://github.com/UpCloudLtd/upcloud-cli/blob/refs/tags/v${version}/CHANGELOG.md"; + description = "Command-line tool for managing UpCloud services"; + homepage = "https://github.com/UpCloudLtd/upcloud-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lu1a ]; + mainProgram = "upctl"; + }; +} diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 96406b3636028..20d925f9c6eb6 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -2,23 +2,39 @@ lib, rustPlatform, fetchFromGitHub, + stdenv, + installShellFiles, nix-update-script, usage, testers, }: rustPlatform.buildRustPackage rec { - pname = "jdx"; - version = "0.3.1"; + pname = "usage"; + version = "1.7.4"; src = fetchFromGitHub { owner = "jdx"; repo = "usage"; rev = "v${version}"; - hash = "sha256-9zQ+gkBVhzjqSIieGjxoD9vc7999lfRQ7awkvlEkseE="; + hash = "sha256-+Wt/ZOwj9LHgt0EOFF554TGf2tZyuRoXAPpCebPZfNY="; }; - cargoHash = "sha256-4ebjD1Tf7F2YyNrF7eEi2yKonctprnyu4nMf+vE2whY="; + cargoHash = "sha256-w8GWvMjC6Plho+zw542Q00hU/KZMdyyoP/rGAg72h1s="; + + postPatch = '' + substituteInPlace ./examples/mounted.sh \ + --replace-fail '/usr/bin/env -S usage' "$(pwd)/target/${stdenv.targetPlatform.rust.rustcTargetSpec}/release/usage" + ''; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd usage \ + --bash <($out/bin/usage --completions bash) \ + --fish <($out/bin/usage --completions fish) \ + --zsh <($out/bin/usage --completions zsh) + ''; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index eeefef797010e..c7f2e53309eef 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -2,20 +2,26 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +let + version = "0.8.0"; +in +rustPlatform.buildRustPackage { pname = "vault-tasks"; - version = "0.6.1"; + inherit version; src = fetchFromGitHub { owner = "louis-thevenet"; repo = "vault-tasks"; rev = "v${version}"; - hash = "sha256-H0cfzjOtVzOEoGmj3u80hj1QlK1QEgbl9vq4otlXKew="; + hash = "sha256-liU2zxBEOH5KMftru2PaIYZHLskm9WLNmUakn300/Xo="; }; - cargoHash = "sha256-Iezin3TguweHd9RIyFvNL4IWUtXNJbQH2KXIgaXJHgk="; + cargoHash = "sha256-uKhgi3u7YSKLqG2ROCWs6+p206xghnsQ7nIZw5OtkY4="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; + passthru.updateScript = nix-update-script { }; + meta = { description = "TUI Markdown Task Manager"; longDescription = '' diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix index 8419b215b8320..51bcd961d412e 100644 --- a/pkgs/by-name/vv/vvenc/package.nix +++ b/pkgs/by-name/vv/vvenc/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vvenc"; - version = "1.12.1"; + version = "1.13.0"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fraunhoferhhi"; repo = "vvenc"; rev = "v${finalAttrs.version}"; - hash = "sha256-Et/JmF/2hh6A1EsOzvgzruMN47rd5cPgRke3uPvz298="; + hash = "sha256-9fWKunafTniBsY9hK09+xYwvB7IgGPhZmgqauPHgB/g="; }; env.NIX_CFLAGS_COMPILE = toString ( @@ -39,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "rc"; + }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/wo/workcraft/package.nix b/pkgs/by-name/wo/workcraft/package.nix index cec867c8bd55a..cb6a6b6c8e82f 100644 --- a/pkgs/by-name/wo/workcraft/package.nix +++ b/pkgs/by-name/wo/workcraft/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-326iDxQ1t9iih2JVRO07C41V5DtkUzwkcNHCz5kLHT8="; + sha256 = "sha256-/Qax8cSO9j77OXNTYoZoAk5H5teWuNuR+9ubQuFq6qc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 0b2581aaf4581..7cc46715e99c5 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -47,12 +47,12 @@ let throwSystem = throw "Unsupported system: ${system}"; # Zoom versions are released at different times for each platform - # and often with different versions. We write them on three lines + # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. versions.aarch64-darwin = "6.3.1.45300"; versions.x86_64-darwin = "6.3.1.45300"; - versions.x86_64-linux = "6.3.1.5673"; + versions.x86_64-linux = "6.2.11.5069"; srcs = { aarch64-darwin = fetchurl { @@ -66,7 +66,7 @@ let }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-0gREcRnGkiFj6kIra0laR5PUqrb0Jvoj6gDfpAVLRtg="; + hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw="; }; }; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0468bca709a7d..702a6ec37dbb2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -328,8 +328,8 @@ rec { }; crystal_1_14 = generic { - version = "1.14.0"; - sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y="; + version = "1.14.1"; + sha256 = "sha256-cQWK92BfksOW8GmoXn4BmPGJ7CLyLAeKccOffQMh5UU="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_18; doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 17b61499c2d94..1d834ff471657 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.95"; + version = "0.2.101"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; tag = version; - hash = "sha256-5kPC6UxqysJEHNWDoXhg7oo/hQSKICuqWmOdjlljoLs="; + hash = "sha256-PUTa4ypq6zmoeNMp5SyqB05H//M2zNVILcjmU5Mzv8M="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography getmac requests diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bd9eb754246b0..a0d13ed3edcaf 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.95"; + version = "1.35.96"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-xEwUHCSDw8Ksz14p9g01oX7F/dLTh3IWtQiniLwDH8I="; + hash = "sha256-A2hb88YvKjTrjlVCAHTxdZQBU82QDkXK864xVu5seGE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 8ffd456ec592d..5df230adcdd7f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.95"; + version = "1.35.96"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZLiCnm4QcizMGrbWjl4LG/MZizsRvn0XRxGdfFzDnpk="; + hash = "sha256-pBfc3PEn2mRMl1ljvHQDsYjSrlqMG7kHhJ1LhoHk+5A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix index b3384fe03f5ce..d9ab527478952 100644 --- a/pkgs/development/python-modules/dotty-dict/default.nix +++ b/pkgs/development/python-modules/dotty-dict/default.nix @@ -1,27 +1,34 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, - setuptools-scm, + poetry-core, + pytestCheckHook, }: buildPythonPackage rec { - pname = "dotty_dict"; + pname = "dotty-dict"; version = "1.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-SwFuA7iuJlU5dXpT66JLm/2lBvuU+84L7oQ8bwVUGhU="; + src = fetchFromGitHub { + owner = "pawelzny"; + repo = "dotty_dict"; + tag = "v${version}"; + hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ poetry-core ]; - doCheck = false; + pythonImportsCheck = [ "dotty_dict" ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Dictionary wrapper for quick access to deeply nested keys"; homepage = "https://dotty-dict.readthedocs.io"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/pawelzny/dotty_dict/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 59203e1ef3623..cee048cbaa87c 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,9 +20,11 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-rY3jIrCl5y2Pyw7qakUuMtdPTR7e61n5pScPavvBtbM="; + hash = "sha256-V+i+e1McE9YFVuq2fuQtD3RKTHw9u3u0bZ2zCi9yZCM="; }; + pythonRelaxDeps = [ "withings-sync" ]; + build-system = [ pdm-backend ]; dependencies = [ diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index 676e2f3a5299f..38eebb5654ae0 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -3,21 +3,18 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, pybind11, setuptools, - wheel, - aiohttp, diskcache, fastapi, - gptcache, - msal, + huggingface-hub, + jsonschema, numpy, openai, ordered-set, platformdirs, protobuf, - pyformlang, + pydantic, requests, tiktoken, torch, @@ -29,8 +26,6 @@ buildPythonPackage rec { version = "0.1.16"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "guidance-ai"; repo = "guidance"; @@ -38,34 +33,39 @@ buildPythonPackage rec { hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU="; }; - nativeBuildInputs = [ pybind11 ]; - build-system = [ + pybind11 setuptools - wheel ]; dependencies = [ - aiohttp diskcache - fastapi - gptcache - msal numpy - openai ordered-set platformdirs protobuf - pyformlang + pydantic requests tiktoken - uvicorn ]; + optional-dependencies = { + azureai = [ openai ]; + openai = [ openai ]; + schemas = [ jsonschema ]; + server = [ + fastapi + uvicorn + ]; + }; + nativeCheckInputs = [ + huggingface-hub pytestCheckHook torch - ]; + ] ++ optional-dependencies.schemas; + + pytestFlagsArray = [ "tests/unit" ]; disabledTests = [ # require network access @@ -79,6 +79,10 @@ buildPythonPackage rec { "test_recursion_error" "test_openai_class_detection" "test_openai_chat_without_roles" + "test_local_image" + "test_remote_image" + "test_image_from_bytes" + "test_remote_image_not_found" # flaky tests "test_remote_mock_gen" # frequently fails when building packages in parallel @@ -86,22 +90,23 @@ buildPythonPackage rec { disabledTestPaths = [ # require network access - "tests/library/test_gen.py" + "tests/unit/test_tokenizers.py" ]; preCheck = '' export HOME=$TMPDIR + rm tests/conftest.py ''; pythonImportsCheck = [ "guidance" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Guidance language for controlling large language models"; homepage = "https://github.com/guidance-ai/guidance"; - changelog = "https://github.com/guidance-ai/guidance/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index d341e26d1e3d8..0f8426de29ba1 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # fails if builder load is highly variable + "test_performance" + ]; + meta = with lib; { description = "Fork of frozendict, an immutable wrapper around dictionaries"; homepage = "https://github.com/corenting/immutabledict"; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index bee0580e27e8a..bb0a263ecdc6a 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.13.0"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,17 +30,9 @@ buildPythonPackage rec { owner = pname; repo = pname; tag = "v${version}"; - hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI="; + hash = "sha256-HkMxYULeWcAYdlEI4N4qv7AGh/+xY0zuvV2mFPStPq8="; }; - patches = [ - (fetchpatch { - name = "tests-pillow-10.2.0-compat.patch"; - url = "https://github.com/liquidctl/liquidctl/commit/c50afa4e610bd2e268e85c347e2644794c817a78.diff"; - hash = "sha256-1cKk3drl3RybHmnPXdlJoeYK6UDz25jHSS2YS/XLHIY="; - }) - ]; - nativeBuildInputs = [ installShellFiles setuptools diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index aa04df459d6b9..80f3ca4527dd5 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.10.0"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; tag = "v${version}"; - hash = "sha256-VhX0KDlGf0J6fiO1RzOoqJ4WMDM8Bb2+lYYMlgQ9nkc="; + hash = "sha256-LslE/ROfr/2gU5VPiLKgaTxd4miM+Bvrh9OdY06zkr0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index 590ce2bfe8ed8..a06c212947204 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.29.0"; + version = "2.30.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; tag = "v${version}"; - hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184="; + hash = "sha256-Ht59pYJfcBkfoWSTDipsoy/71pMzc5rlDD6xHgvUs1g="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix index e5cd443ff59b2..c8ca0cbd2c073 100644 --- a/pkgs/development/python-modules/pixel-font-knife/default.nix +++ b/pkgs/development/python-modules/pixel-font-knife/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pixel-font-knife"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_knife"; inherit version; - hash = "sha256-kgr9j/i8Z7U4KvjQMoZp5JaWMlSYwuhaFMmvEktNw8w="; + hash = "sha256-tm5cAaeUBL9vbdvq73N2HCytlwYe0Q2Tovo+6XU59GQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 04125ca41ddde..01f403c58be46 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250107"; + version = "1.0.2.20250110"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GvJVQooR09RXTebkrq5QlhlgxRktJp1D2RUgGEwpLHk="; + hash = "sha256-qG3vY6LWm3N2RTiErmz8H644YFsMRjXS2ZMpBby7MTI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index ac13fca2c722f..dd0a7220896ae 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ozpv4yyu8lmWmKg2iGMMN8IJ29zr87Gj73dn5QMgifI="; + hash = "sha256-1oSZzmcDEwThBbF8M/nvY//axJLyQUxDAVOYIsLr9w0="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 54b989d4576bf..c1b31bfb091a0 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.9.0"; + version = "5.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wlXeHtQCrazCSpDdYjENbVc10WbzmV6r6eqQ23xnvbY="; + hash = "sha256-Eg2eakri5+1hPuKyq9+f4dL33il6G4LYLZvoWYfU4LY="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix index 5291c12e53a1e..9a8ca2837a94a 100644 --- a/pkgs/development/python-modules/python-mimeparse/default.nix +++ b/pkgs/development/python-modules/python-mimeparse/default.nix @@ -1,25 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "python-mimeparse"; - version = "1.6.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "falconry"; + repo = "python-mimeparse"; + tag = version; + hash = "sha256-4LdfxVOioiyjeZjxCrvOELG+mJ4YOX4CUn+CXYWCtOo="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = "https://github.com/dbtsai/python-mimeparse"; + changelog = "https://github.com/falconry/python-mimeparse/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix deleted file mode 100644 index b5399d896844c..0000000000000 --- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitHub, - lib, - poetry-core, -}: - -buildPythonPackage rec { - pname = "qmk_dotty_dict"; - version = "1.3.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "pawelzny"; - repo = "dotty_dict"; - tag = "v${version}"; - hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc="; - }; - - nativeBuildInputs = [ poetry-core ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/pawelzny/dotty_dict"; - description = "Dictionary wrapper for quick access to deeply nested keys"; - longDescription = '' - This is a version of dotty-dict by QMK (https://qmk.fm) since the original - dotty-dict published to pypi has non-ASCII characters that breaks with - some non-UTF8 locale settings. - ''; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 6e98830be27cd..430baca08ccf5 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1299"; + version = "3.0.1300"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-9HdpQDB2TflCk2NK0tJ/EOo0tyZFWWHKSbHeXUwqXqo="; + hash = "sha256-pvs2vLceRtg4Ro+ZqGdTNXchezu/dO6xizoRZ4xYRZ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 1ad27f4a9b99d..76f0401e72f38 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.53"; + version = "0.1.54"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l5r0ZbF3LlGzJgMt0rPizzP0ZBLJQNLGBynPw4nAwMc="; + sha256 = "sha256-R4t1mzXX95rVbEuHvoAnxxEYt7XYg+Bmr8Mh4LIhnMs="; }; - cargoHash = "sha256-XRK26pYVUVOUAQsWxIhY2m5bwSIqCMBZ2r34eN3RQiE="; + cargoHash = "sha256-DigRCz9BicNI+bkEwdJEKy9i0pT9HAhLsN56hAbEzUI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index a5d5b5d2355e7..a9874dce375b9 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -32,19 +32,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.8.2"; + version = "18.9"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-+X56o8s9kbNxufDeQVLAaVG8jxcSTFVssn1HnxIHhZQ="; + hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-b1JOj8p5+Q2SvmbBvLxGFPCLALcOc4mAdegPCsMnNqc="; + hash = "sha256-WN8hYl3L1z+yAfxQnDKnr/zC+0GOYvjzM8YL5XQgVJg="; }; nativeBuildInputs = [ diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 90041b5642f27..125052abc7542 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildNum = builtins.elemAt version-split 1; in fetchurl { - url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; + url = "https://api.papermc.io/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; inherit (finalAttrs) hash; }; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 77ca7cf60ed08..81cc4843cb4d8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy" }, "6.6": { - "version": "6.6.70", - "hash": "sha256:15rgzl86q52ki0n7n4xlhb1pmipxbshmnafinsyfnvxjgzh3xll4" + "version": "6.6.71", + "hash": "sha256:0kkj5v1hd6z8z1vhvdly303kabvp2a93zb89pagm79ng5nx1b5r1" }, "6.11": { "version": "6.11.11", diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index 92ba73329bb45..e831319e1b391 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-izD2Ks29/4/FBsZoH0raFzqb0DgPR8hXRYBZQEvET+s="; + sha256 = "sha256-sX0yNuUg/x8BtMLbbq1gz+4//Cce+n5Qi/zspC7/scI="; }; vendorHash = "sha256-DGCNYklINPPzC7kCdEUS7TqVvg2SnKFqe0qHs5RSmzY="; diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index 2926438523ffc..d78f5b56db589 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rtrtr"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-P9bofTmDpnNCVQAGeq9J2XqfNeula8nL1KoBIHMZNWg="; + hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8="; }; - cargoHash = "sha256-ToJLE4nqgTqg5D4Qh2zi+wjmcdwDo0aupoDwKJCTwnM="; + cargoHash = "sha256-2/pm/Tfn6UxFpHW6HW20yOxEtm6N3jOe8kk9k7OPppU="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix index c86cebf2377c4..91b2633315396 100644 --- a/pkgs/shells/nushell/plugins/dbus.nix +++ b/pkgs/shells/nushell/plugins/dbus.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nu_plugin_dbus"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "devyn"; repo = pname; rev = version; - hash = "sha256-w+0H0A+wQa4BUzKx9G2isn29IicoZsLlWCDnC3YSzek="; + hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto="; }; - cargoHash = "sha256-NuWwPfAo3qYer4eUNDQ+VR9R+uLp5WAT2mhnr/zayEI="; + cargoHash = "sha256-2QbsgxY82Vq7Op5kc45ejK/H14iDNpSqVWVAVaMObFY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ dbus ]; diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 52db405630149..a5df42a1b5b81 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; tag = "v${version}"; - hash = "sha256-KJsZZLjZj+p18HRXY+rQ9ooonxxTavmXi1ISA4mR26s="; + hash = "sha256-HJi5GhtUKhfV27Ic94iIYEe/ZeyL6CeduhWi/cSXOmA="; }; - vendorHash = "sha256-RM/bsoQTbOj/NKr16GsCQWCxV0f7pYYf2aYcWGghGEQ="; + vendorHash = "sha256-76mIpOWpW4NgyKDzeVd7LkmiRhcikMvFaqt8qvh16+U="; ldflags = [ "-s" diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 1f5723948f788..22320eef193b3 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.36.0"; + version = "11.36.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-oi5ftC6xuh6DEIn5qYZxCbKis656fU4kRVbjWOjNCLA="; + hash = "sha256-VwGD9qfz8WdUl6nxTw0SuA5sfahdt2eIaryfPbI4NY4="; }; proxyVendor = true; - vendorHash = "sha256-XLDbhNN7Y1E/yBQeFs8RmUP3WgI9G+s/tfts8WJsdvA="; + vendorHash = "sha256-Uivl9RzshS2FkdoGdVWKzLvch1d+JQxG1tcT83yU0hs="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2b4d993564db1..0f47f30526a47 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -584,6 +584,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22 qds_sdk = qds-sdk; # added 2023-10-21 + qmk-dotty-dict = throw "qmk-dotty-dict has been removed. It is no longer needed since the fixes have been merged into dotty-dict."; # added 2025-01-01 Quandl = quandl; # added 2023-02-19 quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17 querystring_parser = querystring-parser; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 050e8c12cd6ca..d0e689656783e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13765,8 +13765,6 @@ self: super: with self; { qutip = callPackage ../development/python-modules/qutip { }; - qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; - pythonqwt = callPackage ../development/python-modules/pythonqwt { }; r2pipe = callPackage ../development/python-modules/r2pipe { };