diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 8c9673d887bf..4306fa926278 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -106,6 +106,7 @@ stdenvNoCC.mkDerivation { --arg nixpkgsPath "./." \ --argstr revision ${nixpkgs.rev or "master"} \ --argstr libsetsJSON ${lib.escapeShellArg (builtins.toJSON libsets)} \ + --store $(mktemp -d) \ > locations.json function docgen { diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 2b46a14b672a..f236d44d5d0e 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -6,7 +6,11 @@ let cfg = config.services.samba; settingsFormat = pkgs.formats.ini { }; - configFile = settingsFormat.generate "smb.conf" cfg.settings; + # Ensure the global section is always first + globalConfigFile = settingsFormat.generate "smb-global.conf" { global = cfg.settings.global; }; + sharesConfigFile = settingsFormat.generate "smb-shares.conf" (lib.removeAttrs cfg.settings [ "global" ]); + + configFile = pkgs.concatText "smb.conf" [ globalConfigFile sharesConfigFile ]; in diff --git a/nixos/tests/opentelemetry-collector.nix b/nixos/tests/opentelemetry-collector.nix index 9a56a22ca47e..98e597cf807b 100644 --- a/nixos/tests/opentelemetry-collector.nix +++ b/nixos/tests/opentelemetry-collector.nix @@ -12,7 +12,9 @@ in { enable = true; settings = { exporters.logging.verbosity = "detailed"; - receivers.otlp.protocols.http = {}; + receivers.otlp.protocols = { + http.endpoint = "0.0.0.0:${toString port}"; + }; service = { pipelines.logs = { receivers = [ "otlp" ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0f4132b59de0..da4adfbe3477 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-x3UeZM00kmZB3IG9EBx1jssyWmC3gcYTPtwMmJNSzgM="; + hash = "sha256-fjEUo0NY/ZOujtgpWTXHLaMjzAlel3xHY+erzxLi5kQ="; }; postPatch = '' diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index 5b6cdf7e7904..cb8439305c68 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "indicator-sound-switcher"; - version = "2.3.9"; + version = "2.3.10.1"; src = fetchFromGitHub { owner = "yktoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qJ1lg9A1aCM+/v/JbQAVpYGX25qA5ULqsM8k7uH1uvQ="; + sha256 = "sha256-Benhlhz81EgL6+pmjzyruKBOS6O7ce5PPmIIzk2Zong="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 87bc32bd1af5..0ff6542b9710 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.18.2-beta"; + version = "0.18.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-qqvLnJlFGeCizm6T9iUwvYLjWpAeZwbuzQlUUopwrjc="; + hash = "sha256-CNCMVYuLUVmNgW5YTTn3TR1+2UCLbF3/gXXZWiREj/E="; }; - vendorHash = "sha256-BxNtZzwmKJ/kZk7ndtEUC4bMGpd8LEhFFu4Z49bKydE="; + vendorHash = "sha256-dr8Ra8ywy+Zow8JF3K21XZ7lDIIdxvjRz+OD3E+348o="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e32282400902..3d58a59a61c4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "1.19.11"; - hash = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; + version = "2.2.0"; + hash = "sha256-9CKm9SLotPlwkAELb7Us/blK959HVt6eXiDp0fgVLmA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 55ed38a10130..fd3358e99f6d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -41,11 +41,11 @@ let isx86Linux = stdenv.hostPlatform.system == "x86_64-linux"; supported = { x86_64-linux = { - hash = "sha256-jibImnpRtshbHu21JeS4VxL1jETm3Ein8S/M73UXc2w="; + hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-7UagRO7qHyT1JIvvTSx9+USYrnDRXJ2wnXPLaBHRc3k="; + hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA="; arch = "linux-arm64"; }; }; @@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.21.4"; + version = "1.22.2"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 61a0b3b3e81a..cb60ee6b59ad 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -186,6 +186,28 @@ stdenv.mkDerivation (finalAttrs: { done ''; + doInstallCheck = true; + installCheckInputs = with python3Packages; [ + fonttools + psutil + ]; + installCheckPhase = '' + runHook preInstallCheck + + ETN='--exclude-test-name' + EXCLUDED_FLAGS=( + $ETN 'test_7z' # we don't include 7z support + $ETN 'test_zstd' # we don't include zstd support + $ETN 'test_qt' # we don't include svg or webp support + $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused + ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} + ) + + python setup.py test ''${EXCLUDED_FLAGS[@]} + + runHook postInstallCheck + ''; + meta = { homepage = "https://calibre-ebook.com"; description = "Comprehensive e-book software"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index caddc7e0be62..a78454196e39 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then rec { pname = "brave"; - version = "1.69.162"; + version = "1.69.168"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-uG3I91XyuEn/ZFjlv84041ZTCslkC5XElag/4R7MBHc="; + hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then rec { pname = "brave"; - version = "1.69.162"; + version = "1.69.168"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-O8sf0sw6ljemNdSJwHyX2JjqQWEuKvSP9hj0H2VXQC8="; + hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index d4fa55f26676..06d4251b9faa 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -54,15 +54,15 @@ let version = { - corporate = "24.4.3.1073-1"; - beta = "24.4.1.952-1"; - stable = "24.4.1.951-1"; + corporate = "24.7.1.1195-1"; + beta = "24.7.1.1124-1"; + stable = "24.7.1.1120-1"; }.${edition}; hash = { - corporate = "sha256-f2Q6q3rL+RcVYX46RHRAageF2JKPxmBaV6KHYl5XtN8="; - beta = "sha256-WCyjgb5uj9guqyge6giP0wavndorlMG6yacG134xWjw="; - stable = "sha256-4AsMpANtMXUS2NCPKI+Ut0tWGurRIpWCmS3PhEi1CGo="; + corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; + beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; + stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; }.${edition}; app = { diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix index 9cf3dfe955d7..f04ea8df2eb0 100644 --- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.3+rke2r1"; - rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; - rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; - rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; - k8sVersion = "v1.30.3"; - k8sImageTag = "v1.30.3-rke2r1-build20240717"; + rke2Version = "1.31.0+rke2r1"; + rke2RepoSha256 = "1xf7yhpfwiydhl31dd8wc2bhq0j470ad8vazjzzsl76skcy07rbc"; + rke2Commit = "4bf1156f41631dc0e81d66a6834a53d14b48aaef"; + rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; + k8sVersion = "v1.31.0"; + k8sImageTag = "v1.31.0-rke2r1-build20240815"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.30.3-dev."; + dockerizedVersion = "v1.31.0-dev."; golangVersion = "go1.22.5"; - eol = "2025-06-28"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix index 58b0eb57b80c..ee2c9ceebc1f 100644 --- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.28.11+rke2r1"; - rke2RepoSha256 = "1mkl7mnlsq2j9n610jnr9545hq6ilr5sdg8jxjxjbk9lnmmbvrm1"; - rke2Commit = "6b12d7a783238b72da8450fa1b6ec587cebb79ed"; - rke2VendorHash = "sha256-VenNSaa86nbhrFYzXPbj0fxbDlrIu6pxqMo+HPDuUxs="; - k8sVersion = "v1.28.11"; - k8sImageTag = "v1.28.11-rke2r1-build20240619"; + rke2Version = "1.30.4+rke2r1"; + rke2RepoSha256 = "1daxs8gxy775qn1yrf7zh77cyaj3nn3qlwj0vjqfpbv1gpkimfyi"; + rke2Commit = "9517eea519b780e154dd791c555c698e84a0e5cd"; + rke2VendorHash = "sha256-Q+Wt4Hyp6VyxfCXNsRQMyAo0QCGWhnY9tcV/NQrrSEY="; + k8sVersion = "v1.30.4"; + k8sImageTag = "v1.30.4-rke2r1-build20240815"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.28.11-rke2r1"; - golangVersion = "go1.21.11"; - eol = "2024-10-28"; + dockerizedVersion = "v1.30.4-dev.877838a0-dirty"; + golangVersion = "go1.22.5"; + eol = "2025-06-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix index 1ba579e917ed..1801831584d1 100644 --- a/pkgs/applications/networking/cluster/rke2/testing/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/testing/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.3-rc5+rke2r1"; - rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; - rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; - rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; - k8sVersion = "v1.30.3"; - k8sImageTag = "v1.30.3-rke2r1-build20240717"; + rke2Version = "1.31.0-rc1+rke2r1"; + rke2RepoSha256 = "0mfl01rv6xn2kg2739215j9hsyym16mgp92bqsz0hkpfm61dd96j"; + rke2Commit = "3acd10e9389fa930860896ca6ed925a15dff61a3"; + rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; + k8sVersion = "v1.31.0"; + k8sImageTag = "v1.31.0-rke2r1-build20240815"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.30.3-dev."; + dockerizedVersion = "v1.31.0-dev."; golangVersion = "go1.22.5"; - eol = "2025-06-28"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 659025d6538a..1c0ad5aa361a 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -10,20 +10,20 @@ }: stdenv.mkDerivation rec { pname = "armcord"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ArmCord"; repo = "ArmCord"; rev = "v${version}"; - hash = "sha256-nVirmGgR5yssMRXFUialMjTTSEa5nVNtue207eYUJCg="; + hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-ETnTWErdOIdcyK/v42bx+dFPPt+Lc0Lxyzo+RpxvEjU="; + hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 863c5b70e021..5f9fe55b9b5f 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.7.0"; + version = "3.7.2"; src = fetchurl { - url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz"; - hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg="; + url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz"; + hash = "sha256-fEu3BGBW5cgrY38zBB3iL0/SRrobEtJVsGNWRNtT40s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 3dece25915b4..d4b98fce8719 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, - libminc, libjpeg, nifticlib, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeWrapper, + flex, + bison, + perl, + TextFormat, + libminc, + libjpeg, + nifticlib, + zlib, +}: stdenv.mkDerivation rec { - pname = "minc-tools"; - version = "unstable-2020-07-25"; + pname = "minc-tools"; + version = "2.3.06-unstable-2023-08-12"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "fb0a68a07d281e4e099c5d54df29925240de14c1"; - sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw"; + owner = "BIC-MNI"; + repo = pname; + rev = "c86a767dbb63aaa05ee981306fa09f6133bde427"; + hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4="; }; - nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ libminc libjpeg nifticlib zlib ]; - propagatedBuildInputs = [ perl TextFormat ]; + nativeBuildInputs = [ + cmake + flex + bison + makeWrapper + ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" - "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; + buildInputs = [ + libminc + libjpeg + nifticlib + zlib + ]; + + propagatedBuildInputs = [ + perl + TextFormat + ]; + + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" + "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" + ]; postFixup = '' for prog in minccomplete minchistory mincpik; do @@ -31,6 +61,6 @@ stdenv.mkDerivation rec { description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.free; }; } diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b5f721c3d772..310f9b1c6067 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -39,7 +39,7 @@ , pcre2 , libdeflate -, swig4 +, swig , python , wxPython , opencascade-occt_7_6 @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { curl openssl boost - swig4 + swig python unixODBC libdeflate diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 0c929fe47c18..65bf094c2a2c 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , flex , git , python3 -, swig4 +, swig , boost179 , cbc # for clp , cimg @@ -51,7 +51,7 @@ mkDerivation rec { flex git pkg-config - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index c82aec00a703..93cd92863283 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -40,8 +40,8 @@ let source = if enablePlumed then { - version = "2023"; - hash = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; + version = "2024.2"; + hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs="; } else { @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patches = [ ./pkgconfig.patch ]; postPatch = lib.optionalString enablePlumed '' - plumed patch -p -e gromacs-2023 + plumed patch -p -e gromacs-${source.version} ''; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 72f21fd8e2a3..7f0122e56c06 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -49,6 +49,14 @@ let # "-P" CPPFLAG is needed to build Python bindings and subversionClient CPPFLAGS = [ "-P" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + "-Wno-int-conversion" + ]; + }; + preConfigure = lib.optionalString needsAutogen '' ./autogen.sh ''; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 158e1f38b32b..249b7b896201 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2023-12-08"; + version = "0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; - hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; + rev = "f1fdf10b17f394f2d42520d0e9bf22feaa20a9f4"; + hash = "sha256-cygLf+0PMH7cVXBcY12PdcxBHmy38DNoXQubKAlerHM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 4cd084de529c..7cbcdcfa914b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,7 +29,7 @@ , wrapGAppsHook3 , scriptingSupport ? true , luajit -, swig4 +, swig , python3 , alsaSupport ? stdenv.isLinux , alsa-lib @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 wrapQtAppsHook ] - ++ optional scriptingSupport swig4; + ++ optional scriptingSupport swig; buildInputs = [ curl diff --git a/pkgs/by-name/au/auto-changelog/package.nix b/pkgs/by-name/au/auto-changelog/package.nix index ba35a26d6e37..0add7c39c6c9 100644 --- a/pkgs/by-name/au/auto-changelog/package.nix +++ b/pkgs/by-name/au/auto-changelog/package.nix @@ -10,18 +10,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "auto-changelog"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cookpete"; repo = "auto-changelog"; rev = "v${finalAttrs.version}"; - hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; + hash = "sha256-ticQpDOQieLaWXfavDKIH0jSenRimp5QYeJy42BjpKw="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; + hash = "sha256-NGQbzogQi0XbeGd7fYNyw0i9Yo9j91CfeTdO7nhq4Yw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix index 4d651d5e700e..93673789fb8f 100644 --- a/pkgs/by-name/ba/babeltrace/package.nix +++ b/pkgs/by-name/ba/babeltrace/package.nix @@ -11,7 +11,7 @@ elfutils, enablePython ? false, pythonPackages ? null, - swig4, + swig, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals enablePython [ - swig4 + swig pythonPackages.setuptools ]; buildInputs = [ diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 4f051c5dca94..a347712c057b 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.13.2"; + version = "5.13.3"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-1SP0X1KcnVB/HQkbYBZqSmLS3LZYvylPOP4pWm7oFu4="; + hash = "sha256-LFiDyNuWbEAKU0Rl+n7ozxr5CM4NLphR2o9bYHw6xJY="; }; patches = [ ]; diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 9c39449704df..dda1eed048d0 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -30,7 +30,7 @@ #sundials, superscs, spral, - swig4, + swig, tinyxml-2, withUnfree ? false, }: @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { #sundials superscs spral - swig4 + swig tinyxml-2 ] ++ lib.optionals withUnfree [ diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 1d45df4f632e..5d2a68e4be26 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-BnDS1n1aIQh9HJZeZv0hR7vo2l6Kf9B/11fYFbb/cpQ="; + hash = "sha256-lYs8V/phdyM1kpcxBDS3vAjxFgGCaaOCdNHU3//dgDs="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 6da8005fed8a..d28d85c99a0c 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.125.1"; + version = "0.126.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-QlQ1TaS6iUXNVF5SXyBmbcIBQfD6R7nKjPeOjRuvSds="; + hash = "sha256-9HjZI3MQBI24Ut3CI2hMOlRtZExoJtMXfd/HmSSICx0="; }; - vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E="; + vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 5499a5e74270..86cb3cfe303c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -8,6 +8,8 @@ wrapGAppsHook3, v2ray-geoip, v2ray-domain-list-community, + copyDesktopItems, + makeDesktopItem, }: let pname = "clash-verge-rev"; @@ -101,7 +103,22 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 + copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "clash-verge"; + exec = "clash-verge"; + comment = "Clash Verge Rev"; + type = "Application"; + icon = "clash-verge"; + desktopName = "Clash Verge Rev"; + terminal = false; + categories = [ "Network" ]; + }) + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 24b319308919..c54695abf703 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -3,18 +3,24 @@ , fetchFromGitHub }: buildGoModule rec { pname = "cntb"; - version = "1.4.8"; + version = "1.4.12"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; - rev = version; - hash = "sha256-Cj1PO82JeztThFAHR4/8UyqKrodgxBqVDMDsun3iGDo="; + rev = "v${version}"; + hash = "sha256-clDIrZdvEy4oO0ZvqDNLJbr4Ij8D5dcyZPxey6zLV6Q="; }; subPackages = [ "." ]; - vendorHash = "sha256-4PhLUUtlnRh2dKkeVD7rZDDVP0eTDVAohvLLftQxQyE="; + vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg="; + + ldflags = [ + "-X contabo.com/cli/cntb/cmd.version=${src.rev}" + "-X contabo.com/cli/cntb/cmd.commit=${src.rev}" + "-X contabo.com/cli/cntb/cmd.date=1970-01-01T00:00:00Z" + ]; meta = with lib; { description = "CLI tool for managing your products from Contabo like VPS and VDS"; diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index dd730adc1308..0db16cdcd1f4 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -4,15 +4,16 @@ , fetchFromGitHub , nix-update-script , installShellFiles +, versionCheckHook }: let - version = "0.20.1"; + version = "0.21.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-0ndYFpfijuBSODdl5XJah6/avLE1Bf6OZ0p0KGRB3dw="; + hash = "sha256-MRmT7DqD6Tlej5Y/LVr++RcMjWlGA9xFe3FNYgxIPvM="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +21,7 @@ let src = gitSrc; - npmDepsHash = "sha256-BcYrZ95BLxKXQ4c1bHqNZKT9Tv4rAK72WSwrjhIsASY="; + npmDepsHash = "sha256-246xQz1eI3WmJxSrKe6Q/oUQtZMjpa4mYwOIqSukyo8="; dontNpmInstall = true; @@ -40,7 +41,7 @@ in buildGo123Module rec { src = gitSrc; - vendorHash = "sha256-BTJzhKf8aGHKbG0fdWVRWy0rFob9ZSTH45ME+4rdohU="; + vendorHash = "sha256-RUUDIPuCxV+JwPLNxLALEmRIJ68XSNPtfwchuAJJYn0="; CGO_ENABLED = 0; @@ -54,6 +55,8 @@ in buildGo123Module rec { subPackages = [ "cmd/glasskube" "cmd/package-operator" ]; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; preBuild = '' cp -r ${web-bundle}/bundle internal/web/root/static/bundle diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 5d097f13f5c6..dec42a99a488 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -49,13 +49,13 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${finalAttrs.version}"; - hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0="; + hash = "sha256-fM6dBxBC2b1/v+rfiP//QaAcTJmMtYPn4OUNwVqKhYk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix index 85fcc843ef0f..fbae6f89a7cd 100644 --- a/pkgs/by-name/ht/httping/package.nix +++ b/pkgs/by-name/ht/httping/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httping"; - version = "3.6"; + version = "4.1.0"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = "HTTPing"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-lDgQC3VzfcLqMOQSaRZ/znMamAAGYq/9C9bHgI4G7B8="; + hash = "sha256-JtsPtrj/ZineBokEytbkZdAfjVLTkiaNcGtKVJlKm38="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index e61aa25d1a2e..c1f81ee3f2f5 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -27,7 +27,7 @@ let in buildNpmPackage' rec { pname = "jellyfin-web"; - version = "10.9.10"; + version = "10.9.11"; src = assert version == jellyfin.version; @@ -35,10 +35,10 @@ buildNpmPackage' rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-6t/kCuMbSug1q1EdQFAMqf/sWa+LAO46OUG0FL84UiE="; + hash = "sha256-zt0Exx/4B5gqiN3fxvQuVh1MqRNNtJG6/G0/reqVHRc="; }; - npmDepsHash = "sha256-R4myooMkKdvOFvyNqKIlZ2GozNOkg8YNTvomkt4aRIU="; + npmDepsHash = "sha256-kQxfh8o8NBshKmmjQrLdxiOQK83LG+lxhZwzDkEJwEo="; npmBuildScript = [ "build:production" ]; diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 65182e433a67..9f3c78719cbb 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.9.10"; # ensure that jellyfin-web has matching version + version = "10.9.11"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "sha256-tkSQ7BKic/MD7xcvAPHeFb/RDz++KTLhmAzR4cv1q10="; + sha256 = "sha256-gZJIsNKXwhUUVgJh8vXuGSu9DEyrVY8NuIeyZHHQKN4="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index 8378a804fdcf..a9f89e967e26 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-Bq16UH4IUR7dU57bGHKq8P6JsjaB4arOJ4zFeNyxXSg="; + sha256 = "sha256-OZfsEk6sTTvwgAetjilSWbkfC1nMQnPH3oL0IeuqObA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index dbd6b7a08f77..3ff46c8b477b 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, scdoc -, systemd -, pango -, cairo -, gdk-pixbuf -, jq -, bash -, wayland -, wayland-scanner -, wayland-protocols -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + systemd, + pango, + cairo, + gdk-pixbuf, + jq, + bash, + wayland, + wayland-scanner, + wayland-protocols, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -30,8 +31,22 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ]; - buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-protocols + wrapGAppsHook3 + wayland-scanner + ]; + buildInputs = [ + systemd + pango + cairo + gdk-pixbuf + wayland + ]; mesonFlags = [ "-Dzsh-completions=true" @@ -40,15 +55,31 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq bash ]}" + --prefix PATH : "${ + lib.makeBinPath [ + systemd # for busctl + jq + bash + ] + }" ) ''; + postInstall = '' + mkdir -p $out/lib/systemd/user + substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \ + --replace-fail '/usr/bin' "$out/bin" + chmod 0644 $out/lib/systemd/user/mako.service + ''; + meta = { description = "Lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dywedir synthetica ]; + maintainers = with lib.maintainers; [ + dywedir + synthetica + ]; platforms = lib.platforms.linux; mainProgram = "mako"; }; diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index c93995188502..27cc4ecd5902 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -10,6 +10,7 @@ glib, glm, gtest, + json_c, libevdev, libglvnd, libnotify, @@ -26,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y="; + hash = "sha256-2OoMkD4ChNXzqqzdOvzYRL0UYU7Uecm5yTXCvG45jCI="; }; patches = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { boost glib glm + json_c libevdev libglvnd libnotify diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 1dce0beba51f..84a98183a047 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-0CWiSDE9DbkvfKq06DwufhQucaR80vEhQU+X5Lg0HWI="; + hash = "sha256-V4ppqHQjPkkRKHkDHzEr05vOyv3BhiLnYxEftIn08XU="; }; vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M="; diff --git a/pkgs/by-name/op/opencomposite-helper/package.nix b/pkgs/by-name/op/opencomposite-helper/package.nix deleted file mode 100644 index f19f5e868139..000000000000 --- a/pkgs/by-name/op/opencomposite-helper/package.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ writeShellApplication - -, monado -, opencomposite -}: -writeShellApplication { - name = "opencomposite-helper"; - text = '' - # Tell Proton to use OpenComposite instead of OpenVR - export VR_OVERRIDE=${opencomposite}/lib/opencomposite - # Help OpenComposite find the OpenXR runtime - export XR_RUNTIME_JSON=${monado}/share/openxr/1/openxr_monado.json - # Tell Steam Pressure Vessel to allow access to Monado - export PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/monado_comp_ipc - exec "$@" - ''; -} - diff --git a/pkgs/by-name/pi/picocom/lrzsz-path.patch b/pkgs/by-name/pi/picocom/lrzsz-path.patch new file mode 100644 index 000000000000..86e9759db2de --- /dev/null +++ b/pkgs/by-name/pi/picocom/lrzsz-path.patch @@ -0,0 +1,15 @@ +diff --git a/picocom.c b/picocom.c +index ba2f9bd666..d4df60f2d3 100644 +--- a/picocom.c ++++ b/picocom.c +@@ -243,8 +243,8 @@ + .send_cmd = "", + .receive_cmd = "", + #else +- .send_cmd = "sz -vv", +- .receive_cmd = "rz -vv -E", ++ .send_cmd = "@lrzsz@/bin/sz -vv", ++ .receive_cmd = "@lrzsz@/bin/rz -vv -E", + #endif + .imap = M_I_DFL, + .omap = M_O_DFL, diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix new file mode 100644 index 000000000000..9e9d1380558a --- /dev/null +++ b/pkgs/by-name/pi/picocom/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitLab, + replaceVars, + pkg-config, + go-md2man, + installShellFiles, + linenoise, + darwin, + lrzsz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "picocom"; + version = "2024-07"; + + src = fetchFromGitLab { + owner = "wsakernel"; + repo = "picocom"; + rev = finalAttrs.version; + hash = "sha256-cQoEfi75iltjeAm26NvXgfrL7d1Hm+1veQ4dVe0S1q8="; + }; + + patches = [ + ./use-system-linenoise.patch + (replaceVars ./lrzsz-path.patch { inherit lrzsz; }) + ]; + + nativeBuildInputs = [ + pkg-config + go-md2man + installShellFiles + ]; + + buildInputs = [ + linenoise + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + + makeFlags = [ + "HISTFILE=.cache/picocom_history" + "all" + "doc" + ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin picocom + installManPage picocom.1 + installShellCompletion --bash bash_completion/picocom + + runHook postInstall + ''; + + meta = { + description = "Minimal dumb-terminal emulation program"; + homepage = "https://gitlab.com/wsakernel/picocom"; + changelog = "https://gitlab.com/wsakernel/picocom/-/releases"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + mainProgram = "picocom"; + }; +}) diff --git a/pkgs/by-name/pi/picocom/use-system-linenoise.patch b/pkgs/by-name/pi/picocom/use-system-linenoise.patch new file mode 100644 index 000000000000..ee31a0d617cc --- /dev/null +++ b/pkgs/by-name/pi/picocom/use-system-linenoise.patch @@ -0,0 +1,30 @@ +diff --git a/Makefile b/Makefile +index 8fca24ee38..33b59b5b96 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,9 +39,9 @@ + ## Comment these out to disable "linenoise"-library support + HISTFILE = .picocom_history + CPPFLAGS += -DHISTFILE=\"$(HISTFILE)\" \ +- -DLINENOISE +-OBJS += linenoise-1.0/linenoise.o +-linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h ++ -DLINENOISE \ ++ $(shell pkg-config --cflags linenoise) ++LDFLAGS += $(shell pkg-config --libs linenoise) + + ## Comment this in to enable (force) custom baudrate support + ## even on systems not enabled by default. +diff --git a/picocom.c b/picocom.c +index 775ee9c3bb..ba2f9bd666 100644 +--- a/picocom.c ++++ b/picocom.c +@@ -48,7 +48,7 @@ + #include "split.h" + #include "term.h" + #ifdef LINENOISE +-#include "linenoise-1.0/linenoise.h" ++#include + #endif + + #include "custbaud.h" diff --git a/pkgs/by-name/si/single-file-cli/package.nix b/pkgs/by-name/si/single-file-cli/package.nix index 13da0e896d15..d6aa4d28a7d8 100644 --- a/pkgs/by-name/si/single-file-cli/package.nix +++ b/pkgs/by-name/si/single-file-cli/package.nix @@ -4,7 +4,6 @@ buildNpmPackage, fetchFromGitHub, chromium, - chromedriver, python3, }: buildNpmPackage { @@ -19,7 +18,7 @@ buildNpmPackage { }; npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM="; - nativeCheckInputs = [chromium chromedriver]; + nativeCheckInputs = [chromium]; doCheck = stdenv.isLinux; postBuild = '' @@ -34,8 +33,7 @@ buildNpmPackage { ./single-file \ --browser-headless \ - --web-driver-executable-path=chromedriver \ - --back-end=webdriver-chromium \ + --browser-executable-path chromium-browser\ http://127.0.0.1:8000 grep -F 'Page saved with SingleFile' 'Directory listing for'*.html diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index d40881045fbb..5abe3dff4154 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; rev = "refs/tags/v${version}"; - hash = "sha256-qc7WooUJQa0+tzoS0z0GPV3N3WGM1WQ4ewZj8zUWHZE="; + hash = "sha256-otsgMUdDp93J/ynquHDs6+oLh0CunyfqZwmcKXcXX0Q="; }; - cargoHash = "sha256-GYLJGkEI7AYUxuE57fGz4NM9hZ+Z73tq8wnOzANtwnM="; + cargoHash = "sha256-n3gqw4R8NZP8l2PmHWag+cBXlLx1GQPPADBmaYRTe6Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index dc738be669d9..cf3ca6f0639a 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -17,22 +17,22 @@ let pname = "spacedrive"; - version = "0.3.1"; + version = "0.4.2"; src = fetchurl { aarch64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; - hash = "sha256-9E7h03zJtH8b6khDcbBsB46iVWwl48s+GJuBMOmEre4="; + hash = "sha256-W0nFNmBgrypTj1Y6r6vstdL0UUaP9jTOH5RgAirwxsY="; }; x86_64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; - hash = "sha256-h+B7tc6jXJUFNEMhG6ZNch+grtgUeAzfa37BDoZ6M8Q="; + hash = "sha256-iX7aUs2k1fjOoDxkgXbePEYXYKFK3rGFlN9b0+gz378="; }; x86_64-linux = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb"; - hash = "sha256-E1mOODG4YzBc0TPZJmKgrt/c5hp5LwzLaYPl+J5dnkg="; + hash = "sha256-SbuL96xNEOPZ3Z5jd0gfJtNkUoEjO4W+P7K9mvyNmHA="; }; } .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 17749c01542b..524d761d7cbc 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.37.7"; + version = "2.38.3"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Sfh2dvqCsV5rl6SmfqV6icJrTcsJy89RibCIRrf2p0k="; + hash = "sha256-la0zNYWzsU49Z6OKTefocN3xzoyNceaPAzG+CAFKMPc="; }; - vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8="; + vendorHash = "sha256-BT/zmeNKr2pNBSCaRtT/Dxm3uCshd1j4IW0xU7b9Yz4="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index be087a9a62dc..ac9f9b2a55f8 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sshesame"; - version = "0.0.38"; + version = "0.0.39"; src = fetchFromGitHub { owner = "jaksi"; repo = "sshesame"; rev = "v${version}"; - hash = "sha256-CSoDUfbYSf+V7jHVqXGhLc6Mrluy+XbZKCs6IA8reIw="; + hash = "sha256-h0qvi90gbWm4LCL3FeipW8BKkbuUt0xGMTjaaeYadnE="; }; - vendorHash = "sha256-tfxqr1yDXE+ACCfAtZ0xePpB/xktfwJe/xPU8qAVz54="; + vendorHash = "sha256-1v+cNMr2jpLPfxusPsgnFN31DwuNntXuq3sDNpWL0Rg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index 1549d2c6e1c9..9f68a707bfca 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -11,35 +11,28 @@ xvfb-run, }: -let - # There are breaking changes between 6 and 7 - importlib-metadata_6 = python3Packages.importlib-metadata.overrideAttrs (_: rec { - version = "6.9.0"; - src = fetchPypi { - pname = "importlib_metadata"; - inherit version; - hash = "sha256-6Ky1I8M1qRgiZ04Um0bAOZ7E0yjE0fbknCc9pf8CAbk="; - }; - }); -in - python3Packages.buildPythonApplication rec { pname = "streamdeck-ui"; - version = "4.1.2"; + version = "4.1.3"; + pyproject = true; src = fetchFromGitHub { repo = "streamdeck-linux-gui"; owner = "streamdeck-linux-gui"; rev = "v${version}"; - hash = "sha256-CSsFPGnKVQUCND6YOA9kfO41KS85C57YL9LcrWlQRKo="; + hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "importlib-metadata" + "pillow" + ]; - pythonRelaxDeps = [ "pillow" ]; + build-system = [ + python3Packages.poetry-core + ]; nativeBuildInputs = [ - python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook wrapGAppsHook3 @@ -56,7 +49,7 @@ python3Packages.buildPythonApplication rec { pyside6 streamdeck xlib - importlib-metadata_6 + importlib-metadata evdev ] ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ]; @@ -128,6 +121,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { + changelog = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/releases/tag/v${version}"; description = "Linux compatible UI for the Elgato Stream Deck"; downloadPage = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/"; homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/"; diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 0ba3b727c949..f76f7cdbf0b4 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = "v${version}"; - hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; + hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; }; strictDeps = true; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/by-name/sw/swig/package.nix similarity index 85% rename from pkgs/development/tools/misc/swig/4.nix rename to pkgs/by-name/sw/swig/package.nix index bae53ad42f9d..1ccaf4fb13fe 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/by-name/sw/swig/package.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }: +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + libtool, + bison, + pcre2, +}: stdenv.mkDerivation (finalAttrs: { pname = "swig"; @@ -12,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: { }; PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; - nativeBuildInputs = [ autoconf automake libtool bison ]; + nativeBuildInputs = [ + autoconf + automake + libtool + bison + ]; buildInputs = [ pcre2 ]; configureFlags = [ "--without-tcl" ]; diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 49ca6562f59e..bce30922719d 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,20 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.23.2"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-wXBfrlb4i4G3Sm0SopvDVGcQ0/hRGtUdzUQYyUj8/Ps="; + hash = "sha256-HRwQ2IDTa3dlxTlToiwBvjxjQgD18rv/F5OIuG7FKG8="; }; pythonRelaxDeps = [ "defusedxml" "ijson" "sqlalchemy" + "xsdata" ]; build-system = with python3.pkgs; [ diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 2b44edfb7f40..9fef14edb33f 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-08-14"; + version = "4.0.0-unstable-2024-09-07"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "be80a123f1c47a9fdb6181e60a641778e14be2f7"; - hash = "sha256-c+DOYv3Eg31Fdt8qDBNYFPS/zuGInxJu2AsZqDExjPk="; + rev = "19e0dcb5d821df8948a96fef8be551f463fcf0d2"; + hash = "sha256-WfpoGEs2ki84HwE53Fh8CFiybJXZhaiP7m0sfx9Z1X4="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 2a6322cec899..cf65e6b1b568 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -8,10 +8,10 @@ in rebar3Relx rec { releaseType = "escript"; # The package name "elvis" is already taken pname = "elvis-erlang"; - version = "3.1.0"; + version = "3.2.5"; src = fetchFromGitHub { inherit owner repo; - sha256 = "u1KDoLLFQ+HdrLqUAbAFYOZhfpO0j/DfEQ7/ZD5RBDM="; + sha256 = "I0GgfNyozkrM1PRkIXwANr1lji4qZCtOQ/bBEgZc5gc="; rev = version; }; beamDeps = builtins.attrValues (import ./rebar-deps.nix { diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix index c8d6edcac4a9..a71d0e5d7714 100644 --- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }: +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: let self = packages // (overrides self packages); packages = with self; { diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix index 92d4c2dcc97f..84cdaee6a36a 100644 --- a/pkgs/development/compilers/gforth/swig.nix +++ b/pkgs/development/compilers/gforth/swig.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -## for updating to swig4, see +## for updating to SWIG 4, see ## https://github.com/GeraldWodni/swig/pull/6 (swig.overrideAttrs (old: { version = "3.0.9-forth"; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index fe5b432f8cf0..1c56e0f6f4c1 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -10,6 +10,7 @@ substituteAll, fetchFromGitHub, fetchpatch, + fetchpatch2, overrideCC, wrapCCWith, wrapBintoolsWith, @@ -606,9 +607,35 @@ let (_: _: { name = "resource-dir.patch"; }) ) { }; in - lib.optional (lib.versionOlder metadata.release_version "16") + lib.optionals (lib.versionOlder metadata.release_version "15") [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1"; + stripLen = 1; + hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1"; + stripLen = 1; + hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI="; + }) + ] + ++ lib.optionals (lib.versionOlder metadata.release_version "16") [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1"; + stripLen = 1; + hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1"; + stripLen = 1; + hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4="; + }) + # FIXME: do we need this after 15? (metadata.getVersionFile "lldb/procfs.patch") + ] ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch ++ lib.optional (lib.versionOlder metadata.release_version "14") ( metadata.getVersionFile "lldb/gnu-install-dirs.patch" diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 02cd334d0a70..65974e757c4b 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -5,8 +5,7 @@ , cmake , zlib , ncurses -, swig3 -, swig4 +, swig , which , libedit , libxml2 @@ -42,7 +41,6 @@ let name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode"; version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0"; }; - swig = if lib.versionAtLeast release_version "18" then swig4 else swig3; in stdenv.mkDerivation (rec { @@ -186,10 +184,7 @@ stdenv.mkDerivation (rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; - # llvm <10 never built on aarch64-darwin since first introduction in nixpkgs - broken = - (lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64) - || (((lib.versions.major release_version) == "13") && stdenv.isDarwin); + broken = lib.versionOlder release_version "14"; mainProgram = "lldb"; }; } // lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 31cbd298603a..d3e2017958fd 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -13,6 +13,7 @@ , python3Packages , git , fetchpatch +, fetchpatch2 , makeWrapper , gnumake , file @@ -302,6 +303,32 @@ in stdenv.mkDerivation { patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch} + for lldbPatch in ${lib.escapeShellArgs [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1"; + stripLen = 1; + hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1"; + stripLen = 1; + hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1"; + stripLen = 1; + hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1"; + stripLen = 1; + hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4="; + }) + ]}; do + patch -p1 -d llvm-project/lldb -i $lldbPatch + done + patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch} @@ -365,7 +392,7 @@ in stdenv.mkDerivation { ''; # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0' - hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs"; + hardeningDisable = lib.optional stdenv.isAarch64 "zerocallusedregs"; configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index 4bfefe1aeaa2..db4feeb9af66 100644 --- a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -13,7 +13,7 @@ diff --git a/GNUmakefile b/GNUmakefile # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -816,9 +811,8 @@ endif +@@ -848,9 +843,8 @@ endif wasmtest: $(GO) test ./tests/wasm @@ -24,15 +24,7 @@ diff --git a/GNUmakefile b/GNUmakefile @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -832,15 +826,11 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src -- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0 -- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus -- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 - @echo copying source files - @cp -p build/tinygo$(EXE) build/release/tinygo/bin +@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN ifneq ($(USE_SYSTEM_BINARYEN),1) @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin endif @@ -40,24 +32,16 @@ diff --git a/GNUmakefile b/GNUmakefile @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -891,16 +881,9 @@ endif - @cp -rp lib/wasi-libc/libc-top-half/musl/src/string build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src +@@ -927,8 +920,7 @@ endif @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot + @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit - @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins - @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins + @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins @cp -rp src build/release/tinygo/src @cp -rp targets build/release/tinygo/targets -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc - release: - tar -czf build/release.tar.gz -C build/release tinygo -- 2.37.2 diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 751da950005d..a32e516633a8 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,13 +28,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-ehXkYOMQz6zEmofK+3ajwxLK9vIRZava/F3Ki5jTzYo="; + hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step @@ -45,7 +45,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-rJ8AfJkIpxDkk+9Tf7ORnn7ueJB1kjJUBiLMDV5tias="; + vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs="; patches = [ ./0001-GNUmakefile.patch diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index aee4d65b7cfa..944ce621a08d 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -29,8 +29,6 @@ let hb = mkCoqDerivation { mlPlugin = true; - extraInstallFlags = [ "VFILES=structures.v" ]; - meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; @@ -41,6 +39,8 @@ hb.overrideAttrs (o: lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") - { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } + (if lib.versions.isGe "1.1.0" o.version || o.version == "dev" then + { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } + else + { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }) ) diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 9c5c8b8eda5d..737cb9345a4b 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -45,7 +45,7 @@ let # Start by wrapping Julia so it has access to Python and any other extra libs. # Also, prevent various packages (CondaPkg.jl, PythonCall.jl) from trying to do network calls. - juliaWrapped = runCommand "julia-${julia.version}-wrapped" { buildInputs = [makeWrapper]; inherit makeWrapperArgs; } '' + juliaWrapped = runCommand "julia-${julia.version}-wrapped" { nativeBuildInputs = [makeWrapper]; inherit makeWrapperArgs; } '' mkdir -p $out/bin makeWrapper ${julia}/bin/julia $out/bin/julia \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \ @@ -163,7 +163,7 @@ let in runCommand "julia-${julia.version}-env" { - buildInputs = [makeWrapper]; + nativeBuildInputs = [makeWrapper]; inherit julia; inherit juliaWrapped; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cacfb778c7bc..33afe0ea7c54 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -10,7 +10,7 @@ , libiconv , enablePython ? false , python ? null -, swig4 +, swig , expat , libuuid , openjpeg @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig4 python ]; + ] ++ lib.optionals enablePython [ swig python ]; disabledTests = [ # require networking: diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index d6c2a10edb8c..fa4bb1be6dd3 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -15,7 +15,7 @@ buildPackages, qtbase ? null, pythonSupport ? false, - swig4 ? null, + swig ? null, # only for passthru.tests libsForQt5, qt6Packages, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools python3.pkgs.wheel ncurses - swig4 + swig which ]; diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 42017e5e1718..a525a3da9a41 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , validatePkgConfig +, fixDarwinDylibNames }: stdenv.mkDerivation { @@ -15,7 +16,8 @@ stdenv.mkDerivation { hash = "sha256-GsrYg16gpjHkkmpCU3yGzqNS/buZl+JoWALLvwzmT4A="; }; - nativeBuildInputs = [ validatePkgConfig ]; + nativeBuildInputs = [ validatePkgConfig ] + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index c172fbf3139e..3381282f675b 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.29.0"; + version = "0.29.1"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-umseIESdiiefQReycc2W8gsurxlpFHfAgV0YdXl1hZE="; + hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 5e0b0cbdc04a..51c1f255c326 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { version = "2.5.15.0"; src = fetchFromGitHub { - owner = "OpenImageIO"; - repo = "oiio"; + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; rev = "v${version}"; hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; }; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 710d985ee346..febbf5114e58 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.38"; + version = "1.1.40"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-nM/c6fvjprQ5GQO4F13cOigi4xATgRTq+ebEwyv58gg="; + sha256 = "sha256-dKSQqiZtnxKj9arpxm9vwz8WzKBXh6y6vzZ9uHP7vX0="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/development/libraries/science/chemistry/plumed/default.nix index b70d2146b2da..643ee2bc228c 100644 --- a/pkgs/development/libraries/science/chemistry/plumed/default.nix +++ b/pkgs/development/libraries/science/chemistry/plumed/default.nix @@ -8,13 +8,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-68/ajM87ApEXUs4xPIq7Vfmzl7Ms4ck6jnjlIv7woMs="; + hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 8e7f2e26f7a3..b74a9899e495 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -14,7 +14,7 @@ , python , re2 , stdenv -, swig4 +, swig , unzip , zlib }: @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ensureNewerSourcesForZipFilesHook pkg-config python.pythonOnBuildForHost - swig4 + swig unzip ] ++ lib.optionals stdenv.isDarwin [ DarwinTools diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index fbdfd20441d9..c17064729f96 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, swig4 +, swig , lua , elastix , itk @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ elastix diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index f0e844360cca..e23285511afa 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; - hash = "sha256-U8uPrdCPUmDuV4M/wkiFZUgUOLx6jjTz4RTRLMnZ25o="; + hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0="; }; separateDebugInfo = true; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 252a61369feb..8d7f666056bc 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,7 +5,7 @@ }: buildDunePackage rec { - version = "3.13.1"; + version = "3.14"; pname = "containers"; minimalOCamlVersion = "4.08"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-jkXh/dBRotWXvA77M/+tm39qsCiBsH/HSs+Y9D9QCek="; + hash = "sha256-+r1zv7tfCS/dqnTSxpWSagTKVRauqgN6Np1Xa+aQT8k="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index c0ba327dd2fc..2a4f1ccd01ff 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -4,14 +4,14 @@ }: buildDunePackage rec { - version = "2.5"; + version = "2.6"; pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs="; + hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg="; }; buildInputs = [ lwt ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index da4efbbdbb38..b374d2e51930 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -18,7 +18,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.7.1"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,21 +27,21 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-c8zeKebS04bZS9pMIKAauaLPvRrWaGoDKbnF906tFzQ="; + hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov aioconsole --strict-markers --count 2 -vv" "" + ''; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov aioconsole --count 2" "" - ''; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -53,11 +53,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioconsole" ]; meta = with lib; { - changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; description = "Asynchronous console and interfaces for asyncio"; - mainProgram = "apython"; + changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; homepage = "https://github.com/vxgmichel/aioconsole"; license = licenses.gpl3Only; maintainers = with maintainers; [ catern ]; + mainProgram = "apython"; }; } diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix new file mode 100644 index 000000000000..1fec6b0ea116 --- /dev/null +++ b/pkgs/development/python-modules/aiostreammagic/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pythonOlder, + websockets, + yarl, +}: + +buildPythonPackage rec { + pname = "aiostreammagic"; + version = "2.2.5"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "noahhusby"; + repo = "aiostreammagic"; + rev = "refs/tags/${version}"; + hash = "sha256-fJiP16LvHuYlSkeq/SijWI8YEX8T4lGDJLAVvKplgHI="; + }; + + pythonRelaxDeps = [ "websockets" ]; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + websockets + yarl + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "aiostreammagic" ]; + + meta = { + description = "Module for interfacing with Cambridge Audio/Stream Magic compatible streamers"; + homepage = "https://github.com/noahhusby/aiostreammagic"; + changelog = "https://github.com/noahhusby/aiostreammagic/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index bdd5665f5922..62c537e8de7a 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -17,7 +17,6 @@ pytestCheckHook, pyyaml, setuptools, - setuptools-git-versioning, xyzservices, beautifulsoup4, channels, @@ -47,21 +46,21 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.5.0"; - format = "pyproject"; + version = "3.5.2"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k="; + hash = "sha256-A6VKZ9tne4iBg0JxxiCngbODrlk69cPqIUkWR1REDQc="; }; src_test = fetchFromGitHub { owner = "bokeh"; - repo = pname; + repo = "bokeh"; rev = "refs/tags/${version}"; - hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; + hash = "sha256-MAv+6bwc5f+jZasRDsYTJ/ir0i1pYCuwqPMumsYWvws="; }; patches = [ @@ -72,11 +71,16 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-git-versioning"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ colorama nodejs setuptools - setuptools-git-versioning ]; nativeCheckInputs = [ @@ -106,7 +110,7 @@ buildPythonPackage rec { typing-extensions ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 contourpy numpy diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 807c9c8acb91..4eae86bbbf46 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -11,21 +11,25 @@ pyarrow, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.25.0"; - format = "setuptools"; + version = "2.26.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg="; + pname = "google_cloud_bigquery_storage"; + inherit version; + hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core protobuf ] ++ google-api-core.optional-dependencies.grpc; @@ -57,10 +61,10 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Storage API API client library"; - mainProgram = "fixup_bigquery_storage_v1_keywords.py"; homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "fixup_bigquery_storage_v1_keywords.py"; }; } diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index ce11293d2d8e..386b240f6b1f 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.50.0"; + version = "2.51.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-xq8m4jM6RcVAJVGdP0cZhriZQmT73AEJDLlXo9rjaQg="; + hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 2e533b5ce9c4..34e3ab0ceae1 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.10.2"; + version = "5.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-ajcy7dGltN9Yp8XPGYpmDBHPnYmuEL1/nuEkTh9iF3E="; + hash = "sha256-6jiAOYf9eBjRMyQ9tvR3EWfnqk1MfYIUTm98Plnfkhg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 421f2ade417b..14527a19a43a 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.48.0"; + version = "3.49.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-spanner"; rev = "refs/tags/v${version}"; - hash = "sha256-QgLZQ0rgBEmYDAE16K84bSx4bFWJRviY1WqsVwKcO6w="; + hash = "sha256-KwANiuzVyqsz+KKTqNPM1WftuoMtUXRI8xbIdAzZF+s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index d13183bacf35..49d081c8efa6 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "google-i18n-address"; - version = "3.1.0"; - format = "pyproject"; + version = "3.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "mirumee"; repo = "google-i18n-address"; rev = "refs/tags/${version}"; - hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw="; + hash = "sha256-7RqS/+6zInlhWydJwp4xf2uGpfmSdiSwvJugpL8Mlpk="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,10 +32,10 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - mainProgram = "update-validation-files"; homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; maintainers = [ ]; + mainProgram = "update-validation-files"; }; } diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 59494d65f753..813798f0a37f 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-oxZZIfzPsGs2hhVRdWEvPhIR5JwTMAmO5VgEQHzBO90="; + hash = "sha256-s2GvtgDS3myCVwO8+jSJlo2FH7Od8d5WYjjxM1oroIo="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 187d5a8bbba4..bfd5beb329bf 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rSAKjb2qorvF8m0u59cH2aH97TU6D0vXUc6MfZ9EnGA="; + hash = "sha256-HAUXiCbauBH4yrWwoVTUKnoz2Lzd6fo9e0WC5Dw8A9s="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/lttng/default.nix b/pkgs/development/python-modules/lttng/default.nix index 735eb4408a32..521def0abf77 100644 --- a/pkgs/development/python-modules/lttng/default.nix +++ b/pkgs/development/python-modules/lttng/default.nix @@ -2,7 +2,7 @@ toPythonModule, python, lttng-tools, - swig4, + swig, }: toPythonModule ( @@ -15,7 +15,7 @@ toPythonModule ( { pname = "lttng"; - nativeBuildInputs = nativeBuildInputs ++ [ swig4 ]; + nativeBuildInputs = nativeBuildInputs ++ [ swig ]; configureFlags = configureFlags ++ [ "--enable-python-bindings" diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index 6f20b2234cff..f979e9b7510b 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.6.1"; + version = "14.7.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-9bnkpzHbYYrxVGPPdM1sWkk7IVvNd3GNJ/8CaYV52ko="; + hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index e5edee26e22d..93232d3816af 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "pygithub"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-ccAbn9x1r+wBIAK66ur8+2Op9ij09rQvHumq5Wh7TUU="; + hash = "sha256-VM3xxLa4MlR3vTpeOunsq4/bxZhuKXNKFZbFVul1cMw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix index 5700fd4523a6..b4fdeb938147 100644 --- a/pkgs/development/python-modules/pykcs11/default.nix +++ b/pkgs/development/python-modules/pykcs11/default.nix @@ -4,7 +4,7 @@ callPackage, fetchPypi, setuptools, - swig4, + swig, }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ swig4 ]; + nativeBuildInputs = [ swig ]; pypaBuildFlags = [ "--skip-dependency-check" ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1718cf91593e..f01fb4ca467e 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -15,7 +15,7 @@ libXmu, opencascade-occt, rapidjson, - swig4, + swig, }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ python diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index f241cd0a2968..e15a2a7a726d 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, pythonOlder, cmake, - swig4, + swig, elastix, itk, numpy, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - swig4 + swig scikit-build ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 43a223bdfd5e..abed46cc766e 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchPypi, - flit, + flit-core, click, tomli, }: buildPythonPackage rec { pname = "turnt"; - version = "1.11.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; + hash = "sha256-4K7cqGwKErGbZ+dxVa06v8aIfrpVLC293d29QT+vsBw="; }; - nativeBuildInputs = [ flit ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ click tomli ]; diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index ac2dc4d195fc..19a8b8ba0df7 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,29 +2,30 @@ lib, buildPythonPackage, fetchPypi, - future, mock, parameterized, pytestCheckHook, python-dateutil, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.8"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5SuJT8Mu/4MnAmTWb9TL5b0f0Hug2n70X5BhZME2vrw="; + hash = "sha256-VCB4ri/t7mlK3tsE2Bxu3Cd7h+10QDApQhB9hqC81EU="; }; - propagatedBuildInputs = [ - future + build-system = [ setuptools ]; + + dependencies = [ python-dateutil six ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 366f18f50266..72b28b4bbfc6 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.249"; + version = "3.2.251"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-xsb57uCPLzrqMA2T0rcbnmXlsioagFr0yc4wcRUubPI="; + hash = "sha256-PBv6e0Y9kT6KmM12jnhF+9QC17v5A/rbR/5KBDV6Ekc="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index f5b3e03f8609..f3cb1a9313e1 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "7.1.2"; + version = "7.3.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-Ax7UKkClYsoqxaR+tsQnTv6BFafl9SkY7MC4kYJNmwY="; + hash = "sha256-AdwJDRw+AY3F+ZDaKqn5YzAVyAzvrV+d1WTk8OJtUdk="; }; - vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; + vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY="; preBuild = '' rm -r warn/docs diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix index 4b398629cab1..5663782852c1 100644 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ec2-metadata-mock"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${version}"; - sha256 = "sha256-hYyJtkwAzweH8boUY3vrvy6Ug+Ier5f6fvR52R+Di8o="; + sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y="; }; - vendorHash = "sha256-T45abGVoiwxAEO60aPH3hUqiH6ON3aRhkrOFcOi+Bm8="; + vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c="; postInstall = '' mv $out/bin/{cmd,ec2-metadata-mock} diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 8dabb8a23969..cfe12b41d3aa 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.13.4"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; rev = "refs/tags/v${version}"; - hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw="; + hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E="; }; build-system = with python3Packages; [ @@ -44,8 +44,9 @@ python3Packages.buildPythonApplication rec { with python3Packages; [ ipython - pytestCheckHook pytest-cov # fix Unknown pytest.mark.no_cover + pytest-textual-snapshot + pytestCheckHook ] ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 29e90c031cb7..a7a923a6d484 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -102,7 +102,6 @@ lib.listToAttrs ( "aarch64" "riscv" "ppc64" - "nds32le" ] ) diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix deleted file mode 100644 index 4b266044ff84..000000000000 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: - -stdenv.mkDerivation rec { - pname = "swig"; - version = "3.0.12"; - - src = fetchFromGitHub { - owner = "swig"; - repo = "swig"; - rev = "rel-${version}"; - sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; - }; - - PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ pcre ]; - - configureFlags = [ "--without-tcl" ]; - - # Disable ccache documentation as it needs yodl - postPatch = '' - sed -i '/man1/d' CCache/Makefile.in - ''; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - description = "Interface compiler that connects C/C++ code to higher-level languages"; - homepage = "https://swig.org/"; - # Different types of licenses available: http://www.swig.org/Release/LICENSE . - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 778fa66e5ee8..89419379239f 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.9.0"; - hash = "sha256-ekJh5Q2aRNkkC69snW4QCJ3PCnnQAH8qJphaaScyQXc="; + version = "9.10.0"; + hash = "sha256-NVqKuNu2rUG+++85vE/Wtd+F4Sdh0nJL0B8T6HjeSxM"; }; }; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 7e5f1e496522..65b4516d3b2b 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/checkpolicy-${version}.tar.gz"; - sha256 = "sha256-GzRrPN1PinihV2J7rWSjs0ecZ7ahnRXm1chpRiDq28E="; + sha256 = "sha256-/T4ZJUd9SZRtERaThmGvRMH4bw1oFGb9nwLqoGACoH8="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index fa22ed3bc3bd..cf322e59bdc8 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.48"; - hash = "sha256-Ayuq4qKWu/wgG3wiMNrgkcc6BNSUReqileNx4vYMtak="; + version = "6.6.50"; + hash = "sha256-NaAJMsOlN1T/KfE2lbQdeoS/B9l2YdVMDdmrN9HygHw="; }; main = { - version = "6.10.7"; - hash = "sha256-I2gtxaANJBmUlko7I9x1izLTyCBMqvUW/1Qx3a0H4uU="; + version = "6.10.9"; + hash = "sha256-hzSWeyJF2JeP12M1PP+CgcFKMahjTw4pE7PcAuozksw="; }; }; diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 267f1ed38aaa..be7ed60083ed 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-Ab/f6n2n24mLsWS4WF6jOBt9m7dyeSP0ftYixKANsjY="; + hash = "sha256-eada2xQlzB1kknwitwxZhFiv6myTbtYHHFkQtppa0tc="; }; - cargoHash = "sha256-CNHDZHyg4jrEl3hmdQ7ITCtg9iTmB2RwDAzqSirOCO4="; + cargoHash = "sha256-juT3trREV7LmjBz+x7Od4XoTGuL1XRhknbU4Nopg2HU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 254729a31762..e6f3ea5f1685 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-b0y3EKcYWt3cH79HvHnpiHt18ZbRf9lEsfKTZO0dHME="; + hash = "sha256-TR2hd8TdWA2zSyalxBaqqdcK6FO2CovqddF8mvvyb1U="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 2bb2b56168b8..95d1c36b467f 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -8,18 +8,18 @@ unstableGitUpdater, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nu-plugin-net"; - version = "0-unstable-2024-04-05"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - rev = "60d315afb19c3c673409db796a4cc7a240058605"; - hash = "sha256-izIxV2rFxZ1Om6NNaofNpc5prtN/lsw8dC4DyKEQ+v8="; + rev = "refs/tags/${version}"; + hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I="; }; - cargoHash = "sha256-nBxcxADyvPgGrfkW8eBq/wmB2Slq+YGJV2IlxuuCgCg="; + cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 0ad07bae9fd9..4b969c11ba78 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-06-03"; + version = "0-unstable-2024-07-25"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "67548a31c45f93d8b25ee553c5969d6a6d5d9408"; - sha256 = "sha256-yCyBha7i2rxYjEDRYdg8QI7raCEkOPT0Tc8dzSamsmc="; + rev = "122a3f239ed2f24271eb61b9aa3060fa06b820ac"; + sha256 = "sha256-tUb4YeYXFWpxV4GONoxo2QwRqbBemqm2sFP6jkoiBWA="; }; cmakeFlags = [ diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 8740c273eef3..e65f9a20989b 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; mesonFlags = [ - "-Dbash-completions=true" + (lib.mesonBool "bash-completions" true) + (lib.mesonBool "zsh-completions" true) (lib.mesonBool "gtk-doc" withDocs) ]; diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 3fdfa10907a9..66505d82b7ec 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-SrkRPDyASXpUAKapwcfaJSlUJBcVNtYZltdPzuhpvYM="; + sha256 = "sha256-EqSzveqLb0Ms7D5Pczoh0BuKD1sILzAbJMnDLacokl4="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 446af9107754..c22dfdb14865 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -40,14 +40,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.136"; + version = "1.0.137"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; - repo = pname; + repo = "debootstrap"; rev = "refs/tags/${version}"; - hash = "sha256-hUXOUIUSANXS1a65AA30jZ3J444Xb2klu3m8x0QJfns="; + hash = "sha256-l4vdojsrHAJsa8RwZezH3uI6pWJHK/PBs+YZCtnpXnQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix index 6b092b35be8c..9ef8b525584f 100644 --- a/pkgs/tools/misc/flitter/default.nix +++ b/pkgs/tools/misc/flitter/default.nix @@ -1,55 +1,32 @@ { lib -, ocamlPackages +, stdenv +, rustPlatform , fetchFromGitHub -, makeWrapper -, python3 +, pkg-config +, xorg }: -ocamlPackages.buildDunePackage { +rustPlatform.buildRustPackage rec { pname = "flitter"; - # request to tag releases: https://github.com/alexozer/flitter/issues/34 - version = "unstable-2020-10-05"; - - duneVersion = "3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "alexozer"; repo = "flitter"; - rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; - sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + rev = "v${version}"; + sha256 = "sha256-XyHUUuENnGmIUlfYl7+NuSP115+sZfjXtd4bEIZQpf8="; }; - # compatibility with core >= 0.15 - patches = [ ./flitter.patch ]; - - # https://github.com/alexozer/flitter/issues/28 - postPatch = '' - for f in src/*.ml; do - substituteInPlace "$f" \ - --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' \ - --replace 'Core_kernel' 'Core' \ - --replace 'sexp_option' 'option[@sexp.option]' \ - --replace 'sexp_list' 'list[@sexp.list]' - done - ''; + cargoHash = "sha256-ydYBHC/LxdYGA1+eYLTSZdkOhAgkw99J9JVT5micgdg="; nativeBuildInputs = [ - makeWrapper + pkg-config ]; - buildInputs = with ocamlPackages; [ - core_unix - lwt_ppx - sexp_pretty - color - notty + buildInputs = [ + xorg.libX11 ]; - postInstall = '' - wrapProgram $out/bin/flitter \ - --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" - ''; - meta = with lib; { description = "Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; license = licenses.mit; @@ -57,5 +34,6 @@ ocamlPackages.buildDunePackage { homepage = "https://github.com/alexozer/flitter"; platforms = platforms.unix; mainProgram = "flitter"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/flitter/flitter.patch b/pkgs/tools/misc/flitter/flitter.patch deleted file mode 100644 index 04cd40dc74e5..000000000000 --- a/pkgs/tools/misc/flitter/flitter.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/big.ml b/src/big.ml -index 7cd327f..f84bc10 100644 ---- a/src/big.ml -+++ b/src/big.ml -@@ -11,7 +11,7 @@ let big_font_map = - ] in - - let uchar_of_char = -- let open Caml.Uchar in -+ let open Stdlib.Uchar in - function - | '[' -> of_int 0x258C - | ']' -> of_int 0x2590 -@@ -48,4 +48,4 @@ let image_of_string attr str = - List.map (String.to_list str) ~f:(fun ch -> - List.map (Map.find_exn big_font_map ch) ~f:(I.uchars attr) - |> I.vcat -- ) |> I.hcat -\ No newline at end of file -+ ) |> I.hcat -diff --git a/src/display.ml b/src/display.ml -index bd6f7e4..44d7f6d 100644 ---- a/src/display.ml -+++ b/src/display.ml -@@ -41,7 +41,7 @@ let splits_header timer width = - let joined = I.hcat cell_padded in - let padded = left_pad width joined in - -- let br = I.uchar Colors.label (Caml.Uchar.of_int 0x2500) width 1 in -+ let br = I.uchar Colors.label (Stdlib.Uchar.of_int 0x2500) width 1 in - I.(padded <-> br) - - type time_status = Ahead_gain | Ahead_loss | Behind_gain | Behind_loss | Gold -diff --git a/src/dune b/src/dune -index a50b09a..2b00ee2 100644 ---- a/src/dune -+++ b/src/dune -@@ -1,7 +1,7 @@ - (library - (name flitter) - (wrapped false) -- (libraries core lwt.unix notty notty.unix re color sexp_pretty) -+ (libraries core core_kernel.caml_unix lwt.unix notty notty.unix re color sexp_pretty) - (preprocess (pps lwt_ppx ppx_sexp_conv)) - ) - diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 648126154d37..017fd1a015d7 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.104.0"; + version = "0.109.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-M0aNobj5h2NcliNDI2TjyV6xcd8m0MK6Cv9bf2d0d9g="; + hash = "sha256-ROAapCGIRD5kdA3k1LjSxdfICLRgBcQORe6wW1bszNI="; }; - # proxy vendor to avoid hash missmatches between linux and macOS + # proxy vendor to avoid hash mismatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-VTV6xgGWHc+H7eX1q2bYIS+YQxTvErf6+d8PNucUPkw="; + vendorHash = "sha256-4MRXwp428d9oJPHrgOaGCaIFpRAIOpL/AYc/fLPAVBk="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index f372d705491f..f437590936e2 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.103.0"; + version = "0.109.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-xmsxr1A0/kyWXLNVZglZy8K7ieZT1GS4lGqsSrUkttI="; + hash = "sha256-ShVUBohSnIoeq2aTWJ9IMXKt0CeRv3CZjlqpYHR9DhY="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-1NDGfzg/60VJNrWkMtGS2t3Cv1CXSguR1qLp4mqF1UM="; + vendorHash = "sha256-rXC4lm2ZvO3k6h1ZiYB+FskhW0c2uJyPLZg6n125MZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 4b9a9bdf04c1..de771e9e86a5 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "pazi"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "euank"; repo = pname; rev = "v${version}"; - sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8"; + sha256 = "sha256-PDgk6VQ/J9vkFJ0N+BH9LqHOXRYM+a+WhRz8QeLZGiM="; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-TJbwLbmexu/PLhKPJl7DttZz/WbEJNJerQimUMqlVcU="; + cargoHash = "sha256-7ChHYcyzRPFkZ+zh9lBOHcOizDvJf2cp9ULoI7Ofmqk="; + + postInstall = '' + installManPage packaging/man/pazi.1 + ''; meta = with lib; { description = "Autojump \"zap to directory\" helper"; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix deleted file mode 100644 index d8422e3679fd..000000000000 --- a/pkgs/tools/misc/picocom/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, installShellFiles -, lrzsz -, IOKit -}: - -stdenv.mkDerivation rec { - pname = "picocom"; - # last tagged release is 3.1 but 3.2 is still considered a release - version = "3.2a"; - - # upstream is quiet as the original author is no longer active since March 2018 - src = fetchFromGitHub { - owner = "npat-efault"; - repo = "picocom"; - rev = "1acf1ddabaf3576b4023c4f6f09c5a3e4b086fb8"; - sha256 = "sha256-cs2bxqZfTbnY5d+VJ257C5hssaFvYup3tBKz68ROnAo="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace '.picocom_history' '.cache/picocom_history' - - substituteInPlace picocom.c \ - --replace '"rz -vv -E"' '"${lrzsz}/bin/rz -vv -E"' \ - --replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"' - ''; - - enableParallelBuilding = true; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optional stdenv.isDarwin IOKit; - - installPhase = '' - install -Dm555 -t $out/bin picocom - installManPage picocom.1 - installShellCompletion --bash bash_completion/picocom - ''; - - meta = with lib; { - description = "Minimal dumb-terminal emulation program"; - homepage = "https://github.com/npat-efault/picocom/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - mainProgram = "picocom"; - }; -} diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index cccb112ec3ba..a2ea2b5dab49 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.15.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-4/Qt0Fh+YzG/PymMyT/0Yedsy+u+03MswDh9Z9QJynQ="; + hash = "sha256-xfoYUcnCwrJ3SM+Xr+dsf4NnisN5K4UehT9T2US5p/s="; }; - vendorHash = "sha256-kOLeaEKtpI3l0qLphRTnm27Ms63ID4LJ6VkUHJzGAcc="; + vendorHash = "sha256-TZDQCvcwsCa08bBBb8Zs8W0OFDYb+ZWN85+VCelFgyc="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 5939c752dbde..c9b359cb3a2e 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tlby/netmask"; description = "IP address formatting tool"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; mainProgram = "netmask"; }; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index da046f8afcea..b0b7bc82e0d8 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-9gBrFudzn75rzx7bTPgr+zzUpX2cLHOmE12xFtoH1eA="; + sha256 = "sha256-0tMGTKcuvyDE5281nGCvZKYJKIEAU01G6vV8Fnt/1ZQ="; }; - cargoHash = "sha256-/f67AhaNLHS/3veAzNZwYujMMM/Vmq/U4MHNHvfRoBE="; + cargoHash = "sha256-5KV2VDsPmSgrdZIqCuQ5gjgCVs/Ki6uG6GTwjmtKLlQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index 4d8f347e048a..7f8d931fbb6a 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig4, bison, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig, bison, cmake, python3 }: stdenv.mkDerivation rec { pname = "grap"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmake flex python3 - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 381e13530bee..7f65e0119f3e 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.19.2"; + version = "1.19.8"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3CmbxLWRz6fvnk3ieNq65ph/zN91/8q1y9rYcnWf0II="; + hash = "sha256-+fg482jVMc9IDH0MKSbXaU44QXH/wdjXbztqKNqJjbs="; }; - vendorHash = "sha256-Hk7dkhb1GiCY9CkKZ1dMQc+s97VRUli7WAoneJVNK08="; + vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index d45a45a880a6..43e791377b25 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.81.10"; + version = "3.82.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-U2HKrOk6+QO3QhDTDXpx3eWIsikfkuFTOQWcqbtj1qE="; + hash = "sha256-NHSRUHp6sb+1HE9UvcxMrWdlQROj2FXQEA+0irQJKiU="; }; - vendorHash = "sha256-9AY0Dzn29GbWveb5HGWpKHkW9LCglPUzlX9wyQmj+FM="; + vendorHash = "sha256-+XXLoLPtsEkxVfycpAovvd9UO9J6E7PUjyYZCBVHSAo="; proxyVendor = true; diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index d729f0a3e797..57664295d1c0 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "openseachest"; - version = "23.12"; + version = "24.08"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - hash = "sha256-2snxruIC/93+yI7g/9cCXcms8FaoXnoyWq9py8GTwrs="; + hash = "sha256-g5zCPlqK2AmGvPFqxEeSsZfDf4ksMYdIvJ+1PuuauL8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 9a00c7d163dc..d3f7dd2af922 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-SWLXY7SsoeJFr2RLOtVSnt5Knx44+9hNIy50NzN602k="; + hash = "sha256-5aQwXNtGAZuVwOpX700VVFTxM/kxOT6c1NtpJR4s1xQ="; }; - vendorHash = "sha256-74El20C7kE0lLAng9wQL7MnfcJLtPR2cAk00CuO4NlY="; + vendorHash = "sha256-Wj3wthDMNkuWVWFIqRsVUeJfoUvjyyu2gCvFBjh8mGw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9c7df2a52020..1346bff8b73d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1122,6 +1122,7 @@ mapAliases ({ openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 + opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 @@ -1482,6 +1483,9 @@ mapAliases ({ swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 + swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 + swig4 = swig; # Added 2024-09-12 + swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 swtpm-tpm2 = swtpm; # Added 2021-02-26 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36abab291058..3ae9bbdcb7c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18953,11 +18953,6 @@ with pkgs; systemfd = callPackage ../development/tools/systemfd { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; - swig4 = callPackage ../development/tools/misc/swig/4.nix { }; - swig = swig4; - swigWithJava = swig; - c2ffi = callPackage ../development/tools/misc/c2ffi { }; c0 = callPackage ../development/compilers/c0 { @@ -32025,9 +32020,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openmm = callPackage ../development/libraries/science/chemistry/openmm { - swig = swig4; - }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -32587,10 +32580,6 @@ with pkgs; picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - picoloop = callPackage ../applications/audio/picoloop { }; picosnitch = callPackage ../tools/networking/picosnitch { }; @@ -33001,11 +32990,7 @@ with pkgs; rke = callPackage ../applications/networking/cluster/rke { }; - inherit (callPackage ../applications/networking/cluster/rke2 { - buildGoModule = buildGo121Module; - go = go_1_21; - }) rke2_stable; - inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_latest rke2_testing; + inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_stable rke2_latest rke2_testing; rke2 = rke2_stable; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -37632,9 +37617,6 @@ with pkgs; faiss = callPackage ../development/libraries/science/math/faiss { pythonPackages = python3Packages; - # faiss wants the "-doxygen" option - # available only since swig4 - swig = swig4; }; faissWithCuda = faiss.override { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32e9eca5c43a..ba005105d482 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -443,6 +443,8 @@ self: super: with self; { aiostream = callPackage ../development/python-modules/aiostream { }; + aiostreammagic = callPackage ../development/python-modules/aiostreammagic { }; + aioswitcher = callPackage ../development/python-modules/aioswitcher { }; aiosyncthing = callPackage ../development/python-modules/aiosyncthing { };