diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-14 18:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 18:01:14 +0000 |
| commit | 52e165035c897a7b41ff26bc235f8d841e9d3850 (patch) | |
| tree | b167328df746ac6624fdce50ae06e2aa9be78c6a | |
| parent | 8d853d2c3a1e13d18309a61267471ace13bb8035 (diff) | |
| parent | f74d88a6f19ec8c29bff5cc9e42ee5ec4e0e70f6 (diff) | |
| download | nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar.gz nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar.bz2 nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar.lz nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar.xz nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.tar.zst nixlib-52e165035c897a7b41ff26bc235f8d841e9d3850.zip | |
Merge master into staging-next
80 files changed, 435 insertions, 484 deletions
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 287d93c82cad..45a9e9e2a689 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -23,7 +23,7 @@ in enablePlasmaBrowserIntegration = mkEnableOption (lib.mdDoc "Native Messaging Host for Plasma Browser Integration"); - plasmaBrowserIntegrationPackage = mkPackageOption pkgs "plasma5Packages.plasma-browser-integration" { }; + plasmaBrowserIntegrationPackage = mkPackageOption pkgs [ "plasma5Packages" "plasma-browser-integration" ] { }; extensions = mkOption { type = with types; nullOr (listOf str); diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix index 3133804f485f..f96760e92c57 100644 --- a/nixos/modules/services/hardware/brltty.nix +++ b/nixos/modules/services/hardware/brltty.nix @@ -34,6 +34,7 @@ in { users.users.brltty = { description = "BRLTTY daemon user"; group = "brltty"; + isSystemUser = true; }; users.groups = { brltty = { }; diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 67d8171587bb..c4d4c6791a21 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -12,6 +12,7 @@ let inherit (cfg) verbose temp + turbo ; # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: # @@ -105,6 +106,14 @@ in ''; }; + turbo = mkOption { + type = types.nullOr types.int; + default = null; + description = lib.mdDoc '' + Changes the Intel Turbo feature status (1 is disabled and 0 is enabled). + ''; + }; + p1.limit = mkOption { type = with types; nullOr int; default = null; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 00482e59acf3..40542155ed63 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -909,7 +909,7 @@ in { in { settings = { ssid = bssCfg.ssid; - utf8_ssid = bssCfg.ssid; + utf8_ssid = bssCfg.utf8Ssid; logger_syslog = mkDefault (-1); logger_syslog_level = bssCfg.logLevel; diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index db4d2f7f0ba0..a44cac93d5f6 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -133,9 +133,6 @@ in "ipsec.d/01-nixos.conf".source = configFile; } // policyFiles; - # Create NSS database directory - systemd.tmpfiles.rules = [ "d /var/lib/ipsec/nss 755 root root -" ]; - systemd.services.ipsec = { description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; wantedBy = [ "multi-user.target" ]; @@ -153,6 +150,10 @@ in echo 0 | tee /proc/sys/net/ipv4/conf/*/send_redirects echo 0 | tee /proc/sys/net/ipv{4,6}/conf/*/accept_redirects ''; + serviceConfig = { + StateDirectory = "ipsec/nss"; + StateDirectoryMode = 0700; + }; }; }; diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix index 48741aa41d85..e3cb5cc3be2b 100644 --- a/nixos/modules/services/x11/window-managers/icewm.nix +++ b/nixos/modules/services/x11/window-managers/icewm.nix @@ -17,7 +17,7 @@ in { name = "icewm"; start = '' - ${pkgs.icewm}/bin/icewm & + ${pkgs.icewm}/bin/icewm-session & waitPID=$! ''; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index e990aeea7a14..8f3f3612805f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -621,6 +621,11 @@ in path the secret should have inside the initrd, the value is the path it should be copied from (or null for the same path inside and out). + + Note that `nixos-rebuild switch` will generate the initrd + also for past generations, so if secrets are moved or deleted + you will also have to garbage collect the generations that + use those secrets. ''; example = literalExpression '' diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 3c6d807714bf..e4c9272ba2f8 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.92"; - pyproject= true; + version = "2.0.93"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tt2D8pjU/SClweAn9vHYl+H1POdB1u2SQfrnZZvBQ7I="; + hash = "sha256-A34GY7uhkHcrofjeFzK3l/Uzr+aoQQ5JERK+HUhoosM="; }; pythonRelaxDeps = true; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 2e793df95efa..474088572883 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2024-01-02"; + version = "unstable-2024-02-11"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "ede555c4c6e5f198659a979b85c69294d148c8f3"; - hash = "sha256-G2SPzMAfJK3mOUJ+odmaugMoAyIAU1J6OXk25J/oXI0="; + rev = "fc6ffb3bbbae9224316e2a888db08ef56608966a"; + hash = "sha256-V1SW8OyuBKLbUoQ4O5iiS4mq3MOXidcVKpiw125vxjQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/soundux/default.nix b/pkgs/applications/audio/soundux/default.nix deleted file mode 100644 index ea9ea3322b55..000000000000 --- a/pkgs/applications/audio/soundux/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, makeBinaryWrapper -, pipewire -, libpulseaudio -, libappindicator -, libstartup_notification -, openssl -, libwnck -, pcre -, util-linux -, libselinux -, libsepol -, libthai -, libdatrie -, xorg -, libxkbcommon -, libepoxy -, dbus -, at-spi2-core -, nlohmann_json -, fancypp -, httplib -, semver-cpp -, webkitgtk -, yt-dlp -, ffmpeg -, lsb-release -}: - -stdenv.mkDerivation rec { - pname = "soundux"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "Soundux"; - repo = "Soundux"; - rev = version; - sha256 = "sha256-aSCsg6nJt6F+6O7UeXnvYva0vllTfsxK/cjaeOhObZY="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeBinaryWrapper - ]; - - buildInputs = [ - pipewire - libpulseaudio - libappindicator - openssl - libwnck - pcre - util-linux - libselinux - libsepol - libthai - libdatrie - xorg.libXdmcp - xorg.libXtst - xorg.libXres - libxkbcommon - libepoxy - dbus - at-spi2-core - nlohmann_json - fancypp - httplib - semver-cpp - libstartup_notification - webkitgtk - yt-dlp - ffmpeg - ]; - - postPatch = '' - # cannot be overwritten with variables - substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_INSTALL_PREFIX \"/opt/soundux\" CACHE PATH \"Install path prefix, prepended onto install directories.\" FORCE)" "" \ - --replace "/usr/share" "$out/usr/share" - substituteInPlace src/ui/impl/webview/webview.cpp \ - --replace "/usr/share/pixmaps/soundux.png" "$out/share/pixmaps/soundux.png" - ''; - - # We need to append /opt to our CMAKE_INSTALL_PREFIX - dontAddPrefix = true; - - preConfigure = '' - # This needs to be set in preConfigure to access the $prefix variable - export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags" - - # Replace some fetched submodules with symlinks nix packages. - rm -rf \ - lib/json \ - lib/fancypp \ - lib/lib-httplib \ - lib/semver - - ln -s ${nlohmann_json} lib/json - ln -s ${fancypp} lib/fancypp - ln -s ${httplib} lib/lib-httplib - ln -s ${semver-cpp} lib/semver - ''; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - - # Somehow some of the install destination paths in the build system still - # gets transformed to point to /var/empty/share, even though they are at least - # relative to the nix output directory with our earlier patching. - postInstall = '' - mv "$out/var/empty/share" "$out" - rm -rf "$out/var" - mkdir "$out/bin" - ln -s "$out/opt/soundux" "$out/bin" - substituteInPlace "$out/share/applications/soundux.desktop" \ - --replace "/opt/soundux/soundux" "soundux" - ''; - - postFixup = let - rpaths = lib.makeLibraryPath [libwnck pipewire libpulseaudio]; - in '' - # Wnck, PipeWire, and PulseAudio are dlopen-ed by Soundux, so they do - # not end up on the RPATH during the build process. - patchelf --add-rpath "${rpaths}" "$out/opt/soundux-${version}" - - # Work around upstream bug https://github.com/Soundux/Soundux/issues/435 - wrapProgram "$out/bin/soundux" \ - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ - --prefix PATH : ${lib.makeBinPath [ yt-dlp ffmpeg lsb-release ]} \ - ''; - - meta = with lib; { - description = "A cross-platform soundboard."; - homepage = "https://soundux.rocks/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ aidalgol ]; - }; -} diff --git a/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch b/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch deleted file mode 100644 index 8cafd9c3e2e6..000000000000 --- a/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b26a91fd0f70e8f0a8f3360a5f371a1eace70002 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Sun, 16 Apr 2023 22:10:55 +0800 -Subject: [PATCH] fix build with qt 6.5 - -The fix is borrowed from https://github.com/hluk/CopyQ/pull/2324 ---- - src/scripting/Script.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scripting/Script.cpp b/src/scripting/Script.cpp -index 3437f125..906eefde 100644 ---- a/src/scripting/Script.cpp -+++ b/src/scripting/Script.cpp -@@ -352,7 +352,7 @@ Script::MethodResult Script::doCallMethod(QObject * obj, const QString& name, - } - else if (typeName == QString::fromLatin1("QVariant")) { - // QMetaType can't construct QVariant objects -- retValArg = Q_RETURN_ARG(QVariant, result); -+ retValArg = QGenericReturnArgument("QVariant", static_cast<void*>(result.data())); - } - else { - // Note: These two lines are a hack! --- -2.39.2 - diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 315db4115900..4ddd4c9cb6c1 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -14,17 +14,15 @@ stdenv.mkDerivation rec { pname = "texworks"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ="; + sha256 = "sha256-G8TVTVQPELyE6H9a6gWSyWHi653TWzUoaRdlfPnngM0="; }; - patches = [ ./0001-fix-build-with-qt-6.5.patch ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index fdabc61aeb46..bad0fce09aa4 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tjxsJv5w0Rvk2XYisncytcRdZLRnOSDJmNJN4kkzr7U="; + hash = "sha256-plJ2iKloRGtBSa1upSo675bMj6qczR6TQ043UQboxQE="; }; buildInputs = [ libcap acl file readline python3]; diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index c52d729f9b51..3ba27e66e66f 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo="; + sha256 = "iPGvCJz2iywpSePBZ3c8OiccKfwaGAToGaJfRhruUPk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 7514c80e602b..dad61b88d4ff 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, bash , fetchFromGitHub , SDL2 , alsa-lib @@ -163,6 +164,11 @@ stdenv.mkDerivation (finalAttrs: { "wireplumber" = wireplumberSupport; }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + postPatch = '' + substituteInPlace include/util/command.hpp \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + ''; + preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 9b34dfcd888b..cf52f6d948ea 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-4n+20EZvj1cCJTZFSYTpOeArVKvpz4+U1qYxaqWXBSc="; + sha256 = "sha256-/o0UzjIUlRP936YG7fgfonPHc86z1WFCBcELor2frqE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 92a66eb8172a..e3d2bdce753b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.55.1"; + version = "0.55.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SYMdn/d13YUlgK1l1pWQsJo31JG4leaCZckKmUWqpUA="; + hash = "sha256-6lUBtTG05Bz+M9Jj5HaOqG2yelwbC1trCM33NzUP1U4="; }; vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo="; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 27e5eedc31a7..ce83ef028706 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "yor"; - version = "0.1.188"; + version = "0.1.189"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-8bQUZFV5euXki7jz3tZmhJ/vSFnJusYyejfw0s+N6rk="; + hash = "sha256-9xZVim5fMKDaeATSpgEGV5ukLv+aw7A99825iBIvvb0="; }; - vendorHash = "sha256-VYzMdYwWe2TTIV28kORX6pImSE04aFISDCjlQvqiIp8="; + vendorHash = "sha256-RNtWPAAOCGs0aCR0PWnOP4GxaXTXA3uLI3aGLuMNGYI="; doCheck = false; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index c5434c869909..5cf4dc437752 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,34 +1,63 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cereal, openmp -, libjpeg ? null -, zlib ? null -, libpng ? null -, eigen ? null -, libtiff ? null +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake +, cereal , ceres-solver +, clp +, coin-utils +, eigen +, lemon-graph +, libjpeg +, libpng +, libtiff +, nix-update-script +, openmp +, osi +, zlib , enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: stdenv.mkDerivation rec { - version = "unstable-2022-12-30"; + version = "2.1"; pname = "openmvg"; src = fetchFromGitHub { owner = "openmvg"; repo = "openmvg"; - rev = "e1bbfe801986cd7171f36443a1573b0f69f3702d"; - sha256 = "sha256-DngfmejNFw5pogTo7Ec5aUey2LUQIojvJybLmtCfvVY="; - fetchSubmodules = true; + rev = "v${version}"; + hash = "sha256-vG+tW9Gl/DAUL8DeY+rJVDJH/oMPH3XyZMUgzjtwFv0="; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ]; + # Pretend we checked out the dependency submodules + postPatch = '' + mkdir src/dependencies/cereal/include + ''; + + buildInputs = [ + cereal + ceres-solver + clp + coin-utils + eigen + lemon-graph + libjpeg + libpng + libtiff + openmp + osi + zlib + ]; nativeBuildInputs = [ cmake pkg-config ]; + # flann is missing because the lz4 dependency isn't propagated: https://github.com/openMVG/openMVG/issues/1265 cmakeFlags = [ "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" "-DTARGET_ARCHITECTURE=generic" + "-DCLP_INCLUDE_DIR_HINTS=${lib.getDev clp}/include" + "-DCOINUTILS_INCLUDE_DIR_HINTS=${lib.getDev coin-utils}/include" + "-DLEMON_INCLUDE_DIR_HINTS=${lib.getDev lemon-graph}/include" + "-DOSI_INCLUDE_DIR_HINTS=${lib.getDev osi}/include" ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; @@ -41,6 +70,8 @@ stdenv.mkDerivation rec { # Without hardeningDisable, certain flags are passed to the compile that break the build (primarily string format errors) hardeningDisable = [ "all" ]; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.isDarwin && stdenv.isx86_64; description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index c5534c18d7bb..7c9d6f5cb0a6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchurl +, fetchpatch , makeWrapper , cmake , coreutils @@ -109,6 +110,17 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # compatibility with recent XRootD + # https://github.com/root-project/root/pull/13752 + (fetchpatch { + url = "https://github.com/root-project/root/commit/3d3cda6c520791282298782189cdb8ca07ace4b9.diff"; + hash = "sha256-O3aXzrOEQiPjZgbAj9TL6Wt/adN1kKFwjooeaFRyT4I="; + }) + (fetchpatch { + url = "https://github.com/root-project/root/commit/6e7798e62dbed1ffa8b91a180fa5a080b7c04ba3.diff"; + hash = "sha256-47/J631DBnVlvM1Pm9iicKXDKAqN8v9hjAstQuHmH8Q="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 4bcc6ee72b60..2141d9246dae 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = lib.optionalString (!xdg-utils.meta.broken) '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b66aa7681bc7..30a259d12540 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.9.2"; + version = "4.9.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-6E6Qobkvv6y+Jx+X6Z9wJsGIuP7MXoc+cXRiajj0ojw="; + hash = "sha256-PdAXcXtc/Jl3ttWWB6TciiOwWescJ51Glhf2ZhOw550="; }; patches = [ diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 174d5aa827f9..23a2432c824e 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -5,8 +5,19 @@ , fixDarwinDylibNames , autoconf , aws-sdk-cpp +, aws-sdk-cpp-arrow ? aws-sdk-cpp.override { + apis = [ + "cognito-identity" + "config" + "identity-management" + "s3" + "sts" + "transfer" + ]; + } , boost , brotli +, bzip2 , c-ares , cmake , crc32c @@ -36,6 +47,7 @@ , which , zlib , zstd +, testers , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? true , enableJemalloc ? !stdenv.isDarwin @@ -64,17 +76,6 @@ let hash = "sha256-CUckfNjfDW05crWigzMP5b9UynviXKGZUlIr754OoGU="; }; - aws-sdk-cpp-arrow = aws-sdk-cpp.override { - apis = [ - "cognito-identity" - "config" - "identity-management" - "s3" - "sts" - "transfer" - ]; - }; - in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -128,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost brotli + bzip2 flatbuffers gflags glog @@ -187,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { "-DARROW_USE_GLOG=ON" "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" + "-DARROW_WITH_BZ2=ON" "-DARROW_WITH_LZ4=ON" "-DARROW_WITH_NLOHMANN_JSON=ON" "-DARROW_WITH_SNAPPY=ON" @@ -247,6 +250,8 @@ stdenv.mkDerivation (finalAttrs: { installCheckPhase = let disabledTests = [ + # flaky + "arrow-flight-test" # requires networking "arrow-gcsfs-test" "arrow-flight-integration-test" @@ -266,8 +271,24 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; + pkgConfigModules = [ + "arrow" + "arrow-acero" + "arrow-compute" + "arrow-csv" + "arrow-dataset" + "arrow-filesystem" + "arrow-flight" + "arrow-flight-sql" + "arrow-flight-testing" + "arrow-json" + "arrow-substrait" + "arrow-testing" + "parquet" + ]; }; passthru = { inherit enableFlight enableJemalloc enableS3 enableGcs; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }) diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index 05066f90fb40..e73f0741b0fe 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-M3Qc9PAcYASOQyEjWdGrLKx9h6uQGPftMJnD0Uc2buc="; + hash = "sha256-nFTE6RCVpfF/CPcwKM0wK15/1KMXAuvSdmtrt+Xrp8E="; }; - vendorHash = "sha256-Bn2SDvFWmmMYDpOe+KBuzyTZLpdDtYDPc8HixgEgX+M="; + vendorHash = "sha256-AxBvmDB3mfgkv7U+BzR0Khdgx1hrDI61CSxr45pRZqg="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index 127e06f7129e..40c66d6f8c71 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "game-rs"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "amanse"; repo = "game-rs"; rev = "v${version}"; - hash = "sha256-M9/hFItoCL8fSrc0dFNn43unqkIaD179OGUdbXL6/Rs="; + hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA="; }; - cargoHash = "sha256-aq58sFK4/Zd8S4dOWjag+g5PmTeaVAK3FS3fW/YlCLs="; + cargoHash = "sha256-fNC8Aff09nTSbtxZg5qEKtvFyKFLRVjaokWiZihZCgM="; buildFeatures = [ "nixos" ]; diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index aab0ab3d6358..dcc83f461090 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "criyle"; repo = pname; rev = "v${version}"; - hash = "sha256-iKSOD/jh7NgGUNeQxFqlZDcctUXBDC1Tjxsm0Q2iZ3I="; + hash = "sha256-yWO4LD8inFOZiyrwFhjl2FCkGePpLfXuLCTwBUUGal4="; }; - vendorHash = "sha256-GVsRflqqt+PwVGWaNGMH4prKQ5pWqPRlsTBJZtC+7zo="; + vendorHash = "sha256-lMqZGrrMwNER8RKABheUH4GPy0q32FBTY3zmYHtssKo="; tags = [ "nomsgpack" ]; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 83e9305f9802..b09b3e88cd95 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-lm1Bq2AduKFYHdl/q0OLYOdYBTHnKyHGewwQa68q/Wc="; + hash = "sha256-JZmXxLHYB7t95B5iJdiZml0APJn4nKrGU8M88e8Dkgs="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index 78a9e8522fbc..c103e77dd0fc 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "keep-sorted"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "google"; repo = "keep-sorted"; rev = "v${version}"; - hash = "sha256-qCR1JVDC/+NVz+CAY/2mMP8Sk71WDl2+Ig7QWwXTUrQ="; + hash = "sha256-wXR471Iuo+4oZUNa2MN4N5q0n7vEpYtoTaJHvdGIDHw="; }; vendorHash = "sha256-tPTWWvr+/8wWUnQcI4Ycco2OEgA2mDQt15OGCk/ZjrQ="; diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 087833d406ee..09dc6fc4edd0 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.2.00"; + version = "4.2.01"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-tclPqFxXK5x9P0RD7R/fcab8WPr8Wphq5rzrZbij/ds="; + hash = "sha256-d8GB7+hHqpD5KPeYmiXmT5+6W64j3bbTs2hoFYJnfa8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index c2c2f6b18ea2..3652bb90800b 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -7,17 +7,18 @@ , meson , ninja , pkg-config +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "libui-ng"; - version = "unstable-2023-12-19"; + version = "unstable-2024-02-05"; src = fetchFromGitHub { owner = "libui-ng"; repo = "libui-ng"; - rev = "8de4a5c8336f82310df1c6dad51cb732113ea114"; - hash = "sha256-ZMt2pEHwxXxLWtK8Rm7hky9Kxq5ZIB0olBLf1d9wVfc="; + rev = "4d46de31eafad84c88b939356bcd64e6c5ee3821"; + hash = "sha256-Yb8VdJe75uBzRnsfTOVxUXstZmu6dJ9nBuOrf86KO5s="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' @@ -46,6 +47,8 @@ stdenv.mkDerivation rec { (lib.mesonBool "examples" (!stdenv.isDarwin)) ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A portable GUI library for C"; homepage = "https://github.com/libui-ng/libui-ng"; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 08657bde7297..50bec8c0428c 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.334"; + version = "0.0.338"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-gFh4LF++UB5JIVHVaZNDOhQoowf6xKow3ULrJt8CWTw="; + hash = "sha256-pZMqSZuyu7tRMcASWLVB2/Dd7qre35Evz83PLXoMgrs="; }; - vendorHash = "sha256-wurZp8cKyayZuTuUwonYZmUHp6OJ5I1RJWtELNyu2pc="; + vendorHash = "sha256-8VO+VKd6vsCzWeU1Bh33TvAmpiyCIEJbZ2HebpuwU5g="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 73c395cf00db..00738eac3694 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-jkI5t+1P7Ae6MkSnyy7Ur3Z0Vt8+hWTgf6dgL5tzhY8="; + hash = "sha256-WrpyT5h+eoCu7cspf9KGaM0FgLmnBm8tOHIWbj8sYpo="; }; - cargoHash = "sha256-9qLeFuaKAGhtyHFHOBS6HA0wAWuk0ZJppVySpMwUGYc="; + cargoHash = "sha256-XTKaVHy7FWYgMq5gNCLF8kIjDDyiyZ+GPZYBMKtLrsI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 91139a255a16..5115a84f2671 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-vgkVxQK18RBIhhL9gyuH9kmCueJFDZByhy0FE4JuVO8="; + hash = "sha256-Dzm1f7iNVCzbSogYfjDIHJ2UbPnP1F9nF9QASe/H3TU="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 0bc01d16cf72..691e89fa2b80 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scitokens/scitokens-cpp/"; description = "A C++ implementation of the SciTokens library with a C library interface"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ evey ]; }; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 8601e3041903..570bf0ea09f7 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.31.1"; + version = "2.31.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-FmL1AalQzsHIJ1yDtcAt1sjfRdzbpplYK5t0UAdwIyY="; + hash = "sha256-kOjWjubYkAUIU18jKa6WMcBgrMFOg9lql59WXusAoa8="; }; - vendorHash = "sha256-T7aUjzb69ZAnpLCpHv5C6ZyUktfC8Zt94rIju8QplWI="; + vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E="; ldflags = [ "-s -w" diff --git a/pkgs/development/libraries/fancypp/default.nix b/pkgs/development/libraries/fancypp/default.nix deleted file mode 100644 index f93ab77c63de..000000000000 --- a/pkgs/development/libraries/fancypp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "fancypp"; - version = "unstable-2021-04-08"; - - src = fetchFromGitHub { - owner = "Curve"; - repo = "fancypp"; - rev = "ede7f712a08f7c66ff4a5590ad94a477c48850a5"; - sha256 = "sha256-E2JsQnvrqrZFYo+xBJr7xDCoPnRQftqUjjBpZzFvIic="; - }; - - # Header-only library. - dontBuild = true; - - installPhase = '' - mkdir "$out" - cp -r include "$out" - ''; - - meta = with lib; { - description = "Tiny C++ Library for terminal colors and more!"; - homepage = "https://github.com/Curve/fancypp"; - maintainers = with maintainers; [ aidalgol ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index fd1aaf9c2e92..11228c572e34 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -198,8 +198,9 @@ stdenv.mkDerivation (finalAttrs: { ++ darwinDeps ++ nonDarwinDeps; + pythonPath = [ python3.pkgs.numpy ]; postInstall = '' - wrapPythonPrograms + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" '' + lib.optionalString useJava '' cd $out/lib ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix index 81c21bb68d69..ae071a727133 100644 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { # error: no viable conversion from ... doCheck = !stdenv.isDarwin; + patches = [ + # error: ISO C++17 does not allow 'register' storage class specifier + ./remove-register.patch + ]; + meta = with lib; { homepage = "https://lemon.cs.elte.hu/trac/lemon"; description = "Efficient library for combinatorial optimization tasks on graphs and networks"; diff --git a/pkgs/development/libraries/lemon-graph/remove-register.patch b/pkgs/development/libraries/lemon-graph/remove-register.patch new file mode 100644 index 000000000000..002e832035bf --- /dev/null +++ b/pkgs/development/libraries/lemon-graph/remove-register.patch @@ -0,0 +1,15 @@ +diff --git a/lemon/random.h b/lemon/random.h +index 8de74ede8a..f9861f3916 100644 +--- a/lemon/random.h ++++ b/lemon/random.h +@@ -249,8 +249,8 @@ namespace lemon { + + current = state + length; + +- register Word *curr = state + length - 1; +- register long num; ++ Word *curr = state + length - 1; ++ long num; + + num = length - shift; + while (num--) { diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index e01934b1d731..a1ce524be2f0 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-C3LfrdXNs5AG9B2n2c39fTjv2gri910EYxApGWwtH90="; + hash = "sha256-ogTw0+ZFhMRaLAxAAXzHSlLRYFuX8W/zjqglXHfvUv4="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/semver-cpp/default.nix b/pkgs/development/libraries/semver-cpp/default.nix deleted file mode 100644 index 966f170eaad0..000000000000 --- a/pkgs/development/libraries/semver-cpp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "semver-cpp"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "Neargye"; - repo = "semver"; - rev = "v${version}"; - sha256 = "sha256-nRWmY/GJtSkPJIW7i7/eIr/YtfyvYhJVZBRIDXUC7xg="; - }; - - # Header-only library. - dontBuild = true; - - installPhase = '' - mkdir "$out" - cp -r include "$out" - ''; - - meta = with lib; { - description = "Semantic Versioning for modern C++"; - homepage = "https://github.com/Neargye/semver"; - maintainers = with maintainers; [ aidalgol ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 6c49acf449cf..497d4a9aa4dd 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -54,7 +54,6 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_docstrings" # Tests expects paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 40a166c14be4..aa5b58570478 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "3.0.5"; + version = "3.0.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VaHdUxZ72JCm9zFMSEg3EW1uwfn+IIYy3yrtW9qC6rA="; + hash = "sha256-0EaJwxT80qLqlrxYk4H7Pf/UKq2pA/8HGL8OiqNA/2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 6caabb97b6e5..2ff39e63981b 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "crc"; - version = "6.1.0"; - format = "pyproject"; + version = "6.1.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Nicoretti"; - repo = pname; + repo = "crc"; rev = "refs/tags/${version}"; - hash = "sha256-NfJGiVxvFPlecDB72/Dfe0yafBH9dghGQh/TAnbPzOA="; + hash = "sha256-GlXDDG8NZ3Lp0IwYKS0+fZG85uVdo4V8mZnCa+za02U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 65536d16151b..0302770761ed 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, huggingface-hub , pythonOlder +, pythonRelaxDepsHook , poetry-core +, onnx , onnxruntime , requests , tokenizers @@ -13,7 +16,7 @@ buildPythonPackage rec { pname = "fastembed"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -26,16 +29,25 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + huggingface-hub + onnx onnxruntime requests tokenizers tqdm ]; - pythonImportsCheck = [ "fastembed" ]; + pythonImportsCheck = [ + "fastembed" + ]; + + pythonRelaxDeps = [ + "huggingface-hub" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 620ead1afe2e..96e1698002f0 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "intbitset"; - version = "3.0.2"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-owCy1aSYmFf/HQw5cWJHZqiadR4xWqCAwHhlAxrmN6c="; + hash = "sha256-boPFun/aJSCqhWVCi7r4Qt63KT1mXzzYKByzklTS/3E="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 4547916212b0..0bcf055a8766 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -14,7 +14,6 @@ # * https://github.com/google/jax/issues/5723#issuecomment-913038780 { absl-py -, addOpenGLRunpath , autoPatchelfHook , buildPythonPackage , config @@ -33,7 +32,7 @@ }: let - inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion; version = "0.4.24"; @@ -181,7 +180,7 @@ buildPythonPackage { # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ] - ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc.lib ]; @@ -197,8 +196,6 @@ buildPythonPackage { preInstallCheck = lib.optional cudaSupport '' shopt -s globstar - addOpenGLRunpath $out/**/*.so - for file in $out/**/*.so; do rpath=$(patchelf --print-rpath $file) # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 723eb220b587..81e6709ed756 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.12"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-Ysg97ApwbraRn19Mn5pJsg91dzf/njnNZiBJQKZqIbQ="; + hash = "sha256-1uJetSJ4P4PcuvzBQBfkQHVIvLU+rdyEZDV2T28GKhg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 6639be7e61c2..2810332d42bb 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.19"; + version = "1.4.20"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-UvnDpt0PrK2stO9eRXtqApJjlzXCIXmwMq7ewx+fQ/0="; + hash = "sha256-NiAv0zNITpKIQ2TarNoU4HwKuHm22LTu8pJUi0SDlfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 72f04c72a8de..740939959e76 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -119,6 +119,8 @@ buildPythonPackage rec { "-n" "$NIX_BUILD_CORES" # Follow upstream with settings + "-m 'not serial'" + "--hypothesis-profile ci" "--durations=20" ]; @@ -141,6 +143,11 @@ buildPythonPackage rec { "test_get_array_in_scalar_param_data" "test_get_parameter_data" "test_ramp_safely" + + # more flaky tests + # https://github.com/microsoft/Qcodes/issues/5551 + "test_query_close_once_at_init" + "test_step_ramp" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix index f9d7d2931e5a..5d34cd6693bf 100644 --- a/pkgs/development/python-modules/smtpdfix/default.nix +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , setuptools , pytest , portpicker @@ -36,6 +37,11 @@ buildPythonPackage rec { pytest-asyncio ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/bebleo/smtpdfix/issues/335 + "test_missing_certs" + ]; + meta = with lib; { description = "An SMTP server for use as a pytest fixture for testing"; homepage = "https://github.com/bebleo/smtpdfix"; diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index dd0d7d890acb..7c951f697b8e 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.1.1"; + version = "1.1.2"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - hash = "sha256-zk3xqqs4WjqWM/p5coGTfqEgpRcJaLbrgXsR8+CKvAc="; + hash = "sha256-zudERm/eSPUDArhRKRsgiqZ+cmyjG3o7+5tuahRWY+A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 3af7ba636e9e..36fe7e0eb1f8 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, unidecode -, sphinx +, pytestCheckHook , pythonAtLeast , pythonOlder -, pytestCheckHook -, pytest-cov +, setuptools +, sphinx +, unidecode }: buildPythonPackage rec { pname = "uqbar"; - version = "0.7.0"; - format = "pyproject"; + version = "0.7.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cEhWXGtMSXVjT5QigDedjT/lwYQnVqPCE5vbctXWznk="; + hash = "sha256-pZ2sNs9uK49PK8qxRRqpGMEI1Xr6Fn+fxptlEVv3GSk="; }; postPatch = '' - sed -i '/"black"/d' pyproject.toml + sed -i pyproject.toml \ + -e '/"black"/d' \ + -e "/--cov/d" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ unidecode sphinx @@ -32,22 +38,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov - ]; - - pytestFlagsArray = [ - "tests/" - "-vv" - "-rf" - "--cov-branch" - "--cov-report=html" - "--cov-report=term" - "--doctest-modules" ]; disabledTests = [ - # UnboundLocalError: local variable 'output_path' referenced before - # assignment + # UnboundLocalError: local variable 'output_path' referenced before assignment "test_01" # AssertionError: assert False "test_sphinx_book_html_cached" @@ -56,18 +50,23 @@ buildPythonPackage rec { # assert not ["\x1b[91mWARNING: dot command 'dot' cannot be run (needed for # graphviz output), check the graphviz_dot setting\x1b[39;49;00m"] "test_sphinx_style_latex" - ] - # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring - ++ lib.optional (pythonAtLeast "3.11") "test_sphinx_style"; + ] ++ lib.optional (pythonAtLeast "3.11") [ + # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring + "test_sphinx_style" + ] ++ lib.optional (pythonAtLeast "3.12") [ + # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/93 + "objects.get_vars" + ]; - pythonImportsCheck = [ "uqbar" ]; + pythonImportsCheck = [ + "uqbar" + ]; - meta = { + meta = with lib; { description = "Tools for creating Sphinx and Graphviz documentation"; - license = lib.licenses.mit; homepage = "https://github.com/josiah-wolf-oberholtzer/uqbar"; - changelog = - "https://github.com/josiah-wolf-oberholtzer/uqbar/releases/tag/v${version}"; - maintainers = [ lib.maintainers.davisrichard437 ]; + changelog = "https://github.com/josiah-wolf-oberholtzer/uqbar/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ davisrichard437 ]; }; } diff --git a/pkgs/development/python-modules/xrootd/default.nix b/pkgs/development/python-modules/xrootd/default.nix new file mode 100644 index 000000000000..626a5e46e4c4 --- /dev/null +++ b/pkgs/development/python-modules/xrootd/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, cmake +, setuptools +, wheel +, pkgs +}: + +buildPythonPackage rec { + pname = "xrootd"; + pyproject = true; + + inherit (pkgs.xrootd) version src; + + sourceRoot = "${src.name}/bindings/python"; + + nativeBuildInputs = [ + cmake + setuptools + wheel + ]; + + buildInputs = [ + pkgs.xrootd + ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ "XRootD" ]; + + # Tests are only compatible with Python 2 + doCheck = false; + + meta = with lib; { + description = "The XRootD central repository"; + homepage = "https://github.com/xrootd/xrootd"; + changelog = "https://github.com/xrootd/xrootd/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 6e26a71ff38d..f9b5cfffdf8b 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.29936"; + version = "0.1.30084"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PJy2kg727ZEsEbQzR5EE8SeYfM1ZqaIbS2FZxewn5J0="; + sha256 = "sha256-LZPHBxl1wBZD0zk11Yu2cKwBdOa1QXtLPpNvjeCOuJY="; }; - vendorHash = "sha256-mDpuoKOW2/PexZ/yJeQ2yzCjoKfD23J36pZ5BPDo/mg="; + vendorHash = "sha256-Ko2y/3h/SZk5aDympMT7nkZqXU1JsvKOaztKm8A8YXQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index c69ee18df314..2d4ed5599d77 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-WO9W4jDQklvHOlfbfTtQIpSxn/jzytz1P6ODO6LTwlI="; + hash = "sha256-eN+MByapusaznL3BR1WOWJ3tMtxJ4yrxrcNCHOgoL0k="; }; - vendorHash = "sha256-ogmshFRVZPCDKHcbDuJ4M1d+Bv3GSnylhnmuUHseRGM="; + vendorHash = "sha256-+7/bY0qrRRZ0GNkIcuqOi4MA8wE75/HllRI6e/IQgy4="; subPackages = [ "cmd/src" diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 98b6e7e0c3bf..de78dcbc1aa5 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.182.0"; + version = "0.183.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zqwdTtNbPm9D0zfVI8zd3hFM6zLQVxXyxNOyEW1gSHY="; + sha256 = "sha256-+zmfMOp+ygVUErggHz+9AkpJ7AjfUBjCRcE4Uqusjz4="; }; - vendorHash = "sha256-93Eu38tDxV4pT4HtmssFckYwdnkOaW2IY6PsqT9W73c="; + vendorHash = "sha256-oENe7OGAW/i5LJbqPn7PJDemdxfSsLwmpER28R6zza4="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index f87bb3d2b1ed..65e3dc1266fa 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-ZvuSws7QkoKeMyHFoJEeLemDCdAxDnq5SaOaUCOOA/M="; + hash = "sha256-rOgRrDrum/vRpV62y0lHmkgj6tbznyA1cenXdkhFA4E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 9a1adef89190..a288c1516bfc 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.35"; + version = "1.0.36"; src = fetchCrate { inherit pname version; - hash = "sha256-RtpOKngi8oTCnJFXSHHlBPpNoPcco06yyB2/+S5nG04="; + hash = "sha256-WvOzlz/ACM+TBc5HOiQe4ELhqhAIc8pobRN/9hxmPNI="; }; - cargoHash = "sha256-CC4F7fsQsjNAVwslxVHG3scjqWvKfjlDve27LEGXSms="; + cargoHash = "sha256-uud6cr77XAxzGhN5wWtUh9jD9JWsyCMufx+b2fyIm0Q="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index bccec663dbaa..9ff36c949ce3 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vtkGV97FG43HIKPJ/of7jXWSrwHWgHUjwtq0XJPeKws="; + hash = "sha256-f+VJYWsfsoGLs9Ypk5cJQgn86PhsJ/6ODDjlnp84Frg="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index cc9fb7374658..4b9758494dca 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.3.0"; + version = "0.4.0"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = version; - sha256 = "1aybk8vbb4745raz7rvpkk6b98xrdiwjhkpbv3kwsgsr9sj42lp0"; + hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow="; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 691fa523b522..64a1e7955000 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -17,7 +17,7 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.8" + then kernel.kernelOlder "6.9" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM @@ -28,13 +28,13 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.3-unstable-2024-01-26"; - rev = "3425484eb907d489c315cced2a1fdea08ef03fc4"; + version = "2.2.3-unstable-2024-02-12"; + rev = "4635453d9f06771678b2125d5b45852b4d2eb04f"; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-P8PIp0qRHm/fxYdxWKVRX9LR5tKZR7fFUSY90QDE/lU="; + hash = "sha256-ch1/R61cn1BtWkkH2IViWjVp22XFz4/WbByquN+vybs="; } diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 0a6a831414fa..fe1575000a2f 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-H8BUyIsbn8UL6VuA2SEJXzJ77S/880rQIoNKFJNApqQ="; + hash = "sha256-QPMjf+VpsjvIrjjhDuZqd8VLl2Uu5Wop286Yn8XeRWk="; }; - npmDepsHash = "sha256-RC2Y4XZqO+mLEKQxq+j2ukZYi/uu9XIjYadxek9P+SM="; + npmDepsHash = "sha256-u15lDdXnV3xlXAC9WQQKLIeV/AgtRM1sFNsacw3j6kU="; preBuild = '' mkdir -p config diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 3a88f72ae03d..a889f42f97aa 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.38.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-YPEJP+RdGxEMVRoDohxGiOkOMmWLhlBrkr+T+zcST5g="; + hash = "sha256-BoFoF7V6bTQiJ+afGnivviU/s2ikOxAX06s+AwRxo8Q="; }; - cargoHash = "sha256-Dia0/yV2rsUx0Mfd2rQkNh7QB+dZubudcoyfMmeaxx8="; + cargoHash = "sha256-B0K/lco7suYM0/02LaDbeqyt4zyiwoeBxhmUPsVTvkw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 87379c4d7df1..9a50c3063eb3 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -25,15 +25,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.27.2"; - rev = "ae07f9a11715245f7d25d2a13699c260c2ae8ebb"; - hash = "sha256-VgP3st26Wkx51tTM++tKAZX7+BmPGgy1MIJFGLDu4JU="; + version = "1.27.3"; + rev = "0fd81ee7ffcd7cfc864094b24dc9b5c3ade89ff2"; + hash = "sha256-WNyyUw3517oKqMd1sJMk9CiLa/V7UrhwlRS+AWNNOOo="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-389CaxJ3F66eMID7+KgwzCdlT2QPOTkKPLnqpmM49ig="; - aarch64-linux = "sha256-ui7AUzWouAn2DZ7kUpp1huNxPGBqzKXqtwcuRZUhmqo="; + x86_64-linux = "sha256-wTGHfeFkCuijPdX//lT5GPspaxZsxzBHJffH1tpVM2w="; + aarch64-linux = "sha256-9/Wem+Gk/7bFeMNFC4J3mdTm3mrNmyMxiu5oadQcovU="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage { @@ -70,7 +70,7 @@ buildBazelPackage { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch - # bump proxy-wasm-cpp-host until > 1.27.2/1.28.0 + # bump proxy-wasm-cpp-host until > 1.27.3/1.28.0 (fetchpatch { url = "https://github.com/envoyproxy/envoy/pull/31451.patch"; hash = "sha256-n8k7bho3B8Gm0dJbgf43kU7ymvo15aGJ2Twi2xR450g="; @@ -191,6 +191,7 @@ buildBazelPackage { meta = with lib; { homepage = "https://envoyproxy.io"; + changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}"; description = "Cloud-native edge and service proxy"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 537b865fc649..7279f61bac72 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; connection_pool = { groups = ["default" "test"]; @@ -1723,10 +1723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1881,10 +1881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; + sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; type = "gem"; }; - version = "1.15.4"; + version = "1.16.2"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2170,10 +2170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -2781,10 +2781,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9a1cwv86c9zb3hj1m42gbjk6r7rgs5ismalr9c9nx365yyj90i"; + sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl"; type = "gem"; }; - version = "6.5.10"; + version = "6.5.12"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2814,10 +2814,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02f91b24hrrn688wqvxb13lwvcgqb7g9k3sxylnydd6v89wr8mcg"; + sha256 = "1am17wfx023z1x9sxq90cyjarcmcwb95mi456mcf13m783r4n190"; type = "gem"; }; - version = "7.1.29"; + version = "7.1.33"; }; simple-navigation = { dependencies = ["activesupport"]; @@ -3025,10 +3025,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; tilt = { groups = ["default" "development"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 06c07c09df5b..bb1a11ac7e60 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.5"; + version = "4.2.6"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-dgC5V/CVE9F1ORTjPWUWc/JVcWCEj/pb4eWpDV0WliY="; + hash = "sha256-xUJiyQN3xsl/8+D/kaky+iYunY0ctlSbjkftN2+NQNw="; }; patches = patches ++ []; }) // { diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 796118df4d34..b99f5aa2d423 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.23.8"; + version = "1.23.9"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-+ER6g6oZaYuAO5wAPo4XT6h7n+DV5btB/zmqoFCiSEc="; + hash = "sha256-cl8jTMrX/N/MNxmFtF818veZEFuBQ1APXzqs8WC/Bt4="; }; vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 82f82e65f8c9..9986f2131f30 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2023-12-04"; + version = "unstable-2024-02-10"; buildInputs = [ postgresql freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "14b147fde8d99f3946fbd7b84aaaf5fc00af90e2"; - hash = "sha256-h1kTcm796ibfcrkRRs+yi1TRpcyZog95Genw8hMh0cg="; + rev = "f78bd38955d01d3ca357b90717588ec2f90b4991"; + hash = "sha256-3J8wzk0YIxRPhALd5PgVW000hzQw3r4rTrnqg9uB/Bo="; }; installPhase = '' diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index e33587b94670..82081a68af43 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -20,36 +20,19 @@ let hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw="; }; }); - - okta = super.okta.overridePythonAttrs (oldAttrs: rec { - version = "0.0.4"; - format = "setuptools"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-U+eSxo02hP9BQLTLHAKvOCEJA2j4EQ/eVMC9tjhEkzI="; - }; - propagatedBuildInputs = [ - self.six - self.python-dateutil - self.requests - ]; - pythonImportsCheck = [ "okta" ]; - doCheck = false; # no tests were included with this version - }); }; }; in python.pkgs.buildPythonApplication rec { pname = "gimme-aws-creds"; - version = "2.7.2"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.8.0"; # N.B: if you change this, check if overrides are still up-to-date format = "setuptools"; src = fetchFromGitHub { owner = "Nike-Inc"; repo = "gimme-aws-creds"; rev = "v${version}"; - hash = "sha256-ydzGaUQ43vvQqU9xvhPJqHG/2PUtBbASIVpZCDnsR60="; + hash = "sha256-RcqvI+jR7TiNAzq8F6VGVhyj6MxnmsjQKh0CiZvLY9Q="; }; nativeBuildInputs = with python.pkgs; [ @@ -69,6 +52,8 @@ python.pkgs.buildPythonApplication rec { requests okta pyjwt + html5lib + furl ]; preCheck = '' diff --git a/pkgs/tools/admin/simplotask/default.nix b/pkgs/tools/admin/simplotask/default.nix index 6f8c96c2eb72..b2b15ebe982a 100644 --- a/pkgs/tools/admin/simplotask/default.nix +++ b/pkgs/tools/admin/simplotask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-PuyM2WhBww6SqlI5VptTNNS61401c1R0DOsHmOcfLCI="; + hash = "sha256-Sg84Q5I82W2fz/CHh9ov0QPCzAoyqkNrATWNFnMrnEw="; }; vendorHash = null; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index f9b3ec3f73ac..7b677aff70ac 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "brltty"; - version = "6.3"; + version = "6.6"; src = fetchurl { url = "https://brltty.app/archive/${pname}-${version}.tar.gz"; - sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb"; + sha256 = "E+j2mb8UTuGx6PkAOt03hQkvf1XvEHxJEuPBT2zMpPw="; }; - nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython python3.pkgs.setuptools tcl ]; buildInputs = [ bluez ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional systemdSupport systemd; @@ -37,10 +37,12 @@ stdenv.mkDerivation rec { "SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system" "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d" "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d" - "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev" + "UDEV_PARENT_LOCATION=$(out)/lib" + "INSTALL_COMMANDS_DIRECTORY=$(out)/libexec/brltty" "UDEV_RULES_TYPE=all" "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions" "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d" + "TCL_DIR=$(out)/lib" ]; configureFlags = [ "--with-writable-directory=/run/brltty" @@ -69,7 +71,6 @@ stdenv.mkDerivation rec { ( cd $out/lib substituteInPlace systemd/system/brltty@.service \ - --replace '/usr/lib' "$out/lib" \ --replace '/sbin/modprobe' '${kmod}/bin/modprobe' # Ensure the systemd-wrapper script uses the correct path to the brltty binary sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service @@ -77,11 +78,14 @@ stdenv.mkDerivation rec { --replace '/usr/bin/true' '${coreutils}/bin/true' substituteInPlace udev/rules.d/90-brltty-uinput.rules \ --replace '/usr/bin/setfacl' '${acl}/bin/setfacl' - substituteInPlace tmpfiles.d/brltty.conf \ + substituteInPlace udev/rules.d/90-brltty-hid.rules \ + --replace '/usr/bin/setfacl' '${acl}/bin/setfacl' + substituteInPlace tmpfiles.d/brltty.conf \ --replace "$out/etc" '/etc' # Remove unused commands from udev rules - sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules + sed '/initctl/d' -i udev/rules.d/90-brltty-usb-generic.rules + sed '/initctl/d' -i udev/rules.d/90-brltty-usb-customized.rules # Remove pulse-access group from systemd unit and sysusers substituteInPlace systemd/system/brltty@.service \ --replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access' diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index dd767f4bd275..ecfa780cc532 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.21.6"; + version = "0.21.7"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - hash = "sha256-k9RStWmj5hTONYVzgOfzo4bkXu1Oxg0OyabeINVw1P8="; + hash = "sha256-puaqAMUnlQNOQmxhJCKQKTBypTjdModijtIpPBZsIXY="; }; vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw="; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 2ad3922212a9..8f9570af4015 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.25.7"; + version = "0.25.8"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-DclCqXNGXFTbJTD6zllCUfSR3twnnS4rfXMuRtWQpeQ="; + hash = "sha256-BsExPkUbkHJbi4oWKEH9tPoipGutzz19FuLxImlFUVQ="; }; - vendorHash = "sha256-61i/QqUFuKXbOGBJVDRi5BdUxB/k18RM8dvgQwiHb/k="; + vendorHash = "sha256-CFLwb5cqsfxTxOwuLOB0IMYkRZUNPgB7grjQ4xm84BM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index e32139fdfceb..991b9039860e 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -2,8 +2,10 @@ , stdenv , callPackage , fetchFromGitHub +, davix , cmake , cppunit +, gtest , makeWrapper , pkg-config , curl @@ -14,6 +16,7 @@ , libxml2 , openssl , readline +, scitokens-cpp , systemd , voms , zlib @@ -22,21 +25,19 @@ # If not null, the builder will # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. , externalEtc ? "/etc" +, removeReferencesTo }: stdenv.mkDerivation (finalAttrs: { - - __structuredAttrs = true; - pname = "xrootd"; - version = "5.5.5"; + version = "5.6.6"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-SLmxv8opN7z4V07S9kLGo8HG7Ql62iZQLtf3zGemwA8="; + hash = "sha256-vSZKTsDMY5bhfniFOQ11VA30gjfb4Y8tCC7JNjNw8Y0="; }; outputs = [ "bin" "out" "dev" "man" ] @@ -62,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: { cmake makeWrapper pkg-config + removeReferencesTo ]; buildInputs = [ + davix curl libkrb5 libuuid @@ -72,7 +75,11 @@ stdenv.mkDerivation (finalAttrs: { libxml2 openssl readline + scitokens-cpp zlib + ] + ++ lib.optionals (!stdenv.isDarwin) [ + # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58 fuse ] ++ lib.optionals stdenv.isLinux [ @@ -80,11 +87,16 @@ stdenv.mkDerivation (finalAttrs: { voms ] ++ lib.optionals enableTestRunner [ + gtest cppunit ]; preConfigure = '' patchShebangs genversion.sh + substituteInPlace cmake/XRootDConfig.cmake.in \ + --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_" + '' + lib.optionalString stdenv.isDarwin '' + sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )' ''; # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675= @@ -98,21 +110,37 @@ stdenv.mkDerivation (finalAttrs: { install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example mkdir -p "$out/etc/logrotate.d" install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd" + '' + # Leaving those in bin/ leads to a cyclic reference between $dev and $bin + # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788 + # So far, this xrootd-config script does not seem necessary in $bin + + '' + moveToOutput "bin/xrootd-config" "$dev" + moveToOutput "bin/.xrootd-config-wrapped" "$dev" '' + lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib/systemd/system" install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket ''; - cmakeFlags = lib.optionals enableTestRunner [ + cmakeFlags = [ + "-DXRootD_VERSION_STRING=${finalAttrs.version}" + ] ++ lib.optionals enableTestRunner [ + "-DFORCE_ENABLED=TRUE" + "-DENABLE_DAVIX=TRUE" + "-DENABLE_FUSE=${if (!stdenv.isDarwin) then "TRUE" else "FALSE"}" # not supported + "-DENABLE_MACAROONS=OFF" + "-DENABLE_PYTHON=FALSE" # built separately + "-DENABLE_SCITOKENS=TRUE" "-DENABLE_TESTS=TRUE" + "-DENABLE_VOMS=${if stdenv.isLinux then "TRUE" else "FALSE"}" ]; - makeWrapperArgs = [ - # Workaround the library-not-found issue - # happening to binaries compiled with xrootd libraries. - # See #169677 - "--prefix" "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" ":" "${placeholder "out"}/lib" - ]; + # Workaround the library-not-found issue + # happening to binaries compiled with xrootd libraries. + # See #169677 + preFixup = '' + makeWrapperArgs+=("--prefix" "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" ":" "${placeholder "out"}/lib") + ''; postFixup = '' while IFS= read -r FILE; do diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index 885106528483..b053640d8da9 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.5.4"; + version = "8.5.5"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-Ip8SJi77QjNF2ez2NU48NKi+suOhViecuQyXSY6hLkI="; + sha256 = "sha256-DKfCXtFrZgmR0jiXwCD1iuwx/8aNEjwZ/fCQNeRhSu4="; }; vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk="; diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index 4d1bf855ad6f..e7875f00bb6a 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -25,7 +25,7 @@ let pname = "multipass"; - version = "1.13.0"; + version = "1.13.1"; # This is done here because a CMakeLists.txt from one of it's submodules tries # to modify a file, so we grab the source for the submodule here, copy it into @@ -46,7 +46,7 @@ stdenv.mkDerivation owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-DMyIvhlkMuUyOlUw8b4312NUtpK0n8rI8nhoV6Dscyo="; + hash = "sha256-QttgWSuhxcuOyMNF9Ve1w0ftT41+hNz3WW5Vag/88X4="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eeaf485a951f..4238169e980d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -279,6 +279,7 @@ mapAliases ({ ### F ### + fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = fastnlo-toolkit; # Added 2021-04-24 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 @@ -981,6 +982,7 @@ mapAliases ({ scitoken-cpp = scitokens-cpp; # Added 2024-02-12 sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 + semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 @@ -1001,6 +1003,7 @@ mapAliases ({ solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 + soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47d842460f08..0c74b39af6e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20449,8 +20449,6 @@ with pkgs; cudaPackages = cudaPackages_12; }; - arrow-cpp = callPackage ../development/libraries/arrow-cpp { }; - arrow-glib = callPackage ../development/libraries/arrow-glib { }; arsenal = callPackage ../tools/security/arsenal { }; @@ -21048,8 +21046,6 @@ with pkgs; factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { }; factor-lang = factor-lang-scope.interpreter; - fancypp = callPackage ../development/libraries/fancypp { }; - far2l = callPackage ../applications/misc/far2l { inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; @@ -24832,8 +24828,6 @@ with pkgs; seasocks = callPackage ../development/libraries/seasocks { }; - semver-cpp = callPackage ../development/libraries/semver-cpp { }; - serd = callPackage ../development/libraries/serd { }; serf = callPackage ../development/libraries/serf { }; @@ -26763,10 +26757,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - soundux = callPackage ../applications/audio/soundux { - yt-dlp = yt-dlp.override { withAlias = true; }; - }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddc59230010d..2cdef92e31be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14236,7 +14236,7 @@ self: super: with self; { tensorflow-build = let compat = rec { protobufTF = pkgs.protobuf_21.override { - abseil-cpp = pkgs.abseil-cpp; + abseil-cpp = pkgs.abseil-cpp_202301; }; grpcTF = (pkgs.grpc.overrideAttrs ( oldAttrs: rec { @@ -14288,6 +14288,7 @@ self: super: with self; { grpc = compat.grpcTF; grpcio = compat.grpcioTF; tensorboard = compat.tensorboardTF; + abseil-cpp = pkgs.abseil-cpp_202301; # Tensorflow 2.13 doesn't support gcc13: # https://github.com/tensorflow/tensorflow/issues/61289 @@ -16416,6 +16417,8 @@ self: super: with self; { xpybutil = callPackage ../development/python-modules/xpybutil { }; + xrootd = callPackage ../development/python-modules/xrootd { }; + xsdata = callPackage ../development/python-modules/xsdata { }; xstatic-asciinema-player = callPackage ../development/python-modules/xstatic-asciinema-player { }; |