diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index b2345cbf7f33..bac0c5cf14bb 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -227,9 +227,11 @@ in }; environment.systemPackages = - with pkgs; let default = a: b: if a != null then a else b; + genconf = pkgs.klipper-genconf.override { + klipper = cfg.package; + }; firmwares = lib.filterAttrs (n: v: v != null) ( lib.mapAttrs ( mcu: @@ -241,6 +243,7 @@ in }: if enable then pkgs.klipper-firmware.override { + klipper = cfg.package; mcu = lib.strings.sanitizeDerivationName mcu; firmwareConfig = configFile; } @@ -251,14 +254,15 @@ in firmwareFlasher = lib.mapAttrsToList ( mcu: firmware: pkgs.klipper-flash.override { - mcu = lib.strings.sanitizeDerivationName mcu; + klipper = cfg.package; klipper-firmware = firmware; + mcu = lib.strings.sanitizeDerivationName mcu; flashDevice = default cfg.firmwares."${mcu}".serial cfg.settings."${mcu}".serial; firmwareConfig = cfg.firmwares."${mcu}".configFile; } ) (lib.filterAttrs (mcu: firmware: cfg.firmwares."${mcu}".enableKlipperFlash) firmwares); in - [ klipper-genconf ] ++ firmwareFlasher ++ lib.attrValues firmwares; + [ genconf ] ++ firmwareFlasher ++ lib.attrValues firmwares; }; meta.maintainers = [ lib.maintainers.cab404 diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix index 703c1ad0e2c6..75b40b64e875 100644 --- a/pkgs/by-name/ki/killerbee/package.nix +++ b/pkgs/by-name/ki/killerbee/package.nix @@ -28,10 +28,6 @@ python3.pkgs.buildPythonApplication rec { scapy ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; - pythonImportsCheck = [ "killerbee" ]; meta = { diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix index 2cf8aee295fc..833a47cdafee 100644 --- a/pkgs/by-name/mu/mubeng/package.nix +++ b/pkgs/by-name/mu/mubeng/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = "mubeng"; tag = "v${version}"; - hash = "sha256-DZwtHLSsV6JYEqb6fdLtJs8DdaMBBb0uSx6AL1cjjBs="; + hash = "sha256-LApviKG6sgIYtosU0xW4lkBH0iB7MGB4bfG9fPI16iQ="; }; - vendorHash = "sha256-TZDQCvcwsCa08bBBb8Zs8W0OFDYb+ZWN85+VCelFgyc="; + vendorHash = "sha256-Uvxkvj5hodVQ0j05HZdSKammGWy9DxEIBT0VnCW8QuI="; ldflags = [ "-s" diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 9867a558e5f8..098ae263619f 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "task-keeper"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "linux-china"; repo = "task-keeper"; tag = "v${version}"; - hash = "sha256-lcwWl1ycMSmHgYT4m+CofwefqnjxjvuJkcv1Pe0OtEo="; + hash = "sha256-ufKHKQULN1zaEmnLx4voL/rL8bBe0aZEfclb+5/ybps="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-OVDwaMpA2gw0asdQ+yNRKmcmXLs+ddJI/lodewXujro="; + cargoHash = "sha256-g2CxCpSBAKUn+ENduuh+u5l3KD7rchY0qLAuPz8ATww="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index b2cccc198b77..0f3228a53efa 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -2,22 +2,21 @@ lib, fetchFromGitHub, buildGoModule, - testers, - termshot, + versionCheckHook, nix-update-script, }: buildGoModule rec { pname = "termshot"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; tag = "v${version}"; - hash = "sha256-vvSUdXVLuc3GmxPX9SzSeb8vbmqjhSLjXd9nmU7Q46g="; + hash = "sha256-x2XVA686E3GPMz1hzTWZ1FqVflfPWTwbAf8JAG8HMp0="; }; - vendorHash = "sha256-nXAIU07SY/GdWZGASHXDg36cSGKw4elLOBDCoJk/xlU="; + vendorHash = "sha256-ON3dmwf9IYEf+e4Z5EJ72wC4IIr/0/ssgzAJmRb7MSk="; ldflags = [ "-s" @@ -25,10 +24,13 @@ buildGoModule rec { "-X github.com/homeport/termshot/internal/cmd.version=${version}" ]; - passthru = { - tests.version = testers.testVersion { package = termshot; }; - updateScript = nix-update-script { }; - }; + checkFlags = [ "-skip=^TestPtexec$" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { description = "Creates screenshots based on terminal command output"; diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix index f4f866e0b4e2..a7cc3e618582 100644 --- a/pkgs/by-name/tf/tfsec/package.nix +++ b/pkgs/by-name/tf/tfsec/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.11"; + version = "1.28.12"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; tag = "v${version}"; - hash = "sha256-7e75VdqwjzP+GyTtXqOf1pN+5wEbxNYoUcpsTjwB+0Y="; + hash = "sha256-ul4KKwTWFg5FxmLhyrQAQWfuCoSVDc6eIchbLwpG/xI="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-Zr6Z9Px1nxkr6fKWINMbp6cESZeZkxnuDPwbV+WX2Oo="; + vendorHash = "sha256-yi124OllfSchKSaj+OlxG/7UQcBLdx8JUlnu/a8MSOU="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index f96caa1428da..40a6adf37a04 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -64,10 +64,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = - lib.optionals withMakeWrapper [ makeWrapper ] + nativeBuildInputs = [ bison flex pkg-config ] + ++ lib.optionals withMakeWrapper [ makeWrapper ] ++ lib.optionals withDNSTAP [ protobufc ] - ++ [ pkg-config flex bison ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index bd0c90ea8665..7a4ea114b931 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -16,23 +16,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhuyifei1999"; - repo = pname; + repo = "guppy3"; tag = "v${version}"; hash = "sha256-hgJcy4DRfZL50dCcRv2a6GJPDabsUMfDtq7HCXXYYz8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ tkinter ]; + dependencies = [ tkinter ]; # Tests are starting a Tkinter GUI doCheck = false; + pythonImportsCheck = [ "guppy" ]; meta = with lib; { description = "Python Programming Environment & Heap analysis toolset"; homepage = "https://zhuyifei1999.github.io/guppy3/"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index 414aa327007f..95817e7986ce 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; tag = "v${version}"; - hash = "sha256-fyQKkwHQEvRNTh1IBqE0/YSskBfrFEequ+VxoHSeShA="; + hash = "sha256-6n6uvUJm6y0AynAZMQG+NKNIIaeMSpOJqWDdpPdGy4Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index 7eefcb2dfa5d..de3b7403b69f 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jh2"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "jawah"; repo = "h2"; tag = "v${version}"; - hash = "sha256-la1tZ+t6HeGqaua1f858mT1IRyqS0hnoOiKr656vthQ="; + hash = "sha256-H1i2lolctispLtQc+uqeE+NUeKr/dtgDq1zdTJH5gyU="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-m1MkKhwTMDGsC0jt1skyFb23Ln5spa+vUEOyA5pHxP4="; + hash = "sha256-E/Ah1sEqKrJd49ZvvbhqWtV1Abd0S1Ab/AF4tOn2RPY="; }; build-system = [ diff --git a/pkgs/development/python-modules/keba-kecontact/default.nix b/pkgs/development/python-modules/keba-kecontact/default.nix index 6fabe34185ae..261f46f59756 100644 --- a/pkgs/development/python-modules/keba-kecontact/default.nix +++ b/pkgs/development/python-modules/keba-kecontact/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "keba-kecontact"; - version = "4.2.1"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dannerph"; repo = "keba-kecontact"; tag = version; - hash = "sha256-2XWZt9H+1m4TX0C3cjEIlkrXp6BSArUsbLi+VKGDqhE="; + hash = "sha256-gIqHo+J/I4vqJCs/r3ZHo3kChefTRqpVmdw3r3y3Hzk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 089de94fbe67..3375c23bc909 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.6"; + version = "1.12.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-KiYpPgwMsIuIDUjQfw83ATiE5VI2XMaxGsnP5xEypqc="; + hash = "sha256-bB9BeDhFlwdIgIv9VfvBkqxcfzpPe3jl6D/ChdP2FsM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index c105952bf3a8..6cc2b0804cb9 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.14"; + version = "6.0.15"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/FZwGXQwx46r1koP20LSRXxcqVQCEMWhkT2XlXhtKn0="; + hash = "sha256-kC1ILRtdQQbt0u7MBnNAxots5OJHkJZDgThPZ9NbnlU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 2b66e0c64039..c943f18a6e8b 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.2.240909"; + version = "2.2.3.241126"; pyproject = true; disabled = pythonOlder "3.10"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; tag = "v${version}"; - hash = "sha256-Dt2a4l5WAOizUeaDa80CRuvyPT9mWfFz+zGZMm3vQP4="; + hash = "sha256-y+td1x33mALh/AfDh0uIq7ebCBWWWCJewhvBQ4WNe3U="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-overseerr/default.nix b/pkgs/development/python-modules/python-overseerr/default.nix index 8f688faead0d..536657e8cbcf 100644 --- a/pkgs/development/python-modules/python-overseerr/default.nix +++ b/pkgs/development/python-modules/python-overseerr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-overseerr"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-overseerr"; tag = "v${version}"; - hash = "sha256-WZv2AWh+Jg7+86QXe1PiJ2xVhg9Xqjv5CJvX5fIpiWE="; + hash = "sha256-MdJISHU/YbmQReT/Sf29jERUkuFASNCq4NQnk/BKK70="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 5c5c0917f100..a9dbccf3140c 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -2,6 +2,7 @@ lib, aioconsole, aiohttp, + aioresponses, async-timeout, buildPythonPackage, fetchFromGitHub, @@ -37,14 +38,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytest-mock pytestCheckHook ]; - # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 - doCheck = false; - pythonImportsCheck = [ "whirlpool" ]; meta = with lib; { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9c6c7b32f75d..eeed47dc2152 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1616,6 +1616,12 @@ let ''; }); + BiocParallel = old.BiocParallel.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-error=missing-template-arg-list-after-template-kw"; + }; + }); + rstan = old.rstan.overrideAttrs (attrs: { env = (attrs.env or { }) // { NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index 6a5da56092d8..fc0ab09fd0a4 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -3,10 +3,25 @@ newScope, python3, recurseIntoAttrs, + fetchFromGitHub, }: # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { - python = python3; + python = python3.override { + self = self.python; + packageOverrides = self: super: { + service-identity = super.service-identity.overridePythonAttrs (oldAttrs: { + version = "24.2.0"; + src = fetchFromGitHub { + owner = "pyca"; + repo = "service-identity"; + tag = "24.2.0"; + hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; + }; + checkInputs = [ super.pyopenssl ]; + }); + }; + }; buildbot-pkg = self.callPackage ./pkg.nix { };